diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-11 04:41:36 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-11 04:41:36 +0000 |
commit | 45c7498f59ad2889f2120a865a51043004eddd5d (patch) | |
tree | 1a62b0e8549a7f2750679de8d7dd3f82039c5719 /firmware/target/arm/memset-arm.S | |
parent | fe7ca44471b309a0adea563cce947de9efb62ab5 (diff) | |
download | rockbox-45c7498f59ad2889f2120a865a51043004eddd5d.tar.gz rockbox-45c7498f59ad2889f2120a865a51043004eddd5d.zip |
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
Diffstat (limited to 'firmware/target/arm/memset-arm.S')
-rw-r--r-- | firmware/target/arm/memset-arm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/target/arm/memset-arm.S b/firmware/target/arm/memset-arm.S index 5dbde7a1d7..682da874ce 100644 --- a/firmware/target/arm/memset-arm.S +++ b/firmware/target/arm/memset-arm.S | |||
@@ -69,7 +69,7 @@ memset: | |||
69 | stmgedb r0!, {r1, r3, ip, lr} | 69 | stmgedb r0!, {r1, r3, ip, lr} |
70 | stmgedb r0!, {r1, r3, ip, lr} | 70 | stmgedb r0!, {r1, r3, ip, lr} |
71 | bgt 3b | 71 | bgt 3b |
72 | ldreq pc, [sp], #4 @ Now <64 bytes to go. | 72 | ldrpc cond=eq @ Now <64 bytes to go. |
73 | /* | 73 | /* |
74 | * No need to correct the count; we're only testing bits from now on | 74 | * No need to correct the count; we're only testing bits from now on |
75 | */ | 75 | */ |