Merge branch 'main' into fix/v3a-interrupt

Author: aq1018

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.6.0" # for rt and macros
+version = "0.6.1" # for rt and macros
 edition = "2024"
 
 [package]

qingke-rt/Cargo.toml

@@ -26,8 +26,8 @@ u-mode = []
 highcode = []
 
 [dependencies]
-qingke-rt-macros = {  version = "0.6.0", path = "./macros" }
-qingke = { version = "0.6.0", path = "../", features = ["critical-section-impl"] }
+qingke-rt-macros = {  version = "0.6.1", path = "./macros" }
+qingke = { version = "0.6.1", path = "../", features = ["critical-section-impl"] }
 
 [package.metadata.docs.rs]
 targets = ["riscv32imc-unknown-none-elf"]

qingke-rt/link-highcode.x

@@ -49,12 +49,12 @@ SECTIONS
         . = ALIGN(4);
     } >FLASH AT>FLASH
 
-    /* highcode section will be copied to RAM offset 0x0 */
+    /* highcode section will be copied to RAM */
     .highcode : ALIGN(4)
     {
         _highcode_lma = LOADADDR(.highcode);
         PROVIDE(_highcode_vma_start = .);
-        LONG(0x00000000); /* Placeholder for the first vector */
+        LONG(_start); /* Placeholder for the first vector */
         KEEP(*(.vector_table.core_interrupts));
         KEEP(*(.vector_table.external_interrupts));
         KEEP(*(.vector_table.exceptions));
@@ -99,6 +99,11 @@ SECTIONS
         PROVIDE( _ebss = .);
     } >RAM
 
+    .uninit (NOLOAD) : ALIGN(4)
+    {
+        *(.uninit .uninit.*);
+    } >RAM
+
     .stack ORIGIN(RAM)+LENGTH(RAM) (NOLOAD) :
     {
         . = ALIGN(4);
@@ -113,3 +118,5 @@ SECTIONS
     .eh_frame (INFO) : { KEEP(*(.eh_frame)) }
     .eh_frame_hdr (INFO) : { *(.eh_frame_hdr) }
 }
+
+ASSERT(_highcode_vma_start % 1024 == 0, "vector table must be 1KB aligned for Qingke V2");

qingke-rt/link-no-highcode.x

@@ -84,6 +84,11 @@ SECTIONS
         PROVIDE( _ebss = .);
     } >RAM
 
+    .uninit (NOLOAD) : ALIGN(4)
+    {
+        *(.uninit .uninit.*);
+    } >RAM
+
     .stack ORIGIN(RAM)+LENGTH(RAM) (NOLOAD) :
     {
         . = ALIGN(4);
@@ -98,3 +103,5 @@ SECTIONS
     .eh_frame (INFO) : { KEEP(*(.eh_frame)) }
     .eh_frame_hdr (INFO) : { *(.eh_frame_hdr) }
 }
+
+ASSERT(_start % 1024 == 0, "vector table must be 1KB aligned for Qingke V2");

qingke-rt/macros/src/lib.rs

@@ -60,7 +60,7 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream {
 
     quote!(
         #[allow(non_snake_case)]
-        #[export_name = "main"]
+        #[unsafe(export_name = "main")]
         #(#attrs)*
         pub #unsafety fn __risc_v_rt__main(#args) -> ! {
             #(#stmts)*
@@ -89,7 +89,7 @@ pub fn highcode(_args: TokenStream, input: TokenStream) -> TokenStream {
     let f = parse_macro_input!(input as ItemFn);
 
     let section = quote! {
-        #[link_section = ".highcode"]
+        #[unsafe(link_section = ".highcode")]
         #[inline(never)] // make certain function is not inlined
     };
 
@@ -245,8 +245,8 @@ core::arch::global_asm!(
         #start_interrupt_asm
 
         #[allow(non_snake_case)]
-        #[no_mangle]
-        #[link_section = ".trap.rust"]
+        #[unsafe(no_mangle)]
+        #[unsafe(link_section = ".trap.rust")]
         #f
     )
     .into()

qingke-rt/src/lib.rs

@@ -203,18 +203,27 @@ unsafe extern "C" fn qingke_setup_interrupts() {
         }
         mtvec::write(_unified_trap_handler as *const () as usize, TrapMode::Direct);
     }
-
-    // Qingke V2's mtvec must be 1KB aligned.
-
     #[cfg(not(feature = "v3a"))]
     unsafe {
         #[cfg(feature = "highcode")]
-        mtvec::write(0x20000000, TrapMode::VectoredAddress);
-
+        {
+            unsafe extern "C" {
+                static _highcode_vma_start: u8;
+            }
+            mtvec::write(
+                &raw const _highcode_vma_start as usize,
+                TrapMode::VectoredAddress,
+            );
+        }
         #[cfg(not(feature = "highcode"))]
-        mtvec::write(0x00000000, TrapMode::VectoredAddress);
+        {
+            unsafe extern "C" {
+                static _start: u8;
+            }
+            mtvec::write(&raw const _start as usize, TrapMode::VectoredAddress);
+        }
     }
-
+  
     unsafe {
         qingke::pfic::wfi_to_wfe(true);
     }