Skip to content

Commit 8a0bd5d

Browse files
mdempskymdempsky
committed
cmd/compile: eliminate differences in appendpp functions
Consistently use int16 for [ft]reg and int64 for [ft]offset. Change-Id: I7d279bb6e4fb735105429234a949074bf1cefb29 Reviewed-on: https://go-review.googlesource.com/29215 Run-TryBot: Matthew Dempsky <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Michael Hudson-Doyle <[email protected]>
1 parent 838eaa7 commit 8a0bd5d

6 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎src/cmd/compile/internal/amd64/ggen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,16 @@ func zerorange(p *obj.Prog, frame int64, lo int64, hi int64, ax *uint32, x0 *uin
166166
return p
167167
}
168168

169-
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int, foffset int64, ttype obj.AddrType, treg int, toffset int64) *obj.Prog {
169+
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int16, foffset int64, ttype obj.AddrType, treg int16, toffset int64) *obj.Prog {
170170
q := gc.Ctxt.NewProg()
171171
gc.Clearp(q)
172172
q.As = as
173173
q.Lineno = p.Lineno
174174
q.From.Type = ftype
175-
q.From.Reg = int16(freg)
175+
q.From.Reg = freg
176176
q.From.Offset = foffset
177177
q.To.Type = ttype
178-
q.To.Reg = int16(treg)
178+
q.To.Reg = treg
179179
q.To.Offset = toffset
180180
q.Link = p.Link
181181
p.Link = q

‎src/cmd/compile/internal/arm/ggen.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,20 @@ func zerorange(p *obj.Prog, frame int64, lo int64, hi int64, r0 *uint32) *obj.Pr
6868

6969
if cnt < int64(4*gc.Widthptr) {
7070
for i := int64(0); i < cnt; i += int64(gc.Widthptr) {
71-
p = appendpp(p, arm.AMOVW, obj.TYPE_REG, arm.REG_R0, 0, obj.TYPE_MEM, arm.REGSP, int32(4+frame+lo+i))
71+
p = appendpp(p, arm.AMOVW, obj.TYPE_REG, arm.REG_R0, 0, obj.TYPE_MEM, arm.REGSP, 4+frame+lo+i)
7272
}
7373
} else if !gc.Nacl && (cnt <= int64(128*gc.Widthptr)) {
74-
p = appendpp(p, arm.AADD, obj.TYPE_CONST, 0, int32(4+frame+lo), obj.TYPE_REG, arm.REG_R1, 0)
74+
p = appendpp(p, arm.AADD, obj.TYPE_CONST, 0, 4+frame+lo, obj.TYPE_REG, arm.REG_R1, 0)
7575
p.Reg = arm.REGSP
7676
p = appendpp(p, obj.ADUFFZERO, obj.TYPE_NONE, 0, 0, obj.TYPE_MEM, 0, 0)
7777
f := gc.Sysfunc("duffzero")
7878
gc.Naddr(&p.To, f)
7979
gc.Afunclit(&p.To, f)
8080
p.To.Offset = 4 * (128 - cnt/int64(gc.Widthptr))
8181
} else {
82-
p = appendpp(p, arm.AADD, obj.TYPE_CONST, 0, int32(4+frame+lo), obj.TYPE_REG, arm.REG_R1, 0)
82+
p = appendpp(p, arm.AADD, obj.TYPE_CONST, 0, 4+frame+lo, obj.TYPE_REG, arm.REG_R1, 0)
8383
p.Reg = arm.REGSP
84-
p = appendpp(p, arm.AADD, obj.TYPE_CONST, 0, int32(cnt), obj.TYPE_REG, arm.REG_R2, 0)
84+
p = appendpp(p, arm.AADD, obj.TYPE_CONST, 0, cnt, obj.TYPE_REG, arm.REG_R2, 0)
8585
p.Reg = arm.REG_R1
8686
p = appendpp(p, arm.AMOVW, obj.TYPE_REG, arm.REG_R0, 0, obj.TYPE_MEM, arm.REG_R1, 4)
8787
p1 := p
@@ -95,17 +95,17 @@ func zerorange(p *obj.Prog, frame int64, lo int64, hi int64, r0 *uint32) *obj.Pr
9595
return p
9696
}
9797

98-
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int, foffset int32, ttype obj.AddrType, treg int, toffset int32) *obj.Prog {
98+
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int16, foffset int64, ttype obj.AddrType, treg int16, toffset int64) *obj.Prog {
9999
q := gc.Ctxt.NewProg()
100100
gc.Clearp(q)
101101
q.As = as
102102
q.Lineno = p.Lineno
103103
q.From.Type = ftype
104-
q.From.Reg = int16(freg)
105-
q.From.Offset = int64(foffset)
104+
q.From.Reg = freg
105+
q.From.Offset = foffset
106106
q.To.Type = ttype
107-
q.To.Reg = int16(treg)
108-
q.To.Offset = int64(toffset)
107+
q.To.Reg = treg
108+
q.To.Offset = toffset
109109
q.Link = p.Link
110110
p.Link = q
111111
return q

‎src/cmd/compile/internal/arm64/ggen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ func zerorange(p *obj.Prog, frame int64, lo int64, hi int64) *obj.Prog {
105105
return p
106106
}
107107

108-
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int, foffset int64, ttype obj.AddrType, treg int, toffset int64) *obj.Prog {
108+
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int16, foffset int64, ttype obj.AddrType, treg int16, toffset int64) *obj.Prog {
109109
q := gc.Ctxt.NewProg()
110110
gc.Clearp(q)
111111
q.As = as
112112
q.Lineno = p.Lineno
113113
q.From.Type = ftype
114-
q.From.Reg = int16(freg)
114+
q.From.Reg = freg
115115
q.From.Offset = foffset
116116
q.To.Type = ttype
117-
q.To.Reg = int16(treg)
117+
q.To.Reg = treg
118118
q.To.Offset = toffset
119119
q.Link = p.Link
120120
p.Link = q

‎src/cmd/compile/internal/mips64/ggen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ func zerorange(p *obj.Prog, frame int64, lo int64, hi int64) *obj.Prog {
100100
return p
101101
}
102102

103-
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int, foffset int64, ttype obj.AddrType, treg int, toffset int64) *obj.Prog {
103+
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int16, foffset int64, ttype obj.AddrType, treg int16, toffset int64) *obj.Prog {
104104
q := gc.Ctxt.NewProg()
105105
gc.Clearp(q)
106106
q.As = as
107107
q.Lineno = p.Lineno
108108
q.From.Type = ftype
109-
q.From.Reg = int16(freg)
109+
q.From.Reg = freg
110110
q.From.Offset = foffset
111111
q.To.Type = ttype
112-
q.To.Reg = int16(treg)
112+
q.To.Reg = treg
113113
q.To.Offset = toffset
114114
q.Link = p.Link
115115
p.Link = q

‎src/cmd/compile/internal/ppc64/ggen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@ func zerorange(p *obj.Prog, frame int64, lo int64, hi int64) *obj.Prog {
9292
return p
9393
}
9494

95-
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int, foffset int64, ttype obj.AddrType, treg int, toffset int64) *obj.Prog {
95+
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int16, foffset int64, ttype obj.AddrType, treg int16, toffset int64) *obj.Prog {
9696
q := gc.Ctxt.NewProg()
9797
gc.Clearp(q)
9898
q.As = as
9999
q.Lineno = p.Lineno
100100
q.From.Type = ftype
101-
q.From.Reg = int16(freg)
101+
q.From.Reg = freg
102102
q.From.Offset = foffset
103103
q.To.Type = ttype
104-
q.To.Reg = int16(treg)
104+
q.To.Reg = treg
105105
q.To.Offset = toffset
106106
q.Link = p.Link
107107
p.Link = q

‎src/cmd/compile/internal/x86/ggen.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,16 @@ func zerorange(p *obj.Prog, frame int64, lo int64, hi int64, ax *uint32) *obj.Pr
8484
return p
8585
}
8686

87-
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int, foffset int64, ttype obj.AddrType, treg int, toffset int64) *obj.Prog {
87+
func appendpp(p *obj.Prog, as obj.As, ftype obj.AddrType, freg int16, foffset int64, ttype obj.AddrType, treg int16, toffset int64) *obj.Prog {
8888
q := gc.Ctxt.NewProg()
8989
gc.Clearp(q)
9090
q.As = as
9191
q.Lineno = p.Lineno
9292
q.From.Type = ftype
93-
q.From.Reg = int16(freg)
93+
q.From.Reg = freg
9494
q.From.Offset = foffset
9595
q.To.Type = ttype
96-
q.To.Reg = int16(treg)
96+
q.To.Reg = treg
9797
q.To.Offset = toffset
9898
q.Link = p.Link
9999
p.Link = q

0 commit comments

Comments
 (0)