chips/esp32-c3: #[naked] -> global_asm!()

YoeDistro · Jan 18, 2024 · c785ca0 · c785ca0
1 parent c405b76
commit c785ca0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/chips/esp32-c3/src/chip.rs b/chips/esp32-c3/src/chip.rs
@@ -297,16 +297,18 @@ pub extern "C" fn _start_trap_vectored() {
 }
 
 #[cfg(all(target_arch = "riscv32", target_os = "none"))]
-#[link_section = ".riscv.trap_vectored"]
-#[export_name = "_start_trap_vectored"]
-#[naked]
-pub extern "C" fn _start_trap_vectored() -> ! {
-    use core::arch::asm;
-    unsafe {
-        // Below are 32 (non-compressed) jumps to cover the entire possible
-        // range of vectored traps.
-        asm!(
-            "
+extern "C" {
+    pub fn _start_trap_vectored();
+}
+
+#[cfg(all(target_arch = "riscv32", target_os = "none"))]
+// Below are 32 (non-compressed) jumps to cover the entire possible
+// range of vectored traps.
+global_asm!(
+    "
+            .section .riscv.trap_vectored, \"ax\"
+            .globl _start_trap_vectored
+          _start_trap_vectored:
             j _start_trap
             j _start_trap
             j _start_trap
@@ -338,8 +340,5 @@ pub extern "C" fn _start_trap_vectored() -> ! {
             j _start_trap
             j _start_trap
             j _start_trap
-        ",
-            options(noreturn)
-        );
-    }
-}
+        "
+);
diff --git a/chips/esp32-c3/src/lib.rs b/chips/esp32-c3/src/lib.rs
@@ -4,7 +4,6 @@
 
 //! Drivers and chip support for ESP32-C3.
 
-#![feature(naked_functions)]
 #![no_std]
 #![crate_name = "esp32_c3"]
 #![crate_type = "rlib"]