[dev.cc] cmd/9a, cmd/new9a: fix line numbers

Fixed for the other assemblers in CL 2297042 in 2010.

Change-Id: I6cf41c569e884d98d295369e60e550ff8c0884e6
Reviewed-on: https://go-review.googlesource.com/5173
Reviewed-by: Rob Pike <r@golang.org>

src/cmd/9a/a.h

@@ -118,6 +118,7 @@ EXTERN	char*	outfile;
 EXTERN	int	pass;
 EXTERN	int32	pc;
 EXTERN	int	peekc;
+EXTERN	int32	stmtline;
 EXTERN	int	sym;
 EXTERN	char*	symb;
 EXTERN	int	thechar;

src/cmd/9a/a.y

@@ -64,7 +64,11 @@
 %type	<addr>	imm ximm fimm rel psr lcr cbit fpscr msr mask
 %%
 prog:
-|	prog line
+|	prog
+	{
+		stmtline = lineno;
+	}
+	line
 
 line:
 	LNAME ':'

src/cmd/9a/lex.c

@@ -672,7 +672,7 @@ outcode(int a, Addr *g1, int reg, Addr *g2)
 
 	p = emallocz(sizeof(Prog));
 	p->as = a;
-	p->lineno = lineno;
+	p->lineno = stmtline;
 	if(nosched)
 		p->mark |= NOSCHED;
 	p->from = *g1;
@@ -702,7 +702,7 @@ outgcode(int a, Addr *g1, int reg, Addr *g2, Addr *g3)
 
 	p = emallocz(sizeof(Prog));
 	p->as = a;
-	p->lineno = lineno;
+	p->lineno = stmtline;
 	if(nosched)
 		p->mark |= NOSCHED;
 	p->from = *g1;

src/cmd/new9a/a.y

@@ -68,7 +68,11 @@ import (
 %type	<addr>	imm ximm fimm rel psr lcr cbit fpscr msr mask
 %%
 prog:
-|	prog line
+|	prog
+	{
+		stmtline = asm.Lineno
+	}
+	line
 
 line:
 	LNAME ':'

src/cmd/new9a/lex.go

@@ -38,8 +38,9 @@ import (
 )
 
 var (
-	yyerror = asm.Yyerror
+	yyerror  = asm.Yyerror
-	nullgen obj.Addr
+	nullgen  obj.Addr
+	stmtline int32
 )
 
 func main() {
@@ -496,7 +497,7 @@ func outcode(a int, g1 *obj.Addr, reg int, g2 *obj.Addr) {
 
 	p = asm.Ctxt.NewProg()
 	p.As = int16(a)
-	p.Lineno = asm.Lineno
+	p.Lineno = stmtline
 	if nosched != 0 {
 		p.Mark |= ppc64.NOSCHED
 	}
@@ -529,7 +530,7 @@ func outgcode(a int, g1 *obj.Addr, reg int, g2, g3 *obj.Addr) {
 
 	p = asm.Ctxt.NewProg()
 	p.As = int16(a)
-	p.Lineno = asm.Lineno
+	p.Lineno = stmtline
 	if nosched != 0 {
 		p.Mark |= ppc64.NOSCHED
 	}