rust-embedded
diff --git a/‎cortex-m-rt/asm.s
Lines changed: 9 additions & 0 deletions b/‎cortex-m-rt/asm.s
Lines changed: 9 additions & 0 deletions
diff --git a/‎cortex-m-rt/bin/thumbv6m-none-eabi.a
20 Bytes b/‎cortex-m-rt/bin/thumbv6m-none-eabi.a
20 Bytes
diff --git a/‎cortex-m-rt/bin/thumbv7em-none-eabi.a
20 Bytes b/‎cortex-m-rt/bin/thumbv7em-none-eabi.a
20 Bytes
diff --git a/‎cortex-m-rt/bin/thumbv7em-none-eabihf.a
20 Bytes b/‎cortex-m-rt/bin/thumbv7em-none-eabihf.a
20 Bytes
diff --git a/‎cortex-m-rt/bin/thumbv7m-none-eabi.a
20 Bytes b/‎cortex-m-rt/bin/thumbv7m-none-eabi.a
20 Bytes
diff --git a/‎cortex-m-rt/bin/thumbv8m.base-none-eabi.a
20 Bytes b/‎cortex-m-rt/bin/thumbv8m.base-none-eabi.a
20 Bytes
@@ -6,5 +6,14 @@
   .type HardFaultTrampoline,%function
   .thumb_func
 HardFaultTrampoline:
+  # depending on the stack mode in EXC_RETURN, fetch stack pointer from
+  # PSP or MSP
+  mov r0, lr
+  mov r1, #4
+  tst r0, r1
+  bne 0f
   mrs r0, MSP
   b HardFault
+0:
+  mrs r0, PSP
+  b HardFault