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

deploy: 5601a24e60

Browse Source
This commit is contained in:
YdrMaster
2022-10-20 04:27:51 +00:00
parent 55dfcbf31d
commit 58163084d4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_sources/chapter1/3mini-rt-usrland.rst.txt
View File

@@ -213,7 +213,7 @@ Rust 的 core 库内建了以一系列帮助实现显示字符的基本 Trait
注： ``os/src/console.rs`` 文件的代码中使用到了 ``main.rs`` 文件中的sys_write方法，需要说明在文件头部声明 ``use crate::sys_write;`` 。
而 ``main.rs`` 为了能够用到 ``console.rs`` 提供的功能，也需要添加对 console 的引用。主要的添加如下：
.. code-block:: rust
// os/src/main.rs
@@ -233,7 +233,7 @@ Rust 的 core 库内建了以一系列帮助实现显示字符的基本 Trait
#[no_mangle]
extern "C" fn _start() {
print!("Hello, "");
print!("Hello, ");
println!("world!");
sys_exit(9);
}

8
chapter1/3mini-rt-usrland.html
View File

@@ -475,10 +475,10 @@
<span class="cp">#[no_mangle]</span><span class="w"></span>
<span class="k">extern</span><span class="w"> </span><span class="s">"C"</span><span class="w"> </span><span class="k">fn</span> <span class="nf">_start</span><span class="p">()</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
<span class="w"> </span><span class="fm">print!</span><span class="p">(</span><span class="s">"Hello, "");</span>
<span class="s"> println!("</span><span class="n">world</span><span class="o">!</span><span class="s">");</span>
<span class="s"> sys_exit(9);</span>
<span class="s">}</span>
<span class="w"> </span><span class="fm">print!</span><span class="p">(</span><span class="s">"Hello, "</span><span class="p">);</span><span class="w"></span>
<span class="w"> </span><span class="fm">println!</span><span class="p">(</span><span class="s">"world!"</span><span class="p">);</span><span class="w"></span>
<span class="w"> </span><span class="n">sys_exit</span><span class="p">(</span><span class="mi">9</span><span class="p">);</span><span class="w"></span>
<span class="p">}</span><span class="w"></span>
</pre></div>
</div>
<p>现在，我们编译并执行一下，可以看到正确的字符串输出，且程序也能正确退出！</p>