Try #77:

rust-embedded · Jun 22, 2018 · 70f39b7 · 70f39b7
2 parents 939d68f + 13f9849
commit 70f39b7
Show file tree

Hide file tree

Showing 3 changed files with 17 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,16 @@
+  .global HardFault
+  .thumb_func
+HardFault:
+  movs r0, #4
+  mov  r1, lr
+  tst  r0, r1      // Test bit[3] of EXC_RETURN to determine thread mode
+
+  beq HardFault.MSP
+
+HardFault.PSP:
+  mrs r0, PSP      // Use Process Stack Pointer (if in user mode)
+  bl UserHardFault // Jump to hard fault handler
+
+HardFault.MSP:
+  mrs r0, MSP      // Use Main Stack Pointer (if in privileged mode)
+  bl UserHardFault // Jump to hard fault handler