powerpc: Fix usage of register macros getting ready for %r0 change

[cascardo/linux.git] / arch / powerpc / lib / memcpy_power7.S

diff --git a/arch/powerpc/lib/memcpy_power7.S b/arch/powerpc/lib/memcpy_power7.S
index 84674d8..04524a2 100644 (file)
--- a/arch/powerpc/lib/memcpy_power7.S
+++ b/arch/powerpc/lib/memcpy_power7.S
@@ -69,15 +69,15 @@ _GLOBAL(memcpy_power7)
 
        mflr    r0
        stdu    r1,-STACKFRAMESIZE(r1)
-       std     r14,STK_REG(r14)(r1)
-       std     r15,STK_REG(r15)(r1)
-       std     r16,STK_REG(r16)(r1)
-       std     r17,STK_REG(r17)(r1)
-       std     r18,STK_REG(r18)(r1)
-       std     r19,STK_REG(r19)(r1)
-       std     r20,STK_REG(r20)(r1)
-       std     r21,STK_REG(r21)(r1)
-       std     r22,STK_REG(r22)(r1)
+       std     r14,STK_REG(R14)(r1)
+       std     r15,STK_REG(R15)(r1)
+       std     r16,STK_REG(R16)(r1)
+       std     r17,STK_REG(R17)(r1)
+       std     r18,STK_REG(R18)(r1)
+       std     r19,STK_REG(R19)(r1)
+       std     r20,STK_REG(R20)(r1)
+       std     r21,STK_REG(R21)(r1)
+       std     r22,STK_REG(R22)(r1)
        std     r0,STACKFRAMESIZE+16(r1)
 
        srdi    r6,r5,7
@@ -124,15 +124,15 @@ _GLOBAL(memcpy_power7)
 
        clrldi  r5,r5,(64-7)
 
-       ld      r14,STK_REG(r14)(r1)
-       ld      r15,STK_REG(r15)(r1)
-       ld      r16,STK_REG(r16)(r1)
-       ld      r17,STK_REG(r17)(r1)
-       ld      r18,STK_REG(r18)(r1)
-       ld      r19,STK_REG(r19)(r1)
-       ld      r20,STK_REG(r20)(r1)
-       ld      r21,STK_REG(r21)(r1)
-       ld      r22,STK_REG(r22)(r1)
+       ld      r14,STK_REG(R14)(r1)
+       ld      r15,STK_REG(R15)(r1)
+       ld      r16,STK_REG(R16)(r1)
+       ld      r17,STK_REG(R17)(r1)
+       ld      r18,STK_REG(R18)(r1)
+       ld      r19,STK_REG(R19)(r1)
+       ld      r20,STK_REG(R20)(r1)
+       ld      r21,STK_REG(R21)(r1)
+       ld      r22,STK_REG(R22)(r1)
        addi    r1,r1,STACKFRAMESIZE
 
        /* Up to 127B to go */
@@ -343,9 +343,9 @@ _GLOBAL(memcpy_power7)
 7:     sub     r5,r5,r6
        srdi    r6,r5,7
 
-       std     r14,STK_REG(r14)(r1)
-       std     r15,STK_REG(r15)(r1)
-       std     r16,STK_REG(r16)(r1)
+       std     r14,STK_REG(R14)(r1)
+       std     r15,STK_REG(R15)(r1)
+       std     r16,STK_REG(R16)(r1)
 
        li      r12,64
        li      r14,80
@@ -380,9 +380,9 @@ _GLOBAL(memcpy_power7)
        addi    r3,r3,128
        bdnz    8b
 
-       ld      r14,STK_REG(r14)(r1)
-       ld      r15,STK_REG(r15)(r1)
-       ld      r16,STK_REG(r16)(r1)
+       ld      r14,STK_REG(R14)(r1)
+       ld      r15,STK_REG(R15)(r1)
+       ld      r16,STK_REG(R16)(r1)
 
        /* Up to 127B to go */
        clrldi  r5,r5,(64-7)
@@ -529,9 +529,9 @@ _GLOBAL(memcpy_power7)
 7:     sub     r5,r5,r6
        srdi    r6,r5,7
 
-       std     r14,STK_REG(r14)(r1)
-       std     r15,STK_REG(r15)(r1)
-       std     r16,STK_REG(r16)(r1)
+       std     r14,STK_REG(R14)(r1)
+       std     r15,STK_REG(R15)(r1)
+       std     r16,STK_REG(R16)(r1)
 
        li      r12,64
        li      r14,80
@@ -574,9 +574,9 @@ _GLOBAL(memcpy_power7)
        addi    r3,r3,128
        bdnz    8b
 
-       ld      r14,STK_REG(r14)(r1)
-       ld      r15,STK_REG(r15)(r1)
-       ld      r16,STK_REG(r16)(r1)
+       ld      r14,STK_REG(R14)(r1)
+       ld      r15,STK_REG(R15)(r1)
+       ld      r16,STK_REG(R16)(r1)
 
        /* Up to 127B to go */
        clrldi  r5,r5,(64-7)