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/imdct_l_arm.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/codecs/libmad/imdct_l_arm.S') 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 @@ * ****************************************************************************/ +#include "config.h" /* On entry: @@ -823,7 +824,7 @@ normal_block_x18_to_x35: @---- add sp, sp, #(21*4) @ return stack frame - ldmia sp!, { r4 - r11, pc } @ restore callee saved regs, and return + ldmpc regs=r4-r11 @ restore callee saved regs, and return @---- @@ -992,7 +993,7 @@ start_block_x18_to_x35: @---- add sp, sp, #(21*4) @ return stack frame - ldmia sp!, { r4 - r11, pc } @ restore callee saved regs, and return + ldmpc regs=r4-r11 @ restore callee saved regs, and return @---- @END -- cgit v1.2.3