Skip to content

G
go
Commit 2b417dc3 authored by Rob Pike's avatar Rob Pike
Browse files
Options

cmd/internal/obj: make ppc64's CR subregisters print as CRn rather than Cn 

These 8 registers are windows into the CR register. They are officially CR0
through CR7 and that is what the assembler accepts, but for some reason
they have always printed as C0 through C7. Fix the naming and printing.

Change-Id: I55822c0322c29d3e01a1f2776b3b210ebf9ded21
Reviewed-on: https://go-review.googlesource.com/6290Reviewed-by: default avatarRuss Cox <rsc@golang.org>
parent d24e62f2
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 37 deletions
src/cmd/9a/a.y
View file @ 2b417dc3
...@@ -806,7 +806,7 @@ creg: ...@@ -806,7 +806,7 @@ creg:
{ {
$$ = nullgen; $$ = nullgen;
$$.Type = obj.TYPE_REG; $$.Type = obj.TYPE_REG;
$$.Reg = int16(REG_C0 + $3); $$.Reg = int16(REG_CR0 + $3);
} }
......
src/cmd/9a/lex.go
View file @ 2b417dc3
...@@ -101,14 +101,14 @@ var lexinit = []asm.Lextab{ ...@@ -101,14 +101,14 @@ var lexinit = []asm.Lextab{
{"SPR", LSPR, ppc64.REG_SPR0}, {"SPR", LSPR, ppc64.REG_SPR0},
{"DCR", LSPR, ppc64.REG_DCR0}, {"DCR", LSPR, ppc64.REG_DCR0},
{"CR", LCR, ppc64.REG_CR}, {"CR", LCR, ppc64.REG_CR},
{"CR0", LCREG, ppc64.REG_C0}, {"CR0", LCREG, ppc64.REG_CR0},
{"CR1", LCREG, ppc64.REG_C1}, {"CR1", LCREG, ppc64.REG_CR1},
{"CR2", LCREG, ppc64.REG_C2}, {"CR2", LCREG, ppc64.REG_CR2},
{"CR3", LCREG, ppc64.REG_C3}, {"CR3", LCREG, ppc64.REG_CR3},
{"CR4", LCREG, ppc64.REG_C4}, {"CR4", LCREG, ppc64.REG_CR4},
{"CR5", LCREG, ppc64.REG_C5}, {"CR5", LCREG, ppc64.REG_CR5},
{"CR6", LCREG, ppc64.REG_C6}, {"CR6", LCREG, ppc64.REG_CR6},
{"CR7", LCREG, ppc64.REG_C7}, {"CR7", LCREG, ppc64.REG_CR7},
{"R", LR, 0}, {"R", LR, 0},
{"R0", LREG, ppc64.REG_R0}, {"R0", LREG, ppc64.REG_R0},
{"R1", LREG, ppc64.REG_R1}, {"R1", LREG, ppc64.REG_R1},
......
src/cmd/9a/y.go
View file @ 2b417dc3
...@@ -1651,7 +1651,7 @@ yydefault: ...@@ -1651,7 +1651,7 @@ yydefault:
{ {
yyVAL.addr = nullgen yyVAL.addr = nullgen
yyVAL.addr.Type = obj.TYPE_REG yyVAL.addr.Type = obj.TYPE_REG
yyVAL.addr.Reg = int16(REG_C0 + yyDollar[3].lval) yyVAL.addr.Reg = int16(REG_CR0 + yyDollar[3].lval)
} }
case 142: case 142:
yyDollar = yyS[yypt-1 : yypt+1] yyDollar = yyS[yypt-1 : yypt+1]
......
src/cmd/asm/internal/arch/arch.go
View file @ 2b417dc3
...@@ -372,9 +372,8 @@ func archPPC64() *Arch { ...@@ -372,9 +372,8 @@ func archPPC64() *Arch {
for i := ppc64.REG_F0; i <= ppc64.REG_F31; i++ { for i := ppc64.REG_F0; i <= ppc64.REG_F31; i++ {
register[obj.Rconv(i)] = int16(i) register[obj.Rconv(i)] = int16(i)
} }
for i := ppc64.REG_C0; i <= ppc64.REG_C7; i++ { for i := ppc64.REG_CR0; i <= ppc64.REG_CR7; i++ {
// TODO: Rconv prints these as C7 but the input syntax requires CR7. register[obj.Rconv(i)] = int16(i)
register[fmt.Sprintf("CR%d", i-ppc64.REG_C0)] = int16(i)
} }
for i := ppc64.REG_MSR; i <= ppc64.REG_CR; i++ { for i := ppc64.REG_MSR; i <= ppc64.REG_CR; i++ {
register[obj.Rconv(i)] = int16(i) register[obj.Rconv(i)] = int16(i)
......
src/cmd/asm/internal/arch/ppc64.go
View file @ 2b417dc3
...@@ -68,7 +68,7 @@ func ppc64RegisterNumber(name string, n int16) (int16, bool) { ...@@ -68,7 +68,7 @@ func ppc64RegisterNumber(name string, n int16) (int16, bool) {
switch name { switch name {
case "CR": case "CR":
if 0 <= n && n <= 7 { if 0 <= n && n <= 7 {
return ppc64.REG_C0 + n, true return ppc64.REG_CR0 + n, true
} }
case "F": case "F":
if 0 <= n && n <= 31 { if 0 <= n && n <= 31 {
......
src/cmd/asm/internal/asm/operand_test.go
View file @ 2b417dc3
...@@ -359,7 +359,7 @@ var ppc64OperandTests = []operandTest{ ...@@ -359,7 +359,7 @@ var ppc64OperandTests = []operandTest{
{"-1(R4)", "-1(R4)"}, {"-1(R4)", "-1(R4)"},
{"-1(R5)", "-1(R5)"}, {"-1(R5)", "-1(R5)"},
{"6(PC)", "6(PC)"}, {"6(PC)", "6(PC)"},
{"CR7", "C7"}, // TODO: Should print CR7. {"CR7", "CR7"},
{"CTR", "CTR"}, {"CTR", "CTR"},
{"F14", "F14"}, {"F14", "F14"},
{"F15", "F15"}, {"F15", "F15"},
......
src/cmd/asm/internal/asm/testdata/ppc64.out
View file @ 2b417dc3
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
145 00031 (testdata/ppc64.s:145) MOVFL FPSCR,F1 145 00031 (testdata/ppc64.s:145) MOVFL FPSCR,F1
151 00032 (testdata/ppc64.s:151) MOVFL F1,FPSCR 151 00032 (testdata/ppc64.s:151) MOVFL F1,FPSCR
157 00033 (testdata/ppc64.s:157) MOVFL F1,$4,FPSCR 157 00033 (testdata/ppc64.s:157) MOVFL F1,$4,FPSCR
163 00034 (testdata/ppc64.s:163) MOVFL FPSCR,C0 163 00034 (testdata/ppc64.s:163) MOVFL FPSCR,CR0
184 00035 (testdata/ppc64.s:184) MOVW R1,C1 184 00035 (testdata/ppc64.s:184) MOVW R1,CR1
190 00036 (testdata/ppc64.s:190) MOVW R1,CR 190 00036 (testdata/ppc64.s:190) MOVW R1,CR
202 00037 (testdata/ppc64.s:202) ADD R1,R2,R3 202 00037 (testdata/ppc64.s:202) ADD R1,R2,R3
208 00038 (testdata/ppc64.s:208) ADD $1,R2,R3 208 00038 (testdata/ppc64.s:208) ADD $1,R2,R3
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
292 00049 (testdata/ppc64.s:292) MOVW $1,R1 292 00049 (testdata/ppc64.s:292) MOVW $1,R1
298 00050 (testdata/ppc64.s:298) MOVW $1,R1 298 00050 (testdata/ppc64.s:298) MOVW $1,R1
299 00051 (testdata/ppc64.s:299) MOVW $foo(SB),R1 299 00051 (testdata/ppc64.s:299) MOVW $foo(SB),R1
323 00052 (testdata/ppc64.s:323) MOVFL C0,C1 323 00052 (testdata/ppc64.s:323) MOVFL CR0,CR1
335 00053 (testdata/ppc64.s:335) MOVW CR,R1 335 00053 (testdata/ppc64.s:335) MOVW CR,R1
341 00054 (testdata/ppc64.s:341) MOVW SPR(0),R1 341 00054 (testdata/ppc64.s:341) MOVW SPR(0),R1
342 00055 (testdata/ppc64.s:342) MOVW SPR(7),R1 342 00055 (testdata/ppc64.s:342) MOVW SPR(7),R1
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
387 00063 (testdata/ppc64.s:387) JMP ,4(R1) 387 00063 (testdata/ppc64.s:387) JMP ,4(R1)
388 00064 (testdata/ppc64.s:388) JMP ,foo(SB) 388 00064 (testdata/ppc64.s:388) JMP ,foo(SB)
394 00065 (testdata/ppc64.s:394) JMP ,CTR 394 00065 (testdata/ppc64.s:394) JMP ,CTR
413 00066 (testdata/ppc64.s:413) BEQ C1,67(PC) 413 00066 (testdata/ppc64.s:413) BEQ CR1,67(PC)
414 00067 (testdata/ppc64.s:414) BEQ C1,66 414 00067 (testdata/ppc64.s:414) BEQ CR1,66
440 00068 (testdata/ppc64.s:440) BC 4,CTR 440 00068 (testdata/ppc64.s:440) BC 4,CTR
450 00069 (testdata/ppc64.s:450) BC $3,R4,66 450 00069 (testdata/ppc64.s:450) BC $3,R4,66
470 00070 (testdata/ppc64.s:470) BC $3,R3,LR 470 00070 (testdata/ppc64.s:470) BC $3,R3,LR
...@@ -73,11 +73,11 @@ ...@@ -73,11 +73,11 @@
512 00073 (testdata/ppc64.s:512) FADD F1,F2,F3 512 00073 (testdata/ppc64.s:512) FADD F1,F2,F3
518 00074 (testdata/ppc64.s:518) FMADD F1,F2,F3,F4 518 00074 (testdata/ppc64.s:518) FMADD F1,F2,F3,F4
524 00075 (testdata/ppc64.s:524) FCMPU F1,F2 524 00075 (testdata/ppc64.s:524) FCMPU F1,F2
530 00076 (testdata/ppc64.s:530) FCMPU F1,F2,C0 530 00076 (testdata/ppc64.s:530) FCMPU F1,F2,CR0
539 00077 (testdata/ppc64.s:539) CMP R1,R2 539 00077 (testdata/ppc64.s:539) CMP R1,R2
545 00078 (testdata/ppc64.s:545) CMP R1,$4 545 00078 (testdata/ppc64.s:545) CMP R1,$4
551 00079 (testdata/ppc64.s:551) CMP R1,C0,R2 551 00079 (testdata/ppc64.s:551) CMP R1,CR0,R2
557 00080 (testdata/ppc64.s:557) CMP R1,C0,$4 557 00080 (testdata/ppc64.s:557) CMP R1,CR0,$4
566 00081 (testdata/ppc64.s:566) RLDC $4,R1,$5,R2 566 00081 (testdata/ppc64.s:566) RLDC $4,R1,$5,R2
572 00082 (testdata/ppc64.s:572) RLDC $26,R1,$201326592,R2 572 00082 (testdata/ppc64.s:572) RLDC $26,R1,$201326592,R2
578 00083 (testdata/ppc64.s:578) RLDC R1,R2,$4,R3 578 00083 (testdata/ppc64.s:578) RLDC R1,R2,$4,R3
......
src/cmd/internal/obj/ppc64/9.out.go
View file @ 2b417dc3
...@@ -110,14 +110,14 @@ const ( ...@@ -110,14 +110,14 @@ const (
REG_F30 REG_F30
REG_F31 REG_F31
REG_SPECIAL = obj.RBasePPC64 + 64 REG_SPECIAL = obj.RBasePPC64 + 64
REG_C0 = obj.RBasePPC64 + 64 + iota - 65 REG_CR0 = obj.RBasePPC64 + 64 + iota - 65
REG_C1 REG_CR1
REG_C2 REG_CR2
REG_C3 REG_CR3
REG_C4 REG_CR4
REG_C5 REG_CR5
REG_C6 REG_CR6
REG_C7 REG_CR7
REG_MSR = obj.RBasePPC64 + 72 + iota - 73 REG_MSR = obj.RBasePPC64 + 72 + iota - 73
REG_FPSCR REG_FPSCR
REG_CR REG_CR
......
src/cmd/internal/obj/ppc64/asm9.go
View file @ 2b417dc3
...@@ -554,7 +554,7 @@ func aclass(ctxt *obj.Link, a *obj.Addr) int { ...@@ -554,7 +554,7 @@ func aclass(ctxt *obj.Link, a *obj.Addr) int {
if REG_F0 <= a.Reg && a.Reg <= REG_F31 { if REG_F0 <= a.Reg && a.Reg <= REG_F31 {
return C_FREG return C_FREG
} }
if REG_C0 <= a.Reg && a.Reg <= REG_C7 || a.Reg == REG_CR { if REG_CR0 <= a.Reg && a.Reg <= REG_CR7 || a.Reg == REG_CR {
return C_CREG return C_CREG
} }
if REG_SPR0 <= a.Reg && a.Reg <= REG_SPR0+1023 { if REG_SPR0 <= a.Reg && a.Reg <= REG_SPR0+1023 {
...@@ -2343,13 +2343,13 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) { ...@@ -2343,13 +2343,13 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) {
o1 = AOP_RRR(o1, uint32(r), 0, 0) | (uint32(v)&0x1f)<<16 | ((uint32(v)>>5)&0x1f)<<11 o1 = AOP_RRR(o1, uint32(r), 0, 0) | (uint32(v)&0x1f)<<16 | ((uint32(v)>>5)&0x1f)<<11
case 67: /* mcrf crfD,crfS */ case 67: /* mcrf crfD,crfS */
if p.From.Type != obj.TYPE_REG || p.From.Reg < REG_C0 || REG_C7 < p.From.Reg || p.To.Type != obj.TYPE_REG || p.To.Reg < REG_C0 || REG_C7 < p.To.Reg { if p.From.Type != obj.TYPE_REG || p.From.Reg < REG_CR0 || REG_CR7 < p.From.Reg || p.To.Type != obj.TYPE_REG || p.To.Reg < REG_CR0 || REG_CR7 < p.To.Reg {
ctxt.Diag("illegal CR field number\n%v", p) ctxt.Diag("illegal CR field number\n%v", p)
} }
o1 = AOP_RRR(OP_MCRF, ((uint32(p.To.Reg) & 7) << 2), ((uint32(p.From.Reg) & 7) << 2), 0) o1 = AOP_RRR(OP_MCRF, ((uint32(p.To.Reg) & 7) << 2), ((uint32(p.From.Reg) & 7) << 2), 0)
case 68: /* mfcr rD; mfocrf CRM,rD */ case 68: /* mfcr rD; mfocrf CRM,rD */
if p.From.Type == obj.TYPE_REG && REG_C0 <= p.From.Reg && p.From.Reg <= REG_C7 { if p.From.Type == obj.TYPE_REG && REG_CR0 <= p.From.Reg && p.From.Reg <= REG_CR7 {
v = 1 << uint(7-(p.To.Reg&7)) /* CR(n) */ v = 1 << uint(7-(p.To.Reg&7)) /* CR(n) */
o1 = AOP_RRR(OP_MFCR, uint32(p.To.Reg), 0, 0) | 1<<20 | uint32(v)<<12 /* new form, mfocrf */ o1 = AOP_RRR(OP_MFCR, uint32(p.To.Reg), 0, 0) | 1<<20 | uint32(v)<<12 /* new form, mfocrf */
} else { } else {
...@@ -2392,7 +2392,7 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) { ...@@ -2392,7 +2392,7 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) {
o1 = AOP_RRR(uint32(oprrr(ctxt, int(p.As))), uint32(p.From.Reg), 0, uint32(p.To.Reg)) o1 = AOP_RRR(uint32(oprrr(ctxt, int(p.As))), uint32(p.From.Reg), 0, uint32(p.To.Reg))
case 73: /* mcrfs crfD,crfS */ case 73: /* mcrfs crfD,crfS */
if p.From.Type != obj.TYPE_REG || p.From.Reg != REG_FPSCR || p.To.Type != obj.TYPE_REG || p.To.Reg < REG_C0 || REG_C7 < p.To.Reg { if p.From.Type != obj.TYPE_REG || p.From.Reg != REG_FPSCR || p.To.Type != obj.TYPE_REG || p.To.Reg < REG_CR0 || REG_CR7 < p.To.Reg {
ctxt.Diag("illegal FPSCR/CR field number\n%v", p) ctxt.Diag("illegal FPSCR/CR field number\n%v", p)
} }
o1 = AOP_RRR(OP_MCRFS, ((uint32(p.To.Reg) & 7) << 2), ((0 & 7) << 2), 0) o1 = AOP_RRR(OP_MCRFS, ((uint32(p.To.Reg) & 7) << 2), ((0 & 7) << 2), 0)
......
src/cmd/internal/obj/ppc64/list9.go
View file @ 2b417dc3
...@@ -142,8 +142,8 @@ func Rconv(r int) string { ...@@ -142,8 +142,8 @@ func Rconv(r int) string {
if REG_F0 <= r && r <= REG_F31 { if REG_F0 <= r && r <= REG_F31 {
return fmt.Sprintf("F%d", r-REG_F0) return fmt.Sprintf("F%d", r-REG_F0)
} }
if REG_C0 <= r && r <= REG_C7 { if REG_CR0 <= r && r <= REG_CR7 {
return fmt.Sprintf("C%d", r-REG_C0) return fmt.Sprintf("CR%d", r-REG_CR0)
} }
if r == REG_CR { if r == REG_CR {
return "CR" return "CR"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7