WangRunji
|
2d5178d0b7
|
rename ucore to rcore
|
6 years ago |
|
WangRunji
|
61dfcb5558
|
Merge remote-tracking branch 'equation314/arch-aarch64' into merging
# Conflicts:
# kernel/Makefile
# kernel/src/arch/aarch64/board/raspi3/irq.rs
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/riscv32/paging.rs
# kernel/src/arch/x86_64/paging.rs
|
6 years ago |
|
WangRunji
|
33eaded142
|
Merge remote-tracking branch 'bpc/user-lib-bin' into merge-1228
# Conflicts:
# kernel/src/arch/riscv32/compiler_rt.c
# kernel/src/arch/riscv32/consts.rs
# kernel/src/arch/riscv32/context.rs
# kernel/src/arch/riscv32/io.rs
# kernel/src/arch/riscv32/memory.rs
# kernel/src/arch/riscv32/paging.rs
# user/ucore-ulib/src/syscall.rs
|
6 years ago |
|
WangRunji
|
a852c96136
|
Merge branch 'master' into rust-rv64
# Conflicts:
# crate/memory/src/memory_set.rs
# kernel/src/arch/riscv32/compiler_rt.rs
# kernel/src/arch/riscv32/memory.rs
# kernel/src/arch/riscv32/paging.rs
# kernel/src/memory.rs
# kernel/src/process/mod.rs
|
6 years ago |
dzy
|
21adebb203
|
run until ms.token()
|
6 years ago |
|
dzy
|
0dbffbc0fa
|
temporary
|
6 years ago |
equation314
|
aa5bd3041b
|
Merge branch 'master' into arch-aarch64
|
6 years ago |
Ben Pig Chu
|
07b8a063ec
|
maually remove warning, pt2
|
6 years ago |
|
Ben Pig Chu
|
1ca2bde069
|
maually remove warning, pt1
|
6 years ago |
|
equation314
|
b5cc79d1b2
|
modify mmio() & set_mmio() in PageEntry
|
6 years ago |
|
equation314
|
5987c2068b
|
aarch64/fb: remap framebuffer base address
|
6 years ago |
|
WangRunji
|
9b0b0064d0
|
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
# Conflicts:
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/aarch64/paging.rs
# kernel/src/process/context.rs
|
6 years ago |
|
WangRunji
|
557f021c08
|
fix DelayHandler & MemoryAttr
|
6 years ago |
|
WangRunji
|
ff806d4465
|
move common codes to InactivePageTable trait
|
6 years ago |
|
WangRunji
|
102866bcf9
|
introduce MemoryHandler and refactor MemorySet. temporary disable swap.
This is a manual rebase of LCY's code
|
6 years ago |
|
equation314
|
aa5e7a4e6f
|
remove #![feature(extern_crate_item_prelude)]
|
6 years ago |
|
WangRunji
|
2afe8c731e
|
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
# Conflicts:
# crate/memory/src/memory_set.rs
# kernel/Cargo.lock
# kernel/src/arch/aarch64/interrupt/handler.rs
# kernel/src/arch/aarch64/interrupt/mod.rs
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/aarch64/mod.rs
# kernel/src/arch/aarch64/paging.rs
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/memory.rs
# kernel/src/process/context.rs
# tools/riscv-pk/.gitignore
# tools/riscv-pk/LICENSE
# tools/riscv-pk/Makefile.in
# tools/riscv-pk/README.md
# tools/riscv-pk/aclocal.m4
# tools/riscv-pk/bbl/bbl.ac
# tools/riscv-pk/bbl/bbl.c
# tools/riscv-pk/bbl/bbl.h
# tools/riscv-pk/bbl/bbl.lds
# tools/riscv-pk/bbl/bbl.mk.in
# tools/riscv-pk/bbl/logo.c
# tools/riscv-pk/bbl/payload.S
# tools/riscv-pk/bbl/raw_logo.S
# tools/riscv-pk/bbl/riscv_logo.txt
# tools/riscv-pk/config.h.in
# tools/riscv-pk/configure
# tools/riscv-pk/configure.ac
# tools/riscv-pk/dummy_payload/dummy_entry.S
# tools/riscv-pk/dummy_payload/dummy_payload.lds
# tools/riscv-pk/dummy_payload/dummy_payload.mk.in
# tools/riscv-pk/machine/atomic.h
# tools/riscv-pk/machine/bits.h
# tools/riscv-pk/machine/disabled_hart_mask.h
# tools/riscv-pk/machine/emulation.c
# tools/riscv-pk/machine/emulation.h
# tools/riscv-pk/machine/encoding.h
# tools/riscv-pk/machine/fdt.c
# tools/riscv-pk/machine/fdt.h
# tools/riscv-pk/machine/finisher.c
# tools/riscv-pk/machine/finisher.h
# tools/riscv-pk/machine/flush_icache.c
# tools/riscv-pk/machine/htif.c
# tools/riscv-pk/machine/htif.h
# tools/riscv-pk/machine/machine.ac
# tools/riscv-pk/machine/machine.mk.in
# tools/riscv-pk/machine/mcall.h
# tools/riscv-pk/machine/mentry.S
# tools/riscv-pk/machine/minit.c
# tools/riscv-pk/machine/misaligned_ldst.c
# tools/riscv-pk/machine/mtrap.c
# tools/riscv-pk/machine/mtrap.h
# tools/riscv-pk/machine/muldiv_emulation.c
# tools/riscv-pk/machine/uart.c
# tools/riscv-pk/machine/uart.h
# tools/riscv-pk/machine/uart16550.c
# tools/riscv-pk/machine/uart16550.h
# tools/riscv-pk/machine/unprivileged_memory.h
# tools/riscv-pk/machine/vm.h
# tools/riscv-pk/scripts/config.guess
# tools/riscv-pk/scripts/config.sub
# tools/riscv-pk/scripts/install.sh
# tools/riscv-pk/scripts/mk-install-dirs.sh
# tools/riscv-pk/scripts/vcs-version.sh
# tools/riscv-pk/util/snprintf.c
# tools/riscv-pk/util/string.c
# tools/riscv-pk/util/util.mk.in
|
6 years ago |
|
equation314
|
0eb33b661f
|
aarch64/mmu: fix some bugs
|
6 years ago |
|
WangRunji
|
18640b7537
|
impl NoMMU
|
6 years ago |
|
WangRunji
|
52fe93188d
|
disable delay allocating frame, remove `memory_set_record`
|
6 years ago |
|
equation314
|
264600f145
|
aarch64/mmu: add io remap
|
6 years ago |
|
equation314
|
a9de99d3a9
|
aarch64/mmu: remap kernel memory ranges at the end of memory::init()
|
6 years ago |
|
WangRunji
|
12457f10cb
|
update `memory` crate to 2018 edition
|
6 years ago |
lcy1996
|
76d2c6ec7b
|
Fix the bug of active_table_swap() wrongly force unlock in pg fault handler
|
6 years ago |
|
lcy1996
|
b2fec2b16b
|
Fix a bug in context for smp
|
6 years ago |
|
lcy1996
|
9d803e87d9
|
replace some unwrap() and comment the cow pgfault handler
|
6 years ago |
|
WangRunji
|
205f90a264
|
Merge branch 'dev' into g4-merge
# Conflicts:
# crate/memory/src/cow.rs
# crate/memory/src/memory_set.rs
# crate/memory/src/paging/mod.rs
# crate/memory/src/swap/mod.rs
# crate/process/src/lib.rs
# crate/process/src/process_manager.rs
# crate/process/src/processor.rs
# crate/process/src/thread.rs
# crate/riscv
# kernel/Cargo.lock
# kernel/src/arch/riscv32/compiler_rt.rs
# kernel/src/arch/riscv32/consts.rs
# kernel/src/arch/riscv32/context.rs
# kernel/src/arch/riscv32/interrupt.rs
# kernel/src/arch/riscv32/memory.rs
# kernel/src/arch/riscv32/mod.rs
# kernel/src/arch/riscv32/paging.rs
# kernel/src/arch/x86_64/driver/ide.rs
# kernel/src/arch/x86_64/interrupt/handler.rs
# kernel/src/arch/x86_64/mod.rs
# kernel/src/console.rs
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/memory.rs
# kernel/src/process/context.rs
# kernel/src/process/mod.rs
# kernel/src/syscall.rs
# kernel/src/trap.rs
|
6 years ago |
|
lcy1996
|
c5499a62c5
|
Fix bug in swap in/out. Address ailign to 4K.
|
6 years ago |
|
lcy1996
|
5ee44588e0
|
Enlarge the physical and kernel heap memory. Fix the bug in map the kernel.
|
6 years ago |
|
lcy1996
|
9adcea44d5
|
Code transplanting: Fix bugs. Pass test 'spin'
|
6 years ago |
|
lcy1996
|
c8ea2cb0cf
|
Fix bug and enable swap in/out and frame delayed allocating.
|
6 years ago |
|
lcy1996
|
b1425a53f9
|
finish frame delayed allocating
|
6 years ago |
|
lcy1996
|
504401355f
|
Add expr3 report(not finiished.
|
6 years ago |
|
lcy1996
|
edde416052
|
Finish swap for multi-user process
|
6 years ago |
|
WangRunji
|
72dc3f62ad
|
Remove kernel stack from MemorySet.
|
6 years ago |
|
WangRunji
|
438e290b6d
|
Fix PageTable::get_entry -> Option.
|
6 years ago |
|
lcy1996
|
63349ade19
|
Finish add more comment for kernel and finish set user memory swappable.
|
6 years ago |
|
lcy1996
|
0a81014007
|
Add page handler for swap in/out in riscv32's pagefault
|
6 years ago |
|
Ben Pig Chu
|
4a17ce8f16
|
comments of crate/memory
|
6 years ago |
|
WangRunji
|
501ce6c4be
|
Fix memory crate test compile.
|
6 years ago |
|
WangRunji
|
b88648ff44
|
Fit for newest Rust nightly. x86_64 ok, riscv32 broken.
|
6 years ago |
|
WangRunji
|
0c9679b710
|
Fix fork and syscall return value.
|
6 years ago |
|
WangRunji
|
96d8af8034
|
Use CowExt for RV32
|
6 years ago |
|
WangRunji
|
7d856fe009
|
Fix memory::cow LLVM error for RV32
|
6 years ago |
|
WangRunji
|
7c7dbc9ded
|
Add CR3 to Context (x86_64)
|
6 years ago |
|
WangRunji
|
95ab3a2f3b
|
Allocate kernel stack from heap, remove stack allocator, remove guard page.
|
6 years ago |
|
WangRunji
|
81ff6f13e5
|
Fix recursive mapping, finish kernel remap.
|
6 years ago |
|
WangRunji
|
d3ed84ba61
|
Fix compile
|
6 years ago |
|
WangRunji
|
aecb85d5e7
|
Move MemorySet out to memory crate
|
6 years ago |
|
WangRunji
|
b26fee1990
|
Make more mods common for both x86_64 & riscv32.
|
6 years ago |
