diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-11 04:41:36 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-11 04:41:36 +0000 |
| commit | 45c7498f59ad2889f2120a865a51043004eddd5d (patch) | |
| tree | 1a62b0e8549a7f2750679de8d7dd3f82039c5719 /firmware/target/arm/as3525/sansa-clip | |
| parent | fe7ca44471b309a0adea563cce947de9efb62ab5 (diff) | |
FS#11335 by me: make ARM assembly functions thumb-friendly
We can't pop into pc on ARMv4t when using thumb: the T bit won't be
modified if we are returning to a thumb function
Code running on ARMv4t should use the new ldrpc / ldmpc macros instead
of ldr pc, [sp], #4 and ldm(cond) sp!, {regs, pc}
No modification on pure ARM builds and ARMv5+
Note: USE_THUMB is currently never defined, no targets can currently be
built with -mthumb, see FS#6734
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26756 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/sansa-clip')
| -rw-r--r-- | firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S b/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S index 942ddf79f8..431dc62da0 100644 --- a/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S +++ b/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S @@ -19,6 +19,7 @@ * ****************************************************************************/ +#include "config.h" #include "as3525.h" .text @@ -90,5 +91,5 @@ lcd_grey_data: ands r5, r5, #(1<<10) @ wait until push fifo empties beq 1b - ldmfd sp!, {r4-r7, pc} + ldmpc regs=r4-r7 .size lcd_grey_data,.-lcd_grey_data |