feat: 使用 sifive-test-device

Signed-off-by: YdrMaster <[email protected]>

Author: YdrMaster

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Use crate rcore-console version 0.0.0 in rustsbi-qemu and test-kernel for `print!` and `println!`
 - Use crate aclint version 0.0.0 in rustsbi-qemu for aclint structs
 - Use crate os-xtask-utils version 0.0.0 in xtask builder
+- Use crate sifive-test-device version 0.0.0 instead of qemu-exit
 
 ### Fixed
 

Cargo.lock

@@ -24,9 +24,9 @@ spin = "0.9"
 r0 = "1"
 uart_16550 = "0.2"
 rcore-console = "0.0.0"
-dtb-walker = "=0.2.0-alpha.3"
-qemu-exit = "3.0"
 aclint = "0.0.0"
+sifive-test-device = "0.0.0"
+dtb-walker = "=0.2.0-alpha.3"
 
 hsm-cell = { path = "../hsm-cell" }
 fast-trap = { git = "https://github.com/YdrMaster/fast-trap", rev = "5026ee4", features = [

rustsbi-qemu/Cargo.toml

@@ -1,4 +1,3 @@
-use qemu_exit::{QEMUExit, RISCV64};
 use rustsbi::{
     spec::{
         binary::SbiRet,
@@ -9,14 +8,15 @@ use rustsbi::{
     },
     Reset,
 };
+use sifive_test_device::SifiveTestDevice;
 use spin::Once;
 
-pub(crate) struct QemuTest(RISCV64);
+pub(crate) struct QemuTest(usize);
 
 static TEST: Once<QemuTest> = Once::new();
 
 pub(crate) fn init(base: usize) {
-    TEST.call_once(|| QemuTest(RISCV64::new(base as _)));
+    TEST.call_once(|| QemuTest(base));
 }
 
 pub(crate) fn get() -> &'static QemuTest {
@@ -25,13 +25,17 @@ pub(crate) fn get() -> &'static QemuTest {
 
 impl Reset for QemuTest {
     fn system_reset(&self, reset_type: u32, reset_reason: u32) -> SbiRet {
+        let test = unsafe { &*(TEST.wait().0 as *const SifiveTestDevice) };
         match reset_type {
             RESET_TYPE_SHUTDOWN => match reset_reason {
-                RESET_REASON_NO_REASON => self.0.exit_success(),
-                RESET_REASON_SYSTEM_FAILURE => self.0.exit_failure(),
-                value => self.0.exit(value),
+                RESET_REASON_NO_REASON => test.pass(),
+                RESET_REASON_SYSTEM_FAILURE => test.fail(-1 as _),
+                value => test.fail(value as _),
             },
-            RESET_TYPE_COLD_REBOOT | RESET_TYPE_WARM_REBOOT => SbiRet::success(0),
+            RESET_TYPE_COLD_REBOOT | RESET_TYPE_WARM_REBOOT => {
+                // test.reset();
+                todo!()
+            }
             _ => SbiRet::invalid_param(),
         }
     }