misc: replace asm! with naked_asm! in naked functions

Fixes: error[E0787]: the `asm!` macro is not allowed in naked functions Signed-off-by: Esteban Blanc <estblcsk@gmail.com>
ks0n · Oct 10, 2024 · 120894e · 120894e
1 parent d46f599
commit 120894e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/hal_aarch64/src/irq.rs b/hal_aarch64/src/irq.rs
@@ -1,3 +1,4 @@
+use core::arch::naked_asm;
 use core::ptr;
 use core::sync::atomic::{AtomicPtr, Ordering};
 
@@ -57,7 +58,7 @@ macro_rules! gen_isr_stub {
 #[no_mangle]
 #[repr(align(0x800))]
 unsafe extern "C" fn el1_vector_table() {
-    core::arch::asm!(
+    naked_asm!(
         gen_isr_stub!(),
         gen_isr_stub!(),
         gen_isr_stub!(),
@@ -70,7 +71,6 @@ unsafe extern "C" fn el1_vector_table() {
         gen_isr_stub!(),
         gen_isr_stub!(),
         gen_isr_stub!(),
-        options(noreturn)
     );
 }
 

diff --git a/hal_aarch64/src/lib.rs b/hal_aarch64/src/lib.rs
@@ -5,7 +5,7 @@
 use cortex_a::registers::*;
 use tock_registers::interfaces::Readable;
 
-use core::arch::asm;
+use core::arch::naked_asm;
 
 pub mod cpu;
 pub mod irq;
@@ -32,14 +32,13 @@ pub fn panic_info() -> PanicInfo {
 #[naked]
 #[no_mangle]
 unsafe extern "C" fn _start() -> ! {
-    asm!(
+    naked_asm!(
         "
         adrp x9, STACK_START
         msr spsel, xzr
         mov sp, x9
         b k_main
-        ",
-        options(noreturn)
+        "
     );
 }