andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-23 16:36:18 +04:00
Code Issues Projects Releases Wiki Activity
598 Commits 6 Branches 1 Tag 15 MiB
b1bdac7d0f
Commit Graph

163 Commits

Author SHA1 Message Date
lcy1996
fcdee71f9d Merge confilt 2018-11-05 21:31:04 +08:00
lcy1996
c8ea2cb0cf Fix bug and enable swap in/out and frame delayed allocating. 2018-11-05 20:37:05 +08:00
chenqiuhao
87506b000d debug for process 2018-11-05 19:31:45 +08:00
equation314
3e1d8c5827 aarch64: implement ARM generic timer, can work in qemu 2018-11-04 18:15:26 +08:00
chenqiuhao
2002ddd5fa move processor from wrj 2018-11-03 21:45:03 +08:00
lcy1996
b1425a53f9 finish frame delayed allocating 2018-11-03 14:33:36 +08:00
WangRunji
0a6b4fb8f2 Modify const. Update cargo. 2018-11-02 16:14:29 +08:00
WangRunji
ba4a24ba3b Fix RV32 multi-core: Setup page table for other cores. 2018-11-02 16:13:58 +08:00
WangRunji
b7d6b2989d Fix bugs. Pass test 'spin' 
- Fix ACK IRQ on x86.
- Add process exit handler.
 2018-11-01 21:10:19 +08:00
WangRunji
ed20aa45fd Fix user process bug on RV32. 
Set sstatus.SIE = 0 on the initial TrapFrame, to prevent interrupt on switching.
 2018-11-01 19:53:30 +08:00
