cmd/compile: remove more dead code

Change-Id: I0131b0d7421ff1397f16a08eff758250abbdf8e2
Reviewed-on: https://go-review.googlesource.com/29239
Reviewed-by: Dave Cheney <dave@cheney.net>

diff --git a/src/cmd/compile/internal/amd64/prog.go b/src/cmd/compile/internal/amd64/prog.go
index b8f6f0612d5c77e696a90f9c4da798dcd57b11fc..42b3c4d82ecdb41dc90c27f97dda4ec2a8a97282 100644 (file)
--- a/src/cmd/compile/internal/amd64/prog.go
+++ b/src/cmd/compile/internal/amd64/prog.go
@@ -274,18 +274,6 @@ var progtable = [x86.ALAST & obj.AMask]obj.ProgInfo{
        x86.AXORPS & obj.AMask:    {Flags: gc.LeftRead | RightRdwr},
 }
 
-func progflags(p *obj.Prog) uint32 {
-       flags := progtable[p.As&obj.AMask].Flags
-       if flags&gc.ImulAXDX != 0 && p.To.Type != obj.TYPE_NONE {
-               flags |= RightRdwr
-       }
-       return flags
-}
-
-func progcarryflags(p *obj.Prog) uint32 {
-       return progtable[p.As&obj.AMask].Flags
-}
-
 func proginfo(p *obj.Prog) {
        info := &p.Info
        *info = progtable[p.As&obj.AMask]

diff --git a/src/cmd/compile/internal/arm/gsubr.go b/src/cmd/compile/internal/arm/gsubr.go
index e6e2139d48028def2deea1f2a0c7b57800e0b58a..30c2b75598500dfc0ac821dacd52a8029e126491 100644 (file)
--- a/src/cmd/compile/internal/arm/gsubr.go
+++ b/src/cmd/compile/internal/arm/gsubr.go
@@ -30,31 +30,9 @@
 
 package arm
 
-import (
-       "cmd/compile/internal/gc"
-       "cmd/internal/obj"
-       "cmd/internal/obj/arm"
-)
+import "cmd/internal/obj/arm"
 
 var resvd = []int{
        arm.REG_R9,  // formerly reserved for m; might be okay to reuse now; not sure about NaCl
        arm.REG_R10, // reserved for g
 }
-
-/*
- * insert n into reg slot of p
- */
-func raddr(n *gc.Node, p *obj.Prog) {
-       var a obj.Addr
-       gc.Naddr(&a, n)
-       if a.Type != obj.TYPE_REG {
-               if n != nil {
-                       gc.Fatalf("bad in raddr: %v", n.Op)
-               } else {
-                       gc.Fatalf("bad in raddr: <null>")
-               }
-               p.Reg = 0
-       } else {
-               p.Reg = a.Reg
-       }
-}

diff --git a/src/cmd/compile/internal/arm64/gsubr.go b/src/cmd/compile/internal/arm64/gsubr.go
index b6b71f01bea98f2baf63d6a685dfde20df35d431..f65ffe54b5820a04fb1f1bccfbe6b40f21a705a1 100644 (file)
--- a/src/cmd/compile/internal/arm64/gsubr.go
+++ b/src/cmd/compile/internal/arm64/gsubr.go
@@ -30,11 +30,7 @@
 
 package arm64
 
-import (
-       "cmd/compile/internal/gc"
-       "cmd/internal/obj"
-       "cmd/internal/obj/arm64"
-)
+import "cmd/internal/obj/arm64"
 
 var resvd = []int{
        arm64.REGTMP,
@@ -43,22 +39,3 @@ var resvd = []int{
        arm64.REGRT2,
        arm64.REG_R31, // REGZERO and REGSP
 }
-
-/*
- * insert n into reg slot of p
- */
-func raddr(n *gc.Node, p *obj.Prog) {
-       var a obj.Addr
-
-       gc.Naddr(&a, n)
-       if a.Type != obj.TYPE_REG {
-               if n != nil {
-                       gc.Fatalf("bad in raddr: %v", n.Op)
-               } else {
-                       gc.Fatalf("bad in raddr: <null>")
-               }
-               p.Reg = 0
-       } else {
-               p.Reg = a.Reg
-       }
-}

diff --git a/src/cmd/compile/internal/gc/gsubr.go b/src/cmd/compile/internal/gc/gsubr.go
index c0150fd0304a26f86aae88b0e6765a02fca81593..291fb5645c4d47939e997e0ed3a4aa9db2dc119b 100644 (file)
--- a/src/cmd/compile/internal/gc/gsubr.go
+++ b/src/cmd/compile/internal/gc/gsubr.go
@@ -601,23 +601,3 @@ func Gins(as obj.As, f, t *Node) *obj.Prog {
        }
        return p
 }
-
-var reg [100]int       // count of references to reg
-var regstk [100][]byte // allocation sites, when -v is given
-
-func ginit() {
-       for r := range reg {
-               reg[r] = 1
-       }
-
-       for r := Thearch.REGMIN; r <= Thearch.REGMAX; r++ {
-               reg[r-Thearch.REGMIN] = 0
-       }
-       for r := Thearch.FREGMIN; r <= Thearch.FREGMAX; r++ {
-               reg[r-Thearch.REGMIN] = 0
-       }
-
-       for _, r := range Thearch.ReservedRegs {
-               reg[r-Thearch.REGMIN] = 1
-       }
-}

diff --git a/src/cmd/compile/internal/gc/pgen.go b/src/cmd/compile/internal/gc/pgen.go
index bfe1cd21b0443d6cb5fb3824bb8d7a7cb9cc61b0..95618175eb9ce28bef09b19faa4d96e6c0b5f3af 100644 (file)
--- a/src/cmd/compile/internal/gc/pgen.go
+++ b/src/cmd/compile/internal/gc/pgen.go
@@ -420,8 +420,6 @@ func compile(fn *Node) {
                }
        }
 
-       ginit()
-
        gcargs := makefuncdatasym("gcargs·", obj.FUNCDATA_ArgsPointerMaps)
        gclocals := makefuncdatasym("gclocals·", obj.FUNCDATA_LocalsPointerMaps)