cmd/compile: remove Betypeinit

Change-Id: I5c2fd0ff1b49f3826f2b9869b0b11329804b0e2a
Reviewed-on: https://go-review.googlesource.com/29244
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>

diff --git a/src/cmd/compile/internal/amd64/galign.go b/src/cmd/compile/internal/amd64/galign.go
index 364509292fe8905038d8d3373f753f67a8be62c0..cd15864c2b221ffa1e0b9498c32bd2a786d2c558 100644 (file)
--- a/src/cmd/compile/internal/amd64/galign.go
+++ b/src/cmd/compile/internal/amd64/galign.go
@@ -10,26 +10,18 @@ import (
        "cmd/internal/obj/x86"
 )
 
-var (
-       leaptr = x86.ALEAQ
-)
-
-func betypeinit() {
-       if obj.GOARCH == "amd64p32" {
-               leaptr = x86.ALEAL
-       }
-}
+var leaptr = x86.ALEAQ
 
 func Main() {
        gc.Thearch.LinkArch = &x86.Linkamd64
        if obj.GOARCH == "amd64p32" {
                gc.Thearch.LinkArch = &x86.Linkamd64p32
+               leaptr = x86.ALEAL
        }
        gc.Thearch.REGSP = x86.REGSP
        gc.Thearch.REGCTXT = x86.REGCTXT
        gc.Thearch.MAXWIDTH = 1 << 50
 
-       gc.Thearch.Betypeinit = betypeinit
        gc.Thearch.Defframe = defframe
        gc.Thearch.Proginfo = proginfo
 

diff --git a/src/cmd/compile/internal/arm/galign.go b/src/cmd/compile/internal/arm/galign.go
index db124f7a815b623eb161a6a4b2b0e8f6e0e9695a..e16ca42ebc6a75235649ee443224f82c18544d5f 100644 (file)
--- a/src/cmd/compile/internal/arm/galign.go
+++ b/src/cmd/compile/internal/arm/galign.go
@@ -10,16 +10,12 @@ import (
        "cmd/internal/obj/arm"
 )
 
-func betypeinit() {
-}
-
 func Main() {
        gc.Thearch.LinkArch = &arm.Linkarm
        gc.Thearch.REGSP = arm.REGSP
        gc.Thearch.REGCTXT = arm.REGCTXT
        gc.Thearch.MAXWIDTH = (1 << 32) - 1
 
-       gc.Thearch.Betypeinit = betypeinit
        gc.Thearch.Defframe = defframe
        gc.Thearch.Proginfo = proginfo
 

diff --git a/src/cmd/compile/internal/arm64/galign.go b/src/cmd/compile/internal/arm64/galign.go
index 27600579fa0c6cede696268adc99e36407eec021..f93684cc8511786b72fe75e7c91311c50729b5c0 100644 (file)
--- a/src/cmd/compile/internal/arm64/galign.go
+++ b/src/cmd/compile/internal/arm64/galign.go
@@ -10,16 +10,12 @@ import (
        "cmd/internal/obj/arm64"
 )
 
-func betypeinit() {
-}
-
 func Main() {
        gc.Thearch.LinkArch = &arm64.Linkarm64
        gc.Thearch.REGSP = arm64.REGSP
        gc.Thearch.REGCTXT = arm64.REGCTXT
        gc.Thearch.MAXWIDTH = 1 << 50
 
-       gc.Thearch.Betypeinit = betypeinit
        gc.Thearch.Defframe = defframe
        gc.Thearch.Proginfo = proginfo
 

diff --git a/src/cmd/compile/internal/gc/go.go b/src/cmd/compile/internal/gc/go.go
index b44ad19e0d5a7c75d31d49178f1cd1d22e73bb82..154b2792d3d547c4fc52567b0c4b1d7eab3b057b 100644 (file)
--- a/src/cmd/compile/internal/gc/go.go
+++ b/src/cmd/compile/internal/gc/go.go
@@ -359,10 +359,9 @@ type Arch struct {
        REGCTXT  int
        MAXWIDTH int64
 
-       Betypeinit func()
-       Defframe   func(*obj.Prog)
-       Proginfo   func(*obj.Prog) // fills in Prog.Info
-       Use387     bool            // should 8g use 387 FP instructions instead of sse2.
+       Defframe func(*obj.Prog)
+       Proginfo func(*obj.Prog) // fills in Prog.Info
+       Use387   bool            // should 8g use 387 FP instructions instead of sse2.
 
        // SSARegToReg maps ssa register numbers to obj register numbers.
        SSARegToReg []int16

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 079ff9c57d8715fe553cae8195d90628b8fa68e2..5179f68f4af431fb4ebfbc34ce016da71bde1715 100644 (file)
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -291,7 +291,6 @@ func Main() {
                Debug['l'] = 1 - Debug['l']
        }
 
-       Thearch.Betypeinit()
        Widthint = Thearch.LinkArch.IntSize
        Widthptr = Thearch.LinkArch.PtrSize
        Widthreg = Thearch.LinkArch.RegSize

diff --git a/src/cmd/compile/internal/mips64/galign.go b/src/cmd/compile/internal/mips64/galign.go
index a7ea66df0c2437552c133aa326c81f0ede0fb127..6371ac0a442c260a8ffc54d3f4facb5b6816682e 100644 (file)
--- a/src/cmd/compile/internal/mips64/galign.go
+++ b/src/cmd/compile/internal/mips64/galign.go
@@ -11,9 +11,6 @@ import (
        "cmd/internal/obj/mips"
 )
 
-func betypeinit() {
-}
-
 func Main() {
        gc.Thearch.LinkArch = &mips.Linkmips64
        if obj.GOARCH == "mips64le" {
@@ -23,7 +20,6 @@ func Main() {
        gc.Thearch.REGCTXT = mips.REGCTXT
        gc.Thearch.MAXWIDTH = 1 << 50
 
-       gc.Thearch.Betypeinit = betypeinit
        gc.Thearch.Defframe = defframe
        gc.Thearch.Proginfo = proginfo
 

diff --git a/src/cmd/compile/internal/ppc64/galign.go b/src/cmd/compile/internal/ppc64/galign.go
index 1bbac5c868a9d59392aaa5154bb4367c88837a85..461aa315188e2a2ed7ca008f33139c3eb452ddb0 100644 (file)
--- a/src/cmd/compile/internal/ppc64/galign.go
+++ b/src/cmd/compile/internal/ppc64/galign.go
@@ -10,9 +10,6 @@ import (
        "cmd/internal/obj/ppc64"
 )
 
-func betypeinit() {
-}
-
 func Main() {
        gc.Thearch.LinkArch = &ppc64.Linkppc64
        if obj.GOARCH == "ppc64le" {
@@ -22,7 +19,6 @@ func Main() {
        gc.Thearch.REGCTXT = ppc64.REGCTXT
        gc.Thearch.MAXWIDTH = 1 << 50
 
-       gc.Thearch.Betypeinit = betypeinit
        gc.Thearch.Defframe = defframe
        gc.Thearch.Proginfo = proginfo
 

diff --git a/src/cmd/compile/internal/s390x/galign.go b/src/cmd/compile/internal/s390x/galign.go
index 5cf44345506ff7c72d3013b5ce9352d7edf7bd3f..2d4757511a95fb5194acbddf963947dec90621cd 100644 (file)
--- a/src/cmd/compile/internal/s390x/galign.go
+++ b/src/cmd/compile/internal/s390x/galign.go
@@ -9,16 +9,12 @@ import (
        "cmd/internal/obj/s390x"
 )
 
-func betypeinit() {
-}
-
 func Main() {
        gc.Thearch.LinkArch = &s390x.Links390x
        gc.Thearch.REGSP = s390x.REGSP
        gc.Thearch.REGCTXT = s390x.REGCTXT
        gc.Thearch.MAXWIDTH = 1 << 50
 
-       gc.Thearch.Betypeinit = betypeinit
        gc.Thearch.Defframe = defframe
        gc.Thearch.Proginfo = proginfo
 

diff --git a/src/cmd/compile/internal/x86/galign.go b/src/cmd/compile/internal/x86/galign.go
index 9c014678c1910f1a15008b1115172555e7464e6d..83ef330aac559873888fb2ded24e54b81bf58fb8 100644 (file)
--- a/src/cmd/compile/internal/x86/galign.go
+++ b/src/cmd/compile/internal/x86/galign.go
@@ -12,9 +12,6 @@ import (
        "os"
 )
 
-func betypeinit() {
-}
-
 func Main() {
        gc.Thearch.LinkArch = &x86.Link386
        gc.Thearch.REGSP = x86.REGSP
@@ -29,7 +26,6 @@ func Main() {
        }
        gc.Thearch.MAXWIDTH = (1 << 32) - 1
 
-       gc.Thearch.Betypeinit = betypeinit
        gc.Thearch.Defframe = defframe
        gc.Thearch.Proginfo = proginfo