diff options
| author |  Dion Dokter <dion@tweedegolf.com>
| 2023-05-19 10:49:46 +0200 |
|---|---|---|
| committer | Dion Dokter <dion@tweedegolf.com>
| 2023-05-19 10:51:17 +0200 |
| commit | 70c3d0a2a1b3aeb97f5835dc481a767ecea909a4 (patch) | |
| tree | 8bc5be381516c51aba1d59bf252f8c4e4f28ebf2 /cortex-m-rt/src/lib.rs | |
| parent | 82fa94d2cd2829cc37111d247e913cecdad561ac (diff) | |
| download | cortex-m-70c3d0a2a1b3aeb97f5835dc481a767ecea909a4.tar.gz cortex-m-70c3d0a2a1b3aeb97f5835dc481a767ecea909a4.tar.zst cortex-m-70c3d0a2a1b3aeb97f5835dc481a767ecea909a4.zip | |
Hardfault trampoline is now optional
Diffstat (limited to 'cortex-m-rt/src/lib.rs')
| -rw-r--r-- | cortex-m-rt/src/lib.rs | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs index a6d946c..a39d32a 100644 --- a/cortex-m-rt/src/lib.rs +++ b/cortex-m-rt/src/lib.rs @@ -458,7 +458,7 @@ use core::fmt; // HardFault exceptions are bounced through this trampoline which grabs the stack pointer at // the time of the exception and passes it to the user's HardFault handler in r0. // Depending on the stack mode in EXC_RETURN, fetches stack from either MSP or PSP. -#[cfg(cortex_m)] +#[cfg(all(cortex_m, feature = "hardfault-trampoline"))] global_asm!( ".cfi_sections .debug_frame .section .HardFaultTrampoline, \"ax\" @@ -1061,6 +1061,7 @@ pub static __RESET_VECTOR: unsafe extern "C" fn() -> ! = Reset; #[allow(unused_variables)] #[doc(hidden)] #[cfg_attr(cortex_m, link_section = ".HardFault.default")] +#[cfg(feature = "hardfault-trampoline")] #[no_mangle] pub unsafe extern "C" fn HardFault_(ef: &ExceptionFrame) -> ! { #[allow(clippy::empty_loop)] @@ -1068,6 +1069,15 @@ pub unsafe extern "C" fn HardFault_(ef: &ExceptionFrame) -> ! { } #[doc(hidden)] +#[cfg_attr(cortex_m, link_section = ".HardFault.default")] +#[cfg(not(feature = "hardfault-trampoline"))] +#[no_mangle] +pub unsafe extern "C" fn HardFault_() -> ! { + #[allow(clippy::empty_loop)] + loop {} +} + +#[doc(hidden)] #[no_mangle] pub unsafe extern "C" fn DefaultHandler_() -> ! { #[allow(clippy::empty_loop)] @@ -1115,7 +1125,10 @@ extern "C" { fn NonMaskableInt(); + #[cfg(feature = "hardfault-trampoline")] fn HardFaultTrampoline(); + #[cfg(not(feature = "hardfault-trampoline"))] + fn HardFault(); #[cfg(not(armv6m))] fn MemoryManagement(); @@ -1154,9 +1167,12 @@ pub static __EXCEPTIONS: [Vector; 14] = [ handler: NonMaskableInt, }, // Exception 3: Hard Fault Interrupt. + #[cfg(feature = "hardfault-trampoline")] Vector { handler: HardFaultTrampoline, }, + #[cfg(not(feature = "hardfault-trampoline"))] + Vector { handler: HardFault }, // Exception 4: Memory Management Interrupt [not on Cortex-M0 variants]. #[cfg(not(armv6m))] Vector { |