Make _vector_table strong

rust-embedded · Jan 21, 2025 · 2ed7cd3 · 2ed7cd3
1 parent c14faa3
commit 2ed7cd3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 38 deletions.
diff --git a/riscv-rt/src/interrupts.rs b/riscv-rt/src/interrupts.rs
@@ -71,8 +71,13 @@ pub unsafe extern "C" fn _dispatch_core_interrupt(code: usize) {
 }
 
 // In vectored mode, we also must provide a vector table
-#[cfg(all(
-    any(target_arch = "riscv32", target_arch = "riscv64"),
-    feature = "v-trap"
-))]
-riscv::vector_table!();
+#[riscv::pac_enum(unsafe CoreInterruptNumber)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+enum Interrupt {
+    SupervisorSoft = 1,
+    MachineSoft = 3,
+    SupervisorTimer = 5,
+    MachineTimer = 7,
+    SupervisorExternal = 9,
+    MachineExternal = 11,
+}
diff --git a/riscv/macros/src/lib.rs b/riscv/macros/src/lib.rs
@@ -187,8 +187,6 @@ struct PacEnumItem {
     max_number: usize,
     /// A map from discriminant values to variant names
     numbers: HashMap<usize, Ident>,
-    /// Whether `_vector_table` should be a weak symbol
-    weak_vector_table: bool,
 }
 
 impl PacEnumItem {
@@ -227,7 +225,6 @@ impl PacEnumItem {
             name,
             max_number,
             numbers,
-            weak_vector_table: false,
         }
     }
 
@@ -268,11 +265,6 @@ impl PacEnumItem {
     }
 
     fn vector_table(&self) -> TokenStream2 {
-        let weak = if self.weak_vector_table {
-            "weak"
-        } else {
-            "global"
-        };
         let mut align = match std::env::var("RISCV_MTVEC_ALIGN") {
             Ok(x) => x.parse::<u32>().ok(),
             Err(std::env::VarError::NotPresent) => Some(4),
@@ -296,7 +288,7 @@ impl PacEnumItem {
 #[cfg(all(feature = "v-trap", any(target_arch = "riscv32", target_arch = "riscv64")))]
 core::arch::global_asm!("
     .section .trap, \"ax\"
-    .{weak} _vector_table
+    .global _vector_table
     .type _vector_table, @function
     
     .option push
@@ -462,27 +454,3 @@ pub fn pac_enum(attr: TokenStream, item: TokenStream) -> TokenStream {
     }
     .into()
 }
-
-#[proc_macro]
-/// Generates a weak '_vector_table' function in assembly.
-///
-/// The alignment constraint (in bytes) is read from the `RISCV_MTVEC_ALIGN` environment variable
-/// and defaults to 4.
-pub fn vector_table(_input: TokenStream) -> TokenStream {
-    let span = proc_macro2::Span::call_site();
-    let pac = PacEnumItem {
-        name: Ident::new("unused", span),
-        max_number: 11,
-        numbers: [
-            (1, Ident::new("SupervisorSoft", span)),
-            (3, Ident::new("MachineSoft", span)),
-            (5, Ident::new("SupervisorTimer", span)),
-            (7, Ident::new("MachineTimer", span)),
-            (9, Ident::new("SupervisorExternal", span)),
-            (11, Ident::new("MachineExternal", span)),
-        ]
-        .into(),
-        weak_vector_table: true,
-    };
-    pac.vector_table().into()
-}