Skip to content

Commit e90c567

Browse files
committed
Fixes the bug of having &mbed_fault_context argument instead of mbed_fault_context in mbed_fault_handler.
1 parent e4e6c64 commit e90c567

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

platform/source/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ Fault_Handler_Continue2
150150
MRS R2,CONTROL ; Get CONTROL Reg
151151
STR R2,[R1]
152152
MOV R0,R12
153-
LDR R1,=mbed_fault_context
153+
LDR R3,=mbed_fault_context
154+
LDR R1,[R3]
154155
BL mbed_fault_handler
155156
#endif
156157
B . ; Just in case we come back here

platform/source/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ Fault_Handler_Continue2:
183183
MRS R2,CONTROL // Get CONTROL Reg
184184
STR R2,[R1]
185185
MOV R0,R12
186-
LDR R1,=mbed_fault_context
186+
LDR R3,=mbed_fault_context
187+
LDR R1,[R3]
187188
BL mbed_fault_handler
188189
#endif
189190
B . // Just in case we come back here

platform/source/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ Fault_Handler_Continue2
145145
MRS R2,CONTROL ; Get CONTROL Reg
146146
STR R2,[R1]
147147
MOV R0,R12
148-
LDR R1,=mbed_fault_context
148+
LDR R3,=mbed_fault_context
149+
LDR R1,[R3]
149150
BL mbed_fault_handler
150151
#endif
151152
B . ; Just in case we come back here

0 commit comments

Comments
 (0)