fix: repair code to build under nightly 2024-05-02 for ArceOS project

Signed-off-by: Zhouqi Jiang <[email protected]>
arceos-hypervisor · Oct 23, 2024 · a7207d8 · a7207d8
1 parent e2a1a3e
commit a7207d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/detect.rs b/src/detect.rs
@@ -147,7 +147,7 @@ struct TrapFrame {
 // handle exceptions only rather than interrupts.
 #[naked]
 unsafe extern "C" fn on_detect_trap() -> ! {
-    core::arch::naked_asm!(
+    asm!(
         ".p2align 2",
         "addi   sp, sp, -8*21",
         "sd     ra, 0*8(sp)",
@@ -205,5 +205,6 @@ unsafe extern "C" fn on_detect_trap() -> ! {
         "addi   sp, sp, 8*21",
         "sret",
         rust_detect_trap = sym rust_detect_trap,
+        options(noreturn),
     )
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,6 +2,7 @@
 #![feature(doc_cfg)]
 #![feature(naked_functions)]
 #![feature(riscv_ext_intrinsics)]
+#![feature(asm_const)]
 #![doc = include_str!("../README.md")]
 
 #[macro_use]