From 1ec4f227f45f669dfcc017b1eb1d147aca5ac620 Mon Sep 17 00:00:00 2001
From: Dave Cheney <dave@cheney.net>
Date: Sun, 6 Mar 2016 18:40:43 +1100
Subject: [PATCH] cmd/compile/internal/ppc64: clean up table initalisation

Move initproginfo and initvariants to ppc64.Main to avoid checking that
the tables are initialised every time.

Change-Id: I95ff4146a7abc18c42a20bfad716cc80ea8367e5
Reviewed-on: https://go-review.googlesource.com/20286
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 src/cmd/compile/internal/ppc64/galign.go |  3 ++
 src/cmd/compile/internal/ppc64/prog.go   | 37 +++++-------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/cmd/compile/internal/ppc64/galign.go b/src/cmd/compile/internal/ppc64/galign.go
index 9a8773ddd1..b233e19ea6 100644
--- a/src/cmd/compile/internal/ppc64/galign.go
+++ b/src/cmd/compile/internal/ppc64/galign.go
@@ -89,6 +89,9 @@ func Main() {
 	gc.Thearch.Doregbits = doregbits
 	gc.Thearch.Regnames = regnames
 
+	initvariants()
+	initproginfo()
+
 	gc.Main()
 	gc.Exit(0)
 }
diff --git a/src/cmd/compile/internal/ppc64/prog.go b/src/cmd/compile/internal/ppc64/prog.go
index 4cf10d04a9..c028c593ee 100644
--- a/src/cmd/compile/internal/ppc64/prog.go
+++ b/src/cmd/compile/internal/ppc64/prog.go
@@ -105,28 +105,18 @@ var progtable = [ppc64.ALAST]obj.ProgInfo{
 	obj.ADUFFCOPY: {Flags: gc.Call},
 }
 
-var initproginfo_initialized int
-
 func initproginfo() {
 	var addvariant = []int{V_CC, V_V, V_CC | V_V}
 
-	if initproginfo_initialized != 0 {
-		return
-	}
-	initproginfo_initialized = 1
-
 	// Perform one-time expansion of instructions in progtable to
 	// their CC, V, and VCC variants
-	var as2 int
-	var i int
-	var variant int
-	for as := int(0); as < len(progtable); as++ {
+	for as := range progtable {
 		if progtable[as].Flags == 0 {
 			continue
 		}
-		variant = as2variant(as)
-		for i = 0; i < len(addvariant); i++ {
-			as2 = variant2as(as, variant|addvariant[i])
+		variant := as2variant(as)
+		for i := range addvariant {
+			as2 := variant2as(as, variant|addvariant[i])
 			if as2 != 0 && progtable[as2].Flags == 0 {
 				progtable[as2] = progtable[as]
 			}
@@ -135,8 +125,6 @@ func initproginfo() {
 }
 
 func proginfo(p *obj.Prog) {
-	initproginfo()
-
 	info := &p.Info
 	*info = progtable[p.As]
 	if info.Flags == 0 {
@@ -269,26 +257,17 @@ var varianttable = [ppc64.ALAST][4]int{
 	ppc64.AXOR:     {ppc64.AXOR, ppc64.AXORCC, 0, 0},
 }
 
-var initvariants_initialized int
-
 func initvariants() {
-	if initvariants_initialized != 0 {
-		return
-	}
-	initvariants_initialized = 1
-
-	var j int
-	for i := int(0); i < len(varianttable); i++ {
+	for i := range varianttable {
 		if varianttable[i][0] == 0 {
 			// Instruction has no variants
 			varianttable[i][0] = i
-
 			continue
 		}
 
 		// Copy base form to other variants
 		if varianttable[i][0] == i {
-			for j = 0; j < len(varianttable[i]); j++ {
+			for j := range varianttable[i] {
 				varianttable[varianttable[i][j]] = varianttable[i]
 			}
 		}
@@ -297,8 +276,7 @@ func initvariants() {
 
 // as2variant returns the variant (V_*) flags of instruction as.
 func as2variant(as int) int {
-	initvariants()
-	for i := int(0); i < len(varianttable[as]); i++ {
+	for i := range varianttable[as] {
 		if varianttable[as][i] == as {
 			return i
 		}
@@ -310,6 +288,5 @@ func as2variant(as int) int {
 // variant2as returns the instruction as with the given variant (V_*) flags.
 // If no such variant exists, this returns 0.
 func variant2as(as int, flags int) int {
-	initvariants()
 	return varianttable[as][flags]
 }
-- 
2.48.1