diff options
author | Josh Bleecher Snyder <josharian@gmail.com> | 2017-04-28 00:19:49 +0000 |
---|---|---|
committer | Josh Bleecher Snyder <josharian@gmail.com> | 2017-04-28 01:24:13 +0000 |
commit | dae5389d3d2b5303542a6b699eff49307b7ed985 (patch) | |
tree | 3445d4990345f4e9c32d33cc0878b684ba63972c /src/cmd/compile/internal/mips64 | |
parent | 3a342af977ccf8604f49fc776d17c5f3f3e6d293 (diff) | |
download | go-dae5389d3d2b5303542a6b699eff49307b7ed985.tar.gz go-dae5389d3d2b5303542a6b699eff49307b7ed985.zip |
Revert "cmd/compile: add Type.MustSize and Type.MustAlignment"
This reverts commit 94d540a4b6bf68ec472bf4469037955e3133fcf7.
Reason for revert: prefer something along the lines of CL 42018.
Change-Id: I876fe32e98f37d8d725fe55e0fd0ea429c0198e0
Reviewed-on: https://go-review.googlesource.com/42022
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Diffstat (limited to 'src/cmd/compile/internal/mips64')
-rw-r--r-- | src/cmd/compile/internal/mips64/ggen.go | 2 | ||||
-rw-r--r-- | src/cmd/compile/internal/mips64/ssa.go | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/cmd/compile/internal/mips64/ggen.go b/src/cmd/compile/internal/mips64/ggen.go index 28221caa1c..a7e07d3740 100644 --- a/src/cmd/compile/internal/mips64/ggen.go +++ b/src/cmd/compile/internal/mips64/ggen.go @@ -50,7 +50,7 @@ func zerorange(pp *gc.Progs, p *obj.Prog, off, cnt int64, _ *uint32) *obj.Prog { func zeroAuto(pp *gc.Progs, n *gc.Node) { // Note: this code must not clobber any registers. sym := n.Sym.Linksym() - size := n.Type.MustSize() + size := n.Type.Size() for i := int64(0); i < size; i += 8 { p := pp.Prog(mips.AMOVV) p.From.Type = obj.TYPE_REG diff --git a/src/cmd/compile/internal/mips64/ssa.go b/src/cmd/compile/internal/mips64/ssa.go index 93429d3246..487d624ead 100644 --- a/src/cmd/compile/internal/mips64/ssa.go +++ b/src/cmd/compile/internal/mips64/ssa.go @@ -26,13 +26,13 @@ func isHILO(r int16) bool { // loadByType returns the load instruction of the given type. func loadByType(t ssa.Type, r int16) obj.As { if isFPreg(r) { - if t.MustSize() == 4 { // float32 or int32 + if t.Size() == 4 { // float32 or int32 return mips.AMOVF } else { // float64 or int64 return mips.AMOVD } } else { - switch t.MustSize() { + switch t.Size() { case 1: if t.IsSigned() { return mips.AMOVB @@ -61,13 +61,13 @@ func loadByType(t ssa.Type, r int16) obj.As { // storeByType returns the store instruction of the given type. func storeByType(t ssa.Type, r int16) obj.As { if isFPreg(r) { - if t.MustSize() == 4 { // float32 or int32 + if t.Size() == 4 { // float32 or int32 return mips.AMOVF } else { // float64 or int64 return mips.AMOVD } } else { - switch t.MustSize() { + switch t.Size() { case 1: return mips.AMOVB case 2: @@ -322,12 +322,12 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { if a.Op == ssa.OpLoadReg { t := a.Type switch { - case v.Op == ssa.OpMIPS64MOVBreg && t.MustSize() == 1 && t.IsSigned(), - v.Op == ssa.OpMIPS64MOVBUreg && t.MustSize() == 1 && !t.IsSigned(), - v.Op == ssa.OpMIPS64MOVHreg && t.MustSize() == 2 && t.IsSigned(), - v.Op == ssa.OpMIPS64MOVHUreg && t.MustSize() == 2 && !t.IsSigned(), - v.Op == ssa.OpMIPS64MOVWreg && t.MustSize() == 4 && t.IsSigned(), - v.Op == ssa.OpMIPS64MOVWUreg && t.MustSize() == 4 && !t.IsSigned(): + case v.Op == ssa.OpMIPS64MOVBreg && t.Size() == 1 && t.IsSigned(), + v.Op == ssa.OpMIPS64MOVBUreg && t.Size() == 1 && !t.IsSigned(), + v.Op == ssa.OpMIPS64MOVHreg && t.Size() == 2 && t.IsSigned(), + v.Op == ssa.OpMIPS64MOVHUreg && t.Size() == 2 && !t.IsSigned(), + v.Op == ssa.OpMIPS64MOVWreg && t.Size() == 4 && t.IsSigned(), + v.Op == ssa.OpMIPS64MOVWUreg && t.Size() == 4 && !t.IsSigned(): // arg is a proper-typed load, already zero/sign-extended, don't extend again if v.Reg() == v.Args[0].Reg() { return |