fbf59396b2
use 'ucore_*.img' by default
6 years ago
d7511d8120
aarch64/fb: add mailbox property interfaces
6 years ago
6952f008e0
rename ContextImpl to Process
6 years ago
557f021c08
fix DelayHandler & MemoryAttr
6 years ago
704af94211
fix rv32 entry editing
6 years ago
f76a604b78
aarch64: add driver interfaces
6 years ago
81af2c82fd
aarch64: reduce some warnings, config system/generic timer in Makefile
6 years ago
5a165178cc
aarch64: implement IRQ register & serial IRQ
6 years ago
ff806d4465
move common codes to InactivePageTable trait
6 years ago
102866bcf9
introduce MemoryHandler and refactor MemorySet. temporary disable swap.
...
This is a manual rebase of LCY's code
6 years ago
96a76290b6
fix rv32 __mulsi3 add overflow
6 years ago
7b0ac1b84e
Script to allow rustc-only builds without cargo.
6 years ago
25ccdf6731
Update and cleanup makefile.
...
* Change few places from riscv64 to riscv32. Previously it was rv64
because the code author does not have a 32bit toolchain and used a
64bit one instead.
* Add new board type 'none', for running on qemu.
6 years ago
28d872064d
Merge branch 'master' of https://github.com/wangrunji0408/RustOS into arch-aarch64
6 years ago
aa5e7a4e6f
remove #![feature(extern_crate_item_prelude)]
6 years ago
6879c66e58
aarch64: set TTBR1 = TTBR0 in InactivePageTable::edit(), swap is OK
...
TODO: flush icache in the right place
6 years ago
d5a6eb2020
user: fix build error
6 years ago
3f2beab52d
Merge branch 'master' into user-img
6 years ago
e7039945c1
move user img, remove useless files
6 years ago
acafe19e26
fix runtime error on aarch64
...
- InactivePageTable::activate should be separated for user & kernel (TTBR1/0)
- disable swappable for aarch64 (bug?)
- use polling getchar as serial interrupt is not implemented
6 years ago
66ac30d401
user: update make clean in kernel/
6 years ago
710b6d1a28
user: update Makefiles
6 years ago
e86229cb71
user: user rust programs are runnable
6 years ago
b5ced136f7
fix merge compile error
6 years ago
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
7855b70bc0
aarch64: add origin raspberrypi config.txt
6 years ago
4f592336ff
aarch64: remove test functions
6 years ago
163e092c29
Merge branch 'mmu' into arch-aarch64
6 years ago
75b039c924
aarch64/mmu: move crate aarch64 to remote
6 years ago
5a83d6a20f
aarch64: add user program SFS image
6 years ago
a59a7fbe9a
aarch64/mmu: simply handle page fault
6 years ago
d6a54496f0
arch64/mmu: invalidate all icaches in InactivePageTable::with()
6 years ago
0eb33b661f
aarch64/mmu: fix some bugs
6 years ago
fcf5074500
impl M-mode kernel for riscv32
6 years ago
2f8cfabbca
remove redundant nightly features
6 years ago
a74b893bd2
update Makefile
6 years ago
f882a085d6
user: link created SFS image in kernel
6 years ago
94bc8353f7
user: create SFS image in Makefile
6 years ago
02eb7d9125
update 'riscv-pk' to upstream submodule
6 years ago
6921e9018d
fix NoMMU entry point
6 years ago
18640b7537
impl NoMMU
6 years ago
52fe93188d
disable delay allocating frame, remove `memory_set_record`
6 years ago
2db453556d
try to fix interrupt & deadlock on RV32
6 years ago
d30c7e59ca
aarch64: minor modify
6 years ago
264600f145
aarch64/mmu: add io remap
6 years ago
a8b334123a
aarch64/mmu: add memory region attribute config
6 years ago
f9e47b2fd8
aarch64/mmu: refactor PageTableFlags
6 years ago
de6354ddd3
aarch64/mmu: use ASID to avoid flush TLB frequently in context switch
6 years ago
55087fc5a2
aarch64/mmu: use both TTBR0_EL1 & TTBR1_EL1
6 years ago
46f0e85230
add `ucore-i386-pic.img` user programs. reorganize imgs.
6 years ago
bb1c1abaa4
aarch64/mmu: can run on the real raspi3
6 years ago
a9de99d3a9
aarch64/mmu: remap kernel memory ranges at the end of memory::init()
6 years ago
99c5b3c3f8
Merge branch 'arch-aarch64' into mmu
6 years ago
13be52133d
aarch64: move kernel stack top to 0x100000
6 years ago
f398945ad3
aarch64: hard link user program
6 years ago
9e8124abbb
aarch64/mmu: mmu enabled
6 years ago
b1bdac7d0f
fix merge for aarch64. now it works!
6 years ago
2daf8c188d
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
...
# Conflicts:
# .gitignore
# kernel/Cargo.lock
# kernel/Cargo.toml
# kernel/Makefile
# kernel/riscv32-blog_os.json
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/process/context.rs
# kernel/src/process/mod.rs
6 years ago
56fcad245a
update kernel to 2018 edition
6 years ago
c4935a1477
use `pc-keyboard` crate and enable keyboard again for x86
6 years ago
76d2c6ec7b
Fix the bug of active_table_swap() wrongly force unlock in pg fault handler
6 years ago
b2fec2b16b
Fix a bug in context for smp
6 years ago
67035ac556
Fix a bug in pg fault handler caused by memory_set_record
6 years ago
00d0ea8a8b
Modified the code in pgfault
6 years ago
9d803e87d9
replace some unwrap() and comment the cow pgfault handler
6 years ago
df485d506e
simplify ProcessManager
...
- given that a proc can only be waited by its parent, wait_queue is no longer needed.
6 years ago
5478b9ba7b
no longer show normal page fault
6 years ago
ef75c8a072
fix unwrap panic. now user shell is working.
6 years ago
da399dca96
remove Process struct
6 years ago
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
e06f6b8bc5
update Cargo.toml & Cargo.lock
6 years ago
d27ac65df3
fix load program slice error
6 years ago
5ce7d0a9c0
use user shell by default. fix kernel shell removing user thread.
6 years ago
21b0bdcbca
separate kernel shell to a mod, remove console mod
6 years ago
b3e5d1987e
update Cargo.lock
6 years ago
9b3294a5f2
fix clear bss when load user program. 'sh' works!
6 years ago
40b099ed79
clean riscv-pk in Makefile
6 years ago
44bf3fb07a
impl sys_exec
6 years ago
576ae1d911
add setup_page_table
6 years ago
f4305b382f
Add comment and report for expr4
6 years ago
ef213d60bb
mmu
6 years ago
eb00b2bfd3
merge conflict
6 years ago
a8da42d521
Add expr4 report and some trace for synctest
6 years ago
4d8d48cf4d
repair some bugs and move child control to processmanager
6 years ago
65cd42028c
Add illegal vma check in page fault hangler
6 years ago
c5499a62c5
Fix bug in swap in/out. Address ailign to 4K.
6 years ago
6652f8daf6
repair some bugs
6 years ago
8d6d3b7c37
debug for sleepkill
6 years ago
f97e8458b8
impl stdin & stdout as INode
6 years ago
5ee44588e0
Enlarge the physical and kernel heap memory. Fix the bug in map the kernel.
6 years ago
0b900b6f03
Code Transplanting: Blocking getchar
6 years ago
9adcea44d5
Code transplanting: Fix bugs. Pass test 'spin'
6 years ago
a589ae90f3
use SysError in syscalls
6 years ago
beb6533059
impl sys_getdirentry. 'ls' ok.
6 years ago
124a5e0d5d
impl sys_dup
...
- Fix exit_code: i32
- Convert Box<File> to Arc<Mutex<File>> in Context
6 years ago
16be828370
impl sys_fstat
6 years ago
128257c395
impl argc & argv for user process
6 years ago
5610d0bdb0
aarch64: context switch is runnable!
6 years ago
e27aea47e1
impl file syscalls, without test
6 years ago
200a574a1f
fix physical memory range on RV32
6 years ago
67b920cc16
aarch64: format paging.rs
6 years ago
a0b948fb53
add basic alloc
6 years ago
a13f39149b
add basic alloc
6 years ago
91bd411a8f
fit for multi-thread sfs
...
- use global root inode
- remove global IDE on x86
6 years ago
9fc13c8ebb
aarch64: implement syscall
6 years ago
a91534e34d
aarch64: implement context switch, but not tested
6 years ago
16fb733497
Blocking getchar
6 years ago
a145909998
Fix compile error after merge for the new processor.
6 years ago
fcdee71f9d
Merge confilt
6 years ago
c8ea2cb0cf
Fix bug and enable swap in/out and frame delayed allocating.
6 years ago
87506b000d
debug for process
6 years ago
3e1d8c5827
aarch64: implement ARM generic timer, can work in qemu
6 years ago
2002ddd5fa
move processor from wrj
6 years ago
b1425a53f9
finish frame delayed allocating
6 years ago
0a6b4fb8f2
Modify const. Update cargo.
6 years ago
ba4a24ba3b
Fix RV32 multi-core: Setup page table for other cores.
6 years ago
b7d6b2989d
Fix bugs. Pass test 'spin'
...
- Fix ACK IRQ on x86.
- Add process exit handler.
6 years ago
ed20aa45fd
Fix user process bug on RV32.
...
Set sstatus.SIE = 0 on the initial TrapFrame, to prevent interrupt on switching.
6 years ago
6fc23e1134
Ugly impl sys_wait(0)
6 years ago
74facd8e87
Use Vec to replace array in ProcessManager.
6 years ago
07aa9a0686
aarch64: implement IRQ & system timer, but don't work in qemu
6 years ago
182c595a20
Enable multi-core on RV32.
6 years ago
250f1385d3
Better debug print for TrapFrame on RV32
6 years ago
4f03eff015
Use SpinNoIrqLock to replace the spin::mutex
6 years ago
504401355f
Add expr3 report(not finiished.
6 years ago
8c19499112
aarch64: implement exception interface & synchronous exception handler
6 years ago
7229b49eb8
Use rust-lld for RV32. Remove riscv git submodule.
6 years ago
2c3de7b222
Merge branch 'OsTrain2018-g4' of github.com:oscourse-tsinghua/RustOS into lcy_issue1
6 years ago
edde416052
Finish swap for multi-user process
6 years ago
3386a793a5
aarch64: disable NEON
6 years ago
001254fd64
riscv32: change linker to rust-lld
6 years ago
ae5260db5c
aarch64: change linker to rust-lld
6 years ago
7746485861
aarch64: add target 'install' to Makefile
6 years ago
632baedabd
aarch64: can run on the real raspi3
6 years ago
2e094d08bc
common: add a logo
6 years ago
abf3418d24
aarch64: implement I/O by serial port
6 years ago
72dc3f62ad
Remove kernel stack from MemorySet.
6 years ago
addf49ffdb
aarch64: add crate bcm2837, implement GPIO
6 years ago
438e290b6d
Fix PageTable::get_entry -> Option.
6 years ago
cc936ded35
aarch64: bootable in qemu
6 years ago
a42d6086c6
Simplify IDE code.
6 years ago
81196729e4
Fix RV32 atomic.
...
- Fix __atomic_compare_exchange_4().
- Add patch for core::sync::atomic.
- Revert kernel Mutex.
6 years ago
ede69959e4
debug for compare exchange
6 years ago
174e0da3b6
aarch64: basic framework
6 years ago
1140d32aaa
add arch=aarch64 & board=raspi3 to Makefile
6 years ago
95ab9caba1
Add impl of atomic_fetch_*
6 years ago
0680023e35
Recover wait/sleep
6 years ago
85a1dca684
Use weak linkage to provide dependencies for process::thread.
6 years ago
80b161db98
Recover set_priority and fork
6 years ago
5db908b1c5
Separate ProcessManager to a mod.
6 years ago
WangRunji
equation314
dzy
lcy1996
koumingyang
chenqiuhao