From 45c7498f59ad2889f2120a865a51043004eddd5d Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Fri, 11 Jun 2010 04:41:36 +0000 Subject: 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 --- firmware/target/arm/lcd-as-memframe.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'firmware/target/arm/lcd-as-memframe.S') diff --git a/firmware/target/arm/lcd-as-memframe.S b/firmware/target/arm/lcd-as-memframe.S index 4532bab221..87cbb611ca 100644 --- a/firmware/target/arm/lcd-as-memframe.S +++ b/firmware/target/arm/lcd-as-memframe.S @@ -101,7 +101,7 @@ lcd_copy_buffer_rect: @ add r0, r0, r4, lsl #1 @ subs r3, r3, #1 @ next line bgt 10b @ copy line @ - ldmfd sp!, { r4-r11, pc } @ restore regs and return + ldmpc regs=r4-r11 @ restore regs and return .ltorg @ dump constant pool .size lcd_copy_buffer_rect, .-lcd_copy_buffer_rect @@ -344,7 +344,7 @@ lcd_write_yuv420_lines: subs r2, r2, #2 @ subtract block from width bgt 10b @ loop line @ @ - ldmfd sp!, { r4-r10, pc } @ restore registers and return + ldmpc regs=r4-r10 @ restore registers and return .ltorg @ dump constant pool .size lcd_write_yuv420_lines, .-lcd_write_yuv420_lines @@ -691,6 +691,6 @@ lcd_write_yuv420_lines_odither: subs r2, r2, #2 @ subtract block from width bgt 10b @ loop line @ @ - ldmfd sp!, { r4-r11, pc } @ restore registers and return + ldmpc regs=r4-r11 @ restore registers and return .ltorg @ dump constant pool .size lcd_write_yuv420_lines_odither, .-lcd_write_yuv420_lines_odither -- cgit v1.2.3