aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/asm
diff options
context:
space:
mode:
authorDavid Lazar <lazard@golang.org>2016-12-09 14:30:40 -0500
committerDavid Lazar <lazard@golang.org>2016-12-09 20:35:56 +0000
commit48d029fe431f2c19e0ccc62a33de059c7725ee93 (patch)
tree408921b66026a58873c76c90d90093ff4a7fad42 /src/cmd/asm
parentad4efedc6ce317aa9eb1208950daee4c31b023cc (diff)
downloadgo-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/asm')
-rw-r--r--src/cmd/asm/internal/asm/asm.go40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/cmd/asm/internal/asm/asm.go b/src/cmd/asm/internal/asm/asm.go
index c2a8784a27..e7b4d2b9d7 100644
--- a/src/cmd/asm/internal/asm/asm.go
+++ b/src/cmd/asm/internal/asm/asm.go
@@ -162,10 +162,10 @@ func (p *Parser) asmText(word string, operands [][]lex.Token) {
argSize = p.positiveAtoi(op[1].String())
}
prog := &obj.Prog{
- Ctxt: p.ctxt,
- As: obj.ATEXT,
- Lineno: src.MakePos(p.histLineNum),
- From: nameAddr,
+ Ctxt: p.ctxt,
+ As: obj.ATEXT,
+ Pos: src.MakePos(p.histLineNum),
+ From: nameAddr,
From3: &obj.Addr{
Type: obj.TYPE_CONST,
Offset: flag,
@@ -295,11 +295,11 @@ func (p *Parser) asmPCData(word string, operands [][]lex.Token) {
// log.Printf("PCDATA $%d, $%d", key.Offset, value.Offset)
prog := &obj.Prog{
- Ctxt: p.ctxt,
- As: obj.APCDATA,
- Lineno: src.MakePos(p.histLineNum),
- From: key,
- To: value,
+ Ctxt: p.ctxt,
+ As: obj.APCDATA,
+ Pos: src.MakePos(p.histLineNum),
+ From: key,
+ To: value,
}
p.append(prog, "", true)
}
@@ -325,11 +325,11 @@ func (p *Parser) asmFuncData(word string, operands [][]lex.Token) {
}
prog := &obj.Prog{
- Ctxt: p.ctxt,
- As: obj.AFUNCDATA,
- Lineno: src.MakePos(p.histLineNum),
- From: valueAddr,
- To: nameAddr,
+ Ctxt: p.ctxt,
+ As: obj.AFUNCDATA,
+ Pos: src.MakePos(p.histLineNum),
+ From: valueAddr,
+ To: nameAddr,
}
p.append(prog, "", true)
}
@@ -341,9 +341,9 @@ func (p *Parser) asmFuncData(word string, operands [][]lex.Token) {
func (p *Parser) asmJump(op obj.As, cond string, a []obj.Addr) {
var target *obj.Addr
prog := &obj.Prog{
- Ctxt: p.ctxt,
- Lineno: src.MakePos(p.histLineNum),
- As: op,
+ Ctxt: p.ctxt,
+ Pos: src.MakePos(p.histLineNum),
+ As: op,
}
switch len(a) {
case 1:
@@ -469,9 +469,9 @@ func (p *Parser) branch(jmp, target *obj.Prog) {
func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) {
// fmt.Printf("%s %+v\n", op, a)
prog := &obj.Prog{
- Ctxt: p.ctxt,
- Lineno: src.MakePos(p.histLineNum),
- As: op,
+ Ctxt: p.ctxt,
+ Pos: src.MakePos(p.histLineNum),
+ As: op,
}
switch len(a) {
case 0: