Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile/internal/gc: rename Thearch to thearch

Browse source 
Prepared using gorename.

Change-Id: Id55dac9ae5446a8bfeac06e7995b35f4c249eeca
Reviewed-on: https://go-review.googlesource.com/38302
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
This commit is contained in:
Matthew Dempsky 2017-03-17 13:35:36 -07:00
parent 3e2f980e27
commit 09272ae981
9 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/compile/internal/gc/align.go
View file

@ -20,7 +20,7 @@ func offmod(t *Type) {
for _, f := range t.Fields().Slice() { for _, f := range t.Fields().Slice() {
f.Offset = int64(o) f.Offset = int64(o)
o += int32(Widthptr) o += int32(Widthptr)
if int64(o) >= Thearch.MAXWIDTH { if int64(o) >= thearch.MAXWIDTH {
yyerror("interface too large") yyerror("interface too large")
o = int32(Widthptr) o = int32(Widthptr)
} }
@ -74,7 +74,7 @@ func widstruct(errtype *Type, t *Type, o int64, flag int) int64 {
lastzero = o lastzero = o
} }
o += w o += w
maxwidth := Thearch.MAXWIDTH maxwidth := thearch.MAXWIDTH
// On 32-bit systems, reflect tables impose an additional constraint // On 32-bit systems, reflect tables impose an additional constraint
// that each field start offset must fit in 31 bits. // that each field start offset must fit in 31 bits.
if maxwidth < 1<<32 { if maxwidth < 1<<32 {
@ -258,7 +258,7 @@ func dowidth(t *Type) {
dowidth(t.Elem()) dowidth(t.Elem())
if t.Elem().Width != 0 { if t.Elem().Width != 0 {
cap := (uint64(Thearch.MAXWIDTH) - 1) / uint64(t.Elem().Width) cap := (uint64(thearch.MAXWIDTH) - 1) / uint64(t.Elem().Width)
if uint64(t.NumElem()) > cap { if uint64(t.NumElem()) > cap {
yyerror("type %L larger than address space", t) yyerror("type %L larger than address space", t)
} }

2
src/cmd/compile/internal/gc/go.go
View file

@ -382,7 +382,7 @@ type Arch struct {
var pcloc int32 var pcloc int32
var Thearch Arch var thearch Arch
var ( var (
staticbytes, staticbytes,

14
src/cmd/compile/internal/gc/main.go
View file

@ -112,9 +112,9 @@ func Main(archInit func(*Arch)) {
defer hidePanic() defer hidePanic()
archInit(&Thearch) archInit(&thearch)
Ctxt = obj.Linknew(Thearch.LinkArch) Ctxt = obj.Linknew(thearch.LinkArch)
Ctxt.DebugInfo = debuginfo Ctxt.DebugInfo = debuginfo
Ctxt.DiagFunc = yyerror Ctxt.DiagFunc = yyerror
Ctxt.Bso = bufio.NewWriter(os.Stdout) Ctxt.Bso = bufio.NewWriter(os.Stdout)
@ -208,11 +208,11 @@ func Main(archInit func(*Arch)) {
flag.BoolVar(&use_writebarrier, "wb", true, "enable write barrier") flag.BoolVar(&use_writebarrier, "wb", true, "enable write barrier")
var flag_shared bool var flag_shared bool
var flag_dynlink bool var flag_dynlink bool
if supportsDynlink(Thearch.LinkArch.Arch) { if supportsDynlink(thearch.LinkArch.Arch) {
flag.BoolVar(&flag_shared, "shared", false, "generate code that can be linked into a shared library") flag.BoolVar(&flag_shared, "shared", false, "generate code that can be linked into a shared library")
flag.BoolVar(&flag_dynlink, "dynlink", false, "support references to Go symbols defined in other shared libraries") flag.BoolVar(&flag_dynlink, "dynlink", false, "support references to Go symbols defined in other shared libraries")
} }
if Thearch.LinkArch.Family == sys.AMD64 { if thearch.LinkArch.Family == sys.AMD64 {
flag.BoolVar(&flag_largemodel, "largemodel", false, "generate code that assumes a large memory model") flag.BoolVar(&flag_largemodel, "largemodel", false, "generate code that assumes a large memory model")
} }
flag.StringVar(&cpuprofile, "cpuprofile", "", "write cpu profile to `file`") flag.StringVar(&cpuprofile, "cpuprofile", "", "write cpu profile to `file`")
@ -336,9 +336,9 @@ func Main(archInit func(*Arch)) {
Debug['l'] = 1 - Debug['l'] Debug['l'] = 1 - Debug['l']
} }
Widthint = Thearch.LinkArch.IntSize Widthint = thearch.LinkArch.IntSize
Widthptr = Thearch.LinkArch.PtrSize Widthptr = thearch.LinkArch.PtrSize
Widthreg = Thearch.LinkArch.RegSize Widthreg = thearch.LinkArch.RegSize
initUniverse() initUniverse()

4
src/cmd/compile/internal/gc/pgen.go
View file

@ -273,7 +273,7 @@ func (s *ssaExport) AllocFrame(f *ssa.Func) {
dowidth(n.Type) dowidth(n.Type)
w := n.Type.Width w := n.Type.Width
if w >= Thearch.MAXWIDTH || w < 0 { if w >= thearch.MAXWIDTH || w < 0 {
Fatalf("bad width") Fatalf("bad width")
} }
Stksize += w Stksize += w
@ -281,7 +281,7 @@ func (s *ssaExport) AllocFrame(f *ssa.Func) {
if haspointers(n.Type) { if haspointers(n.Type) {
stkptrsize = Stksize stkptrsize = Stksize
} }
if Thearch.LinkArch.InFamily(sys.MIPS, sys.MIPS64, sys.ARM, sys.ARM64, sys.PPC64, sys.S390X) { if thearch.LinkArch.InFamily(sys.MIPS, sys.MIPS64, sys.ARM, sys.ARM64, sys.PPC64, sys.S390X) {
Stksize = Rnd(Stksize, int64(Widthptr)) Stksize = Rnd(Stksize, int64(Widthptr))
} }
if Stksize >= 1<<31 { if Stksize >= 1<<31 {

2
src/cmd/compile/internal/gc/plive.go
View file

@ -508,7 +508,7 @@ func (lv *Liveness) progeffects(prog *obj.Prog) (uevar, varkill, avarinit []int3
varkill = lv.cache.varkill[:0] varkill = lv.cache.varkill[:0]
avarinit = lv.cache.avarinit[:0] avarinit = lv.cache.avarinit[:0]
info := Thearch.Proginfo(prog) info := thearch.Proginfo(prog)
if info.Flags&(LeftRead|LeftWrite|LeftAddr) != 0 { if info.Flags&(LeftRead|LeftWrite|LeftAddr) != 0 {
from := &prog.From from := &prog.From

2
src/cmd/compile/internal/gc/sinit.go
View file

@ -1226,7 +1226,7 @@ func stataddr(nam *Node, n *Node) bool {
} }
// Check for overflow. // Check for overflow.
if n.Type.Width != 0 && Thearch.MAXWIDTH/n.Type.Width <= int64(l) { if n.Type.Width != 0 && thearch.MAXWIDTH/n.Type.Width <= int64(l) {
break break
} }
nam.Xoffset += int64(l) * n.Type.Width nam.Xoffset += int64(l) * n.Type.Width

36
src/cmd/compile/internal/gc/ssa.go
View file

@ -23,9 +23,9 @@ var ssaExp ssaExport
var ssaCache *ssa.Cache var ssaCache *ssa.Cache
func initssaconfig() { func initssaconfig() {
ssaConfig = ssa.NewConfig(Thearch.LinkArch.Name, &ssaExp, Ctxt, Debug['N'] == 0) ssaConfig = ssa.NewConfig(thearch.LinkArch.Name, &ssaExp, Ctxt, Debug['N'] == 0)
if Thearch.LinkArch.Name == "386" { if thearch.LinkArch.Name == "386" {
ssaConfig.Set387(Thearch.Use387) ssaConfig.Set387(thearch.Use387)
} }
ssaCache = new(ssa.Cache) ssaCache = new(ssa.Cache)
} }
@ -1549,18 +1549,18 @@ func (s *state) expr(n *Node) *ssa.Value {
if ft.IsFloat() || tt.IsFloat() { if ft.IsFloat() || tt.IsFloat() {
conv, ok := fpConvOpToSSA[twoTypes{s.concreteEtype(ft), s.concreteEtype(tt)}] conv, ok := fpConvOpToSSA[twoTypes{s.concreteEtype(ft), s.concreteEtype(tt)}]
if s.config.IntSize == 4 && Thearch.LinkArch.Name != "amd64p32" && Thearch.LinkArch.Family != sys.MIPS { if s.config.IntSize == 4 && thearch.LinkArch.Name != "amd64p32" && thearch.LinkArch.Family != sys.MIPS {
if conv1, ok1 := fpConvOpToSSA32[twoTypes{s.concreteEtype(ft), s.concreteEtype(tt)}]; ok1 { if conv1, ok1 := fpConvOpToSSA32[twoTypes{s.concreteEtype(ft), s.concreteEtype(tt)}]; ok1 {
conv = conv1 conv = conv1
} }
} }
if Thearch.LinkArch.Name == "arm64" { if thearch.LinkArch.Name == "arm64" {
if conv1, ok1 := uint64fpConvOpToSSA[twoTypes{s.concreteEtype(ft), s.concreteEtype(tt)}]; ok1 { if conv1, ok1 := uint64fpConvOpToSSA[twoTypes{s.concreteEtype(ft), s.concreteEtype(tt)}]; ok1 {
conv = conv1 conv = conv1
} }
} }
if Thearch.LinkArch.Family == sys.MIPS { if thearch.LinkArch.Family == sys.MIPS {
if ft.Size() == 4 && ft.IsInteger() && !ft.IsSigned() { if ft.Size() == 4 && ft.IsInteger() && !ft.IsSigned() {
// tt is float32 or float64, and ft is also unsigned // tt is float32 or float64, and ft is also unsigned
if tt.Size() == 4 { if tt.Size() == 4 {
@ -2850,7 +2850,7 @@ func findIntrinsic(sym *Sym) intrinsicBuilder {
return nil return nil
} }
fn := sym.Name fn := sym.Name
return intrinsics[intrinsicKey{Thearch.LinkArch.Arch, pkg, fn}] return intrinsics[intrinsicKey{thearch.LinkArch.Arch, pkg, fn}]
} }
func isIntrinsicCall(n *Node) bool { func isIntrinsicCall(n *Node) bool {
@ -3378,7 +3378,7 @@ func (s *state) rtcall(fn *obj.LSym, returns bool, results []*Type, args ...*ssa
off += size off += size
} }
off = Rnd(off, int64(Widthptr)) off = Rnd(off, int64(Widthptr))
if Thearch.LinkArch.Name == "amd64p32" { if thearch.LinkArch.Name == "amd64p32" {
// amd64p32 wants 8-byte alignment of the start of the return values. // amd64p32 wants 8-byte alignment of the start of the return values.
off = Rnd(off, 8) off = Rnd(off, 8)
} }
@ -4226,7 +4226,7 @@ func genssa(f *ssa.Func, ptxt *obj.Prog, gcargs, gclocals *Sym) {
blockProgs[pc] = f.Blocks[0] blockProgs[pc] = f.Blocks[0]
} }
if Thearch.Use387 { if thearch.Use387 {
s.SSEto387 = map[int16]int16{} s.SSEto387 = map[int16]int16{}
} }
@ -4237,7 +4237,7 @@ func genssa(f *ssa.Func, ptxt *obj.Prog, gcargs, gclocals *Sym) {
for i, b := range f.Blocks { for i, b := range f.Blocks {
s.bstart[b.ID] = pc s.bstart[b.ID] = pc
// Emit values in block // Emit values in block
Thearch.SSAMarkMoves(&s, b) thearch.SSAMarkMoves(&s, b)
for _, v := range b.Values { for _, v := range b.Values {
x := pc x := pc
s.SetPos(v.Pos) s.SetPos(v.Pos)
@ -4267,7 +4267,7 @@ func genssa(f *ssa.Func, ptxt *obj.Prog, gcargs, gclocals *Sym) {
default: default:
// let the backend handle it // let the backend handle it
Thearch.SSAGenValue(&s, v) thearch.SSAGenValue(&s, v)
} }
if logProgs { if logProgs {
@ -4287,7 +4287,7 @@ func genssa(f *ssa.Func, ptxt *obj.Prog, gcargs, gclocals *Sym) {
} }
x := pc x := pc
s.SetPos(b.Pos) s.SetPos(b.Pos)
Thearch.SSAGenBlock(&s, b, next) thearch.SSAGenBlock(&s, b, next)
if logProgs { if logProgs {
for ; x != pc; x = x.Link { for ; x != pc; x = x.Link {
blockProgs[x] = b blockProgs[x] = b
@ -4345,7 +4345,7 @@ func genssa(f *ssa.Func, ptxt *obj.Prog, gcargs, gclocals *Sym) {
liveness(Curfn, ptxt, gcargs, gclocals) liveness(Curfn, ptxt, gcargs, gclocals)
// Add frame prologue. Zero ambiguously live variables. // Add frame prologue. Zero ambiguously live variables.
Thearch.Defframe(ptxt) thearch.Defframe(ptxt)
if Debug['f'] != 0 { if Debug['f'] != 0 {
frame(0) frame(0)
} }
@ -4570,7 +4570,7 @@ func AddrAuto(a *obj.Addr, v *ssa.Value) {
a.Type = obj.TYPE_MEM a.Type = obj.TYPE_MEM
a.Node = n a.Node = n
a.Sym = Linksym(n.Sym) a.Sym = Linksym(n.Sym)
a.Reg = int16(Thearch.REGSP) a.Reg = int16(thearch.REGSP)
a.Offset = n.Xoffset + off a.Offset = n.Xoffset + off
if n.Class == PPARAM || n.Class == PPARAMOUT { if n.Class == PPARAM || n.Class == PPARAMOUT {
a.Name = obj.NAME_PARAM a.Name = obj.NAME_PARAM
@ -4587,7 +4587,7 @@ func (s *SSAGenState) AddrScratch(a *obj.Addr) {
a.Name = obj.NAME_AUTO a.Name = obj.NAME_AUTO
a.Node = s.ScratchFpMem a.Node = s.ScratchFpMem
a.Sym = Linksym(s.ScratchFpMem.Sym) a.Sym = Linksym(s.ScratchFpMem.Sym)
a.Reg = int16(Thearch.REGSP) a.Reg = int16(thearch.REGSP)
a.Offset = s.ScratchFpMem.Xoffset a.Offset = s.ScratchFpMem.Xoffset
} }
@ -4601,7 +4601,7 @@ func (s *SSAGenState) Call(v *ssa.Value) *obj.Prog {
// insert an actual hardware NOP that will have the right line number. // insert an actual hardware NOP that will have the right line number.
// This is different from obj.ANOP, which is a virtual no-op // This is different from obj.ANOP, which is a virtual no-op
// that doesn't make it into the instruction stream. // that doesn't make it into the instruction stream.
Thearch.Ginsnop() thearch.Ginsnop()
} }
p := Prog(obj.ACALL) p := Prog(obj.ACALL)
@ -4611,7 +4611,7 @@ func (s *SSAGenState) Call(v *ssa.Value) *obj.Prog {
p.To.Sym = sym p.To.Sym = sym
} else { } else {
// TODO(mdempsky): Can these differences be eliminated? // TODO(mdempsky): Can these differences be eliminated?
switch Thearch.LinkArch.Family { switch thearch.LinkArch.Family {
case sys.AMD64, sys.I386, sys.PPC64, sys.S390X: case sys.AMD64, sys.I386, sys.PPC64, sys.S390X:
p.To.Type = obj.TYPE_REG p.To.Type = obj.TYPE_REG
case sys.ARM, sys.ARM64, sys.MIPS, sys.MIPS64: case sys.ARM, sys.ARM64, sys.MIPS, sys.MIPS64:
@ -4768,7 +4768,7 @@ func (e *ssaExport) SplitInt64(name ssa.LocalSlot) (ssa.LocalSlot, ssa.LocalSlot
return ssa.LocalSlot{N: h, Type: t, Off: 0}, ssa.LocalSlot{N: l, Type: Types[TUINT32], Off: 0} return ssa.LocalSlot{N: h, Type: t, Off: 0}, ssa.LocalSlot{N: l, Type: Types[TUINT32], Off: 0}
} }
// Return the two parts of the larger variable. // Return the two parts of the larger variable.
if Thearch.LinkArch.ByteOrder == binary.BigEndian { if thearch.LinkArch.ByteOrder == binary.BigEndian {
return ssa.LocalSlot{N: n, Type: t, Off: name.Off}, ssa.LocalSlot{N: n, Type: Types[TUINT32], Off: name.Off + 4} return ssa.LocalSlot{N: n, Type: t, Off: name.Off}, ssa.LocalSlot{N: n, Type: Types[TUINT32], Off: name.Off + 4}
} }
return ssa.LocalSlot{N: n, Type: t, Off: name.Off + 4}, ssa.LocalSlot{N: n, Type: Types[TUINT32], Off: name.Off} return ssa.LocalSlot{N: n, Type: t, Off: name.Off + 4}, ssa.LocalSlot{N: n, Type: Types[TUINT32], Off: name.Off}

2
src/cmd/compile/internal/gc/subr.go
View file

@ -1766,7 +1766,7 @@ func genwrapper(rcvr *Type, method *Field, newnam *Sym, iface int) {
// the TOC to the appropriate value for that module. But if it returns // the TOC to the appropriate value for that module. But if it returns
// directly to the wrapper's caller, nothing will reset it to the correct // directly to the wrapper's caller, nothing will reset it to the correct
// value for that function. // value for that function.
if !instrumenting && rcvr.IsPtr() && methodrcvr.IsPtr() && method.Embedded != 0 && !isifacemethod(method.Type) && !(Thearch.LinkArch.Name == "ppc64le" && Ctxt.Flag_dynlink) { if !instrumenting && rcvr.IsPtr() && methodrcvr.IsPtr() && method.Embedded != 0 && !isifacemethod(method.Type) && !(thearch.LinkArch.Name == "ppc64le" && Ctxt.Flag_dynlink) {
// generate tail call: adjust pointer receiver and jump to embedded method. // generate tail call: adjust pointer receiver and jump to embedded method.
dot = dot.Left // skip final .M dot = dot.Left // skip final .M
// TODO(mdempsky): Remove dependency on dotlist. // TODO(mdempsky): Remove dependency on dotlist.

4
src/cmd/compile/internal/gc/walk.go
View file

@ -1009,7 +1009,7 @@ opswitch:
n = walkexpr(n, init) n = walkexpr(n, init)
case OCONV, OCONVNOP: case OCONV, OCONVNOP:
if Thearch.LinkArch.Family == sys.ARM || Thearch.LinkArch.Family == sys.MIPS { if thearch.LinkArch.Family == sys.ARM || thearch.LinkArch.Family == sys.MIPS {
if n.Left.Type.IsFloat() { if n.Left.Type.IsFloat() {
if n.Type.Etype == TINT64 { if n.Type.Etype == TINT64 {
n = mkcall("float64toint64", n.Type, init, conv(n.Left, Types[TFLOAT64])) n = mkcall("float64toint64", n.Type, init, conv(n.Left, Types[TFLOAT64]))
@ -1035,7 +1035,7 @@ opswitch:
} }
} }
if Thearch.LinkArch.Family == sys.I386 { if thearch.LinkArch.Family == sys.I386 {
if n.Left.Type.IsFloat() { if n.Left.Type.IsFloat() {
if n.Type.Etype == TINT64 { if n.Type.Etype == TINT64 {
n = mkcall("float64toint64", n.Type, init, conv(n.Left, Types[TFLOAT64])) n = mkcall("float64toint64", n.Type, init, conv(n.Left, Types[TFLOAT64]))