* dwarf2dbg.c (dwarf2_where): Set line->isa.

        (dwarf2_set_isa): New.
        (dwarf2_directive_loc): Rearrange to allow all options on one line.
        * dwarf2dbg.h (dwarf2_set_isa): Declare.
        * doc/as.texinfo: Update .loc documentation.

        * gas/lns/lns-common-1.d: Don't match header or special opcode numbers.
        * gas/lns/lns-common-1.s: Update for syntax change.
        * gas/lns/lns-diag-1.[sl]: Likewise.

5 files changed, 42 insertions, 33 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b195892..a61ff32 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2005-09-07  Richard Henderson  <rth@redhat.com>
 
+	* gas/lns/lns-common-1.d: Don't match header or special opcode numbers.
+	* gas/lns/lns-common-1.s: Update for syntax change.
+	* gas/lns/lns-diag-1.[sl]: Likewise.
+
+2005-09-07  Richard Henderson  <rth@redhat.com>
+
 	* gas/mips/mips16-dwarf2.d: Don't match anything but address and line
         number increments.  Adjust relocation address.
 	* gas/mips/mips16-dwarf2-n32.d: Likewise.  Add "N32" to test name.
diff --git a/gas/testsuite/gas/lns/lns-common-1.d b/gas/testsuite/gas/lns/lns-common-1.d
index bb250e2..69de638 100644
--- a/gas/testsuite/gas/lns/lns-common-1.d
+++ b/gas/testsuite/gas/lns/lns-common-1.d
@@ -2,28 +2,25 @@
 #name: lns-common-1
 Dump of debug contents of section \.debug_line:
 #...
-  DWARF Version:               2
-  Prologue Length:             28
-  Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1
-  Line Base:                   -5
-  Line Range:                  14
-  Opcode Base:                 13
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
+  Extended opcode 2: set Address to .*
   Copy
+  Set column to 3
+  Special opcode .*: advance Address by .* to .* and Line by 1 to 2
   Set prologue_end to true
-  Special opcode 19: advance Address by .* to .* and Line by 0 to 1
+  Special opcode .*: advance Address by .* to .* and Line by 1 to 3
+  Set column to 0
   Set epilogue_begin to true
-  Special opcode 20: advance Address by .* to .* and Line by 1 to 2
+  Special opcode .*: advance Address by .* to .* and Line by 1 to 4
   Set ISA to 1
   Set basic block
-  Special opcode 20: advance Address by .* to .* and Line by 1 to 3
+  Special opcode .*: advance Address by .* to .* and Line by 1 to 5
   Set is_stmt to 0
-  Special opcode 19: advance Address by .* to .* and Line by 0 to 3
+  Special opcode .*: advance Address by .* to .* and Line by 1 to 6
   Set is_stmt to 1
-  Special opcode 19: advance Address by .* to .* and Line by 0 to 3
+  Special opcode .*: advance Address by .* to .* and Line by 1 to 7
   Advance PC by .* to .*
   Extended opcode 1: End of Sequence
 #...
diff --git a/gas/testsuite/gas/lns/lns-common-1.s b/gas/testsuite/gas/lns/lns-common-1.s
index 8d3fec3..f1d590b 100644
--- a/gas/testsuite/gas/lns/lns-common-1.s
+++ b/gas/testsuite/gas/lns/lns-common-1.s
@@ -1,16 +1,15 @@
 	.file 1 "foo.c"
 	.loc 1 1
 	nop
-	.loc prologue_end
+	.loc 1 2 3
 	nop
-	.loc epilogue_begin
-	.loc 1 2
+	.loc 1 3 prologue_end
 	nop
-	.loc isa 1
-	.loc basic_block
-	.loc 1 3
+	.loc 1 4 0 epilogue_begin
 	nop
-	.loc is_stmt 0
+	.loc 1 5 isa 1 basic_block
 	nop
-	.loc is_stmt 1
+	.loc 1 6 is_stmt 0
+	nop
+	.loc 1 7 is_stmt 1
 	nop
diff --git a/gas/testsuite/gas/lns/lns-diag-1.l b/gas/testsuite/gas/lns/lns-diag-1.l
index 52207ed..53f9936 100644
--- a/gas/testsuite/gas/lns/lns-diag-1.l
+++ b/gas/testsuite/gas/lns/lns-diag-1.l
@@ -8,4 +8,8 @@
 .*:18: Error: is_stmt value not 0 or 1
 .*:19: Error: bad or irreducible absolute expression
 .*:23: Error: isa number less than zero
-.*:26: Error: unknown .loc sub-directive frobnitz
+.*:26: Error: bad or irreducible absolute expression
+.*:26: Error: file number less than one
+.*:27: Error: bad or irreducible absolute expression
+.*:28: Error: unknown .loc sub-directive `frobnitz'
+.*:29: Error: unknown .loc sub-directive `frobnitz'
diff --git a/gas/testsuite/gas/lns/lns-diag-1.s b/gas/testsuite/gas/lns/lns-diag-1.s
index 8193559..7a0aa409 100644
--- a/gas/testsuite/gas/lns/lns-diag-1.s
+++ b/gas/testsuite/gas/lns/lns-diag-1.s
@@ -8,19 +8,22 @@
 	.loc 3 1
 	.loc 1 1 1 1
 
-	.loc basic_block
-	.loc basic_block 0
-	.loc prologue_end
-	.loc epilogue_begin
+	.loc 1 1 basic_block
+	.loc 1 1 basic_block 0
+	.loc 1 1 prologue_end
+	.loc 1 1 epilogue_begin
 
-	.loc is_stmt 0
-	.loc is_stmt 1
-	.loc is_stmt 2
-	.loc is_stmt foo
+	.loc 1 1 1 is_stmt 0
+	.loc 1 1 1 is_stmt 1
+	.loc 1 1 1 is_stmt 2
+	.loc 1 1 1 is_stmt foo
 
-	.loc isa 1
-	.loc isa 2
-	.loc isa -1
-	.loc isa 0
+	.loc 1 1 isa 1
+	.loc 1 1 isa 2
+	.loc 1 1 isa -1
+	.loc 1 1 isa 0
 
 	.loc frobnitz
+	.loc 1 frobnitz
+	.loc 1 1 frobnitz
+	.loc 1 1 1 frobnitz