Skip to content
Snippets Groups Projects
Commit 86af1969 authored by Peter Kietzmann's avatar Peter Kietzmann
Browse files

Merge pull request #3666 from daniel-k/cortexm_r13_deprecated

cortexm_common: don't compare with r13/sp in assembly, fix #3664
parents d438984a cb4aec67
No related branches found
No related tags found
No related merge requests found
......@@ -129,7 +129,8 @@ void hard_fault_default(void)
"mrs r0, psp \n" /* r0 = psp */
" out: \n" /* } */
"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 */
"cmp r0, %[eram] \n" /* so calling c-func works . */
"bge fix_msp \n" /* if(r0 == msp) { */
......@@ -145,7 +146,7 @@ void hard_fault_default(void)
: [sram] "r" (&_sram),
[eram] "r" (&_eram),
[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