djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/nlrthumb: Get working again on standard Thumb arch (ie not Thumb2). 

"b" on Thumb might not be long enough for the jump to nlr_push_tail so it
must be done indirectly.
This commit is contained in:
Damien George 2017-09-01 15:25:29 +10:00
parent 860eeeea9b
commit dd376a239d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/nlrthumb.c
View File

@ -67,7 +67,14 @@ __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
"str lr, [r0, #8] \n" // store lr into nlr_buf "str lr, [r0, #8] \n" // store lr into nlr_buf
#endif #endif
#if defined(__ARM_ARCH_6M__)
"ldr r1, nlr_push_tail_var \n"
"bx r1 \n" // do the rest in C
".align 2 \n"
"nlr_push_tail_var: .word nlr_push_tail \n"
#else
"b nlr_push_tail \n" // do the rest in C "b nlr_push_tail \n" // do the rest in C
#endif
); );
return 0; // needed to silence compiler warning return 0; // needed to silence compiler warning