aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/internal/obj/mips
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2017-02-01 09:35:27 -0500
committerRuss Cox <rsc@golang.org>2017-02-01 09:47:23 -0500
commit47ce87877b1e2d4f34bb93fe6c7d88785b318cd5 (patch)
treec1ae026247c210cad5f4d3614f7763ddc103cea3 /src/cmd/internal/obj/mips
parentc47df7ae171b1470f8304c6759caf68f3f37ea90 (diff)
parentec63158d7104ab6eb3765f7d4ea48744f97d9ff9 (diff)
downloadgo-47ce87877b1e2d4f34bb93fe6c7d88785b318cd5.tar.xz
all: merge dev.inline into master
Change-Id: I7715581a04e513dcda9918e853fa6b1ddc703770
Diffstat (limited to 'src/cmd/internal/obj/mips')
-rw-r--r--src/cmd/internal/obj/mips/asm0.go4
-rw-r--r--src/cmd/internal/obj/mips/obj0.go14
2 files changed, 9 insertions, 9 deletions
diff --git a/src/cmd/internal/obj/mips/asm0.go b/src/cmd/internal/obj/mips/asm0.go
index c421deecb9..48f2b7de40 100644
--- a/src/cmd/internal/obj/mips/asm0.go
+++ b/src/cmd/internal/obj/mips/asm0.go
@@ -435,7 +435,7 @@ func span0(ctxt *obj.Link, cursym *obj.LSym) {
q.Link = p.Link
p.Link = q
q.As = AJMP
- q.Lineno = p.Lineno
+ q.Pos = p.Pos
q.To.Type = obj.TYPE_BRANCH
q.Pcond = p.Pcond
p.Pcond = q
@@ -443,7 +443,7 @@ func span0(ctxt *obj.Link, cursym *obj.LSym) {
q.Link = p.Link
p.Link = q
q.As = AJMP
- q.Lineno = p.Lineno
+ q.Pos = p.Pos
q.To.Type = obj.TYPE_BRANCH
q.Pcond = q.Link.Link
diff --git a/src/cmd/internal/obj/mips/obj0.go b/src/cmd/internal/obj/mips/obj0.go
index 12cfb31377..87ddcd2bb3 100644
--- a/src/cmd/internal/obj/mips/obj0.go
+++ b/src/cmd/internal/obj/mips/obj0.go
@@ -323,7 +323,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
// code will not see a half-updated stack frame.
q = obj.Appendp(ctxt, q)
q.As = mov
- q.Lineno = p.Lineno
+ q.Pos = p.Pos
q.From.Type = obj.TYPE_REG
q.From.Reg = REGLINK
q.To.Type = obj.TYPE_MEM
@@ -332,7 +332,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
q = obj.Appendp(ctxt, q)
q.As = add
- q.Lineno = p.Lineno
+ q.Pos = p.Pos
q.From.Type = obj.TYPE_CONST
q.From.Offset = int64(-autosize)
q.To.Type = obj.TYPE_REG
@@ -470,7 +470,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
q = ctxt.NewProg()
q.As = AJMP
- q.Lineno = p.Lineno
+ q.Pos = p.Pos
q.To.Type = obj.TYPE_MEM
q.To.Offset = 0
q.To.Reg = REGLINK
@@ -495,7 +495,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
if autosize != 0 {
q = ctxt.NewProg()
q.As = add
- q.Lineno = p.Lineno
+ q.Pos = p.Pos
q.From.Type = obj.TYPE_CONST
q.From.Offset = int64(autosize)
q.To.Type = obj.TYPE_REG
@@ -508,7 +508,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
q1 = ctxt.NewProg()
q1.As = AJMP
- q1.Lineno = p.Lineno
+ q1.Pos = p.Pos
if retSym != nil { // retjmp
q1.To.Type = obj.TYPE_BRANCH
q1.To.Name = obj.NAME_EXTERN
@@ -813,7 +813,7 @@ func addnop(ctxt *obj.Link, p *obj.Prog) {
// as R0, we have to resort to manually encode the SLL
// instruction as WORD $0.
q.As = AWORD
- q.Lineno = p.Lineno
+ q.Pos = p.Pos
q.From.Type = obj.TYPE_CONST
q.From.Name = obj.NAME_NONE
q.From.Offset = 0
@@ -1524,7 +1524,7 @@ loop:
a = AJMP
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