Skip to content
Snippets Groups Projects
Commit cb4aec67 authored by Daniel Krebs's avatar Daniel Krebs
Browse files

cortexm_common: don't compare with r13/sp in assembly, fix #3664

parent c83ba9e8
No related branches found
No related tags found
No related merge requests found
...@@ -134,7 +134,8 @@ void hard_fault_default(void) ...@@ -134,7 +134,8 @@ void hard_fault_default(void)
"mrs r0, psp \n" /* r0 = psp */ "mrs r0, psp \n" /* r0 = psp */
" out: \n" /* } */ " out: \n" /* } */
"mov r1, #0 \n" /* corrupted = false */ "mov r1, #0 \n" /* corrupted = false */
"cmp r0, sp \n" /* If msp is active stack- */ "mov r2, sp \n" /* Cmp with SP is deprecated */
"cmp r0, r2 \n" /* If msp is active stack- */
"bne hardfault \n" /* pointer, check if valid so */ "bne hardfault \n" /* pointer, check if valid so */
"cmp r0, %[eram] \n" /* so calling c-func works . */ "cmp r0, %[eram] \n" /* so calling c-func works . */
"bge fix_msp \n" /* if(r0 == msp) { */ "bge fix_msp \n" /* if(r0 == msp) { */
...@@ -150,7 +151,7 @@ void hard_fault_default(void) ...@@ -150,7 +151,7 @@ void hard_fault_default(void)
: [sram] "r" (&_sram), : [sram] "r" (&_sram),
[eram] "r" (&_eram), [eram] "r" (&_eram),
[estack] "r" (&_estack) [estack] "r" (&_estack)
: "r0","r1" : "r0","r1","r2"
); );
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment