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/libwavpack/arml.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/libwavpack/arml.S')
-rw-r--r-- | apps/codecs/libwavpack/arml.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/codecs/libwavpack/arml.S b/apps/codecs/libwavpack/arml.S index 5745c81ed0..60818aa1e6 100644 --- a/apps/codecs/libwavpack/arml.S +++ b/apps/codecs/libwavpack/arml.S | |||
@@ -38,6 +38,8 @@ | |||
38 | * instruction. | 38 | * instruction. |
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "config.h" | ||
42 | |||
41 | .text | 43 | .text |
42 | .align | 44 | .align |
43 | .global decorr_stereo_pass_cont_arml | 45 | .global decorr_stereo_pass_cont_arml |
@@ -500,5 +502,5 @@ common_exit: | |||
500 | mov r4, r4, asr #18 | 502 | mov r4, r4, asr #18 |
501 | strh r4, [r5, #4] | 503 | strh r4, [r5, #4] |
502 | strh r0, [r5, #6] | 504 | strh r0, [r5, #6] |
503 | ldmfd sp!, {r4 - r8, r10, r11, pc} | 505 | ldmpc regs="r4-r8, r10-r11" |
504 | 506 | ||