diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-31 15:14:26 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-31 15:14:26 +0000 |
commit | 0ea79053951e64b659cb3b3d82eaed1c65bd43ea (patch) | |
tree | a36c33fd58a622af3a8244501ef88c225838edc8 /firmware/target/arm | |
parent | 74cee6297c87d9f94ff9d68ca19ba39fc7cc6ae6 (diff) | |
download | rockbox-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
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/crt0-pp.S | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/crt0.S | 2 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/crt0.S | 2 |
3 files changed, 3 insertions, 3 deletions
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 |
167 | L_post_remap: | 167 | L_post_remap: |
168 | .word remap_end | 168 | .word remap_end |
169 | remap_end: | 169 | remap_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 | ||
491 | donecopy: | 491 | donecopy: |
492 | 492 | ||