Commit d98b90ea authored by Victor Kamensky's avatar Victor Kamensky Committed by Russell King
Browse files

ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull 



Renames logical shift macros, 'push' and 'pull', defined in
arch/arm/include/asm/assembler.h, into 'lspush' and 'lspull'.
That eliminates name conflict between 'push' logical shift macro
and 'push' instruction mnemonic. That allows assembler.h to be
included in .S files that use 'push' instruction.

Suggested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarVictor Kamensky <victor.kamensky@linaro.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 74c4137b

arch/arm/include/asm/assembler.h

+4 −4
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
 * Endian independent macros for shifting bytes within registers.

 */

#ifndef __ARMEB__

#define pull            lsr

#define push            lsl

#define lspull          lsr

#define lspush          lsl

#define get_byte_0      lsl #0

#define get_byte_1	lsr #8

#define get_byte_2	lsr #16
@@ -41,8 +41,8 @@ 
#define put_byte_2	lsl #16

#define put_byte_3	lsl #24

#else

#define pull            lsl

#define push            lsr

#define lspull          lsl

#define lspush          lsr

#define get_byte_0	lsr #24

#define get_byte_1	lsr #16

#define get_byte_2	lsr #8

arch/arm/lib/copy_template.S

+18 −18
Original line number Diff line number Diff line
@@ -197,24 +197,24 @@ 


