powerpc: Fix usage of register macros getting ready for %r0 change
Anything that uses a constructed instruction (ie. from ppc-opcode.h), need to use the new R0 macro, as %r0 is not going to work. Also convert usages of macros where we are just determining an offset (usually for a load/store), like: std r14,STK_REG(r14)(r1) Can't use STK_REG(r14) as %r14 doesn't work in the STK_REG macro since it's just calculating an offset. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:

committed by
Benjamin Herrenschmidt

parent
564aa5cfd3
commit
c75df6f96c
@@ -74,7 +74,7 @@ _GLOBAL(beat_hcall_norets8)
|
||||
mr r6,r7
|
||||
mr r7,r8
|
||||
mr r8,r9
|
||||
ld r10,STK_PARM(r10)(r1)
|
||||
ld r10,STK_PARM(R10)(r1)
|
||||
|
||||
HVSC /* invoke the hypervisor */
|
||||
|
||||
@@ -94,7 +94,7 @@ _GLOBAL(beat_hcall1)
|
||||
|
||||
HCALL_INST_PRECALL
|
||||
|
||||
std r4,STK_PARM(r4)(r1) /* save ret buffer */
|
||||
std r4,STK_PARM(R4)(r1) /* save ret buffer */
|
||||
|
||||
mr r11,r3
|
||||
mr r3,r5
|
||||
@@ -108,7 +108,7 @@ _GLOBAL(beat_hcall1)
|
||||
|
||||
HCALL_INST_POSTCALL
|
||||
|
||||
ld r12,STK_PARM(r4)(r1)
|
||||
ld r12,STK_PARM(R4)(r1)
|
||||
std r4, 0(r12)
|
||||
|
||||
lwz r0,8(r1)
|
||||
@@ -125,7 +125,7 @@ _GLOBAL(beat_hcall2)
|
||||
|
||||
HCALL_INST_PRECALL
|
||||
|
||||
std r4,STK_PARM(r4)(r1) /* save ret buffer */
|
||||
std r4,STK_PARM(R4)(r1) /* save ret buffer */
|
||||
|
||||
mr r11,r3
|
||||
mr r3,r5
|
||||
@@ -139,7 +139,7 @@ _GLOBAL(beat_hcall2)
|
||||
|
||||
HCALL_INST_POSTCALL
|
||||
|
||||
ld r12,STK_PARM(r4)(r1)
|
||||
ld r12,STK_PARM(R4)(r1)
|
||||
std r4, 0(r12)
|
||||
std r5, 8(r12)
|
||||
|
||||
@@ -157,7 +157,7 @@ _GLOBAL(beat_hcall3)
|
||||
|
||||
HCALL_INST_PRECALL
|
||||
|
||||
std r4,STK_PARM(r4)(r1) /* save ret buffer */
|
||||
std r4,STK_PARM(R4)(r1) /* save ret buffer */
|
||||
|
||||
mr r11,r3
|
||||
mr r3,r5
|
||||
@@ -171,7 +171,7 @@ _GLOBAL(beat_hcall3)
|
||||
|
||||
HCALL_INST_POSTCALL
|
||||
|
||||
ld r12,STK_PARM(r4)(r1)
|
||||
ld r12,STK_PARM(R4)(r1)
|
||||
std r4, 0(r12)
|
||||
std r5, 8(r12)
|
||||
std r6, 16(r12)
|
||||
@@ -190,7 +190,7 @@ _GLOBAL(beat_hcall4)
|
||||
|
||||
HCALL_INST_PRECALL
|
||||
|
||||
std r4,STK_PARM(r4)(r1) /* save ret buffer */
|
||||
std r4,STK_PARM(R4)(r1) /* save ret buffer */
|
||||
|
||||
mr r11,r3
|
||||
mr r3,r5
|
||||
@@ -204,7 +204,7 @@ _GLOBAL(beat_hcall4)
|
||||
|
||||
HCALL_INST_POSTCALL
|
||||
|
||||
ld r12,STK_PARM(r4)(r1)
|
||||
ld r12,STK_PARM(R4)(r1)
|
||||
std r4, 0(r12)
|
||||
std r5, 8(r12)
|
||||
std r6, 16(r12)
|
||||
@@ -224,7 +224,7 @@ _GLOBAL(beat_hcall5)
|
||||
|
||||
HCALL_INST_PRECALL
|
||||
|
||||
std r4,STK_PARM(r4)(r1) /* save ret buffer */
|
||||
std r4,STK_PARM(R4)(r1) /* save ret buffer */
|
||||
|
||||
mr r11,r3
|
||||
mr r3,r5
|
||||
@@ -238,7 +238,7 @@ _GLOBAL(beat_hcall5)
|
||||
|
||||
HCALL_INST_POSTCALL
|
||||
|
||||
ld r12,STK_PARM(r4)(r1)
|
||||
ld r12,STK_PARM(R4)(r1)
|
||||
std r4, 0(r12)
|
||||
std r5, 8(r12)
|
||||
std r6, 16(r12)
|
||||
@@ -259,7 +259,7 @@ _GLOBAL(beat_hcall6)
|
||||
|
||||
HCALL_INST_PRECALL
|
||||
|
||||
std r4,STK_PARM(r4)(r1) /* save ret buffer */
|
||||
std r4,STK_PARM(R4)(r1) /* save ret buffer */
|
||||
|
||||
mr r11,r3
|
||||
mr r3,r5
|
||||
@@ -273,7 +273,7 @@ _GLOBAL(beat_hcall6)
|
||||
|
||||
HCALL_INST_POSTCALL
|
||||
|
||||
ld r12,STK_PARM(r4)(r1)
|
||||
ld r12,STK_PARM(R4)(r1)
|
||||
std r4, 0(r12)
|
||||
std r5, 8(r12)
|
||||
std r6, 16(r12)
|
||||
|
Reference in New Issue
Block a user