diff options
| author | Chris Chua <someone42@gmail.com> | 2023-03-19 06:22:08 +1100 |
|---|---|---|
| committer | Aidan MacDonald <amachronic@protonmail.com> | 2023-03-23 13:28:22 -0400 |
| commit | 86429dbf1eca8ee0e08176997f508647c3abf6bd (patch) | |
| tree | 4d35e56e338a326d1a04c8d1f620821fa7909678 /firmware/export/config.h | |
| parent | a64cad847e7d24dc4d01d5ab22f6c8dc42f960ae (diff) | |
| download | rockbox-86429dbf1eca8ee0e08176997f508647c3abf6bd.tar.gz rockbox-86429dbf1eca8ee0e08176997f508647c3abf6bd.zip | |
Using ARM Unified Assembler Language
Change-Id: Iae32a8ba8eff6087330e458fafc912a12fee4509
Diffstat (limited to 'firmware/export/config.h')
| -rw-r--r-- | firmware/export/config.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 0882cad61c..19ee03b4c7 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
| @@ -1006,13 +1006,14 @@ Lyre prototype 1 */ | |||
| 1006 | #endif | 1006 | #endif |
| 1007 | 1007 | ||
| 1008 | #if defined(CPU_ARM) && defined(__ASSEMBLER__) | 1008 | #if defined(CPU_ARM) && defined(__ASSEMBLER__) |
| 1009 | .syntax unified | ||
| 1009 | /* ARMv4T doesn't switch the T bit when popping pc directly, we must use BX */ | 1010 | /* ARMv4T doesn't switch the T bit when popping pc directly, we must use BX */ |
| 1010 | .macro ldmpc cond="", order="ia", regs | 1011 | .macro ldmpc cond="", order="ia", regs |
| 1011 | #if ARM_ARCH == 4 && defined(USE_THUMB) | 1012 | #if ARM_ARCH == 4 && defined(USE_THUMB) |
| 1012 | ldm\cond\order sp!, { \regs, lr } | 1013 | ldm\order\cond sp!, { \regs, lr } |
| 1013 | bx\cond lr | 1014 | bx\cond lr |
| 1014 | #else | 1015 | #else |
| 1015 | ldm\cond\order sp!, { \regs, pc } | 1016 | ldm\order\cond sp!, { \regs, pc } |
| 1016 | #endif | 1017 | #endif |
| 1017 | .endm | 1018 | .endm |
| 1018 | .macro ldrpc cond="" | 1019 | .macro ldrpc cond="" |