cmd/all: stop generating ADATA Progs

The only remaining place that generated ADATA
Prog was the assembler. Stop, and delete some
now-dead code.

Passes toolstash -cmp.

Change-Id: I26578ff1b4868e98562b44f69d909c083e96f8d5
Reviewed-on: https://go-review.googlesource.com/20646
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/asm/internal/asm/asm.go b/src/cmd/asm/internal/asm/asm.go
index a59fb2303866a0dff9e3411ca2c2e19358e66bb6..235fc9ea86f886b9cfbc70fc326e828144582dcd 100644 (file)
--- a/src/cmd/asm/internal/asm/asm.go
+++ b/src/cmd/asm/internal/asm/asm.go
@@ -219,18 +219,23 @@ func (p *Parser) asmData(word string, operands [][]lex.Token) {
        }
        p.dataAddr[name] = nameAddr.Offset + int64(scale)
 
-       prog := &obj.Prog{
-               Ctxt:   p.ctxt,
-               As:     obj.ADATA,
-               Lineno: p.histLineNum,
-               From:   nameAddr,
-               From3: &obj.Addr{
-                       Offset: int64(scale),
-               },
-               To: valueAddr,
+       switch valueAddr.Type {
+       case obj.TYPE_CONST:
+               nameAddr.Sym.WriteInt(p.ctxt, nameAddr.Offset, int64(scale), valueAddr.Offset)
+       case obj.TYPE_FCONST:
+               switch scale {
+               case 4:
+                       nameAddr.Sym.WriteFloat32(p.ctxt, nameAddr.Offset, float32(valueAddr.Val.(float64)))
+               case 8:
+                       nameAddr.Sym.WriteFloat64(p.ctxt, nameAddr.Offset, valueAddr.Val.(float64))
+               default:
+                       panic("bad float scale")
+               }
+       case obj.TYPE_SCONST:
+               nameAddr.Sym.WriteString(p.ctxt, nameAddr.Offset, int64(scale), valueAddr.Val.(string))
+       case obj.TYPE_ADDR:
+               nameAddr.Sym.WriteAddr(p.ctxt, nameAddr.Offset, int64(scale), valueAddr.Sym, valueAddr.Offset)
        }
-
-       p.append(prog, "", false)
 }
 
 // asmGlobl assembles a GLOBL pseudo-op.

