[dev.ssa] cmd/compile/internal/ssa: Fix bootstrap of ssa codegen

The cmd/compile/internal/ssa/gen directory can't depend on cmd/internal/gc
because that package doesn't exist in go1.4.  Use strings instead of
constants from that package.

The asm fields seem somewhat redundant to the opcode names we
conventionally use.  Maybe we can just trim the lowercase from the end
of the op name?  At least by default?

Change-Id: I96e8cda44833763951709e2721588fbd34580989
Reviewed-on: https://go-review.googlesource.com/11129
Reviewed-by: Michael Matloob <michaelmatloob@gmail.com>

diff --git a/src/cmd/compile/internal/ssa/gen/AMD64Ops.go b/src/cmd/compile/internal/ssa/gen/AMD64Ops.go
index 0b79a8247c47850359d3a36dfe3b02d3e18e1b49..d99f793179c3643f7bcfc84fcca9f2debee7e1cd 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/AMD64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/AMD64Ops.go
@@ -5,7 +5,6 @@
 package main
 
 import (
-       "cmd/internal/obj/x86"
        "strings"
 )
 
@@ -95,29 +94,29 @@ func init() {
 
        // TODO: 2-address instructions.  Mark ops as needing matching input/output regs.
        var AMD64ops = []opData{
-               {name: "ADDQ", reg: gp21},                       // arg0 + arg1
-               {name: "ADDQconst", reg: gp11},                  // arg0 + auxint
-               {name: "SUBQ", reg: gp21, asm: x86.ASUBQ},       // arg0 - arg1
-               {name: "SUBQconst", reg: gp11, asm: x86.ASUBQ},  // arg0 - auxint
-               {name: "MULQ", reg: gp21, asm: x86.AIMULQ},      // arg0 * arg1
-               {name: "MULQconst", reg: gp11, asm: x86.AIMULQ}, // arg0 * auxint
-               {name: "ANDQ", reg: gp21, asm: x86.AANDQ},       // arg0 & arg1
-               {name: "ANDQconst", reg: gp11, asm: x86.AANDQ},  // arg0 & auxint
-               {name: "SHLQ", reg: gp21shift, asm: x86.ASHLQ},  // arg0 << arg1, shift amount is mod 64
-               {name: "SHLQconst", reg: gp11, asm: x86.ASHLQ},  // arg0 << auxint, shift amount 0-63
-               {name: "SHRQ", reg: gp21shift, asm: x86.ASHRQ},  // unsigned arg0 >> arg1, shift amount is mod 64
-               {name: "SHRQconst", reg: gp11, asm: x86.ASHRQ},  // unsigned arg0 >> auxint, shift amount 0-63
-               {name: "SARQ", reg: gp21shift, asm: x86.ASARQ},  // signed arg0 >> arg1, shift amount is mod 64
-               {name: "SARQconst", reg: gp11, asm: x86.ASARQ},  // signed arg0 >> auxint, shift amount 0-63
+               {name: "ADDQ", reg: gp21},                    // arg0 + arg1
+               {name: "ADDQconst", reg: gp11},               // arg0 + auxint
+               {name: "SUBQ", reg: gp21, asm: "SUBQ"},       // arg0 - arg1
+               {name: "SUBQconst", reg: gp11, asm: "SUBQ"},  // arg0 - auxint
+               {name: "MULQ", reg: gp21, asm: "IMULQ"},      // arg0 * arg1
+               {name: "MULQconst", reg: gp11, asm: "IMULQ"}, // arg0 * auxint
+               {name: "ANDQ", reg: gp21, asm: "ANDQ"},       // arg0 & arg1
+               {name: "ANDQconst", reg: gp11, asm: "ANDQ"},  // arg0 & auxint
+               {name: "SHLQ", reg: gp21shift, asm: "SHLQ"},  // arg0 << arg1, shift amount is mod 64
+               {name: "SHLQconst", reg: gp11, asm: "SHLQ"},  // arg0 << auxint, shift amount 0-63
+               {name: "SHRQ", reg: gp21shift, asm: "SHRQ"},  // unsigned arg0 >> arg1, shift amount is mod 64
+               {name: "SHRQconst", reg: gp11, asm: "SHRQ"},  // unsigned arg0 >> auxint, shift amount 0-63
+               {name: "SARQ", reg: gp21shift, asm: "SARQ"},  // signed arg0 >> arg1, shift amount is mod 64
+               {name: "SARQconst", reg: gp11, asm: "SARQ"},  // signed arg0 >> auxint, shift amount 0-63
 
                {name: "NEGQ", reg: gp11}, // -arg0
 
-               {name: "CMPQ", reg: gp2flags, asm: x86.ACMPQ},      // arg0 compare to arg1
-               {name: "CMPQconst", reg: gp1flags, asm: x86.ACMPQ}, // arg0 compare to auxint
-               {name: "TESTQ", reg: gp2flags, asm: x86.ATESTQ},    // (arg0 & arg1) compare to 0
-               {name: "TESTB", reg: gp2flags, asm: x86.ATESTB},    // (arg0 & arg1) compare to 0
+               {name: "CMPQ", reg: gp2flags, asm: "CMPQ"},      // arg0 compare to arg1
+               {name: "CMPQconst", reg: gp1flags, asm: "CMPQ"}, // arg0 compare to auxint
+               {name: "TESTQ", reg: gp2flags, asm: "TESTQ"},    // (arg0 & arg1) compare to 0
+               {name: "TESTB", reg: gp2flags, asm: "TESTB"},    // (arg0 & arg1) compare to 0
 
-               {name: "SBBQcarrymask", reg: flagsgp1, asm: x86.ASBBQ}, // (int64)(-1) if carry is set, 0 if carry is clear.
+               {name: "SBBQcarrymask", reg: flagsgp1, asm: "SBBQ"}, // (int64)(-1) if carry is set, 0 if carry is clear.
 
                {name: "SETEQ", reg: flagsgp}, // extract == condition from arg0
                {name: "SETNE", reg: flagsgp}, // extract != condition from arg0
@@ -135,14 +134,14 @@ func init() {
                {name: "LEAQ8", reg: gp21},      // arg0 + 8*arg1 + auxint
                {name: "LEAQglobal", reg: gp01}, // no args.  address of aux.(*gc.Sym)
 
-               {name: "MOVBload", reg: gpload},                   // load byte from arg0+auxint. arg1=mem
-               {name: "MOVBQZXload", reg: gpload},                // ditto, extend to uint64
-               {name: "MOVBQSXload", reg: gpload},                // ditto, extend to int64
-               {name: "MOVQload", reg: gpload},                   // load 8 bytes from arg0+auxint. arg1=mem
-               {name: "MOVQloadidx8", reg: gploadidx},            // load 8 bytes from arg0+8*arg1+auxint. arg2=mem
-               {name: "MOVBstore", reg: gpstore, asm: x86.AMOVB}, // store byte in arg1 to arg0+auxint. arg2=mem
-               {name: "MOVQstore", reg: gpstore, asm: x86.AMOVQ}, // store 8 bytes in arg1 to arg0+auxint. arg2=mem
-               {name: "MOVQstoreidx8", reg: gpstoreidx},          // store 8 bytes in arg2 to arg0+8*arg1+auxint. arg3=mem
+               {name: "MOVBload", reg: gpload, asm: "MOVB"},   // load byte from arg0+auxint. arg1=mem
+               {name: "MOVBQZXload", reg: gpload},             // ditto, extend to uint64
+               {name: "MOVBQSXload", reg: gpload},             // ditto, extend to int64
+               {name: "MOVQload", reg: gpload, asm: "MOVQ"},   // load 8 bytes from arg0+auxint. arg1=mem
+               {name: "MOVQloadidx8", reg: gploadidx},         // load 8 bytes from arg0+8*arg1+auxint. arg2=mem
+               {name: "MOVBstore", reg: gpstore, asm: "MOVB"}, // store byte in arg1 to arg0+auxint. arg2=mem
+               {name: "MOVQstore", reg: gpstore, asm: "MOVQ"}, // store 8 bytes in arg1 to arg0+auxint. arg2=mem
+               {name: "MOVQstoreidx8", reg: gpstoreidx},       // store 8 bytes in arg2 to arg0+8*arg1+auxint. arg3=mem
 
                // Load/store from global. Same as the above loads, but arg0 is missing and
                // aux is a GlobalOffset instead of an int64.
@@ -155,7 +154,7 @@ func init() {
 
                {name: "REPMOVSB", reg: regInfo{[]regMask{buildReg("DI"), buildReg("SI"), buildReg("CX")}, buildReg("DI SI CX"), nil}}, // move arg2 bytes from arg1 to arg0.  arg3=mem, returns memory
 
-               {name: "ADDL", reg: gp21, asm: x86.AADDL}, // arg0+arg1
+               {name: "ADDL", reg: gp21, asm: "ADDL"}, // arg0+arg1
 
                // (InvertFlags (CMPQ a b)) == (CMPQ b a)
                // So if we want (SETL (CMPQ a b)) but we can't do that because a is a constant,

diff --git a/src/cmd/compile/internal/ssa/gen/main.go b/src/cmd/compile/internal/ssa/gen/main.go
index a7009647594ff072e5ef588411ccf7ea92e8d2e4..097f513347d060501a6c5510cc73f754532d05d0 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/main.go
+++ b/src/cmd/compile/internal/ssa/gen/main.go
@@ -9,8 +9,6 @@ package main
 
 import (
        "bytes"
-       "cmd/internal/obj"
-       "cmd/internal/obj/x86"
        "fmt"
        "go/format"
        "io/ioutil"
@@ -27,7 +25,7 @@ type arch struct {
 type opData struct {
        name string
        reg  regInfo
-       asm  int16
+       asm  string
 }
 
 type blockData struct {
@@ -114,8 +112,8 @@ func genOp() {
                for _, v := range a.ops {
                        fmt.Fprintln(w, "{")
                        fmt.Fprintf(w, "name:\"%s\",\n", v.name)
-                       if v.asm != 0 {
-                               fmt.Fprintf(w, "asm: x86.A%s,\n", x86.Anames[v.asm-obj.ABaseAMD64])
+                       if v.asm != "" {
+                               fmt.Fprintf(w, "asm: x86.A%s,\n", v.asm)
                        }
                        fmt.Fprintln(w, "reg:regInfo{")
                        fmt.Fprintln(w, "inputs: []regMask{")

diff --git a/src/cmd/compile/internal/ssa/opGen.go b/src/cmd/compile/internal/ssa/opGen.go
index 0b827cf4f0d99726d26db997a5fcd2012ab12429..dfe611e8f4a778ece2abfd1b76448b456cdae686 100644 (file)
--- a/src/cmd/compile/internal/ssa/opGen.go
+++ b/src/cmd/compile/internal/ssa/opGen.go
@@ -566,6 +566,7 @@ var opcodeTable = [...]opInfo{
        },
        {
                name: "MOVBload",
+               asm:  x86.AMOVB,
                reg: regInfo{
                        inputs: []regMask{
                                4295032831, // .AX .CX .DX .BX .SP .BP .SI .DI .R8 .R9 .R10 .R11 .R12 .R13 .R14 .R15 .FP
@@ -605,6 +606,7 @@ var opcodeTable = [...]opInfo{
        },
        {
                name: "MOVQload",
+               asm:  x86.AMOVQ,
                reg: regInfo{
                        inputs: []regMask{
                                4295032831, // .AX .CX .DX .BX .SP .BP .SI .DI .R8 .R9 .R10 .R11 .R12 .R13 .R14 .R15 .FP