Skip to content

Commit 10652bf

Browse files
Azure-starsAzure-stars
committed
Update to 2024A
1 parent ca0cbef commit 10652bf

File tree

13 files changed

+53
-53
lines changed

13 files changed

+53
-53
lines changed

‎README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
# rCore-Tutorial-Guide-2024S
1+
# rCore-Tutorial-Guide-2024A
22

33
### Code
4-
- [Soure Code of labs for 2024S](https://github.com/LearningOS/rCore-Tutorial-Code-2024S)
4+
- [Soure Code of labs for 2024A](https://github.com/LearningOS/rCore-Tutorial-Code-2024A)
55
### Documents
66

7-
- Concise Manual: [rCore-Tutorial-Guide-2024S](https://LearningOS.github.io/rCore-Tutorial-Guide-2024S/)
7+
- Concise Manual: [rCore-Tutorial-Guide-2024A](https://LearningOS.github.io/rCore-Tutorial-Guide-2024A/)
88

99
- Detail Book [rCore-Tutorial-Book-v3](https://rcore-os.github.io/rCore-Tutorial-Book-v3/)
1010

1111

12-
### OS API docs of rCore Tutorial Code 2024S
13-
- [OS API docs of ch1](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch1/os/index.html)
14-
AND [OS API docs of ch2](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch2/os/index.html)
15-
- [OS API docs of ch3](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch3/os/index.html)
16-
AND [OS API docs of ch4](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch4/os/index.html)
17-
- [OS API docs of ch5](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch5/os/index.html)
18-
AND [OS API docs of ch6](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch6/os/index.html)
19-
- [OS API docs of ch7](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch7/os/index.html)
20-
AND [OS API docs of ch8](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch8/os/index.html)
21-
- [OS API docs of ch9](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch9/os/index.html)
12+
### OS API docs of rCore Tutorial Code 2024A
13+
- [OS API docs of ch1](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch1/os/index.html)
14+
AND [OS API docs of ch2](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch2/os/index.html)
15+
- [OS API docs of ch3](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch3/os/index.html)
16+
AND [OS API docs of ch4](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch4/os/index.html)
17+
- [OS API docs of ch5](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch5/os/index.html)
18+
AND [OS API docs of ch6](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch6/os/index.html)
19+
- [OS API docs of ch7](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch7/os/index.html)
20+
AND [OS API docs of ch8](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch8/os/index.html)
21+
- [OS API docs of ch9](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch9/os/index.html)
2222

2323
### Related Resources
2424
- [Learning Resource](https://github.com/LearningOS/rust-based-os-comp2022/blob/main/relatedinfo.md)
@@ -28,9 +28,9 @@
2828

2929
```bash
3030
# setup build&run environment first
31-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
32-
$ cd rCore-Tutorial-Code-2024S
33-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git user
31+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
32+
$ cd rCore-Tutorial-Code-2024A
33+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
3434
$ cd os
3535
$ git checkout ch$ID
3636
$ make run
@@ -41,10 +41,10 @@ Notice: $ID is from [1-9]
4141

4242
```bash
4343
# setup build&run environment first
44-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
45-
$ cd rCore-Tutorial-Code-2024S
46-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2024S.git ci-user
47-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git ci-user/user
44+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
45+
$ cd rCore-Tutorial-Code-2024A
46+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2024A.git ci-user
47+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git ci-user/user
4848
$ cd ci-user && make test CHAPTER=$ID
4949
```
5050
Notice: $ID is from [3,4,5,6,8]

‎source/0setup-devel-env.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ Qemu 模拟器安装
194194

195195
.. code-block:: bash
196196
197-
git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S
198-
cd rCore-Tutorial-Code-2024S
197+
git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A
198+
cd rCore-Tutorial-Code-2024A
199199
200200
我们先运行不需要处理用户代码的 ch1 分支：
201201

‎source/chapter1/0intro.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343

4444
.. code-block:: console
4545
46-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S
47-
$ cd rCore-Tutorial-Code-2024S
46+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A
47+
$ cd rCore-Tutorial-Code-2024A
4848
$ git checkout ch1
4949
5050
运行本章代码，并设置日志级别为 ``TRACE``：

‎source/chapter2/0intro.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
.. code-block:: console
2626
27-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
28-
$ cd rCore-Tutorial-Code-2024S
27+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
28+
$ cd rCore-Tutorial-Code-2024A
2929
$ git checkout ch2
30-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git user
30+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
3131
3232
上面的指令会将测例仓库克隆到代码仓库下并命名为 ``user`` ，注意 ``/user`` 在代码仓库的 ``.gitignore`` 文件中，因此不会出现 ``.git`` 文件夹嵌套的问题，并且你在代码仓库进行 checkout 操作时也不会影响测例仓库的内容。
3333

‎source/chapter3/0intro.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
.. code-block:: console
2020
21-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
22-
$ cd rCore-Tutorial-Code-2024S
21+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
22+
$ cd rCore-Tutorial-Code-2024A
2323
$ git checkout ch3
24-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git user
24+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
2525
2626
在 qemu 模拟器上运行本章代码：
2727

‎source/chapter3/5exercise.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ ch3 中，我们的系统已经能够支持多个任务分时轮流运行，我
8181
8282
.. code-block:: shell
8383
84-
git clone [email protected]:os-lab/2024s/public/rcore-tutorial-checker-2024s.git ci-user
85-
git clone [email protected]:os-lab/2024s/public/rcore-tutorial-test-2024s.git ci-user/user
84+
git clone [email protected]:os-lab/2024A/public/rcore-tutorial-checker-2024A.git ci-user
85+
git clone [email protected]:os-lab/2024A/public/rcore-tutorial-test-2024A.git ci-user/user
8686
cd ci-user && make test CHAPTER=$ID OFFLINE=1
8787
8888
@@ -95,10 +95,10 @@ ch3 中，我们的系统已经能够支持多个任务分时轮流运行，我
9595
--------------------------------------------
9696
9797
1. 正确进入 U 态后，程序的特征还应有：使用 S 态特权指令，访问 S 态寄存器后会报错。
98-
请同学们可以自行测试这些内容（运行 `三个 bad 测例 (ch2b_bad_*.rs) <https://github.com/LearningOS/rCore-Tutorial-Test-2024S/tree/master/src/bin>`_ ），
98+
请同学们可以自行测试这些内容（运行 `三个 bad 测例 (ch2b_bad_*.rs) <https://github.com/LearningOS/rCore-Tutorial-Test-2024A/tree/master/src/bin>`_ ），
9999
描述程序出错行为，同时注意注明你使用的 sbi 及其版本。
100100
101-
2. 深入理解 `trap.S <https://github.com/LearningOS/rCore-Tutorial-Code-2024S/blob/ch3/os/src/trap/trap.S>`_
101+
2. 深入理解 `trap.S <https://github.com/LearningOS/rCore-Tutorial-Code-2024A/blob/ch3/os/src/trap/trap.S>`_
102102
中两个函数 ``__alltraps`` 和 ``__restore`` 的作用，并回答如下问题:
103103
104104
1. L40：刚进入 ``__restore`` 时，``a0`` 代表了什么值。请指出 ``__restore`` 的两种使用情景。

‎source/chapter4/0intro.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616

1717
.. code-block:: console
1818
19-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
20-
$ cd rCore-Tutorial-Code-2024S
19+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
20+
$ cd rCore-Tutorial-Code-2024A
2121
$ git checkout ch4
22-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git user
22+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
2323
2424
或许你之前已经克隆过了仓库，只希望从远程仓库更新，而非再克隆一次：
2525

2626
.. code-block:: console
2727
28-
$ cd rCore-Tutorial-Code-2024S
28+
$ cd rCore-Tutorial-Code-2024A
2929
# 你可以将 upstream 改为你喜欢的名字
30-
$ git remote add upstream https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
30+
$ git remote add upstream https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
3131
# 更新仓库信息
3232
$ git fetch upstream
3333
# 查看已添加的远程仓库；应该能看到已有一个 origin 和新添加的 upstream 仓库

‎source/chapter5/0intro.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
.. code-block:: console
2525
26-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
27-
$ cd rCore-Tutorial-Code-2024S
26+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
27+
$ cd rCore-Tutorial-Code-2024A
2828
$ git checkout ch5
29-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git user
29+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
3030
3131
请仿照ch4的做法将代码在本地更新并push到自己的实验仓库中。
3232

‎source/chapter6/0intro.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
.. code-block:: console
1515
16-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
17-
$ cd rCore-Tutorial-Code-2024S
16+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
17+
$ cd rCore-Tutorial-Code-2024A
1818
$ git checkout ch6
1919
2020
在 qemu 模拟器上运行本章代码：

‎source/chapter7/0intro.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
.. code-block:: console
1616
17-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
18-
$ cd rCore-Tutorial-Code-2024S
17+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
18+
$ cd rCore-Tutorial-Code-2024A
1919
$ git checkout ch7
2020
2121
在 qemu 模拟器上运行本章代码：

‎source/chapter8/0intro.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@
8888

8989
.. code-block:: console
9090
91-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
92-
$ cd rCore-Tutorial-Code-2024S
91+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
92+
$ cd rCore-Tutorial-Code-2024A
9393
$ git checkout ch8
94-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git user
94+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
9595
9696
记得更新测例仓库的代码。
9797

‎source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
# -- Project information -----------------------------------------------------
1919

20-
project = 'rCore-Tutorial-Guide-2024S'
21-
copyright = 'OS2024Sutumn'
20+
project = 'rCore-Tutorial-Guide-2024A'
21+
copyright = 'OS2024Autumn'
2222
author = 'Yifan Wu'
2323
language = 'zh_CN'
2424
html_search_language = 'zh'
@@ -39,7 +39,7 @@
3939

4040
comments_config = {
4141
"utterances": {
42-
"repo": "LearningOS/rCore-Tutorial-Guide-2024S",
42+
"repo": "LearningOS/rCore-Tutorial-Guide-2024A",
4343
"issue-term": "pathname",
4444
"label": "comments",
4545
"theme": "github-light",

‎source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. rCore-Tutorial-Guide-2024S documentation master file, created by
1+
.. rCore-Tutorial-Guide-2024A documentation master file, created by
22
sphinx-quickstart on Thu Oct 29 22:25:54 2020.
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.

0 commit comments

Comments
 (0)