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/libwavpack/arml.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apps/codecs/libwavpack/arml.S') 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 @@ * instruction. */ +#include "config.h" + .text .align .global decorr_stereo_pass_cont_arml @@ -500,5 +502,5 @@ common_exit: mov r4, r4, asr #18 strh r4, [r5, #4] strh r0, [r5, #6] - ldmfd sp!, {r4 - r8, r10, r11, pc} + ldmpc regs="r4-r8, r10-r11" -- cgit v1.2.3