12:	PLD(	pld	[r1, #124]		)

13:		ldr4w	r1, r4, r5, r6, r7, abort=19f

		mov	r3, lr, pull #\pull

		mov	r3, lr, lspull #\pull

		subs	r2, r2, #32

		ldr4w	r1, r8, r9, ip, lr, abort=19f

		orr	r3, r3, r4, push #\push

		mov	r4, r4, pull #\pull

		orr	r4, r4, r5, push #\push

		mov	r5, r5, pull #\pull

		orr	r5, r5, r6, push #\push

		mov	r6, r6, pull #\pull

		orr	r6, r6, r7, push #\push

		mov	r7, r7, pull #\pull

		orr	r7, r7, r8, push #\push

		mov	r8, r8, pull #\pull

		orr	r8, r8, r9, push #\push

		mov	r9, r9, pull #\pull

		orr	r9, r9, ip, push #\push

		mov	ip, ip, pull #\pull

		orr	ip, ip, lr, push #\push

		orr	r3, r3, r4, lspush #\push

		mov	r4, r4, lspull #\pull

		orr	r4, r4, r5, lspush #\push

		mov	r5, r5, lspull #\pull

		orr	r5, r5, r6, lspush #\push

		mov	r6, r6, lspull #\pull

		orr	r6, r6, r7, lspush #\push

		mov	r7, r7, lspull #\pull

		orr	r7, r7, r8, lspush #\push

		mov	r8, r8, lspull #\pull

		orr	r8, r8, r9, lspush #\push

		mov	r9, r9, lspull #\pull

		orr	r9, r9, ip, lspush #\push

		mov	ip, ip, lspull #\pull

		orr	ip, ip, lr, lspush #\push

		str8w	r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f

		bge	12b

	PLD(	cmn	r2, #96			)
@@ -225,10 +225,10 @@ 
14:		ands	ip, r2, #28

		beq	16f



15:		mov	r3, lr, pull #\pull

15:		mov	r3, lr, lspull #\pull

		ldr1w	r1, lr, abort=21f

		subs	ip, ip, #4

		orr	r3, r3, lr, push #\push

		orr	r3, r3, lr, lspush #\push

		str1w	r0, r3, abort=21f

		bgt	15b

	CALGN(	cmp	r2, #0			)

arch/arm/lib/csumpartialcopygeneric.S

+48 −48
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ FN_ENTRY 
		tst	len, #2

		mov	r5, r4, get_byte_0

		beq	.Lexit

		adcs	sum, sum, r4, push #16

		adcs	sum, sum, r4, lspush #16

		strb	r5, [dst], #1

		mov	r5, r4, get_byte_1

		strb	r5, [dst], #1
@@ -171,23 +171,23 @@ FN_ENTRY 
		cmp	ip, #2

		beq	.Lsrc2_aligned

		bhi	.Lsrc3_aligned

		mov	r4, r5, pull #8		@ C = 0

		mov	r4, r5, lspull #8		@ C = 0

		bics	ip, len, #15

		beq	2f

1:		load4l	r5, r6, r7, r8

		orr	r4, r4, r5, push #24

		mov	r5, r5, pull #8

		orr	r5, r5, r6, push #24

		mov	r6, r6, pull #8

		orr	r6, r6, r7, push #24

		mov	r7, r7, pull #8

		orr	r7, r7, r8, push #24

		orr	r4, r4, r5, lspush #24

		mov	r5, r5, lspull #8

		orr	r5, r5, r6, lspush #24

		mov	r6, r6, lspull #8

		orr	r6, r6, r7, lspush #24

		mov	r7, r7, lspull #8

		orr	r7, r7, r8, lspush #24

		stmia	dst!, {r4, r5, r6, r7}

		adcs	sum, sum, r4

		adcs	sum, sum, r5

		adcs	sum, sum, r6

		adcs	sum, sum, r7

		mov	r4, r8, pull #8

		mov	r4, r8, lspull #8

		sub	ip, ip, #16

		teq	ip, #0

		bne	1b
@@ -196,50 +196,50 @@ FN_ENTRY 
		tst	ip, #8

		beq	3f

		load2l	r5, r6

		orr	r4, r4, r5, push #24

		mov	r5, r5, pull #8

		orr	r5, r5, r6, push #24

		orr	r4, r4, r5, lspush #24

		mov	r5, r5, lspull #8

		orr	r5, r5, r6, lspush #24

		stmia	dst!, {r4, r5}

		adcs	sum, sum, r4

		adcs	sum, sum, r5

		mov	r4, r6, pull #8

		mov	r4, r6, lspull #8

		tst	ip, #4

		beq	4f

3:		load1l	r5

		orr	r4, r4, r5, push #24

		orr	r4, r4, r5, lspush #24

		str	r4, [dst], #4

		adcs	sum, sum, r4

		mov	r4, r5, pull #8

		mov	r4, r5, lspull #8

4:		ands	len, len, #3

		beq	.Ldone

		mov	r5, r4, get_byte_0

		tst	len, #2

		beq	.Lexit

		adcs	sum, sum, r4, push #16

		adcs	sum, sum, r4, lspush #16

		strb	r5, [dst], #1

		mov	r5, r4, get_byte_1

		strb	r5, [dst], #1

		mov	r5, r4, get_byte_2

		b	.Lexit



.Lsrc2_aligned:	mov	r4, r5, pull #16

.Lsrc2_aligned:	mov	r4, r5, lspull #16

		adds	sum, sum, #0

		bics	ip, len, #15

		beq	2f

1:		load4l	r5, r6, r7, r8

		orr	r4, r4, r5, push #16

		mov	r5, r5, pull #16

		orr	r5, r5, r6, push #16

		mov	r6, r6, pull #16

		orr	r6, r6, r7, push #16

		mov	r7, r7, pull #16

		orr	r7, r7, r8, push #16

		orr	r4, r4, r5, lspush #16

		mov	r5, r5, lspull #16

		orr	r5, r5, r6, lspush #16

		mov	r6, r6, lspull #16

		orr	r6, r6, r7, lspush #16

		mov	r7, r7, lspull #16

		orr	r7, r7, r8, lspush #16

		stmia	dst!, {r4, r5, r6, r7}

		adcs	sum, sum, r4

		adcs	sum, sum, r5

		adcs	sum, sum, r6

		adcs	sum, sum, r7

		mov	r4, r8, pull #16

		mov	r4, r8, lspull #16

		sub	ip, ip, #16

		teq	ip, #0

		bne	1b
@@ -248,20 +248,20 @@ FN_ENTRY 
		tst	ip, #8

		beq	3f

		load2l	r5, r6

		orr	r4, r4, r5, push #16

		mov	r5, r5, pull #16

		orr	r5, r5, r6, push #16

		orr	r4, r4, r5, lspush #16

		mov	r5, r5, lspull #16

		orr	r5, r5, r6, lspush #16

		stmia	dst!, {r4, r5}

		adcs	sum, sum, r4

		adcs	sum, sum, r5

		mov	r4, r6, pull #16

		mov	r4, r6, lspull #16

		tst	ip, #4

		beq	4f

3:		load1l	r5

		orr	r4, r4, r5, push #16

		orr	r4, r4, r5, lspush #16

		str	r4, [dst], #4

		adcs	sum, sum, r4

		mov	r4, r5, pull #16

		mov	r4, r5, lspull #16

4:		ands	len, len, #3

		beq	.Ldone

		mov	r5, r4, get_byte_0
@@ -276,24 +276,24 @@ FN_ENTRY 
		load1b	r5

		b	.Lexit



.Lsrc3_aligned:	mov	r4, r5, pull #24

.Lsrc3_aligned:	mov	r4, r5, lspull #24

		adds	sum, sum, #0

		bics	ip, len, #15

		beq	2f

1:		load4l	r5, r6, r7, r8

		orr	r4, r4, r5, push #8

		mov	r5, r5, pull #24

		orr	r5, r5, r6, push #8

		mov	r6, r6, pull #24

		orr	r6, r6, r7, push #8

		mov	r7, r7, pull #24

		orr	r7, r7, r8, push #8

		orr	r4, r4, r5, lspush #8

		mov	r5, r5, lspull #24

		orr	r5, r5, r6, lspush #8

		mov	r6, r6, lspull #24

		orr	r6, r6, r7, lspush #8

		mov	r7, r7, lspull #24

		orr	r7, r7, r8, lspush #8

		stmia	dst!, {r4, r5, r6, r7}

		adcs	sum, sum, r4

		adcs	sum, sum, r5

		adcs	sum, sum, r6

		adcs	sum, sum, r7

		mov	r4, r8, pull #24

		mov	r4, r8, lspull #24

		sub	ip, ip, #16

		teq	ip, #0

		bne	1b
@@ -302,20 +302,20 @@ FN_ENTRY 
		tst	ip, #8

		beq	3f

		load2l	r5, r6

		orr	r4, r4, r5, push #8

		mov	r5, r5, pull #24

		orr	r5, r5, r6, push #8

		orr	r4, r4, r5, lspush #8

		mov	r5, r5, lspull #24

		orr	r5, r5, r6, lspush #8

		stmia	dst!, {r4, r5}

		adcs	sum, sum, r4

		adcs	sum, sum, r5

		mov	r4, r6, pull #24

		mov	r4, r6, lspull #24

		tst	ip, #4

		beq	4f

3:		load1l	r5

		orr	r4, r4, r5, push #8

		orr	r4, r4, r5, lspush #8

		str	r4, [dst], #4

		adcs	sum, sum, r4

		mov	r4, r5, pull #24

		mov	r4, r5, lspull #24

4:		ands	len, len, #3

		beq	.Ldone

		mov	r5, r4, get_byte_0
@@ -326,7 +326,7 @@ FN_ENTRY 
		load1l	r4

		mov	r5, r4, get_byte_0

		strb	r5, [dst], #1

		adcs	sum, sum, r4, push #24

		adcs	sum, sum, r4, lspush #24

		mov	r5, r4, get_byte_1

		b	.Lexit

FN_EXIT

arch/arm/lib/io-readsl.S

+6 −6
Original line number Diff line number Diff line
@@ -47,25 +47,25 @@ ENTRY(__raw_readsl) 
		strb	ip, [r1], #1



4:		subs	r2, r2, #1

		mov	ip, r3, pull #24

		mov	ip, r3, lspull #24

		ldrne	r3, [r0]

		orrne	ip, ip, r3, push #8

		orrne	ip, ip, r3, lspush #8

		strne	ip, [r1], #4

		bne	4b

		b	8f



5:		subs	r2, r2, #1

		mov	ip, r3, pull #16

		mov	ip, r3, lspull #16

		ldrne	r3, [r0]

		orrne	ip, ip, r3, push #16

		orrne	ip, ip, r3, lspush #16

		strne	ip, [r1], #4

		bne	5b

		b	7f



6:		subs	r2, r2, #1

		mov	ip, r3, pull #8

		mov	ip, r3, lspull #8

		ldrne	r3, [r0]

		orrne	ip, ip, r3, push #24

		orrne	ip, ip, r3, lspush #24

		strne	ip, [r1], #4

		bne	6b

arch/arm/lib/io-writesl.S

+6 −6
Original line number Diff line number Diff line
@@ -41,26 +41,26 @@ ENTRY(__raw_writesl) 
		blt	5f

		bgt	6f



4:		mov	ip, r3, pull #16

4:		mov	ip, r3, lspull #16

		ldr	r3, [r1], #4

		subs	r2, r2, #1

		orr	ip, ip, r3, push #16

		orr	ip, ip, r3, lspush #16

		str	ip, [r0]

		bne	4b

		mov	pc, lr



5:		mov	ip, r3, pull #8

5:		mov	ip, r3, lspull #8

		ldr	r3, [r1], #4

		subs	r2, r2, #1

		orr	ip, ip, r3, push #24

		orr	ip, ip, r3, lspush #24

		str	ip, [r0]

		bne	5b

		mov	pc, lr



6:		mov	ip, r3, pull #24

6:		mov	ip, r3, lspull #24

		ldr	r3, [r1], #4

		subs	r2, r2, #1

		orr	ip, ip, r3, push #8

		orr	ip, ip, r3, lspush #8

		str	ip, [r0]

		bne	6b

		mov	pc, lr

CRA Git | Maintained and supported by SUSTech CRA and CCSE