476 Commits (92d40fae61526ca98689e8fc6fb3fd0fc62c7936)

Author SHA1 Message Date
dzy 6f2d059ba5 implement map_kernel, now enters the kernel well
6 years ago
dzy bf3a67a7e4 remap_kernel runs fine
6 years ago
dzy 21adebb203 run until ms.token()
6 years ago
dzy ccee527272 runs without pagefault but does not reach end of remap_kernel
6 years ago
dzy a4348428a6 can run until update
6 years ago
dzy d67a224494 add wrj's 704af94 patch
6 years ago
dzy ed3fb6d423 another temporary
6 years ago
dzy 0dbffbc0fa temporary
6 years ago
WangRunji af6d533cb5 fix trap return on M-Mode
6 years ago
WangRunji 3de76885fa llc build for rv64imc
6 years ago
WangRunji 020e3505ee enable timer interrupt for K210
6 years ago
dzy b7e124930d fix compilation errors
6 years ago
dzy 3910f71521 preliminary support for riscv64, not tested.
6 years ago
WangRunji 3a4b8f5dac fix trap for rv64
6 years ago
WangRunji 8529d9fe4e fix const, linker, build for K210
6 years ago
WangRunji 9ab4fd40ea fix atomic for K210. enable print mutex again
6 years ago
WangRunji 70b6db4282 make clear_bss faster
6 years ago
dzy 1d1d4109c3 Make script easily support both rv32 and rv64.
6 years ago
dzy 98c94a0d83 Fix register size (4->XLEN) in trap handling.
6 years ago
WangRunji 45b91fbcad update rv64 build script. print hello on QEMU!
6 years ago
WangRunji d3ef0252ac move setup_page_table to BBL
6 years ago
WangRunji 3ea104da97 Merge remote-tracking branch 'dzy/rust-rv64' into rust-rv64
6 years ago
WangRunji 0af9776dbd add .stack section. clear bss
6 years ago
WangRunji 7240198a54 fix newline: '\r\n'
6 years ago
Ben Pig Chu 5135fb0c0e the shell that is able to fork-exec-wait
6 years ago
WangRunji 62b931d576 print hello on K210
6 years ago
equation314 aa5bd3041b Merge branch 'master' into arch-aarch64
6 years ago
Ben Pig Chu 364497e379 use the error code specified in ucore_os_lab instead of ucore_plus
6 years ago
equation314 a55f3b61e6 add Makefile option `graphic` & cargo feature `nographic`
6 years ago
dzy a75e52691d port to newer riscv crate supporting rv64
6 years ago
Ben Pig Chu 6e8c80d328 panicless default fs implement
6 years ago
equation314 09c2b6e7b7 aarch64/fb: add ANSI escape sequences parser
6 years ago
Ben Pig Chu 113a33e575 translate FsError to SysError
6 years ago
Ben Pig Chu f8533442f2 return error code from syscall, not always -1
6 years ago
Ben Pig Chu fa03f7b112 use the simple-filesystem crate with FsError
6 years ago
WangRunji d4b6cc1082 compile rv64 pass on macOS
6 years ago
WangRunji 02bd2b2317 remove arch/riscv64 directory
6 years ago
equation314 6c717905d7 aarch64/fb: add foreground & background color
6 years ago
equation314 9dda78d2e3 aarch64/fb: improve the performance of ConsoleBuffer::new_line()
6 years ago
Ben Pig Chu d737b1e7ba maually remove warning, pt6
6 years ago
equation314 7b8359eeef aarch64/fb: add 8x16 font
6 years ago
Ben Pig Chu 6eb49a0106 maually remove warning, pt5
6 years ago
Ben Pig Chu 7eb9f7abcf maually remove warning, pt4
6 years ago
Ben Pig Chu 935c595083 maually remove warning, pt3
6 years ago
Ben Pig Chu 07b8a063ec maually remove warning, pt2
6 years ago
equation314 b47c4758bf aarch64/fb: add basic console driver
6 years ago
Ben Pig Chu 1ca2bde069 maually remove warning, pt1
6 years ago
dzy f954c2fd6a Completely get rid of cargo-generated target/
6 years ago
dzy 61a3beb8ba Start porting for rv64
6 years ago
equation314 b5cc79d1b2 modify mmio() & set_mmio() in PageEntry
6 years ago
equation314 48cf25716f aarch64/fb: flush data cache around mailbox accesses
6 years ago
equation314 5987c2068b aarch64/fb: remap framebuffer base address
6 years ago
equation314 6ba9e34f77 aarch64/fb: add framebuffer initialization
6 years ago
WangRunji 9b0b0064d0 Merge remote-tracking branch 'equation314/arch-aarch64' into dev
6 years ago
WangRunji d20d22b85b add hint for user shell. detect cores through 'SMP' env.
6 years ago
WangRunji fbf59396b2 use 'ucore_*.img' by default
6 years ago
equation314 d7511d8120 aarch64/fb: add mailbox property interfaces
6 years ago
WangRunji 6952f008e0 rename ContextImpl to Process
6 years ago
WangRunji 557f021c08 fix DelayHandler & MemoryAttr
6 years ago
WangRunji 704af94211 fix rv32 entry editing
6 years ago
equation314 f76a604b78 aarch64: add driver interfaces
6 years ago
equation314 81af2c82fd aarch64: reduce some warnings, config system/generic timer in Makefile
6 years ago
equation314 5a165178cc aarch64: implement IRQ register & serial IRQ
6 years ago
WangRunji ff806d4465 move common codes to InactivePageTable trait
6 years ago
WangRunji 102866bcf9 introduce MemoryHandler and refactor MemorySet. temporary disable swap.
6 years ago
WangRunji 96a76290b6 fix rv32 __mulsi3 add overflow
6 years ago
dzy 7b0ac1b84e Script to allow rustc-only builds without cargo.
6 years ago
dzy 25ccdf6731 Update and cleanup makefile.
6 years ago
equation314 28d872064d Merge branch 'master' of https://github.com/wangrunji0408/RustOS into arch-aarch64
6 years ago
equation314 aa5e7a4e6f remove #![feature(extern_crate_item_prelude)]
6 years ago
equation314 6879c66e58 aarch64: set TTBR1 = TTBR0 in InactivePageTable::edit(), swap is OK
6 years ago
equation314 d5a6eb2020 user: fix build error
6 years ago
Wang Runji 3f2beab52d
Merge branch 'master' into user-img
6 years ago
WangRunji e7039945c1 move user img, remove useless files
6 years ago
WangRunji acafe19e26 fix runtime error on aarch64
6 years ago
equation314 66ac30d401 user: update make clean in kernel/
6 years ago
equation314 710b6d1a28 user: update Makefiles
6 years ago
equation314 e86229cb71 user: user rust programs are runnable
6 years ago
WangRunji b5ced136f7 fix merge compile error
6 years ago
WangRunji 2afe8c731e Merge remote-tracking branch 'equation314/arch-aarch64' into dev
6 years ago
equation314 7855b70bc0 aarch64: add origin raspberrypi config.txt
6 years ago
equation314 4f592336ff aarch64: remove test functions
6 years ago
equation314 163e092c29 Merge branch 'mmu' into arch-aarch64
6 years ago
equation314 75b039c924 aarch64/mmu: move crate aarch64 to remote
6 years ago
equation314 5a83d6a20f aarch64: add user program SFS image
6 years ago
equation314 a59a7fbe9a aarch64/mmu: simply handle page fault
6 years ago
equation314 d6a54496f0 arch64/mmu: invalidate all icaches in InactivePageTable::with()
6 years ago
equation314 0eb33b661f aarch64/mmu: fix some bugs
6 years ago
WangRunji fcf5074500 impl M-mode kernel for riscv32
6 years ago
WangRunji 2f8cfabbca remove redundant nightly features
6 years ago
WangRunji a74b893bd2 update Makefile
6 years ago
equation314 f882a085d6 user: link created SFS image in kernel
6 years ago
equation314 94bc8353f7 user: create SFS image in Makefile
6 years ago
WangRunji 02eb7d9125 update 'riscv-pk' to upstream submodule
6 years ago
WangRunji 6921e9018d fix NoMMU entry point
6 years ago
WangRunji 18640b7537 impl NoMMU
6 years ago
WangRunji 52fe93188d disable delay allocating frame, remove `memory_set_record`
6 years ago
WangRunji 2db453556d try to fix interrupt & deadlock on RV32
6 years ago
equation314 d30c7e59ca aarch64: minor modify
6 years ago
equation314 264600f145 aarch64/mmu: add io remap
6 years ago
equation314 a8b334123a aarch64/mmu: add memory region attribute config
6 years ago
equation314 f9e47b2fd8 aarch64/mmu: refactor PageTableFlags
6 years ago
equation314 de6354ddd3 aarch64/mmu: use ASID to avoid flush TLB frequently in context switch
6 years ago
equation314 55087fc5a2 aarch64/mmu: use both TTBR0_EL1 & TTBR1_EL1
6 years ago
WangRunji 46f0e85230 add `ucore-i386-pic.img` user programs. reorganize imgs.
6 years ago
equation314 bb1c1abaa4 aarch64/mmu: can run on the real raspi3
6 years ago
equation314 a9de99d3a9 aarch64/mmu: remap kernel memory ranges at the end of memory::init()
6 years ago
equation314 99c5b3c3f8 Merge branch 'arch-aarch64' into mmu
6 years ago
equation314 13be52133d aarch64: move kernel stack top to 0x100000
6 years ago
equation314 f398945ad3 aarch64: hard link user program
6 years ago
equation314 9e8124abbb aarch64/mmu: mmu enabled
6 years ago
WangRunji b1bdac7d0f fix merge for aarch64. now it works!
6 years ago
WangRunji 2daf8c188d Merge remote-tracking branch 'equation314/arch-aarch64' into dev
6 years ago
WangRunji 56fcad245a update kernel to 2018 edition
6 years ago
WangRunji c4935a1477 use `pc-keyboard` crate and enable keyboard again for x86
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 67035ac556 Fix a bug in pg fault handler caused by memory_set_record
6 years ago
lcy1996 00d0ea8a8b Modified the code in pgfault
6 years ago
lcy1996 9d803e87d9 replace some unwrap() and comment the cow pgfault handler
6 years ago
WangRunji df485d506e simplify ProcessManager
6 years ago
WangRunji 5478b9ba7b no longer show normal page fault
6 years ago
WangRunji ef75c8a072 fix unwrap panic. now user shell is working.
6 years ago
WangRunji da399dca96 remove Process struct
6 years ago
WangRunji 205f90a264 Merge branch 'dev' into g4-merge
6 years ago
WangRunji e06f6b8bc5 update Cargo.toml & Cargo.lock
6 years ago
WangRunji d27ac65df3 fix load program slice error
6 years ago
WangRunji 5ce7d0a9c0 use user shell by default. fix kernel shell removing user thread.
6 years ago
WangRunji 21b0bdcbca separate kernel shell to a mod, remove console mod
6 years ago
WangRunji b3e5d1987e update Cargo.lock
6 years ago
WangRunji 9b3294a5f2 fix clear bss when load user program. 'sh' works!
6 years ago
WangRunji 40b099ed79 clean riscv-pk in Makefile
6 years ago
WangRunji 44bf3fb07a impl sys_exec
6 years ago
equation314 576ae1d911 add setup_page_table
6 years ago
lcy1996 f4305b382f Add comment and report for expr4
6 years ago
koumingyang ef213d60bb mmu
6 years ago
lcy1996 eb00b2bfd3 merge conflict
6 years ago
lcy1996 a8da42d521 Add expr4 report and some trace for synctest
6 years ago
chenqiuhao 4d8d48cf4d repair some bugs and move child control to processmanager
6 years ago
lcy1996 65cd42028c Add illegal vma check in page fault hangler
6 years ago
lcy1996 c5499a62c5 Fix bug in swap in/out. Address ailign to 4K.
6 years ago
chenqiuhao 6652f8daf6 repair some bugs
6 years ago
chenqiuhao 8d6d3b7c37 debug for sleepkill
6 years ago
WangRunji f97e8458b8 impl stdin & stdout as INode
6 years ago
lcy1996 5ee44588e0 Enlarge the physical and kernel heap memory. Fix the bug in map the kernel.
6 years ago
lcy1996 0b900b6f03 Code Transplanting: Blocking getchar
6 years ago
lcy1996 9adcea44d5 Code transplanting: Fix bugs. Pass test 'spin'
6 years ago
WangRunji a589ae90f3 use SysError in syscalls
6 years ago
WangRunji beb6533059 impl sys_getdirentry. 'ls' ok.
6 years ago
WangRunji 124a5e0d5d impl sys_dup
6 years ago
WangRunji 16be828370 impl sys_fstat
6 years ago
WangRunji 128257c395 impl argc & argv for user process
6 years ago
equation314 5610d0bdb0 aarch64: context switch is runnable!
6 years ago
WangRunji e27aea47e1 impl file syscalls, without test
6 years ago
WangRunji 200a574a1f fix physical memory range on RV32
6 years ago
equation314 67b920cc16 aarch64: format paging.rs
6 years ago
koumingyang a0b948fb53 add basic alloc
6 years ago
koumingyang a13f39149b add basic alloc
6 years ago
WangRunji 91bd411a8f fit for multi-thread sfs
6 years ago
equation314 9fc13c8ebb aarch64: implement syscall
6 years ago
equation314 a91534e34d aarch64: implement context switch, but not tested
6 years ago
WangRunji 16fb733497 Blocking getchar
6 years ago
lcy1996 a145909998 Fix compile error after merge for the new processor.
6 years ago
lcy1996 fcdee71f9d Merge confilt
6 years ago
lcy1996 c8ea2cb0cf Fix bug and enable swap in/out and frame delayed allocating.
6 years ago
chenqiuhao 87506b000d debug for process
6 years ago
equation314 3e1d8c5827 aarch64: implement ARM generic timer, can work in qemu
6 years ago
chenqiuhao 2002ddd5fa move processor from wrj
6 years ago
lcy1996 b1425a53f9 finish frame delayed allocating
6 years ago
WangRunji 0a6b4fb8f2 Modify const. Update cargo.
6 years ago
WangRunji ba4a24ba3b Fix RV32 multi-core: Setup page table for other cores.
6 years ago
WangRunji b7d6b2989d Fix bugs. Pass test 'spin'
6 years ago
WangRunji ed20aa45fd Fix user process bug on RV32.
6 years ago
WangRunji 6fc23e1134 Ugly impl sys_wait(0)
6 years ago
WangRunji 74facd8e87 Use Vec to replace array in ProcessManager.
6 years ago
equation314 07aa9a0686 aarch64: implement IRQ & system timer, but don't work in qemu
6 years ago
WangRunji 182c595a20 Enable multi-core on RV32.
6 years ago
WangRunji 250f1385d3 Better debug print for TrapFrame on RV32
6 years ago
lcy1996 4f03eff015 Use SpinNoIrqLock to replace the spin::mutex
6 years ago
lcy1996 504401355f Add expr3 report(not finiished.
6 years ago
equation314 8c19499112 aarch64: implement exception interface & synchronous exception handler
6 years ago
WangRunji 7229b49eb8 Use rust-lld for RV32. Remove riscv git submodule.
6 years ago
lcy1996 2c3de7b222 Merge branch 'OsTrain2018-g4' of github.com:oscourse-tsinghua/RustOS into lcy_issue1
6 years ago
lcy1996 edde416052 Finish swap for multi-user process
6 years ago
equation314 3386a793a5 aarch64: disable NEON
6 years ago
equation314 001254fd64 riscv32: change linker to rust-lld
6 years ago
equation314 ae5260db5c aarch64: change linker to rust-lld
6 years ago
equation314 7746485861 aarch64: add target 'install' to Makefile
6 years ago
equation314 632baedabd aarch64: can run on the real raspi3
6 years ago
equation314 2e094d08bc common: add a logo
6 years ago
equation314 abf3418d24 aarch64: implement I/O by serial port
6 years ago
WangRunji 72dc3f62ad Remove kernel stack from MemorySet.
6 years ago
equation314 addf49ffdb aarch64: add crate bcm2837, implement GPIO
6 years ago
WangRunji 438e290b6d Fix PageTable::get_entry -> Option.
6 years ago
equation314 cc936ded35 aarch64: bootable in qemu
6 years ago
WangRunji a42d6086c6 Simplify IDE code.
6 years ago
WangRunji 81196729e4 Fix RV32 atomic.
6 years ago
chenqiuhao ede69959e4 debug for compare exchange
6 years ago
equation314 174e0da3b6 aarch64: basic framework
6 years ago
equation314 1140d32aaa add arch=aarch64 & board=raspi3 to Makefile
6 years ago
WangRunji 95ab9caba1 Add impl of atomic_fetch_*
6 years ago
WangRunji 0680023e35 Recover wait/sleep
6 years ago
WangRunji 85a1dca684 Use weak linkage to provide dependencies for process::thread.
6 years ago
WangRunji 80b161db98 Recover set_priority and fork
6 years ago
WangRunji 5db908b1c5 Separate ProcessManager to a mod.
6 years ago
WangRunji f7eb09e856 Multicore processing WORKS! Basically ...
6 years ago
WangRunji 6741ba399b Add arch::cpu::halt(). Halt when panic.
6 years ago
lcy1996 5f34cc54d8 Merge branch 'OsTrain2018-g4' of github.com:oscourse-tsinghua/RustOS into lcy_issue1
6 years ago
lcy1996 63349ade19 Finish add more comment for kernel and finish set user memory swappable.
6 years ago
chenqiuhao 9474ad7220 update atomic function and workaround the LLVM compiling bug(maybe)
6 years ago
WangRunji 5bc392f388 Enable RV32 IPI.
6 years ago
WangRunji 1b4edf3bb2 Merge branch 'rv32-smp-porting' into dev
6 years ago
WangRunji 72e92c07f9 Switch to RV64 GNU toolchain. Simplify compiler_rt.
6 years ago
WangRunji f1771f8ef2 Finish x86 SMP startup. Support timer & IPI.
6 years ago
maoyuchaxue f27fd37d82 replaced spin::Mutex with sync::SpinLock, now spinlock works well.
6 years ago
maoyuchaxue f7b7b1bcd6 added workaround for atomic ops
6 years ago
maoyuchaxue cfda03a0f2 trying to add atomic implementations in rv32, but still buggy
6 years ago
lcy1996 0a81014007 Add page handler for swap in/out in riscv32's pagefault
6 years ago
maoyuchaxue 49cd04dce3 added rv32 smp booting, with slight modification to bbl
6 years ago
maoyuchaxue 6cf0d6db23 fixed setting in riscv-pk to enable rv32ia, added smp option in Makefile
6 years ago
lcy1996 0a7ec18701 Add page fault handler to riscv 32.
6 years ago
lcy1996 96cdf37b15 Add some comment for paging and add proposal doc
6 years ago
lcy1996 cef2d792be Add part of comments for riscv32 module
6 years ago
lcy1996 2157e4bbcf Add comment for interrutp and trap code
6 years ago
lcy1996 91455d163d Finish comment riscv context.
6 years ago
lcy1996 5b4aefdb0d Add comment for riscv32 context
6 years ago
lcy1996 e4300d3515 Add more comment in kernel but not finished
6 years ago
lcy1996 4e0b510895 Finish comment for ristv boot.
6 years ago
WangRunji cd1bd55729 Update README, travis, riscv crate.
6 years ago
WangRunji 924c061d64 Merge branch 'x86-boot'
6 years ago
WangRunji 224905f12c Update Makefile
6 years ago
WangRunji 7a9b746c68 x86_64 back to normal.
6 years ago
WangRunji 7f00001fd1 Move to higher half
6 years ago
dzy 5a0ce1e464 Refactored RISC-V page table identity mapping into a function.
6 years ago
dzy 11223957d1 Add `mkdir build` in makefile.
6 years ago
WangRunji 0a9c294814 Fix x86_64 startup. TODO: higher half.
6 years ago
WangRunji 0437e5cb17 Make it compile for bootimage toolchain
6 years ago
WangRunji caeff9ad97 Update packages and fit for new Rust nightly
6 years ago
WangRunji cbe7affc5d Merge riscv for QEMU & FPGA
6 years ago
WangRunji ff8930a36c Make frame allocator smaller. Fix serial stupid bug.
6 years ago
WangRunji 3cf118ba67 Mul & div inst emulation
6 years ago
WangRunji b99dc3d1cf Merge branch 'new-rv-toolchain' into board
6 years ago
WangRunji 640872d154 Use alloc API to fix stack overflow in release mode.
6 years ago
WangRunji 384f6a9c9c Change kernel heap to identity map
6 years ago
WangRunji dc97b4b433 Fix atomic_compare_exchange
6 years ago
WangRunji 3d0d6e3d02 Merge branch 'new-rv-toolchain' into board
6 years ago
WangRunji 3d6fcb8d8c Fix x86_64. Not elegant.
6 years ago
WangRunji 10e3cea340 Only use Rust toolchain to build for rv32. Set arch to rv32i. x86_64 broken.
6 years ago
WangRunji 296b6196f4 rv64 toolchain configure for riscv-pk
6 years ago
WangRunji b88648ff44 Fit for newest Rust nightly. x86_64 ok, riscv32 broken.
6 years ago