1
0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-23 00:16:17 +04:00
Commit Graph

15 Commits

Author SHA1 Message Date
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
2018-11-16 18:58:29 +08:00
WangRunji
7229b49eb8 Use rust-lld for RV32. Remove riscv git submodule. 2018-10-30 13:30:20 +08:00
lcy1996
4e0b510895 Finish comment for ristv boot. 2018-10-04 13:23:32 +08:00
WangRunji
b61a2c9dd2 Fix user project for new toolchain 2018-08-05 10:41:51 +08:00
WangRunji
b88648ff44 Fit for newest Rust nightly. x86_64 ok, riscv32 broken. 2018-08-04 16:20:25 +08:00
WangRunji
6b0556e135 Add Cargo.lock 2018-07-15 16:43:43 +08:00
WangRunji
69bc5caa81 Fix syscall return value, args. Pass hello. 2018-07-14 18:42:58 +08:00
WangRunji
c768ec3e1e Recover fs for RV32. Add user-riscv.img
Now load user programs from SFS data linked at kernel.
2018-07-14 17:41:45 +08:00
WangRunji
ee80a3eeb7 Fix compile user for RV32 2018-07-14 00:39:49 +08:00
WangRunji
935bcb3e15 Change user sub-project structure 2018-07-13 22:17:24 +08:00
WangRunji
f819a702c7 User programs Rust workspace. Compile OK for x86_64. 2018-07-13 15:12:35 +08:00
WangRunji
2867ae60b6 Add ucore & xv6-x86_64 user program img file. 2018-05-21 22:49:22 +08:00
WangRunji
731d6319e4 Can load user programs from sfs.img (hard linked). 2018-05-18 11:49:27 +08:00
WangRunji
8c64b2abb2 uCore 32bit user program is runnable! 2018-05-17 21:06:13 +08:00
WangRunji
8ce3173c3d Link a user program from xv6-x86_64 in. Add elf crate. 2018-04-28 10:40:31 +08:00