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/as3525/lcd-as-e200v2-fuze-fuzev2.S | 4 ++-- firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'firmware/target/arm/as3525') diff --git a/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S b/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S index f71216c674..690641c850 100644 --- a/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S +++ b/firmware/target/arm/as3525/lcd-as-e200v2-fuze-fuzev2.S @@ -241,7 +241,7 @@ lcd_write_yuv420_lines: tst r7, #DBOP_BUSY @ fifo not empty? beq 1b @ - 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, .-lcd_write_yuv420_lines @@ -545,6 +545,6 @@ lcd_write_yuv420_lines_odither: tst r7, #DBOP_BUSY @ fifo not empty? beq 1b @ - 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 diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S b/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S index 942ddf79f8..431dc62da0 100644 --- a/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S +++ b/firmware/target/arm/as3525/sansa-clip/lcd-as-clip.S @@ -19,6 +19,7 @@ * ****************************************************************************/ +#include "config.h" #include "as3525.h" .text @@ -90,5 +91,5 @@ lcd_grey_data: ands r5, r5, #(1<<10) @ wait until push fifo empties beq 1b - ldmfd sp!, {r4-r7, pc} + ldmpc regs=r4-r7 .size lcd_grey_data,.-lcd_grey_data -- cgit v1.2.3