diff options
| author | Josh Bleecher Snyder <josharian@gmail.com> | 2017-03-27 11:02:13 -0700 |
|---|---|---|
| committer | Josh Bleecher Snyder <josharian@gmail.com> | 2017-03-27 18:51:30 +0000 |
| commit | 1acba7d4fafef57d44bbd757abce58d632ee8475 (patch) | |
| tree | d8ce8c918e8e34658c4dcbac03e2df30aaa3352f /src/cmd/internal/obj/arm | |
| parent | 2b4274d66767039bab5dee4639a7558b101f46a0 (diff) | |
| download | go-1acba7d4fafef57d44bbd757abce58d632ee8475.tar.xz | |
cmd/internal/obj: remove prasm
Fold the printing of the offending instruction
into the neighboring Diag call, if it is not
already present.
Change-Id: I310f1479e16a4d2a24ff3c2f7e2c60e5e2015c1b
Reviewed-on: https://go-review.googlesource.com/38714
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/cmd/internal/obj/arm')
| -rw-r--r-- | src/cmd/internal/obj/arm/asm5.go | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/cmd/internal/obj/arm/asm5.go b/src/cmd/internal/obj/arm/asm5.go index b4a7db7349..ec183f95b7 100644 --- a/src/cmd/internal/obj/arm/asm5.go +++ b/src/cmd/internal/obj/arm/asm5.go @@ -1155,10 +1155,6 @@ func aconsize(ctxt *obj.Link) int { return C_LACON } -func prasm(p *obj.Prog) { - fmt.Printf("%v\n", p) -} - func oplook(ctxt *obj.Link, p *obj.Prog) *Optab { a1 := int(p.Optab) if a1 != 0 { @@ -1201,7 +1197,6 @@ func oplook(ctxt *obj.Link, p *obj.Prog) *Optab { ctxt.Diag("illegal combination %v; %v %v %v, %d %d", p, DRconv(a1), DRconv(a2), DRconv(a3), p.From.Type, p.To.Type) ctxt.Diag("from %d %d to %d %d\n", p.From.Type, p.From.Name, p.To.Type, p.To.Name) - prasm(p) if ops == nil { ops = optab } @@ -1485,8 +1480,7 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) { } switch o.type_ { default: - ctxt.Diag("unknown asm %d", o.type_) - prasm(p) + ctxt.Diag("%v: unknown asm %d", p, o.type_) case 0: /* pseudo ops */ if false { /*debug['G']*/ @@ -1706,8 +1700,7 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) { if false { if rt == r || rf == REGPC&15 || r == REGPC&15 || rt == REGPC&15 { - ctxt.Diag("bad registers in MUL") - prasm(p) + ctxt.Diag("%v: bad registers in MUL", p) } } @@ -2573,8 +2566,7 @@ func oprrr(ctxt *obj.Link, a obj.As, sc int) uint32 { return o&(0xf<<28) | 0x12fff3<<4 } - ctxt.Diag("bad rrr %d", a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad rrr %d", ctxt.Curp, a) return 0 } @@ -2627,8 +2619,7 @@ func opbra(ctxt *obj.Link, p *obj.Prog, a obj.As, sc int) uint32 { return 0xe<<28 | 0x5<<25 } - ctxt.Diag("bad bra %v", a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad bra %v", ctxt.Curp, a) return 0 } @@ -2767,8 +2758,7 @@ func omvl(ctxt *obj.Link, p *obj.Prog, a *obj.Addr, dr int) uint32 { aclass(ctxt, a) v := immrot(^uint32(ctxt.Instoffset)) if v == 0 { - ctxt.Diag("missing literal") - prasm(p) + ctxt.Diag("%v: missing literal", p) return 0 } |