ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[M23] Fix CThunk error on Cortex-M23 

Cortex-M23 doesn't support ARMv8-M Main Extension and so doesn't support:
ldm  r0, {r0, r1, r2, pc}

Fix it by going Cortex-M0/M0+ way:
ldm  r0, {r0, r1, r2, r3}
bx   r3
pull/6031/head
ccli8 2018-02-07 15:45:54 +08:00
parent f0273ecb28
commit e9e9b8ed5c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/CThunk.h
View File

@ -42,7 +42,7 @@
#define CTHUNK_VARIABLES volatile uint32_t code[2] #define CTHUNK_VARIABLES volatile uint32_t code[2]
#if (defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7) || defined(__CORTEX_A9) \ #if (defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7) || defined(__CORTEX_A9) \
|| defined(__CORTEX_M23) || defined(__CORTEX_M33)) || defined(__CORTEX_M33))
/** /**
* CTHUNK disassembly for Cortex-M3/M4/M7/A9 (thumb2): * CTHUNK disassembly for Cortex-M3/M4/M7/A9 (thumb2):
* * adr r0, #4 * * adr r0, #4
@ -59,7 +59,7 @@
m_thunk.code[1] = 0x00008007; \ m_thunk.code[1] = 0x00008007; \
} while (0) } while (0)
#elif (defined(__CORTEX_M0PLUS) || defined(__CORTEX_M0)) #elif (defined(__CORTEX_M0PLUS) || defined(__CORTEX_M0) || defined(__CORTEX_M23))
/* /*
* CTHUNK disassembly for Cortex M0/M0+ (thumb): * CTHUNK disassembly for Cortex M0/M0+ (thumb):
* * adr r0, #4 * * adr r0, #4