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

1 files changed, 4 insertions, 2 deletions

diff --git a/apps/codecs/libatrac/atrac3_arm.S b/apps/codecs/libatrac/atrac3_arm.S
index 0908d582ed..80eaa7954d 100644
--- a/apps/codecs/libatrac/atrac3_arm.S
+++ b/apps/codecs/libatrac/atrac3_arm.S
@@ -19,6 +19,8 @@
  *

  ****************************************************************************/

 

+#include "config.h"

+

     .section .text, "ax", %progbits

 

 /****************************************************************************

@@ -63,7 +65,7 @@ atrac3_iqmf_matrixing:
     subs r3, r3, #4                 /* counter -= 4 */

     bgt .iqmf_matrixing_loop

     

-    ldmfd   sp!, {r4-r9, pc}       /* restore registers */

+    ldmpc   regs=r4-r9              /* restore registers */

 

 .atrac3_iqmf_matrixing_end:

     .size   atrac3_iqmf_matrixing,.atrac3_iqmf_matrixing_end-atrac3_iqmf_matrixing

@@ -218,7 +220,7 @@ atrac3_iqmf_dewindowing:
     subs r3, r3, #1                 /* outer loop -= 1 */

     bgt .iqmf_dewindow_outer_loop

     

-    ldmfd   sp!, {r4-r9, pc}        /* restore registers */

+    ldmpc   regs=r4-r9              /* restore registers */

     

 .atrac3_iqmf_dewindowing_end:

     .size   atrac3_iqmf_dewindowing,.atrac3_iqmf_dewindowing_end-atrac3_iqmf_dewindowing