powerpc: Change mtcrf to use real register names
mtocrf define is just a wrapper around the real instructions so we can just use real register names here (ie. lower case). Also remove braces in macro so this is possible. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
b38c77d82e
commit
86e32fdce7
|
@ -29,7 +29,7 @@
|
||||||
#define PPC_LLARX(t, a, b, eh) PPC_LDARX(t, a, b, eh)
|
#define PPC_LLARX(t, a, b, eh) PPC_LDARX(t, a, b, eh)
|
||||||
#define PPC_STLCX stringify_in_c(stdcx.)
|
#define PPC_STLCX stringify_in_c(stdcx.)
|
||||||
#define PPC_CNTLZL stringify_in_c(cntlzd)
|
#define PPC_CNTLZL stringify_in_c(cntlzd)
|
||||||
#define PPC_MTOCRF(FXM, RS) MTOCRF((FXM), (RS))
|
#define PPC_MTOCRF(FXM, RS) MTOCRF((FXM), RS)
|
||||||
#define PPC_LR_STKOFF 16
|
#define PPC_LR_STKOFF 16
|
||||||
#define PPC_MIN_STKFRM 112
|
#define PPC_MIN_STKFRM 112
|
||||||
#else /* 32-bit */
|
#else /* 32-bit */
|
||||||
|
|
|
@ -384,9 +384,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
|
||||||
#ifdef CONFIG_PPC64
|
#ifdef CONFIG_PPC64
|
||||||
#define MTOCRF(FXM, RS) \
|
#define MTOCRF(FXM, RS) \
|
||||||
BEGIN_FTR_SECTION_NESTED(848); \
|
BEGIN_FTR_SECTION_NESTED(848); \
|
||||||
mtcrf (FXM), (RS); \
|
mtcrf (FXM), RS; \
|
||||||
FTR_SECTION_ELSE_NESTED(848); \
|
FTR_SECTION_ELSE_NESTED(848); \
|
||||||
mtocrf (FXM), (RS); \
|
mtocrf (FXM), RS; \
|
||||||
ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_NOEXECUTE, 848)
|
ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_NOEXECUTE, 848)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ _GLOBAL(__copy_tofrom_user_base)
|
||||||
dcbt 0,r4
|
dcbt 0,r4
|
||||||
beq .Lcopy_page_4K
|
beq .Lcopy_page_4K
|
||||||
andi. r6,r6,7
|
andi. r6,r6,7
|
||||||
PPC_MTOCRF(0x01,R5)
|
PPC_MTOCRF(0x01,r5)
|
||||||
blt cr1,.Lshort_copy
|
blt cr1,.Lshort_copy
|
||||||
/* Below we want to nop out the bne if we're on a CPU that has the
|
/* Below we want to nop out the bne if we're on a CPU that has the
|
||||||
* CPU_FTR_UNALIGNED_LD_STD bit set and the CPU_FTR_CP_USE_DCBTZ bit
|
* CPU_FTR_UNALIGNED_LD_STD bit set and the CPU_FTR_CP_USE_DCBTZ bit
|
||||||
|
@ -186,7 +186,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
|
||||||
blr
|
blr
|
||||||
|
|
||||||
.Ldst_unaligned:
|
.Ldst_unaligned:
|
||||||
PPC_MTOCRF(0x01,R6) /* put #bytes to 8B bdry into cr7 */
|
PPC_MTOCRF(0x01,r6) /* put #bytes to 8B bdry into cr7 */
|
||||||
subf r5,r6,r5
|
subf r5,r6,r5
|
||||||
li r7,0
|
li r7,0
|
||||||
cmpldi cr1,r5,16
|
cmpldi cr1,r5,16
|
||||||
|
@ -201,7 +201,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
|
||||||
2: bf cr7*4+1,3f
|
2: bf cr7*4+1,3f
|
||||||
37: lwzx r0,r7,r4
|
37: lwzx r0,r7,r4
|
||||||
83: stwx r0,r7,r3
|
83: stwx r0,r7,r3
|
||||||
3: PPC_MTOCRF(0x01,R5)
|
3: PPC_MTOCRF(0x01,r5)
|
||||||
add r4,r6,r4
|
add r4,r6,r4
|
||||||
add r3,r6,r3
|
add r3,r6,r3
|
||||||
b .Ldst_aligned
|
b .Ldst_aligned
|
||||||
|
|
|
@ -19,7 +19,7 @@ _GLOBAL(memset)
|
||||||
rlwimi r4,r4,16,0,15
|
rlwimi r4,r4,16,0,15
|
||||||
cmplw cr1,r5,r0 /* do we get that far? */
|
cmplw cr1,r5,r0 /* do we get that far? */
|
||||||
rldimi r4,r4,32,0
|
rldimi r4,r4,32,0
|
||||||
PPC_MTOCRF(1,R0)
|
PPC_MTOCRF(1,r0)
|
||||||
mr r6,r3
|
mr r6,r3
|
||||||
blt cr1,8f
|
blt cr1,8f
|
||||||
beq+ 3f /* if already 8-byte aligned */
|
beq+ 3f /* if already 8-byte aligned */
|
||||||
|
@ -49,7 +49,7 @@ _GLOBAL(memset)
|
||||||
bdnz 4b
|
bdnz 4b
|
||||||
5: srwi. r0,r5,3
|
5: srwi. r0,r5,3
|
||||||
clrlwi r5,r5,29
|
clrlwi r5,r5,29
|
||||||
PPC_MTOCRF(1,R0)
|
PPC_MTOCRF(1,r0)
|
||||||
beq 8f
|
beq 8f
|
||||||
bf 29,6f
|
bf 29,6f
|
||||||
std r4,0(r6)
|
std r4,0(r6)
|
||||||
|
@ -65,7 +65,7 @@ _GLOBAL(memset)
|
||||||
std r4,0(r6)
|
std r4,0(r6)
|
||||||
addi r6,r6,8
|
addi r6,r6,8
|
||||||
8: cmpwi r5,0
|
8: cmpwi r5,0
|
||||||
PPC_MTOCRF(1,R5)
|
PPC_MTOCRF(1,r5)
|
||||||
beqlr+
|
beqlr+
|
||||||
bf 29,9f
|
bf 29,9f
|
||||||
stw r4,0(r6)
|
stw r4,0(r6)
|
||||||
|
|
|
@ -16,7 +16,7 @@ BEGIN_FTR_SECTION
|
||||||
FTR_SECTION_ELSE
|
FTR_SECTION_ELSE
|
||||||
b memcpy_power7
|
b memcpy_power7
|
||||||
ALT_FTR_SECTION_END_IFCLR(CPU_FTR_VMX_COPY)
|
ALT_FTR_SECTION_END_IFCLR(CPU_FTR_VMX_COPY)
|
||||||
PPC_MTOCRF(0x01,R5)
|
PPC_MTOCRF(0x01,r5)
|
||||||
cmpldi cr1,r5,16
|
cmpldi cr1,r5,16
|
||||||
neg r6,r3 # LS 3 bits = # bytes to 8-byte dest bdry
|
neg r6,r3 # LS 3 bits = # bytes to 8-byte dest bdry
|
||||||
andi. r6,r6,7
|
andi. r6,r6,7
|
||||||
|
@ -158,7 +158,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
|
||||||
blr
|
blr
|
||||||
|
|
||||||
.Ldst_unaligned:
|
.Ldst_unaligned:
|
||||||
PPC_MTOCRF(0x01,R6) # put #bytes to 8B bdry into cr7
|
PPC_MTOCRF(0x01,r6) # put #bytes to 8B bdry into cr7
|
||||||
subf r5,r6,r5
|
subf r5,r6,r5
|
||||||
li r7,0
|
li r7,0
|
||||||
cmpldi cr1,r5,16
|
cmpldi cr1,r5,16
|
||||||
|
@ -173,7 +173,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
|
||||||
2: bf cr7*4+1,3f
|
2: bf cr7*4+1,3f
|
||||||
lwzx r0,r7,r4
|
lwzx r0,r7,r4
|
||||||
stwx r0,r7,r3
|
stwx r0,r7,r3
|
||||||
3: PPC_MTOCRF(0x01,R5)
|
3: PPC_MTOCRF(0x01,r5)
|
||||||
add r4,r6,r4
|
add r4,r6,r4
|
||||||
add r3,r6,r3
|
add r3,r6,r3
|
||||||
b .Ldst_aligned
|
b .Ldst_aligned
|
||||||
|
|
Loading…
Reference in New Issue