summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-05-31 15:14:26 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-05-31 15:14:26 +0000
commit0ea79053951e64b659cb3b3d82eaed1c65bd43ea (patch)
treea36c33fd58a622af3a8244501ef88c225838edc8
parent74cee6297c87d9f94ff9d68ca19ba39fc7cc6ae6 (diff)
downloadrockbox-0ea79053951e64b659cb3b3d82eaed1c65bd43ea.tar.gz
rockbox-0ea79053951e64b659cb3b3d82eaed1c65bd43ea.zip
ARM: use BX when branch to an address in register
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26432 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/lib/mdct_arm.S2
-rw-r--r--firmware/target/arm/crt0-pp.S2
-rw-r--r--firmware/target/arm/imx31/crt0.S2
-rw-r--r--firmware/target/arm/s3c2440/crt0.S2
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/lib/mdct_arm.S b/apps/codecs/lib/mdct_arm.S
index 76139838a6..f2fa1d9c3e 100644
--- a/apps/codecs/lib/mdct_arm.S
+++ b/apps/codecs/lib/mdct_arm.S
@@ -60,7 +60,7 @@ mdct_butterfly_8:
60 add r11, r12, r7 @ y7 = (x7 + x3) + (x5 + x1) 60 add r11, r12, r7 @ y7 = (x7 + x3) + (x5 + x1)
61 stmia r0!, {r1, r2, r3, r4, r5, r6, r10, r11} 61 stmia r0!, {r1, r2, r3, r4, r5, r6, r10, r11}
62 62
63 mov pc, lr 63 bx lr
64 64
65mdct_butterfly_16: 65mdct_butterfly_16:
66@ inputs: r0,r1 &lr 66@ inputs: r0,r1 &lr
diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S
index 31bf3d6e71..ee95ac8899 100644
--- a/firmware/target/arm/crt0-pp.S
+++ b/firmware/target/arm/crt0-pp.S
@@ -163,7 +163,7 @@ remap_start:
163 str r2, [r1] 163 str r2, [r1]
164 str r4, [r3] 164 str r4, [r3]
165 ldr r1, L_post_remap 165 ldr r1, L_post_remap
166 mov pc, r1 166 bx r1
167L_post_remap: 167L_post_remap:
168 .word remap_end 168 .word remap_end
169remap_end: 169remap_end:
diff --git a/firmware/target/arm/imx31/crt0.S b/firmware/target/arm/imx31/crt0.S
index ef2d7f40b9..d241fcb8ae 100644
--- a/firmware/target/arm/imx31/crt0.S
+++ b/firmware/target/arm/imx31/crt0.S
@@ -67,7 +67,7 @@ newstart:
67 strhi r4, [r1], #4 67 strhi r4, [r1], #4
68 bhi 1b 68 bhi 1b
69 69
70 mov pc, r6 70 bx r6
71 71
72 /* Remapping stub. No absolute addresses may be used until after the 72 /* Remapping stub. No absolute addresses may be used until after the
73 * remapping is complete. */ 73 * remapping is complete. */
diff --git a/firmware/target/arm/s3c2440/crt0.S b/firmware/target/arm/s3c2440/crt0.S
index a61f2a3ce2..faa54313e7 100644
--- a/firmware/target/arm/s3c2440/crt0.S
+++ b/firmware/target/arm/s3c2440/crt0.S
@@ -486,7 +486,7 @@ skipreset:
486 ldr r1, =donecopy 486 ldr r1, =donecopy
487 ldr r2, =0x30000000 487 ldr r2, =0x30000000
488 add r1, r1, r2 488 add r1, r1, r2
489 mov pc, r1 /* The code is located where we want it so jump */ 489 bx r1 /* The code is located where we want it so jump */
490 490
491donecopy: 491donecopy:
492 492