From ede4e72fe1676064c6e8c20e8bf075df2fb14b51 Mon Sep 17 00:00:00 2001 From: Godones <1925466036@qq.com> Date: Tue, 9 Jan 2024 22:17:56 +0800 Subject: [PATCH] update doc and rust version --- README.md | 29 ++++++++++++++++++----------- rust-toolchain.toml | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index bc319168..1c692a51 100644 --- a/README.md +++ b/README.md @@ -57,36 +57,43 @@ A simple operating system implemented in rust. The purpose is to explore how to 2. install rust nightly ``` -make run LOG= SMP=1 +# 一键运行 +# 可以指定LOG=ERROR/WARN/INFO/DEBUG/TRACE开启调式 +make run [LOG=] [SMP=] +``` + +构建测试程序镜像: + +``` +make sdcard [GUI=n/y] ``` 如果只想重新构建`kernel`而不改变测试程序,可以使用: ``` -make build LOG= SMP=1 +make build LOG= [LOG=] [SMP=] ``` 使用已经编译好的程序运行而不是再次编译可以使用: ``` -make fake_run SMP=1 +# 确保和make build的SMP一致 +make fake_run [SMP=] ``` -可以指定LOG=ERROR/WARN/INFO/DEBUG/TRACE开启调式 - 运行测试(in bash) ``` > cd bin +> ls > final_test ``` - - -### Run with Gui +### Run with GUI (QEMU) ``` -make run LOG= SMP=1 GUI=y +make run GUI=y +cd bin slint or guitest or todo or printdemo or memorygame or ... ``` @@ -112,8 +119,8 @@ make unmatched LOG= UNMATCHED=y SMP=2 ## GDB -1. `gdb-server` -2. `gdb-client` +1. `make gdb-server` +2. `make gdb-client` ## [Doc](docs/doc/doc.md) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f22d9b34..34757309 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2023-11-02" +channel = "nightly-2023-11-05" components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"] targets = ["riscv64gc-unknown-none-elf"]