Remove the system_init macro and replaced with blocks of asm marked with cfg.

Requires Rust 1.93 or higher.

Author: thejpster

aarch32-rt/src/arch_v4/boot.rs

@@ -16,7 +16,16 @@ core::arch::global_asm!(
         mov     r0, #0
         bl      _stack_setup_preallocated
     "#,
-    crate::system_init!(),
+    #[cfg(any(target_abi = "eabihf", feature = "eabi-fpu"))]
+    r#"
+        // Allow VFP coprocessor access
+        mrc     p15, 0, r0, c1, c0, 2
+        orr     r0, r0, #0xF00000
+        mcr     p15, 0, r0, c1, c0, 2
+        // Enable VFP
+        mov     r0, #0x40000000
+        vmsr    fpexc, r0
+    "#,
     r#"
         // Zero all registers before calling kmain
         mov     r0, 0

aarch32-rt/src/arch_v7/boot_from_el1.rs

@@ -15,8 +15,21 @@ core::arch::global_asm!(
         // Set up stacks.
         mov     r0, #0
         bl      _stack_setup_preallocated
+        // Clear Thumb Exception bit
+        mrc     p15, 0, r0, c1, c0, 0
+        bic     r0, #0x40000000
+        mcr     p15, 0, r0, c1, c0, 0
+    "#,
+    #[cfg(any(target_abi = "eabihf", feature = "eabi-fpu"))]
+    r#"
+        // Allow VFP coprocessor access
+        mrc     p15, 0, r0, c1, c0, 2
+        orr     r0, r0, #0xF00000
+        mcr     p15, 0, r0, c1, c0, 2
+        // Enable VFP
+        mov     r0, #0x40000000
+        vmsr    fpexc, r0
     "#,
-    crate::system_init!(),
     r#"
         // Zero all registers before calling kmain
         mov     r0, 0

aarch32-rt/src/arch_v7/boot_from_el2.rs

@@ -46,8 +46,21 @@ core::arch::global_asm!(
         // Set up stacks.
         mov     r0, #0
         bl      _stack_setup_preallocated
+        // Clear Thumb Exception bit
+        mrc     p15, 0, r0, c1, c0, 0
+        bic     r0, #0x40000000
+        mcr     p15, 0, r0, c1, c0, 0
+    "#,
+    #[cfg(any(target_abi = "eabihf", feature = "eabi-fpu"))]
+    r#"
+        // Allow VFP coprocessor access
+        mrc     p15, 0, r0, c1, c0, 2
+        orr     r0, r0, #0xF00000
+        mcr     p15, 0, r0, c1, c0, 2
+        // Enable VFP
+        mov     r0, #0x40000000
+        vmsr    fpexc, r0
     "#,
-    crate::system_init!(),
     r#"
         // Zero all registers before calling kmain
         mov     r0, 0

aarch32-rt/src/arch_v8_hyp/boot.rs

@@ -22,9 +22,17 @@ core::arch::global_asm!(
         mrs     r0, CPSR
         orr     r0, {irq_fiq}
         msr     CPSR, r0
-    "#,
-    crate::system_init!(),
-    r#"
+        // Clear Thumb Exception bit
+        mrc     p15, 0, r0, c1, c0, 0
+        bic     r0, #0x40000000
+        mcr     p15, 0, r0, c1, c0, 0
+        // Allow VFP coprocessor access
+        mrc     p15, 0, r0, c1, c0, 2
+        orr     r0, r0, #0xF00000
+        mcr     p15, 0, r0, c1, c0, 2
+        // Enable VFP
+        mov     r0, #0x40000000
+        vmsr    fpexc, r0
         // Zero all registers before calling kmain
         mov     r0, 0
         mov     r1, 0

aarch32-rt/src/lib.rs

@@ -730,77 +730,6 @@ macro_rules! restore_fpu_context {
     };
 }
 
-/// This is for ARMv7 and ARMv8 systems with an FPU
-///
-/// It just disables Thumb Exceptions and turns on the FPU
-#[cfg(all(armv7_or_higher, any(target_abi = "eabihf", feature = "eabi-fpu")))]
-#[macro_export]
-macro_rules! system_init {
-    () => {
-        r#"
-        // Allow VFP coprocessor access
-        mrc     p15, 0, r0, c1, c0, 2
-        orr     r0, r0, #0xF00000
-        mcr     p15, 0, r0, c1, c0, 2
-        // Enable VFP
-        mov     r0, #0x40000000
-        vmsr    fpexc, r0
-        // Clear Thumb Exception bit
-        mrc     p15, 0, r0, c1, c0, 0
-        bic     r0, #0x40000000
-        mcr     p15, 0, r0, c1, c0, 0
-        "#
-    };
-}
-
-/// This is for ARMv7 and ARMv8 systems without an FPU
-///
-/// It just disables Thumb Exceptions
-#[cfg(all(armv7_or_higher, not(any(target_abi = "eabihf", feature = "eabi-fpu"))))]
-#[macro_export]
-macro_rules! system_init {
-    () => {
-        r#"
-        // Clear Thumb Exception bit
-        mrc     p15, 0, r0, c1, c0, 0
-        bic     r0, #0x40000000
-        mcr     p15, 0, r0, c1, c0, 0
-        "#
-    };
-}
-
-/// This is for ARMv6 and earlier systems with an FPU
-///
-/// It enables the FPU
-#[cfg(all(armv6_or_lower, any(target_abi = "eabihf", feature = "eabi-fpu")))]
-#[macro_export]
-macro_rules! system_init {
-    () => {
-        r#"
-        // Allow VFP coprocessor access
-        mrc     p15, 0, r0, c1, c0, 2
-        orr     r0, r0, #0xF00000
-        mcr     p15, 0, r0, c1, c0, 2
-        // Enable VFP
-        mov     r0, #0x40000000
-        vmsr    fpexc, r0
-        "#
-    };
-}
-
-/// This is for ARMv6 and earlier systems without an FPU
-///
-/// It does nothing
-#[cfg(all(armv6_or_lower, not(any(target_abi = "eabihf", feature = "eabi-fpu"))))]
-#[macro_export]
-macro_rules! system_init {
-    () => {
-        r#"
-        // No system init required
-        "#
-    };
-}
-
 // *****************************************************************************
 // Functions
 // *****************************************************************************