ARM: 9039/1: assembler: generalize byte swapping macro into rev_l

Take the 4 instruction byte swapping sequence from the decompressor's
head.S, and turn it into a rev_l GAS macro for general use. While
at it, make it use the 'rev' instruction when compiling for v6 or
later.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index d9cce7238a3650811514396a302237b8b6ca0d0e..d4837c2d0359384475569781fe5bb700916419ca 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -174,10 +174,7 @@
                .macro  be32tocpu, val, tmp
 #ifndef __ARMEB__
                /* convert to little endian */
-               eor     \tmp, \val, \val, ror #16
-               bic     \tmp, \tmp, #0x00ff0000
-               mov     \val, \val, ror #8
-               eor     \val, \val, \tmp, lsr #8
+               rev_l   \val, \tmp
 #endif
                .endm
 

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 6ed30421f697982f6cb58dfc5f2f73673a790d72..e2b1fd558bf3c4d1d6ccc55388e7f3e7b3b090dc 100644 (file)
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -578,4 +578,21 @@ THUMB(     orr     \reg , \reg , #PSR_T_BIT        )
        __adldst_l      str, \src, \sym, \tmp, \cond
        .endm
 
+       /*
+        * rev_l - byte-swap a 32-bit value
+        *
+        * @val: source/destination register
+        * @tmp: scratch register
+        */
+       .macro          rev_l, val:req, tmp:req
+       .if             __LINUX_ARM_ARCH__ < 6
+       eor             \tmp, \val, \val, ror #16
+       bic             \tmp, \tmp, #0x00ff0000
+       mov             \val, \val, ror #8
+       eor             \val, \val, \tmp, lsr #8
+       .else
+       rev             \val, \val
+       .endif
+       .endm
+
 #endif /* __ASM_ASSEMBLER_H__ */