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/arm64 | |
| 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/arm64')
| -rw-r--r-- | src/cmd/internal/obj/arm64/asm7.go | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/cmd/internal/obj/arm64/asm7.go b/src/cmd/internal/obj/arm64/asm7.go index bf105a24ff..5cd51b636f 100644 --- a/src/cmd/internal/obj/arm64/asm7.go +++ b/src/cmd/internal/obj/arm64/asm7.go @@ -524,10 +524,6 @@ var pool struct { size uint32 } -func prasm(p *obj.Prog) { - fmt.Printf("%v\n", p) -} - func span7(ctxt *obj.Link, cursym *obj.LSym) { p := cursym.Text if p == nil || p.Link == nil { // handle external functions and ELF section symbols @@ -1255,7 +1251,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) - prasm(p) if ops == nil { ops = optab } @@ -1934,8 +1929,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 */ break @@ -3489,8 +3483,7 @@ func oprrr(ctxt *obj.Link, a obj.As) uint32 { return FPOP1S(0, 0, 3, 5) } - ctxt.Diag("bad rrr %d %v", a, a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad rrr %d %v", ctxt.Curp, a, a) return 0 } @@ -3676,8 +3669,7 @@ func opirr(ctxt *obj.Link, a obj.As) uint32 { return SYSOP(0, 0, 3, 2, 0, 0, 0x1F) } - ctxt.Diag("bad irr %v", a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad irr %v", ctxt.Curp, a) return 0 } @@ -3786,8 +3778,7 @@ func opimm(ctxt *obj.Link, a obj.As) uint32 { return SYSOP(0, 0, 3, 3, 0, 2, 0x1F) } - ctxt.Diag("bad imm %v", a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad imm %v", ctxt.Curp, a) return 0 } @@ -3870,8 +3861,7 @@ func opbra(ctxt *obj.Link, a obj.As) uint32 { return 1<<31 | 5<<26 } - ctxt.Diag("bad bra %v", a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad bra %v", ctxt.Curp, a) return 0 } @@ -3887,8 +3877,7 @@ func opbrr(ctxt *obj.Link, a obj.As) uint32 { return OPBLR(2) /* RET */ } - ctxt.Diag("bad brr %v", a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad brr %v", ctxt.Curp, a) return 0 } @@ -3919,8 +3908,7 @@ func op0(ctxt *obj.Link, a obj.As) uint32 { return SYSHINT(5) } - ctxt.Diag("bad op0 %v", a) - prasm(ctxt.Curp) + ctxt.Diag("%v: bad op0 %v", ctxt.Curp, a) return 0 } |