fix: avoid using naked_asm!

Author: andelf

Cargo.toml

@@ -8,7 +8,7 @@ documentation = "https://docs.rs/qingke"
 homepage = "https://github.com/ch32-rs/qingke"
 categories = ["embedded", "no-std", "hardware-support"]
 license = "MIT/Apache-2.0"
-version = "0.3.0" # for rt and macros
+version = "0.4.0" # for rt and macros
 edition = "2021"
 
 [package]
@@ -27,8 +27,8 @@ readme = "README.md"
 
 [dependencies]
 bit_field = "0.10.2"
-riscv = "0.11.1"
-critical-section = { version = "1.1.3", features = [
+riscv = "0.12.0"
+critical-section = { version = "1.2.0", features = [
     "restore-state-bool",
 ], optional = true }
 defmt = { version = "0.3.8", optional = true }

publish.sh

@@ -2,8 +2,8 @@
 
 set -ex
 
-cargo publish  --target riscv32imac-unknown-none-elf
+cargo publish  --target riscv32imac-unknown-none-elf --allow-dirty
 
-(cd qingke-rt/macros && cargo publish --target riscv32imac-unknown-none-elf)
+(cd qingke-rt/macros && cargo publish --target riscv32imac-unknown-none-elf --allow-dirty)
 
-(cd qingke-rt && cargo publish --target riscv32imac-unknown-none-elf)
+(cd qingke-rt && cargo publish --target riscv32imac-unknown-none-elf --allow-dirty)

qingke-rt/Cargo.toml

@@ -23,8 +23,8 @@ v4 = []
 highcode = []
 
 [dependencies]
-qingke-rt-macros = { path = "./macros", version = "0.3" }
-qingke = { path = "../", version = "0.3", features = ["critical-section-impl"] }
+qingke-rt-macros = { path = "./macros", version = "0.4" }
+qingke = { path = "../", version = "0.4", features = ["critical-section-impl"] }
 
 [package.metadata.docs.rs]
 targets = ["riscv32imac-unknown-none-elf"]

qingke-rt/macros/src/lib.rs

@@ -159,7 +159,7 @@ pub fn interrupt(args: TokenStream, input: TokenStream) -> TokenStream {
     }
 
     let ident = f.sig.ident.clone();
-    let ident_s = ident.to_string();
+    let interrupt = ident.to_string();
 
     let valid_signature = f.sig.constness.is_none()
         && f.vis == Visibility::Inherited
@@ -189,7 +189,7 @@ pub fn interrupt(args: TokenStream, input: TokenStream) -> TokenStream {
     let ident = f.sig.ident.clone();
 
     // This will be overwritten by `export_name` in linking process, i.e. name of the interrupt
-    let wrapper_ident = Ident::new(&format!("{}_naked_wrapper", f.sig.ident), Span::call_site());
+    // let wrapper_ident = Ident::new(&format!("{}_naked_wrapper", f.sig.ident), Span::call_site());
 
     f.sig.ident = Ident::new(&format!("__qingke_rt_{}", f.sig.ident), Span::call_site());
 
@@ -221,22 +221,32 @@ pub fn interrupt(args: TokenStream, input: TokenStream) -> TokenStream {
         */
     }
 
+    let wrapped_name = wrapped_ident.to_string();
+
+    let start_interrupt = format!(
+        r#"
+core::arch::global_asm!(
+    ".section .trap, \"ax\"
+    .align 2
+    .global {interrupt}
+    {interrupt}:
+        addi sp, sp, -4
+        sw ra, 0(sp)
+        jal {wrapped_name}
+        lw ra, 0(sp)
+        addi sp, sp, 4
+        mret
+");"#
+    );
+
+    let start_interrupt_asm: proc_macro2::TokenStream = start_interrupt.parse().unwrap();
+
     quote!(
-        #[doc(hidden)]
-        #[export_name = #ident_s]
-        #[naked]
-        unsafe extern "C" fn #wrapper_ident() {
-            core::arch::naked_asm!("
-                addi sp, sp, -4
-                sw ra, 0(sp)
-                jal {irq_impl}
-                lw ra, 0(sp)
-                addi sp, sp, 4
-                mret",
-                irq_impl = sym #wrapped_ident
-            );
-        }
+        #start_interrupt_asm
 
+        #[allow(non_snake_case)]
+        #[no_mangle]
+        #[link_section = ".trap.rust"]
         #f
     )
     .into()