diff --git a/src/cmd/compile/internal/arm/peep.go b/src/cmd/compile/internal/arm/peep.go
index 700b909fe5dfce8fcc4b67bd5bcf370480b2c4f6..9e5bba5a611d1531676d990aed190a2572ee3397 100644 (file)
--- a/src/cmd/compile/internal/arm/peep.go
+++ b/src/cmd/compile/internal/arm/peep.go
@@ -1547,7 +1547,6 @@ func predicable(p *obj.Prog) bool {
        switch p.As {
        case obj.ANOP,
                obj.AXXX,
-               obj.ADATA,
                obj.AGLOBL,
                obj.ATEXT,
                arm.AWORD:

diff --git a/src/cmd/compile/internal/gc/gsubr.go b/src/cmd/compile/internal/gc/gsubr.go
index 9584176d9d1d71e35afcbbac35ced456a4eac209..072a66634bf42190f58fbc6f8add7176c4b3a935 100644 (file)
--- a/src/cmd/compile/internal/gc/gsubr.go
+++ b/src/cmd/compile/internal/gc/gsubr.go
@@ -100,7 +100,7 @@ func Gbranch(as obj.As, t *Type, likely int) *obj.Prog {
 func Prog(as obj.As) *obj.Prog {
        var p *obj.Prog
 
-       if as == obj.ADATA || as == obj.AGLOBL {
+       if as == obj.AGLOBL {
                if ddumped {
                        Fatalf("already dumped data")
                }

diff --git a/src/cmd/compile/internal/gc/plive.go b/src/cmd/compile/internal/gc/plive.go
index 683989a720950e0349642871dd0b38b2290e54cd..d5129864522ac2c3af186fad02ca31e432a7f979 100644 (file)
--- a/src/cmd/compile/internal/gc/plive.go
+++ b/src/cmd/compile/internal/gc/plive.go
@@ -864,7 +864,7 @@ func checkptxt(fn *Node, firstp *obj.Prog) {
                if false {
                        fmt.Printf("analyzing '%v'\n", p)
                }
-               if p.As != obj.ADATA && p.As != obj.AGLOBL && p.As != obj.ATYPE {
+               if p.As != obj.AGLOBL && p.As != obj.ATYPE {
                        checkprog(fn, p)
                }
        }

diff --git a/src/cmd/internal/obj/data.go b/src/cmd/internal/obj/data.go
index ad31aee7f0857dc3c5672dbdceccbee692fbeea0..1f09c9de124f2f64408f6a312853c421e247e00e 100644 (file)
--- a/src/cmd/internal/obj/data.go
+++ b/src/cmd/internal/obj/data.go
@@ -110,65 +110,6 @@ func (s *LSym) WriteString(ctxt *Link, off, siz int64, str string) {
        copy(s.P[off:off+siz], str)
 }
 
-func savedata(ctxt *Link, p *Prog) {
-       s := p.From.Sym
-       off := int32(p.From.Offset)
-       siz := int32(p.From3.Offset)
-       if off < 0 || siz < 0 || off >= 1<<30 || siz >= 100 {
-               log.Fatalf("savedata: bad off=%d siz=%d", off, siz)
-       }
-       if s.Type == SBSS || s.Type == STLSBSS {
-               ctxt.Diag("cannot supply data for BSS var")
-       }
-       Symgrow(ctxt, s, int64(off+siz))
-
-       switch p.To.Type {
-       default:
-               ctxt.Diag("bad data: %v", p)
-
-       case TYPE_FCONST:
-               switch siz {
-               default:
-                       ctxt.Diag("unexpected %d-byte floating point constant", siz)
-
-               case 4:
-                       flt := math.Float32bits(float32(p.To.Val.(float64)))
-                       ctxt.Arch.ByteOrder.PutUint32(s.P[off:], flt)
-
-               case 8:
-                       flt := math.Float64bits(p.To.Val.(float64))
-                       ctxt.Arch.ByteOrder.PutUint64(s.P[off:], flt)
-               }
-
-       case TYPE_SCONST:
-               copy(s.P[off:off+siz], p.To.Val.(string))
-
-       case TYPE_CONST, TYPE_ADDR:
-               if p.To.Sym != nil || p.To.Type == TYPE_ADDR {
-                       r := Addrel(s)
-                       r.Off = off
-                       r.Siz = uint8(siz)
-                       r.Sym = p.To.Sym
-                       r.Type = R_ADDR
-                       r.Add = p.To.Offset
-                       break
-               }
-               o := p.To.Offset
-               switch siz {
-               default:
-                       ctxt.Diag("unexpected %d-byte integer constant", siz)
-               case 1:
-                       s.P[off] = byte(o)
-               case 2:
-                       ctxt.Arch.ByteOrder.PutUint16(s.P[off:], uint16(o))
-               case 4:
-                       ctxt.Arch.ByteOrder.PutUint32(s.P[off:], uint32(o))
-               case 8:
-                       ctxt.Arch.ByteOrder.PutUint64(s.P[off:], uint64(o))
-               }
-       }
-}
-
 func Addrel(s *LSym) *Reloc {
        s.R = append(s.R, Reloc{})
        return &s.R[len(s.R)-1]

diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go
index 91837145efd779fc3afe7b705eaedc3536e94613..cfd4c736751829aba6dd02a13cbaa6a54baf1e15 100644 (file)
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@ -198,7 +198,7 @@ const (
 )
 
 // TODO(rsc): Describe prog.
-// TODO(rsc): Describe TEXT/GLOBL flag in from3, DATA width in from3.
+// TODO(rsc): Describe TEXT/GLOBL flag in from3
 type Prog struct {
        Ctxt   *Link
        Link   *Prog
@@ -266,7 +266,7 @@ const (
        AXXX As = iota
        ACALL
        ACHECKNIL
-       ADATA
+       ADATA // used only by the assembler for parsing
        ADUFFCOPY
        ADUFFZERO
        AEND

diff --git a/src/cmd/internal/obj/objfile.go b/src/cmd/internal/obj/objfile.go
index 0920edafff6c1d5e246059ff5f6032fc589b3305..21641a4c2000ba8556c3e166d6479435bf0fbdc5 100644 (file)
--- a/src/cmd/internal/obj/objfile.go
+++ b/src/cmd/internal/obj/objfile.go
@@ -200,10 +200,6 @@ func flushplist(ctxt *Link, freeProgs bool) {
                                ctxt.Edata = s
                                continue
 
-                       case ADATA:
-                               savedata(ctxt, p)
-                               continue
-
                        case ATEXT:
                                s := p.From.Sym
                                if s == nil {

diff --git a/src/cmd/internal/obj/util.go b/src/cmd/internal/obj/util.go
index bd533a003638eacf0ec800812cc22bdce84f22bd..05cfd8c720935ab96b870a3772470a897511c5f7 100644 (file)
--- a/src/cmd/internal/obj/util.go
+++ b/src/cmd/internal/obj/util.go
@@ -288,7 +288,7 @@ func (p *Prog) String() string {
                sep = ", "
        }
        if p.From3Type() != TYPE_NONE {
-               if p.From3.Type == TYPE_CONST && (p.As == ADATA || p.As == ATEXT || p.As == AGLOBL) {
+               if p.From3.Type == TYPE_CONST && (p.As == ATEXT || p.As == AGLOBL) {
                        // Special case - omit $.
                        fmt.Fprintf(&buf, "%s%d", sep, p.From3.Offset)
                } else {

diff --git a/src/cmd/internal/obj/x86/asm6.go b/src/cmd/internal/obj/x86/asm6.go
index c976481229416c3c3ca6385c9304abfd99a47c52..481b08b304d2b72665de8b00559ec93de695a682 100644 (file)
--- a/src/cmd/internal/obj/x86/asm6.go
+++ b/src/cmd/internal/obj/x86/asm6.go
@@ -1100,7 +1100,6 @@ var optab =
        {ACQO, ynone, Pw, [23]uint8{0x99}},
        {ADAA, ynone, P32, [23]uint8{0x27}},
        {ADAS, ynone, P32, [23]uint8{0x2f}},
-       {obj.ADATA, nil, 0, [23]uint8{}},
        {ADECB, yincb, Pb, [23]uint8{0xfe, 01}},
        {ADECL, yincl, Px1, [23]uint8{0x48, 0xff, 01}},
        {ADECQ, yincq, Pw, [23]uint8{0xff, 01}},