Skip to content

Commit e9e9b8e

Browse files
committed
[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
1 parent f0273ec commit e9e9b8e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

platform/CThunk.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#define CTHUNK_VARIABLES volatile uint32_t code[2]
4343

4444
#if (defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7) || defined(__CORTEX_A9) \
45-
|| defined(__CORTEX_M23) || defined(__CORTEX_M33))
45+
|| defined(__CORTEX_M33))
4646
/**
4747
* CTHUNK disassembly for Cortex-M3/M4/M7/A9 (thumb2):
4848
* * adr r0, #4
@@ -59,7 +59,7 @@
5959
m_thunk.code[1] = 0x00008007; \
6060
} while (0)
6161

62-
#elif (defined(__CORTEX_M0PLUS) || defined(__CORTEX_M0))
62+
#elif (defined(__CORTEX_M0PLUS) || defined(__CORTEX_M0) || defined(__CORTEX_M23))
6363
/*
6464
* CTHUNK disassembly for Cortex M0/M0+ (thumb):
6565
* * adr r0, #4

0 commit comments

Comments
 (0)