From 45c7498f59ad2889f2120a865a51043004eddd5d Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Fri, 11 Jun 2010 04:41:36 +0000 Subject: 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 --- apps/codecs/libmad/synth_full_arm.S | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'apps/codecs/libmad/synth_full_arm.S') diff --git a/apps/codecs/libmad/synth_full_arm.S b/apps/codecs/libmad/synth_full_arm.S index e663b8ffcb..dec437f666 100644 --- a/apps/codecs/libmad/synth_full_arm.S +++ b/apps/codecs/libmad/synth_full_arm.S @@ -19,6 +19,7 @@ * ****************************************************************************/ +#include "config.h" #include "mad_iram.h" .section ICODE_SECTION_MPA_ARM,"ax",%progbits @@ -135,7 +136,7 @@ synth_full_odd_sbsample: ldr r5, =synth_full_sp ldr sp, [r5] - ldmia sp!, {r4-r11, pc} + ldmpc regs=r4-r11 synth_full_even_sbsample: stmdb sp!, {r4-r11, lr} @@ -241,7 +242,7 @@ synth_full_even_sbsample: ldr r5, =synth_full_sp ldr sp, [r5] - ldmia sp!, {r4-r11, pc} + ldmpc regs=r4-r11 .global III_aliasreduce @@ -289,7 +290,7 @@ III_aliasreduce: add r0, r0, #72 cmp r0, r1 blo .arl1 - ldmia sp!, {r4-r11, pc} + ldmpc regs=r4-r11 csa: .word +0x0db84a81 @@ -332,7 +333,7 @@ III_overlap: stmia r1!, {r4, r5, r6, r7, r12, lr} ldmia r0!, {r4, r5, r6, r7, r12, lr} stmia r1!, {r4, r5, r6, r7, r12, lr} - ldmia sp!, {r4-r7, pc} + ldmpc regs=r4-r7 .section IBSS_SECTION_MPA_ARM,"aw",%nobits synth_full_sp: -- cgit v1.2.3