From 01b1296791bc85e2ccc24673b88fa42443adcf08 Mon Sep 17 00:00:00 2001 From: lurenjia1213 <30799041+lurenjia1213@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:30:30 +0800 Subject: [PATCH] . --- README.md | 2 +- os/src/entry.asm | 5 +++-- os/src/main.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d5c4d36cf..e3c8e6766 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # rCore-Camp-Code-2024A - +## 注意,在这时候还没有分页什么鬼的 ### Code - [Soure Code of labs for 2024A](https://github.com/LearningOS/rCore-Camp-Code-2024A) ### Documents diff --git a/os/src/entry.asm b/os/src/entry.asm index 4ac54bf41..88de0caea 100644 --- a/os/src/entry.asm +++ b/os/src/entry.asm @@ -7,7 +7,8 @@ _start: .section .bss.stack .globl boot_stack_lower_bound boot_stack_lower_bound: - #16K的启动栈 + #64K的启动栈 .space 4096 * 16 .globl boot_stack_top -boot_stack_top: \ No newline at end of file +boot_stack_top: +#栈顶地址被全局符号 boot_stack_top 标识(sp寄存器),栈底则被全局符号 boot_stack 标识。 \ No newline at end of file diff --git a/os/src/main.rs b/os/src/main.rs index a0372ebac..298ef8f92 100644 --- a/os/src/main.rs +++ b/os/src/main.rs @@ -52,7 +52,7 @@ fn clear_bss() { } /// the rust entry-point of os -#[no_mangle] +#[no_mangle]//禁用名称修改,以便链接 pub fn rust_main() -> ! { extern "C" { fn stext(); // begin addr of text segment