0965d24083
fix map_kernel on riscv32
6 years ago
2d5178d0b7
rename ucore to rcore
6 years ago
f0ea48126d
fix sys_wait arg type: isize -> i32
6 years ago
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
dfb2d49cd6
aarch64/doc: add console driver
6 years ago
1aa8436d71
aarch64/doc: add interruption & timer drivers
6 years ago
7fda4e360f
aarch64/doc: add GPIO, mini UART, mailbox drivers
6 years ago
e46b6c7b0c
move target json. add kflash.py
6 years ago
190711fbc2
yet another riscv atomic fix
6 years ago
e1d0d2a020
aarch64/doc: add overview of AArch64
6 years ago
5d7e97d9e9
fix interrupt in process crate
6 years ago
681a90657a
let Makefile support riscv64
6 years ago
259e7c842e
update Cargo.toml & Makefile
6 years ago
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
c65b7357a4
use riscv crate from github
6 years ago
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
92ae57b251
fix user program memory layout on NoMMU
6 years ago
daee1e9f94
fix bugs on K210
6 years ago
b3a8e95d78
merge interrupt & context switch for rv32 & rv64
6 years ago
de24f6673c
remove '\r'
6 years ago
0d957ff1a6
fix getchar on K210
6 years ago
4b17055f30
running user program.
6 years ago
e74f749ff3
fix context change bug. user sh is running!!!
6 years ago
6f2d059ba5
implement map_kernel, now enters the kernel well
6 years ago
bf3a67a7e4
remap_kernel runs fine
6 years ago
21adebb203
run until ms.token()
6 years ago
ccee527272
runs without pagefault but does not reach end of remap_kernel
6 years ago
a4348428a6
can run until update
6 years ago
d67a224494
add wrj's 704af94 patch
6 years ago
ed3fb6d423
another temporary
6 years ago
0dbffbc0fa
temporary
6 years ago
af6d533cb5
fix trap return on M-Mode
6 years ago
3de76885fa
llc build for rv64imc
6 years ago
020e3505ee
enable timer interrupt for K210
6 years ago
b7e124930d
fix compilation errors
6 years ago
3910f71521
preliminary support for riscv64, not tested.
...
riscv32 runs fine.
6 years ago
3a4b8f5dac
fix trap for rv64
6 years ago
8529d9fe4e
fix const, linker, build for K210
6 years ago
9ab4fd40ea
fix atomic for K210. enable print mutex again
6 years ago
70b6db4282
make clear_bss faster
6 years ago
1d1d4109c3
Make script easily support both rv32 and rv64.
6 years ago
98c94a0d83
Fix register size (4->XLEN) in trap handling.
6 years ago
45b91fbcad
update rv64 build script. print hello on QEMU!
6 years ago
d3ef0252ac
move setup_page_table to BBL
6 years ago
3ea104da97
Merge remote-tracking branch 'dzy/rust-rv64' into rust-rv64
...
# Conflicts:
# kernel/Cargo.toml
6 years ago
0af9776dbd
add .stack section. clear bss
6 years ago
7240198a54
fix newline: '\r\n'
6 years ago
5135fb0c0e
the shell that is able to fork-exec-wait
6 years ago
62b931d576
print hello on K210
6 years ago
aa5bd3041b
Merge branch 'master' into arch-aarch64
6 years ago
364497e379
use the error code specified in ucore_os_lab instead of ucore_plus
6 years ago
a55f3b61e6
add Makefile option `graphic` & cargo feature `nographic`
6 years ago
a75e52691d
port to newer riscv crate supporting rv64
6 years ago
6e8c80d328
panicless default fs implement
6 years ago
09c2b6e7b7
aarch64/fb: add ANSI escape sequences parser
6 years ago
113a33e575
translate FsError to SysError
6 years ago
f8533442f2
return error code from syscall, not always -1
6 years ago
fa03f7b112
use the simple-filesystem crate with FsError
6 years ago
d4b6cc1082
compile rv64 pass on macOS
6 years ago
02bd2b2317
remove arch/riscv64 directory
6 years ago
6c717905d7
aarch64/fb: add foreground & background color
6 years ago
9dda78d2e3
aarch64/fb: improve the performance of ConsoleBuffer::new_line()
6 years ago
d737b1e7ba
maually remove warning, pt6
6 years ago
7b8359eeef
aarch64/fb: add 8x16 font
6 years ago
6eb49a0106
maually remove warning, pt5
6 years ago
7eb9f7abcf
maually remove warning, pt4
6 years ago
935c595083
maually remove warning, pt3
6 years ago
07b8a063ec
maually remove warning, pt2
6 years ago
b47c4758bf
aarch64/fb: add basic console driver
6 years ago
1ca2bde069
maually remove warning, pt1
6 years ago
f954c2fd6a
Completely get rid of cargo-generated target/
6 years ago
61a3beb8ba
Start porting for rv64
6 years ago
b5cc79d1b2
modify mmio() & set_mmio() in PageEntry
6 years ago
48cf25716f
aarch64/fb: flush data cache around mailbox accesses
...
can run on real raspi3
6 years ago
5987c2068b
aarch64/fb: remap framebuffer base address
6 years ago
6ba9e34f77
aarch64/fb: add framebuffer initialization
6 years ago
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
d20d22b85b
add hint for user shell. detect cores through 'SMP' env.
6 years ago
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
WangRunji
equation314
dzy
Ben Pig Chu
lcy1996