WangRunji
|
b1bdac7d0f
|
fix merge for aarch64. now it works!
|
2018-11-20 01:08:39 +08:00 |
|
WangRunji
|
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
|
2018-11-20 00:15:19 +08:00 |
|
WangRunji
|
56fcad245a
|
update kernel to 2018 edition
|
2018-11-19 20:11:17 +08:00 |
|
WangRunji
|
4495622317
|
update process crate to 2018 edition
|
2018-11-19 15:46:40 +08:00 |
|
WangRunji
|
12457f10cb
|
update memory crate to 2018 edition
|
2018-11-19 15:43:28 +08:00 |
|
WangRunji
|
c4935a1477
|
use pc-keyboard crate and enable keyboard again for x86
|
2018-11-18 19:20:26 +08:00 |
|
lcy1996
|
76d2c6ec7b
|
Fix the bug of active_table_swap() wrongly force unlock in pg fault handler
|
2018-11-17 23:17:42 +08:00 |
|
lcy1996
|
b2fec2b16b
|
Fix a bug in context for smp
|
2018-11-17 21:34:21 +08:00 |
|
lcy1996
|
67035ac556
|
Fix a bug in pg fault handler caused by memory_set_record
|
2018-11-17 19:18:48 +08:00 |
|
lcy1996
|
00d0ea8a8b
|
Modified the code in pgfault
|
2018-11-17 16:54:21 +08:00 |
|
lcy1996
|
9d803e87d9
|
replace some unwrap() and comment the cow pgfault handler
|
2018-11-17 16:25:24 +08:00 |
|
WangRunji
|
7d7cedfdd0
|
move g4 docs
|
2018-11-17 13:07:52 +08:00 |
|
WangRunji
|
df485d506e
|
simplify ProcessManager
- given that a proc can only be waited by its parent, wait_queue is no longer needed.
|
2018-11-17 12:58:40 +08:00 |
|
WangRunji
|
5478b9ba7b
|
no longer show normal page fault
|
2018-11-17 12:42:19 +08:00 |
|
WangRunji
|
ef75c8a072
|
fix unwrap panic. now user shell is working.
|
2018-11-17 12:40:51 +08:00 |
|
WangRunji
|
da399dca96
|
remove Process struct
|
2018-11-16 22:27:03 +08:00 |
|
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
|
e06f6b8bc5
|
update Cargo.toml & Cargo.lock
|
2018-11-16 15:17:25 +08:00 |
|
Ben Pig Chu
|
9c56868490
|
report4 fs part
|
2018-11-16 06:28:06 +08:00 |
|
WangRunji
|
d27ac65df3
|
fix load program slice error
|
2018-11-16 01:33:25 +08:00 |
|
WangRunji
|
5ce7d0a9c0
|
use user shell by default. fix kernel shell removing user thread.
|
2018-11-16 01:22:59 +08:00 |
|
WangRunji
|
21b0bdcbca
|
separate kernel shell to a mod, remove console mod
|
2018-11-16 00:49:42 +08:00 |
|
WangRunji
|
b3e5d1987e
|
update Cargo.lock
|
2018-11-16 00:30:15 +08:00 |
|
WangRunji
|
9b3294a5f2
|
fix clear bss when load user program. 'sh' works!
|
2018-11-16 00:17:05 +08:00 |
|
WangRunji
|
40b099ed79
|
clean riscv-pk in Makefile
|
2018-11-15 23:42:44 +08:00 |
|
WangRunji
|
44bf3fb07a
|
impl sys_exec
|
2018-11-15 23:41:22 +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 |
|
equation314
|
576ae1d911
|
add setup_page_table
|
2018-11-15 19:12:02 +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 |
|
koumingyang
|
ef213d60bb
|
mmu
|
2018-11-15 14:22:57 +08:00 |
|
lcy1996
|
eb00b2bfd3
|
merge conflict
|
2018-11-14 21:54:26 +08:00 |
|
lcy1996
|
a8da42d521
|
Add expr4 report and some trace for synctest
|
2018-11-14 21:45:56 +08:00 |
|
chenqiuhao
|
4d8d48cf4d
|
repair some bugs and move child control to processmanager
|
2018-11-14 18:36:47 +08:00 |
|
lcy1996
|
65cd42028c
|
Add illegal vma check in page fault hangler
|
2018-11-14 01:13:19 +08:00 |
|
lcy1996
|
c5499a62c5
|
Fix bug in swap in/out. Address ailign to 4K.
|
2018-11-14 00:32:59 +08:00 |
|
chenqiuhao
|
6652f8daf6
|
repair some bugs
|
2018-11-13 22:52:11 +08:00 |
|
chenqiuhao
|
8d6d3b7c37
|
debug for sleepkill
|
2018-11-13 19:56:17 +08:00 |
|
WangRunji
|
f97e8458b8
|
impl stdin & stdout as INode
|
2018-11-11 23:08:59 +08:00 |
|
WangRunji
|
ec0b1973a0
|
Update travis
|
2018-11-10 21:53:07 +08:00 |
|
lcy1996
|
5ee44588e0
|
Enlarge the physical and kernel heap memory. Fix the bug in map the kernel.
|
2018-11-09 11:08:45 +08:00 |
|
lcy1996
|
990ce51007
|
Code Transplanting: unwrap -> expect
|
2018-11-08 19:58:30 +08:00 |
|
lcy1996
|
0b900b6f03
|
Code Transplanting: Blocking getchar
|
2018-11-08 19:40:28 +08:00 |
|
lcy1996
|
9adcea44d5
|
Code transplanting: Fix bugs. Pass test 'spin'
|
2018-11-08 19:21:13 +08:00 |
|