WangRunji
6fc23e1134 Ugly impl sys_wait(0) 2018-11-01 00:45:02 +08:00
WangRunji
74facd8e87 Use Vec to replace array in ProcessManager. 2018-11-01 00:16:32 +08:00
equation314
07aa9a0686 aarch64: implement IRQ & system timer, but don't work in qemu 2018-10-31 16:10:22 +08:00
WangRunji
182c595a20 Enable multi-core on RV32. 2018-10-31 11:46:50 +08:00
WangRunji
250f1385d3 Better debug print for TrapFrame on RV32 2018-10-31 11:39:42 +08:00
lcy1996
4f03eff015 Use SpinNoIrqLock to replace the spin::mutex 2018-10-31 11:11:06 +08:00
lcy1996
504401355f Add expr3 report(not finiished. 2018-10-30 21:50:38 +08:00
equation314
8c19499112 aarch64: implement exception interface & synchronous exception handler 2018-10-30 20:44:54 +08:00
WangRunji
7229b49eb8 Use rust-lld for RV32. Remove riscv git submodule. 2018-10-30 13:30:20 +08:00
lcy1996
2c3de7b222 Merge branch 'OsTrain2018-g4' of github.com:oscourse-tsinghua/RustOS into lcy_issue1 2018-10-30 12:46:01 +08:00
lcy1996
edde416052 Finish swap for multi-user process 2018-10-30 12:45:09 +08:00
equation314
3386a793a5 aarch64: disable NEON 2018-10-29 23:05:16 +08:00
equation314
001254fd64 riscv32: change linker to rust-lld 2018-10-29 21:37:57 +08:00
equation314
ae5260db5c aarch64: change linker to rust-lld 2018-10-29 21:34:29 +08:00
equation314
7746485861 aarch64: add target 'install' to Makefile 2018-10-29 19:14:54 +08:00
equation314
632baedabd aarch64: can run on the real raspi3 2018-10-29 18:53:14 +08:00
equation314
2e094d08bc common: add a logo 2018-10-29 13:41:25 +08:00
equation314
abf3418d24 aarch64: implement I/O by serial port 2018-10-29 13:38:27 +08:00
WangRunji
72dc3f62ad Remove kernel stack from MemorySet. 2018-10-27 15:17:15 +08:00
equation314
addf49ffdb aarch64: add crate bcm2837, implement GPIO 2018-10-27 02:45:47 +08:00
WangRunji
438e290b6d Fix PageTable::get_entry -> Option. 2018-10-26 23:43:12 +08:00
equation314
cc936ded35 aarch64: bootable in qemu 2018-10-26 22:02:24 +08:00
WangRunji
a42d6086c6 Simplify IDE code. 2018-10-26 18:18:11 +08:00
WangRunji
81196729e4 Fix RV32 atomic. 
- Fix __atomic_compare_exchange_4().
- Add patch for core::sync::atomic.
- Revert kernel Mutex.
 2018-10-26 15:22:03 +08:00
chenqiuhao
ede69959e4 debug for compare exchange 2018-10-26 15:03:20 +08:00
equation314
174e0da3b6 aarch64: basic framework 2018-10-26 11:22:22 +08:00
equation314
1140d32aaa add arch=aarch64 & board=raspi3 to Makefile 2018-10-26 11:22:26 +08:00
WangRunji
95ab9caba1 Add impl of atomic_fetch_* 2018-10-26 02:31:05 +08:00
WangRunji
0680023e35 Recover wait/sleep 2018-10-26 00:49:19 +08:00
WangRunji
85a1dca684 Use weak linkage to provide dependencies for process::thread. 2018-10-24 21:32:23 +08:00
WangRunji
80b161db98 Recover set_priority and fork 2018-10-24 21:29:41 +08:00
WangRunji
5db908b1c5 Separate ProcessManager to a mod. 2018-10-24 00:38:22 +08:00
WangRunji
f7eb09e856 Multicore processing WORKS! Basically ... 
- Rewrite processor.rs
  Refactor to `Processor` & `ProcessManager`
- Use Box<dyn> instead of generic.
- Wait/sleep/wakeup is not supported yet.
  I'm considering to implement them with WaitQueue.
 2018-10-24 00:28:29 +08:00
WangRunji
6741ba399b Add arch::cpu::halt(). Halt when panic. 2018-10-24 00:23:40 +08:00
lcy1996
5f34cc54d8 Merge branch 'OsTrain2018-g4' of github.com:oscourse-tsinghua/RustOS into lcy_issue1 2018-10-23 00:00:27 +08:00
lcy1996
63349ade19 Finish add more comment for kernel and finish set user memory swappable. 2018-10-23 00:00:09 +08:00
chenqiuhao
9474ad7220 update atomic function and workaround the LLVM compiling bug(maybe) 2018-10-22 18:40:21 +08:00
WangRunji
5bc392f388 Enable RV32 IPI. 2018-10-21 21:47:17 +08:00
WangRunji
1b4edf3bb2 Merge branch 'rv32-smp-porting' into dev 
# Conflicts:
#	kernel/Makefile
 2018-10-19 23:36:15 +08:00
WangRunji
72e92c07f9 Switch to RV64 GNU toolchain. Simplify compiler_rt. 2018-10-19 23:35:38 +08:00
WangRunji
f1771f8ef2 Finish x86 SMP startup. Support timer & IPI. 
- Remove smp, apic mod.
  Instead, use new bootloader & apic crate.
- Disable PIC & PIT.
  Instead, use IOAPIC & APIC Timer.
 2018-10-19 01:14:21 +08:00
maoyuchaxue
f27fd37d82 replaced spin::Mutex with sync::SpinLock, now spinlock works well. 2018-10-17 21:34:15 +08:00
maoyuchaxue
f7b7b1bcd6 added workaround for atomic ops 2018-10-17 19:37:53 +08:00
maoyuchaxue
cfda03a0f2 trying to add atomic implementations in rv32, but still buggy 2018-10-17 00:21:18 +08:00
lcy1996
0a81014007 Add page handler for swap in/out in riscv32's pagefault 2018-10-16 21:51:17 +08:00
maoyuchaxue
49cd04dce3 added rv32 smp booting, with slight modification to bbl 2018-10-14 22:28:01 +08:00
maoyuchaxue
6cf0d6db23 fixed setting in riscv-pk to enable rv32ia, added smp option in Makefile 2018-10-14 13:50:59 +08:00
lcy1996
0a7ec18701 Add page fault handler to riscv 32. 2018-10-11 21:30:35 +08:00
lcy1996
96cdf37b15 Add some comment for paging and add proposal doc 2018-10-09 21:11:14 +08:00
lcy1996
cef2d792be Add part of comments for riscv32 module 2018-10-08 01:47:13 +08:00
lcy1996
2157e4bbcf Add comment for interrutp and trap code 2018-10-06 01:45:56 +08:00
lcy1996
91455d163d Finish comment riscv context. 2018-10-05 23:39:28 +08:00
lcy1996
5b4aefdb0d Add comment for riscv32 context 2018-10-05 19:38:14 +08:00
lcy1996
e4300d3515 Add more comment in kernel but not finished 2018-10-05 10:58:15 +08:00
lcy1996
4e0b510895 Finish comment for ristv boot. 2018-10-04 13:23:32 +08:00
WangRunji
cd1bd55729 Update README, travis, riscv crate. 2018-09-19 20:58:00 +08:00
WangRunji
924c061d64 Merge branch 'x86-boot' 
# Conflicts:
#	crate/riscv
#	kernel/Makefile
 2018-09-19 20:18:14 +08:00
WangRunji
224905f12c Update Makefile 2018-09-18 18:05:37 +08:00
WangRunji
7a9b746c68 x86_64 back to normal. 
* Fix kernel stack P4E
* User programs: disk0 -> disk1
* IDE IRQ appears ??
 2018-09-18 17:49:12 +08:00
WangRunji
7f00001fd1 Move to higher half 2018-09-18 17:04:55 +08:00
dzy
5a0ce1e464 Refactored RISC-V page table identity mapping into a function. 2018-09-14 21:44:25 +08:00
dzy
11223957d1 Add mkdir build in makefile. 
It this is missing, building with a clean repository will fail
because build/ does not exist.
 2018-09-14 20:05:59 +08:00
WangRunji
0a9c294814 Fix x86_64 startup. TODO: higher half. 
* Remove legacy boot, MP, ACPI.
* Disable SMP.
* Modify startup: boot -> arch::init -> kmain.
* Fix FrameAllocator on x86_64.
* Remove kernel remap.
* Alloc kernel heap at bss.
 2018-09-09 02:35:32 +08:00
WangRunji
0437e5cb17 Make it compile for bootimage toolchain 
* Revert to nightly-2018-08-27 due to its bug on macOS
* Not build C code
 2018-09-07 12:44:40 +08:00
WangRunji
caeff9ad97 Update packages and fit for new Rust nightly 2018-09-04 13:19:23 +08:00
WangRunji
cbe7affc5d Merge riscv for QEMU & FPGA 2018-08-07 16:11:48 +08:00
WangRunji
ff8930a36c Make frame allocator smaller. Fix serial stupid bug. 2018-08-07 15:09:11 +08:00
WangRunji
3cf118ba67 Mul & div inst emulation 2018-08-07 14:53:35 +08:00
WangRunji
b99dc3d1cf Merge branch 'new-rv-toolchain' into board 2018-08-06 19:07:56 +08:00
WangRunji
640872d154 Use alloc API to fix stack overflow in release mode. 2018-08-06 19:04:18 +08:00
WangRunji
384f6a9c9c Change kernel heap to identity map 2018-08-06 18:07:42 +08:00
WangRunji
dc97b4b433 Fix atomic_compare_exchange 2018-08-06 18:03:21 +08:00
WangRunji
3d0d6e3d02 Merge branch 'new-rv-toolchain' into board 
# Conflicts:
#	kernel/Makefile
#	kernel/src/arch/riscv32/boot/entry.asm
 2018-08-05 18:52:13 +08:00
WangRunji
3d6fcb8d8c Fix x86_64. Not elegant. 2018-08-05 17:50:56 +08:00
WangRunji
10e3cea340 Only use Rust toolchain to build for rv32. Set arch to rv32i. x86_64 broken. 2018-08-05 00:24:36 +08:00
WangRunji
296b6196f4 rv64 toolchain configure for riscv-pk 2018-08-04 23:02:50 +08:00
WangRunji
b88648ff44 Fit for newest Rust nightly. x86_64 ok, riscv32 broken. 2018-08-04 16:20:25 +08:00
WangRunji
7e5726845f Simple bootloader. Remove riscv-pk. 2018-08-03 19:27:38 +08:00
WangRunji
a2111a928f Move thread mod to ucore-process crate 2018-07-17 19:06:30 +08:00
WangRunji
fed7b38845 Try to fix travis for x86_64 2018-07-17 12:52:39 +08:00
WangRunji
776dc976c9 Fix for user 2018-07-17 12:07:21 +08:00
WangRunji
6022ec8efc Fix load user program out of range 2018-07-17 11:45:55 +08:00
WangRunji
52d3443e05 Recover idle process. Make shell wait for the user it spawned. 2018-07-17 10:47:05 +08:00
WangRunji
c8a9eaf3e6 Split process mod to extern crate 2018-07-17 01:56:28 +08:00
WangRunji
37a6df252f Refactor process mod 2018-07-17 00:23:02 +08:00
WangRunji
97b838981f Fix console 2018-07-16 22:02:03 +08:00
WangRunji
cf1a2d3450 Simple kernel shell 2018-07-16 17:31:29 +08:00
WangRunji
542a06d50e Set default log level to WARN 2018-07-16 17:28:15 +08:00
WangRunji
5647fb1273 Fix build guide 2018-07-16 13:37:26 +08:00
WangRunji
60c2a77ac1 Unify IO in arch 2018-07-16 09:48:58 +08:00