deps: update fast-trap

Signed-off-by: YdrMaster <ydrml@hotmail.com>

Author: YdrMaster

Cargo.lock

@@ -17,7 +17,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rustsbi = "0.3.0"
+rustsbi = "0.3.1"
 sbi-spec = { version = "0.0.4", features = ["legacy"] }
 riscv = "0.10.1"
 spin = "0.9"
@@ -28,6 +28,4 @@ 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 = "51a9c71", features = [
-    "riscv-m",
-] }
+fast-trap = { version = "=0.0.1", features = ["riscv-m"] }

rustsbi-qemu/Cargo.toml

@@ -1,9 +1,6 @@
 use crate::{fast_handler, hart_id, Supervisor, LEN_STACK_PER_HART, NUM_HART_MAX};
-use core::{
-    mem::{forget, size_of},
-    ptr::NonNull,
-};
-use fast_trap::{FlowContext, FreeTrapStack, TrapStackBlock};
+use core::{mem::forget, ptr::NonNull};
+use fast_trap::{FlowContext, FreeTrapStack};
 use hsm_cell::{HsmCell, LocalHsmCell, RemoteHsmCell};
 
 /// 栈空间。
@@ -89,39 +86,20 @@ impl Stack {
         let hart = self.hart_context();
         let context_ptr = hart.context_ptr();
         hart.init();
+        let range = self.0.as_ptr_range();
         forget(
-            FreeTrapStack::new(StackRef(self), context_ptr, fast_handler)
-                .unwrap()
-                .load(),
+            FreeTrapStack::new(
+                range.start as usize..range.end as usize,
+                |_| {},
+                context_ptr,
+                fast_handler,
+            )
+            .unwrap()
+            .load(),
         );
     }
 }
 
-#[repr(transparent)]
-struct StackRef(&'static mut Stack);
-
-impl AsRef<[u8]> for StackRef {
-    #[inline]
-    fn as_ref(&self) -> &[u8] {
-        &self.0 .0[size_of::<HartContext>()..]
-    }
-}
-
-impl AsMut<[u8]> for StackRef {
-    #[inline]
-    fn as_mut(&mut self) -> &mut [u8] {
-        &mut self.0 .0[size_of::<HartContext>()..]
-    }
-}
-
-impl TrapStackBlock for StackRef {}
-
-impl Drop for StackRef {
-    fn drop(&mut self) {
-        panic!("Root stack cannot be dropped")
-    }
-}
-
 /// 硬件线程上下文。
 struct HartContext {
     /// 陷入上下文。

rustsbi-qemu/src/trap_stack.rs

@@ -8,7 +8,9 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sbi-testing = { version = "0.0.1", features = ["log"] }
+sbi-testing = { git = "https://github.com/rustsbi/sbi-testing", rev = "7a5e920", features = [
+    "log",
+] }
 log = "0.4.17"
 riscv = "0.10.1"
 spin = "0.9"