Merge pull request #10 from Ivans-11/lab

feat: nobios mode, exercise docs & test cases, CI testing

Author: Ivans-11

.github/workflows/workflow.yml

@@ -2,35 +2,61 @@
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "lab" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "lab" ]
+  workflow_dispatch:
 
 jobs:
-  make:
+  fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Build syscall
-        uses: actions-rs/cargo@v1
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
         with:
-          command: build
-          args: --package syscall
+          components: rustfmt
 
       - name: Check format
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all --check
+        run: cargo fmt --all --check
+
+  qemu-exercise:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    container:
+      image: duskmoon/dev-env:rcore-ci
+    strategy:
+      fail-fast: false
+      matrix:
+        ch: [3, 4, 5, 6, 8]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Sanity check toolchain in container
+        run: |
+          set -eux
+          qemu-system-riscv64 --version
+          python3 --version
+          rustc --version
+          cargo --version
+          rustup --version
+
+      - name: Mark workspace as safe git directory
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+      - name: Checkout checker
+        run: |
+          git clone --depth 1 https://github.com/LearningOS/rCore-Tutorial-Checker-2025S.git checker
+
+      - name: Install Rust components/targets
+        run: |
+          set -eux
+          rustup target add riscv64gc-unknown-none-elf
+          rustup component add rust-src llvm-tools-preview
 
-      - name: Make every chapter
+      - name: Run exercise in QEMU and check output (ch${{ matrix.ch }})
         run: |
-          cargo make --ch 1
-          cargo make --ch 2
-          cargo make --ch 3
-          cargo make --ch 4
-          cargo make --ch 5
-          cargo make --ch 6
-          cargo make --ch 7
-          cargo make --ch 8
+          timeout 3m cargo qemu --ch ${{ matrix.ch }} --exercise --nobios --ci 2>&1 \
+            | python3 checker/check/ch${{ matrix.ch }}.py

.gitignore

@@ -7,3 +7,4 @@
 *.asm
 *.bin
 !/rustsbi-qemu.bin
+!/**/m_entry.asm

Cargo.lock

@@ -23,6 +23,7 @@ members = [
     "signal",
     "signal-impl",
     "sync",
+    "sbi",
 ]
 default-members = ["xtask"]
 resolver = "2"

Cargo.toml

@@ -4,6 +4,12 @@ version = "0.0.1"
 edition = "2021"
 authors = ["YdrMaster <ydrml@hotmail.com>"]
 
+[features]
+default = []
+nobios = [
+    "sbi/nobios",
+]
+
 [dependencies]
-sbi-rt = { version = "0.0.2", features = ["legacy"] }
+sbi = { path = "../sbi" }
 rcore-console = { path = "../console" }

ch1-lab/Cargo.toml

@@ -2,8 +2,9 @@ fn main() {
     use std::{env, fs, path::PathBuf};
 
     let ld = &PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
-    fs::write(ld, LINKER).unwrap();
+    fs::write(ld, if env::var("CARGO_FEATURE_NOBIOS").is_ok() { NOBIOS_LINKER } else { LINKER }).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=CARGO_FEATURE_NOBIOS");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 
@@ -28,3 +29,44 @@ SECTIONS {
         *(.sbss .sbss.*)
     }
 }";
+
+
+const NOBIOS_LINKER: &[u8] = b"
+OUTPUT_ARCH(riscv)
+ENTRY(_m_start)
+M_BASE_ADDRESS = 0x80000000;
+S_BASE_ADDRESS = 0x80200000;
+
+SECTIONS {
+    . = M_BASE_ADDRESS;
+    .text.m_entry : {
+        *(.text.m_entry)
+    }
+    .text.m_trap : {
+        *(.text.m_trap)
+    }
+    .bss.m_stack : {
+        *(.bss.m_stack)
+    }
+    .bss.m_data : {
+        *(.bss.m_data)
+    }
+    . = S_BASE_ADDRESS;
+    .text : {
+        *(.text.entry)
+        *(.text .text.*)
+    }
+    .rodata : {
+        *(.rodata .rodata.*)
+        *(.srodata .srodata.*)
+    }
+    .data : {
+        *(.data .data.*)
+        *(.sdata .sdata.*)
+    }
+    .bss : {
+        *(.bss.uninit)
+        *(.bss .bss.*)
+        *(.sbss .sbss.*)
+    }
+}";

ch1-lab/build.rs

@@ -5,7 +5,7 @@
 #[macro_use]
 extern crate rcore_console;
 
-use sbi_rt::*;
+use sbi;
 
 /// Supervisor 汇编入口。
 ///
@@ -39,8 +39,7 @@ extern "C" fn rust_main() -> ! {
     // 测试各种打印
     rcore_console::test_log();
 
-    system_reset(Shutdown, NoReason);
-    unreachable!()
+    sbi::shutdown(false)
 }
 
 /// 将传给 `console` 的控制台对象。
@@ -51,15 +50,13 @@ struct Console;
 /// 为 `Console` 实现 `console::Console` trait。
 impl rcore_console::Console for Console {
     fn put_char(&self, c: u8) {
-        #[allow(deprecated)]
-        legacy::console_putchar(c as _);
+        sbi::console_putchar(c);
     }
 }
 
 /// Rust 异常处理函数，以异常方式关机。
 #[panic_handler]
 fn panic(info: &core::panic::PanicInfo) -> ! {
     println!("{info}");
-    system_reset(Shutdown, SystemFailure);
-    loop {}
+    sbi::shutdown(true)
 }

ch1-lab/src/main.rs

@@ -4,5 +4,11 @@ version = "0.0.1"
 edition = "2021"
 authors = ["YdrMaster <ydrml@hotmail.com>"]
 
+[features]
+default = []
+nobios = [
+    "sbi/nobios",
+]
+
 [dependencies]
-sbi-rt = { version = "0.0.2", features = ["legacy"] }
+sbi = { path = "../sbi" }

ch1/Cargo.toml

@@ -2,8 +2,9 @@ fn main() {
     use std::{env, fs, path::PathBuf};
 
     let ld = &PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
-    fs::write(ld, LINKER).unwrap();
+    fs::write(ld, if env::var("CARGO_FEATURE_NOBIOS").is_ok() { NOBIOS_LINKER } else { LINKER }).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=CARGO_FEATURE_NOBIOS");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 
@@ -28,3 +29,44 @@ SECTIONS {
         *(.sbss .sbss.*)
     }
 }";
+
+
+const NOBIOS_LINKER: &[u8] = b"
+OUTPUT_ARCH(riscv)
+ENTRY(_m_start)
+M_BASE_ADDRESS = 0x80000000;
+S_BASE_ADDRESS = 0x80200000;
+
+SECTIONS {
+    . = M_BASE_ADDRESS;
+    .text.m_entry : {
+        *(.text.m_entry)
+    }
+    .text.m_trap : {
+        *(.text.m_trap)
+    }
+    .bss.m_stack : {
+        *(.bss.m_stack)
+    }
+    .bss.m_data : {
+        *(.bss.m_data)
+    }
+    . = S_BASE_ADDRESS;
+    .text : {
+        *(.text.entry)
+        *(.text .text.*)
+    }
+    .rodata : {
+        *(.rodata .rodata.*)
+        *(.srodata .srodata.*)
+    }
+    .data : {
+        *(.data .data.*)
+        *(.sdata .sdata.*)
+    }
+    .bss : {
+        *(.bss.uninit)
+        *(.bss .bss.*)
+        *(.sbss .sbss.*)
+    }
+}";