diff options
| author | David Lazar <lazard@golang.org> | 2016-12-09 14:30:40 -0500 |
|---|---|---|
| committer | David Lazar <lazard@golang.org> | 2016-12-09 20:35:56 +0000 |
| commit | 48d029fe431f2c19e0ccc62a33de059c7725ee93 (patch) | |
| tree | 408921b66026a58873c76c90d90093ff4a7fad42 /src/cmd/internal/obj/arm | |
| parent | ad4efedc6ce317aa9eb1208950daee4c31b023cc (diff) | |
| download | go-48d029fe431f2c19e0ccc62a33de059c7725ee93.tar.xz | |
[dev.inline] cmd/internal/obj: rename Prog.Lineno to Prog.Pos
Change-Id: I7585d85907869f5a286b36936dfd035f1e8e9906
Reviewed-on: https://go-review.googlesource.com/34197
Run-TryBot: David Lazar <lazard@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Diffstat (limited to 'src/cmd/internal/obj/arm')
| -rw-r--r-- | src/cmd/internal/obj/arm/asm5.go | 4 | ||||
| -rw-r--r-- | src/cmd/internal/obj/arm/obj5.go | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/cmd/internal/obj/arm/asm5.go b/src/cmd/internal/obj/arm/asm5.go index a1213bcfb8..a7217e2e6d 100644 --- a/src/cmd/internal/obj/arm/asm5.go +++ b/src/cmd/internal/obj/arm/asm5.go @@ -820,7 +820,7 @@ func flushpool(ctxt *obj.Link, p *obj.Prog, skip int, force int) bool { q.To.Type = obj.TYPE_BRANCH q.Pcond = p.Link q.Link = ctxt.Blitrl - q.Lineno = p.Lineno + q.Pos = p.Pos ctxt.Blitrl = q } else if force == 0 && (p.Pc+int64(12+pool.size)-int64(pool.start) < 2048) { // 12 take into account the maximum nacl literal pool alignment padding size return false @@ -838,7 +838,7 @@ func flushpool(ctxt *obj.Link, p *obj.Prog, skip int, force int) bool { // We set it to the line number of the preceding instruction so that // there are no deltas to encode in the pc-line tables. for q := ctxt.Blitrl; q != nil; q = q.Link { - q.Lineno = p.Lineno + q.Pos = p.Pos } ctxt.Elitrl.Link = p.Link diff --git a/src/cmd/internal/obj/arm/obj5.go b/src/cmd/internal/obj/arm/obj5.go index 6e5390c24e..0bf8014398 100644 --- a/src/cmd/internal/obj/arm/obj5.go +++ b/src/cmd/internal/obj/arm/obj5.go @@ -547,7 +547,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) { /* MOV m(g),REGTMP */ p.As = AMOVW - p.Lineno = q1.Lineno + p.Pos = q1.Pos p.From.Type = obj.TYPE_MEM p.From.Reg = REGG p.From.Offset = 6 * 4 // offset of g.m @@ -558,7 +558,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) { /* MOV a,m_divmod(REGTMP) */ p = obj.Appendp(ctxt, p) p.As = AMOVW - p.Lineno = q1.Lineno + p.Pos = q1.Pos p.From.Type = obj.TYPE_REG p.From.Reg = q1.From.Reg p.To.Type = obj.TYPE_MEM @@ -568,7 +568,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) { /* MOV b, R8 */ p = obj.Appendp(ctxt, p) p.As = AMOVW - p.Lineno = q1.Lineno + p.Pos = q1.Pos p.From.Type = obj.TYPE_REG p.From.Reg = q1.Reg if q1.Reg == 0 { @@ -581,7 +581,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) { /* CALL appropriate */ p = obj.Appendp(ctxt, p) p.As = ABL - p.Lineno = q1.Lineno + p.Pos = q1.Pos p.To.Type = obj.TYPE_BRANCH switch o { case ADIV: @@ -600,7 +600,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) { /* MOV REGTMP, b */ p = obj.Appendp(ctxt, p) p.As = AMOVW - p.Lineno = q1.Lineno + p.Pos = q1.Pos p.From.Type = obj.TYPE_REG p.From.Reg = REGTMP p.From.Offset = 0 @@ -689,7 +689,7 @@ func softfloat(ctxt *obj.Link, cursym *obj.LSym) { p.As = ABL p.To.Type = obj.TYPE_BRANCH p.To.Sym = symsfloat - p.Lineno = next.Lineno + p.Pos = next.Pos p = next wasfloat = 1 @@ -811,7 +811,7 @@ func stacksplit(ctxt *obj.Link, p *obj.Prog, framesize int32) *obj.Prog { spfix.Spadj = -framesize pcdata := obj.Appendp(ctxt, spfix) - pcdata.Lineno = ctxt.Cursym.Text.Lineno + pcdata.Pos = ctxt.Cursym.Text.Pos pcdata.Mode = ctxt.Cursym.Text.Mode pcdata.As = obj.APCDATA pcdata.From.Type = obj.TYPE_CONST @@ -995,7 +995,7 @@ loop: a = AB q = ctxt.NewProg() q.As = a - q.Lineno = p.Lineno + q.Pos = p.Pos q.To.Type = obj.TYPE_BRANCH q.To.Offset = p.Pc q.Pcond = p |