Skip to content

Commit 544010a

Browse files
mdempskymdempsky
committed
cmd/compile: remove Betypeinit
Change-Id: I5c2fd0ff1b49f3826f2b9869b0b11329804b0e2a Reviewed-on: https://go-review.googlesource.com/29244 Run-TryBot: Matthew Dempsky <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Dave Cheney <[email protected]>
1 parent 1f2930c commit 544010a

9 files changed

Lines changed: 5 additions & 39 deletions

File tree

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,18 @@ import (
1010
"cmd/internal/obj/x86"
1111
)
1212

13-
var (
14-
leaptr = x86.ALEAQ
15-
)
16-
17-
func betypeinit() {
18-
if obj.GOARCH == "amd64p32" {
19-
leaptr = x86.ALEAL
20-
}
21-
}
13+
var leaptr = x86.ALEAQ
2214

2315
func Main() {
2416
gc.Thearch.LinkArch = &x86.Linkamd64
2517
if obj.GOARCH == "amd64p32" {
2618
gc.Thearch.LinkArch = &x86.Linkamd64p32
19+
leaptr = x86.ALEAL
2720
}
2821
gc.Thearch.REGSP = x86.REGSP
2922
gc.Thearch.REGCTXT = x86.REGCTXT
3023
gc.Thearch.MAXWIDTH = 1 << 50
3124

32-
gc.Thearch.Betypeinit = betypeinit
3325
gc.Thearch.Defframe = defframe
3426
gc.Thearch.Proginfo = proginfo
3527

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,12 @@ import (
1010
"cmd/internal/obj/arm"
1111
)
1212

13-
func betypeinit() {
14-
}
15-
1613
func Main() {
1714
gc.Thearch.LinkArch = &arm.Linkarm
1815
gc.Thearch.REGSP = arm.REGSP
1916
gc.Thearch.REGCTXT = arm.REGCTXT
2017
gc.Thearch.MAXWIDTH = (1 << 32) - 1
2118

22-
gc.Thearch.Betypeinit = betypeinit
2319
gc.Thearch.Defframe = defframe
2420
gc.Thearch.Proginfo = proginfo
2521

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,12 @@ import (
1010
"cmd/internal/obj/arm64"
1111
)
1212

13-
func betypeinit() {
14-
}
15-
1613
func Main() {
1714
gc.Thearch.LinkArch = &arm64.Linkarm64
1815
gc.Thearch.REGSP = arm64.REGSP
1916
gc.Thearch.REGCTXT = arm64.REGCTXT
2017
gc.Thearch.MAXWIDTH = 1 << 50
2118

22-
gc.Thearch.Betypeinit = betypeinit
2319
gc.Thearch.Defframe = defframe
2420
gc.Thearch.Proginfo = proginfo
2521

‎src/cmd/compile/internal/gc/go.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,9 @@ type Arch struct {
359359
REGCTXT int
360360
MAXWIDTH int64
361361

362-
Betypeinit func()
363-
Defframe func(*obj.Prog)
364-
Proginfo func(*obj.Prog) // fills in Prog.Info
365-
Use387 bool // should 8g use 387 FP instructions instead of sse2.
362+
Defframe func(*obj.Prog)
363+
Proginfo func(*obj.Prog) // fills in Prog.Info
364+
Use387 bool // should 8g use 387 FP instructions instead of sse2.
366365

367366
// SSARegToReg maps ssa register numbers to obj register numbers.
368367
SSARegToReg []int16

‎src/cmd/compile/internal/gc/main.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ func Main() {
291291
Debug['l'] = 1 - Debug['l']
292292
}
293293

294-
Thearch.Betypeinit()
295294
Widthint = Thearch.LinkArch.IntSize
296295
Widthptr = Thearch.LinkArch.PtrSize
297296
Widthreg = Thearch.LinkArch.RegSize

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import (
1111
"cmd/internal/obj/mips"
1212
)
1313

14-
func betypeinit() {
15-
}
16-
1714
func Main() {
1815
gc.Thearch.LinkArch = &mips.Linkmips64
1916
if obj.GOARCH == "mips64le" {
@@ -23,7 +20,6 @@ func Main() {
2320
gc.Thearch.REGCTXT = mips.REGCTXT
2421
gc.Thearch.MAXWIDTH = 1 << 50
2522

26-
gc.Thearch.Betypeinit = betypeinit
2723
gc.Thearch.Defframe = defframe
2824
gc.Thearch.Proginfo = proginfo
2925

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import (
1010
"cmd/internal/obj/ppc64"
1111
)
1212

13-
func betypeinit() {
14-
}
15-
1613
func Main() {
1714
gc.Thearch.LinkArch = &ppc64.Linkppc64
1815
if obj.GOARCH == "ppc64le" {
@@ -22,7 +19,6 @@ func Main() {
2219
gc.Thearch.REGCTXT = ppc64.REGCTXT
2320
gc.Thearch.MAXWIDTH = 1 << 50
2421

25-
gc.Thearch.Betypeinit = betypeinit
2622
gc.Thearch.Defframe = defframe
2723
gc.Thearch.Proginfo = proginfo
2824

‎src/cmd/compile/internal/s390x/galign.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@ import (
99
"cmd/internal/obj/s390x"
1010
)
1111

12-
func betypeinit() {
13-
}
14-
1512
func Main() {
1613
gc.Thearch.LinkArch = &s390x.Links390x
1714
gc.Thearch.REGSP = s390x.REGSP
1815
gc.Thearch.REGCTXT = s390x.REGCTXT
1916
gc.Thearch.MAXWIDTH = 1 << 50
2017

21-
gc.Thearch.Betypeinit = betypeinit
2218
gc.Thearch.Defframe = defframe
2319
gc.Thearch.Proginfo = proginfo
2420

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import (
1212
"os"
1313
)
1414

15-
func betypeinit() {
16-
}
17-
1815
func Main() {
1916
gc.Thearch.LinkArch = &x86.Link386
2017
gc.Thearch.REGSP = x86.REGSP
@@ -29,7 +26,6 @@ func Main() {
2926
}
3027
gc.Thearch.MAXWIDTH = (1 << 32) - 1
3128

32-
gc.Thearch.Betypeinit = betypeinit
3329
gc.Thearch.Defframe = defframe
3430
gc.Thearch.Proginfo = proginfo
3531

0 commit comments

Comments
 (0)