CS_learn/rust-based-os-comp2022
1
0
Fork 0
mirror of https://github.com/LearningOS/rust-based-os-comp2022.git synced 2026-05-11 10:33:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: classroom setup

Browse Source 
Signed-off-by: YdrMaster <ydrml@hotmail.com>
This commit is contained in:
YdrMaster
2022-10-20 12:38:01 +08:00
parent 3a4e7e5479
commit e2eab27576
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -2,7 +2,6 @@ DOCKER_NAME ?= rust-os-camp-2022
DIR := workplace DIR := workplace
.PHONY: docker build_docker .PHONY: docker build_docker
test: test3 test4 test5 test6 test7 test8 test: test3 test4 test5 test6 test7 test8
lab1: test3 lab1: test3
@@ -23,7 +22,7 @@ setup:
cp -r ci-user ${DIR} cp -r ci-user ${DIR}
cp -r bootloader ${DIR} cp -r bootloader ${DIR}
cp -r reports ${DIR} cp -r reports ${DIR}
cp rust-toolchain ${DIR} cp rust-toolchain.toml ${DIR}
# export PATH=${PATH}:${HOME}/qemu-7.0.0:${HOME}/qemu-7.0.0/riscv64-softmmu # export PATH=${PATH}:${HOME}/qemu-7.0.0:${HOME}/qemu-7.0.0/riscv64-softmmu
test1: setup test1: setup

2
guide/source/chapter1/0intro.rst
View File

@@ -111,7 +111,7 @@
│   ├── logging.rs (为本项目实现了日志功能) │   ├── logging.rs (为本项目实现了日志功能)
│   ├── main.rs (内核主函数) │   ├── main.rs (内核主函数)
│   └── sbi.rs (封装底层 SBI 实现提供的 SBI 接口) │   └── sbi.rs (封装底层 SBI 实现提供的 SBI 接口)
└── rust-toolchain (整个项目的工具链版本) └── rust-toolchain.toml (整个项目的工具链版本)
cloc os cloc os
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
guide/source/chapter8/0intro.rst
View File

@@ -263,4 +263,4 @@
│ ├── mod.rs (修改：使用线程对应的中断上下文地址而非固定的 TRAP_CONTEXT) │ ├── mod.rs (修改：使用线程对应的中断上下文地址而非固定的 TRAP_CONTEXT)
│ └── trap.S │ └── trap.S
├── README.md ├── README.md
└── rust-toolchain └── rust-toolchain.toml