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 /apps/codecs/libmad/imdct_l_arm.S | |
parent | fe7ca44471b309a0adea563cce947de9efb62ab5 (diff) | |
download | rockbox-45c7498f59ad2889f2120a865a51043004eddd5d.tar.gz rockbox-45c7498f59ad2889f2120a865a51043004eddd5d.zip |
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 'apps/codecs/libmad/imdct_l_arm.S')
-rw-r--r-- | apps/codecs/libmad/imdct_l_arm.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/codecs/libmad/imdct_l_arm.S b/apps/codecs/libmad/imdct_l_arm.S index b86ba1120d..b511ff169d 100644 --- a/apps/codecs/libmad/imdct_l_arm.S +++ b/apps/codecs/libmad/imdct_l_arm.S | |||
@@ -45,6 +45,7 @@ | |||
45 | * | 45 | * |
46 | ****************************************************************************/ | 46 | ****************************************************************************/ |
47 | 47 | ||
48 | #include "config.h" | ||
48 | 49 | ||
49 | /* | 50 | /* |
50 | On entry: | 51 | On entry: |
@@ -823,7 +824,7 @@ normal_block_x18_to_x35: | |||
823 | @---- | 824 | @---- |
824 | 825 | ||
825 | add sp, sp, #(21*4) @ return stack frame | 826 | add sp, sp, #(21*4) @ return stack frame |
826 | ldmia sp!, { r4 - r11, pc } @ restore callee saved regs, and return | 827 | ldmpc regs=r4-r11 @ restore callee saved regs, and return |
827 | 828 | ||
828 | @---- | 829 | @---- |
829 | 830 | ||
@@ -992,7 +993,7 @@ start_block_x18_to_x35: | |||
992 | @---- | 993 | @---- |
993 | 994 | ||
994 | add sp, sp, #(21*4) @ return stack frame | 995 | add sp, sp, #(21*4) @ return stack frame |
995 | ldmia sp!, { r4 - r11, pc } @ restore callee saved regs, and return | 996 | ldmpc regs=r4-r11 @ restore callee saved regs, and return |
996 | 997 | ||
997 | @---- | 998 | @---- |
998 | @END | 999 | @END |