summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-06-11 03:54:47 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-06-11 03:54:47 +0000
commit5fea0056107fee73fb385c79fb3cea00cd4e6d52 (patch)
tree44b93759fb113e5162578bd1cd45c24d194dfbfc
parent66d9ab289f175bfc6873af38d6668697c13577eb (diff)
downloadrockbox-5fea0056107fee73fb385c79fb3cea00cd4e6d52.zip
rockbox-5fea0056107fee73fb385c79fb3cea00cd4e6d52.tar.gz
rockbox-5fea0056107fee73fb385c79fb3cea00cd4e6d52.tar.bz2
rockbox-5fea0056107fee73fb385c79fb3cea00cd4e6d52.tar.xz
arm/memset: don't use ldm to load pc when it has been stored with str
It looks nicer to keep str/ldr and stm/ldm in pairs git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26754 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/memset-arm.S2
-rw-r--r--firmware/target/arm/memset16-arm.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/memset-arm.S b/firmware/target/arm/memset-arm.S
index 4d46b6f..5dbde7a 100644
--- a/firmware/target/arm/memset-arm.S
+++ b/firmware/target/arm/memset-arm.S
@@ -69,7 +69,7 @@ memset:
stmgedb r0!, {r1, r3, ip, lr}
stmgedb r0!, {r1, r3, ip, lr}
bgt 3b
- ldmeqfd sp!, {pc} @ Now <64 bytes to go.
+ ldreq pc, [sp], #4 @ Now <64 bytes to go.
/*
* No need to correct the count; we're only testing bits from now on
*/
diff --git a/firmware/target/arm/memset16-arm.S b/firmware/target/arm/memset16-arm.S
index 47034ab..63d6264 100644
--- a/firmware/target/arm/memset16-arm.S
+++ b/firmware/target/arm/memset16-arm.S
@@ -59,7 +59,7 @@ memset16:
stmgeia r0!, {r1, r3, ip, lr}
stmgeia r0!, {r1, r3, ip, lr}
bgt 2b
- ldmeqfd sp!, {pc} @ Now <64 bytes to go.
+ ldreq pc, [sp], #4 @ Now <64 bytes to go.
/*
* No need to correct the count; we're only testing bits from now on
*/