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

54 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
Ben Pig Chu
9c56868490 report4 fs part 2018-11-16 06:28:06 +08:00
lcy1996
501de6f0d4 none 2018-11-15 22:14:45 +08:00
lcy1996
4b36a398cd Merge branch 'OsTrain2018-g4' of github.com:oscourse-tsinghua/RustOS into lcy_issue1 2018-11-15 22:11:43 +08:00
lcy1996
8c30e9bf05 Modified the report for expr4. 2018-11-15 22:11:27 +08:00
chenqiuhao1997
ec2a759975
Update report.md 2018-11-15 17:19:28 +08:00
lcy1996
38666df04e Modification in the report for expr4. 2018-11-15 16:36:58 +08:00
lcy1996
47a747dd02 merge conflict 2018-11-15 16:31:55 +08:00
lcy1996
f4305b382f Add comment and report for expr4 2018-11-15 16:29:24 +08:00
chenqiuhao1997
413715a3e7
Update report.md 2018-11-15 14:54:09 +08:00
chenqiuhao1997
9aeef1b845
Update report.md 2018-11-15 14:52:50 +08:00
lcy1996
a8da42d521 Add expr4 report and some trace for synctest 2018-11-14 21:45:56 +08:00
lcy1996
c5499a62c5 Fix bug in swap in/out. Address ailign to 4K. 2018-11-14 00:32:59 +08:00
lcy1996
4a92a4c6a1 Update the report for expr3 2018-11-07 10:15:25 +08:00
lcy1996
66b18772c6 Modified the expr3/report 2018-10-31 01:19:24 +08:00
lcy1996
89fb06d8dd Modified the expr3/report 2018-10-31 01:17:26 +08:00
lcy1996
bdd60dd731 Modified the expr3/report 2018-10-31 01:14:51 +08:00
Ben Pig Chu
d698440feb fe report clarify 2018-10-30 23:15:53 +08:00
Ben Pig Chu
93ad064ae9 Merge branch 'OsTrain2018-g4' of https://github.com/oscourse-tsinghua/RustOS into OsTrain2018-g4 2018-10-30 23:12:22 +08:00
Ben Pig Chu
227c514092 fs report 2018-10-30 23:10:26 +08:00
chenqiuhao1997
f69db428c5
Update report.md 2018-10-30 23:02:33 +08:00
lcy1996
504401355f Add expr3 report(not finiished. 2018-10-30 21:50:38 +08:00
WangRunji
925a08f9ae Add OSLab/exp3 report 2018-10-26 02:32:48 +08:00
WangRunji
ff18852c56 Reorganize docs. 2018-10-19 23:37:10 +08:00
WangRunji
1b4edf3bb2 Merge branch 'rv32-smp-porting' into dev
# Conflicts:
#	kernel/Makefile
2018-10-19 23:36:15 +08:00
maoyuchaxue
a34783c277 a late proposal.pptx 2018-10-16 18:05:16 +08:00
maoyuchaxue
d55eae7122 a late proposal.md 2018-10-16 17:42:50 +08:00
WangRunji
6cdf505f62 Add OSLab/exp2 report 2018-10-10 00:50:13 +08:00
Ben Pig Chu
f5acc273d7 Merge branch 'OsTrain2018-g4' of https://github.com/oscourse-tsinghua/RustOS into crate-memory-comment 2018-10-09 23:24:05 +08:00
Ben Pig Chu
7b69d01125 Merge branch 'OsTrain2018-g4' of https://github.com/oscourse-tsinghua/RustOS into crate-memory-comment 2018-10-09 23:21:00 +08:00
lcy1996
c9ed233428 Modified Proposal 2018-10-09 23:20:11 +08:00
Ben Pig Chu
adf474b78f file system planning 2018-10-09 23:19:13 +08:00
chenqiuhao1997
dc95f9c605
Update proposal.md 2018-10-09 21:43:44 +08:00
chenqiuhao1997
f64b8c7f6a
Update proposal.md 2018-10-09 21:42:57 +08:00
lcy1996
683355180c Modified Proposal 2018-10-09 21:21:38 +08:00
lcy1996
25db09bd59 Modified Proposal 2018-10-09 21:19:55 +08:00
chenqiuhao
24d0de8c42 update report 2018-10-09 21:19:32 +08:00
lcy1996
5a1cc4178d Modified proposal 2018-10-09 21:17:14 +08:00
chenqiuhao
0ba43762ff update report 2018-10-09 21:17:00 +08:00
lcy1996
96cdf37b15 Add some comment for paging and add proposal doc 2018-10-09 21:11:14 +08:00
lcy1996
2157e4bbcf Add comment for interrutp and trap code 2018-10-06 01:45:56 +08:00
lcy1996
65df061ec6 Update expr1 report. 2018-10-05 22:16:07 +08:00
lcy1996
2264f69ef7 Add reports 2018-10-05 12:36:50 +08:00
WangRunji
4914d22f44 Update doc & README 2018-07-12 22:46:17 +08:00
WangRunji
87b7ea523b Experimental patch for core::sync::atomic on RISCV32I 2018-07-10 01:32:05 +08:00
WangRunji
a09be9cc40 Add doc for trap 2018-07-08 02:07:20 +08:00
WangRunji
aa22fcabde Change target arch to RISCV32IMA. Recover some dependencies. 2018-07-06 23:02:10 +08:00
WangRunji
37564cb9fd Change build target to riscv32ia_unknown_none 2018-07-06 01:24:35 +08:00
WangRunji
211aeff841 Add bbl as bootloader 2018-07-04 16:23:11 +08:00
WangRunji
ce6c849f5b Update report 2018-06-15 11:50:51 +08:00