Support user thread mode in hard fault handler

rust-embedded · Jun 24, 2018 · 3e50b91 · 3e50b91
1 parent 939d68f
commit 3e50b91
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/asm.s b/asm.s
diff --git a/build.rs b/build.rs
@@ -12,7 +12,7 @@ fn main() {
     let is_armv6m = is_armv6m(&target);
 
     if target.starts_with("thumbv") {
-        cc::Build::new().file("asm.s").compile("asm");
+        cc::Build::new().file("hardfault.s").compile("asm");
     }
 
     // Put the linker script somewhere the linker can find it

diff --git a/hardfault.s b/hardfault.s
@@ -0,0 +1,14 @@
+  .global HardFault
+  .thumb_func
+HardFault:
+  movs r0, lr
+  lsl  r0, r0, #29     // Test bit[2] of EXC_RETURN to determine thread mode
+  bmi  HardFault.PSP
+
+HardFault.MSP:
+  mrs r0, MSP          // Use Main Stack Pointer (if in privileged mode)
+  bl  UserHardFault    // Jump to hard fault handler
+
+HardFault.PSP:
+  mrs r0, PSP          // Use Process Stack Pointer (if in user mode)
+  bl  UserHardFault    // Jump to hard fault handler