From 5fea0056107fee73fb385c79fb3cea00cd4e6d52 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Fri, 11 Jun 2010 03:54:47 +0000 Subject: 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 --- firmware/target/arm/memset-arm.S | 2 +- firmware/target/arm/memset16-arm.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware') diff --git a/firmware/target/arm/memset-arm.S b/firmware/target/arm/memset-arm.S index 4d46b6f62d..5dbde7a1d7 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 47034ab9cd..63d626480e 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 */ -- cgit v1.2.3