binutils/

	* dwarf.c (display_debug_lines_raw): Print section offsets.

binutils/testsuite/
	* binutils-all/dw2-1.W: Adjust expected output.
	* binutils-all/objdump.W: Likewise.
	* binutils-all/i386/compressed-1a.d: Likewise.
	* binutils-all/x86-64/compressed-1a.d: Likewise.

gas/testsuite/
	* gas/cris/rd-dw2-1.d: Adjust expected output.
	* gas/cris/rd-dw2-10.d: Likewise.
	* gas/cris/rd-dw2-11.d: Likewise.
	* gas/cris/rd-dw2-12.d: Likewise.
	* gas/cris/rd-dw2-13.d: Likewise.
	* gas/cris/rd-dw2-14.d: Likewise.
	* gas/cris/rd-dw2-15.d: Likewise.
	* gas/cris/rd-dw2-2.d: Likewise.
	* gas/cris/rd-dw2-3.d: Likewise.
	* gas/cris/rd-dw2-4.d: Likewise.
	* gas/cris/rd-dw2-5.d: Likewise.
	* gas/cris/rd-dw2-6.d: Likewise.
	* gas/cris/rd-dw2-7.d: Likewise.
	* gas/cris/rd-dw2-8.d: Likewise.
	* gas/cris/rd-dw2-9.d: Likewise.
	* gas/elf/dwarf2-1.d: Likewise.
	* gas/elf/dwarf2-2.d: Likewise.
	* gas/elf/dwarf2-3.d: Likewise.
	* gas/i386/debug1.d: Likewise.
	* gas/i386/dw2-compress-1.d: Likewise.
	* gas/i386/ilp32/lns/lns-common-1.d: Likewise.
	* gas/i386/ilp32/lns/lns-duplicate.d: Likewise.
	* gas/ia64/pr13167.d: Likewise.
	* gas/lns/lns-big-delta.d: Likewise.
	* gas/lns/lns-common-1-alt.d: Likewise.
	* gas/lns/lns-common-1.d: Likewise.
	* gas/lns/lns-duplicate.d: Likewise.
	* gas/mips/loc-swap-2.d: Likewise.
	* gas/mips/loc-swap.d: Likewise.
	* gas/mips/micromips@loc-swap-2.d: Likewise.
	* gas/mips/micromips@loc-swap.d: Likewise.
	* gas/mips/mips16-dwarf2-n32.d: Likewise.
	* gas/mips/mips16-dwarf2.d: Likewise.
	* gas/mips/mips16@loc-swap-2.d: Likewise.
	* gas/mips/mips16@loc-swap.d: Likewise.

36 files changed, 976 insertions, 938 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5253912..3b3c376 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,41 @@
+2013-05-28  Cary Coutant  <ccoutant@google.com>
+
+	* gas/cris/rd-dw2-1.d: Adjust expected output.
+	* gas/cris/rd-dw2-10.d: Likewise.
+	* gas/cris/rd-dw2-11.d: Likewise.
+	* gas/cris/rd-dw2-12.d: Likewise.
+	* gas/cris/rd-dw2-13.d: Likewise.
+	* gas/cris/rd-dw2-14.d: Likewise.
+	* gas/cris/rd-dw2-15.d: Likewise.
+	* gas/cris/rd-dw2-2.d: Likewise.
+	* gas/cris/rd-dw2-3.d: Likewise.
+	* gas/cris/rd-dw2-4.d: Likewise.
+	* gas/cris/rd-dw2-5.d: Likewise.
+	* gas/cris/rd-dw2-6.d: Likewise.
+	* gas/cris/rd-dw2-7.d: Likewise.
+	* gas/cris/rd-dw2-8.d: Likewise.
+	* gas/cris/rd-dw2-9.d: Likewise.
+	* gas/elf/dwarf2-1.d: Likewise.
+	* gas/elf/dwarf2-2.d: Likewise.
+	* gas/elf/dwarf2-3.d: Likewise.
+	* gas/i386/debug1.d: Likewise.
+	* gas/i386/dw2-compress-1.d: Likewise.
+	* gas/i386/ilp32/lns/lns-common-1.d: Likewise.
+	* gas/i386/ilp32/lns/lns-duplicate.d: Likewise.
+	* gas/ia64/pr13167.d: Likewise.
+	* gas/lns/lns-big-delta.d: Likewise.
+	* gas/lns/lns-common-1-alt.d: Likewise.
+	* gas/lns/lns-common-1.d: Likewise.
+	* gas/lns/lns-duplicate.d: Likewise.
+	* gas/mips/loc-swap-2.d: Likewise.
+	* gas/mips/loc-swap.d: Likewise.
+	* gas/mips/micromips@loc-swap-2.d: Likewise.
+	* gas/mips/micromips@loc-swap.d: Likewise.
+	* gas/mips/mips16-dwarf2-n32.d: Likewise.
+	* gas/mips/mips16-dwarf2.d: Likewise.
+	* gas/mips/mips16@loc-swap-2.d: Likewise.
+	* gas/mips/mips16@loc-swap.d: Likewise.
+
 2013-05-28  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* gas/mips/ld-zero.d: New test.
diff --git a/gas/testsuite/gas/cris/rd-dw2-1.d b/gas/testsuite/gas/cris/rd-dw2-1.d
index 3b0dc61..ee99381 100644
--- a/gas/testsuite/gas/cris/rd-dw2-1.d
+++ b/gas/testsuite/gas/cris/rd-dw2-1.d
@@ -4,18 +4,18 @@
 # A most simple instruction sequence.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
-  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 6
-  Special opcode .*: advance Address by 2 to 0x4 and Line by 1 to 7
-  Special opcode .*: advance Address by 2 to 0x6 and Line by 1 to 8
-  Special opcode .*: advance Address by 2 to 0x8 and Line by 1 to 9
-  Special opcode .*: advance Address by 2 to 0xa and Line by 1 to 10
-  Special opcode .*: advance Address by 2 to 0xc and Line by 1 to 11
-  Special opcode .*: advance Address by 2 to 0xe and Line by 1 to 12
-  Special opcode .*: advance Address by 2 to 0x10 and Line by 1 to 13
-  Special opcode .*: advance Address by 2 to 0x12 and Line by 1 to 14
-  Special opcode .*: advance Address by 2 to 0x14 and Line by 1 to 15
-  Special opcode .*: advance Address by 2 to 0x16 and Line by 1 to 16
-  Advance PC by 2 to 0x18
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 6
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x4 and Line by 1 to 7
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x6 and Line by 1 to 8
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8 and Line by 1 to 9
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xa and Line by 1 to 10
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xc and Line by 1 to 11
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xe and Line by 1 to 12
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x10 and Line by 1 to 13
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x12 and Line by 1 to 14
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x14 and Line by 1 to 15
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x16 and Line by 1 to 16
+  \[0x.*\]  Advance PC by 2 to 0x18
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-10.d b/gas/testsuite/gas/cris/rd-dw2-10.d
index f9b196f..115246d 100644
--- a/gas/testsuite/gas/cris/rd-dw2-10.d
+++ b/gas/testsuite/gas/cris/rd-dw2-10.d
@@ -5,7 +5,7 @@
 # Continued line.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 6 to 7
-  Advance PC by 4 to 0x4
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 6 to 7
+  \[0x.*\]  Advance PC by 4 to 0x4
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-11.d b/gas/testsuite/gas/cris/rd-dw2-11.d
index ea88664..147c48c 100644
--- a/gas/testsuite/gas/cris/rd-dw2-11.d
+++ b/gas/testsuite/gas/cris/rd-dw2-11.d
@@ -5,42 +5,42 @@
 # Highly "fragmented" code.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
-  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 6
-  Advance PC by 126 to 0x80
-  Special opcode .*: advance Address by 0 to 0x80 and Line by 2 to 8
-  Special opcode .*: advance Address by 2 to 0x82 and Line by 1 to 9
-  Advance PC by 226 to 0x164
-  Special opcode .*: advance Address by 0 to 0x164 and Line by 6 to 15
-  Special opcode .*: advance Address by 4 to 0x168 and Line by 1 to 16
-  Advance PC by 126 to 0x1e6
-  Special opcode .*: advance Address by 0 to 0x1e6 and Line by 2 to 18
-  Special opcode .*: advance Address by 4 to 0x1ea and Line by 1 to 19
-  Advance PC by 1126 to 0x650
-  Special opcode .*: advance Address by 0 to 0x650 and Line by 6 to 25
-  Special opcode .*: advance Address by 4 to 0x654 and Line by 1 to 26
-  Advance PC by 126 to 0x6d2
-  Special opcode .*: advance Address by 0 to 0x6d2 and Line by 2 to 28
-  Special opcode .*: advance Address by 12 to 0x6de and Line by 1 to 29
-  Advance Line by 11 to 40
-  Advance PC by 33250 to 0x88c0
-  Copy
-  Special opcode .*: advance Address by 2 to 0x88c2 and Line by 1 to 41
-  Advance PC by 128 to 0x8942
-  Special opcode .*: advance Address by 0 to 0x8942 and Line by 2 to 43
-  Special opcode .*: advance Address by 2 to 0x8944 and Line by 1 to 44
-  Advance PC by 248 to 0x8a3c
-  Special opcode .*: advance Address by 0 to 0x8a3c and Line by 6 to 50
-  Special opcode .*: advance Address by 4 to 0x8a40 and Line by 1 to 51
-  Advance PC by 128 to 0x8ac0
-  Special opcode .*: advance Address by 0 to 0x8ac0 and Line by 2 to 53
-  Special opcode .*: advance Address by 4 to 0x8ac4 and Line by 1 to 54
-  Advance PC by 252 to 0x8bc0
-  Special opcode .*: advance Address by 0 to 0x8bc0 and Line by 6 to 60
-  Special opcode .*: advance Address by 4 to 0x8bc4 and Line by 1 to 61
-  Advance PC by 128 to 0x8c44
-  Special opcode .*: advance Address by 0 to 0x8c44 and Line by 2 to 63
-  Special opcode .*: advance Address by 4 to 0x8c48 and Line by 1 to 64
-  Advance PC by 124 to 0x8cc4
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 6
+  \[0x.*\]  Advance PC by 126 to 0x80
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x80 and Line by 2 to 8
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x82 and Line by 1 to 9
+  \[0x.*\]  Advance PC by 226 to 0x164
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x164 and Line by 6 to 15
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x168 and Line by 1 to 16
+  \[0x.*\]  Advance PC by 126 to 0x1e6
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x1e6 and Line by 2 to 18
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x1ea and Line by 1 to 19
+  \[0x.*\]  Advance PC by 1126 to 0x650
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x650 and Line by 6 to 25
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x654 and Line by 1 to 26
+  \[0x.*\]  Advance PC by 126 to 0x6d2
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x6d2 and Line by 2 to 28
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x6de and Line by 1 to 29
+  \[0x.*\]  Advance Line by 11 to 40
+  \[0x.*\]  Advance PC by 33250 to 0x88c0
+  \[0x.*\]  Copy
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x88c2 and Line by 1 to 41
+  \[0x.*\]  Advance PC by 128 to 0x8942
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8942 and Line by 2 to 43
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8944 and Line by 1 to 44
+  \[0x.*\]  Advance PC by 248 to 0x8a3c
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8a3c and Line by 6 to 50
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8a40 and Line by 1 to 51
+  \[0x.*\]  Advance PC by 128 to 0x8ac0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8ac0 and Line by 2 to 53
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8ac4 and Line by 1 to 54
+  \[0x.*\]  Advance PC by 252 to 0x8bc0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8bc0 and Line by 6 to 60
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8bc4 and Line by 1 to 61
+  \[0x.*\]  Advance PC by 128 to 0x8c44
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8c44 and Line by 2 to 63
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8c48 and Line by 1 to 64
+  \[0x.*\]  Advance PC by 124 to 0x8cc4
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-12.d b/gas/testsuite/gas/cris/rd-dw2-12.d
index 1b9dca5..aeb2e32 100644
--- a/gas/testsuite/gas/cris/rd-dw2-12.d
+++ b/gas/testsuite/gas/cris/rd-dw2-12.d
@@ -5,89 +5,89 @@
 # Pushes and other prefixes.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
-  Special opcode .*: advance Address by 4 to 0x4 and Line by 1 to 6
-  Special opcode .*: advance Address by 4 to 0x8 and Line by 1 to 7
-  Special opcode .*: advance Address by 4 to 0xc and Line by 2 to 9
-  Special opcode .*: advance Address by 4 to 0x10 and Line by 1 to 10
-  Special opcode .*: advance Address by 4 to 0x14 and Line by 1 to 11
-  Special opcode .*: advance Address by 4 to 0x18 and Line by 2 to 13
-  Special opcode .*: advance Address by 4 to 0x1c and Line by 1 to 14
-  Special opcode .*: advance Address by 4 to 0x20 and Line by 1 to 15
-  Special opcode .*: advance Address by 4 to 0x24 and Line by 2 to 17
-  Special opcode .*: advance Address by 4 to 0x28 and Line by 1 to 18
-  Special opcode .*: advance Address by 4 to 0x2c and Line by 2 to 20
-  Special opcode .*: advance Address by 4 to 0x30 and Line by 1 to 21
-  Special opcode .*: advance Address by 4 to 0x34 and Line by 1 to 22
-  Special opcode .*: advance Address by 4 to 0x38 and Line by 2 to 24
-  Special opcode .*: advance Address by 4 to 0x3c and Line by 1 to 25
-  Special opcode .*: advance Address by 4 to 0x40 and Line by 2 to 27
-  Special opcode .*: advance Address by 4 to 0x44 and Line by 1 to 28
-  Special opcode .*: advance Address by 4 to 0x48 and Line by 2 to 30
-  Special opcode .*: advance Address by 4 to 0x4c and Line by 1 to 31
-  Special opcode .*: advance Address by 4 to 0x50 and Line by 1 to 32
-  Special opcode .*: advance Address by 4 to 0x54 and Line by 2 to 34
-  Special opcode .*: advance Address by 4 to 0x58 and Line by 1 to 35
-  Special opcode .*: advance Address by 4 to 0x5c and Line by 1 to 36
-  Special opcode .*: advance Address by 4 to 0x60 and Line by 2 to 38
-  Special opcode .*: advance Address by 4 to 0x64 and Line by 1 to 39
-  Special opcode .*: advance Address by 4 to 0x68 and Line by 1 to 40
-  Special opcode .*: advance Address by 4 to 0x6c and Line by 2 to 42
-  Special opcode .*: advance Address by 4 to 0x70 and Line by 1 to 43
-  Special opcode .*: advance Address by 4 to 0x74 and Line by 1 to 44
-  Special opcode .*: advance Address by 4 to 0x78 and Line by 2 to 46
-  Special opcode .*: advance Address by 4 to 0x7c and Line by 1 to 47
-  Special opcode .*: advance Address by 4 to 0x80 and Line by 1 to 48
-  Special opcode .*: advance Address by 4 to 0x84 and Line by 2 to 50
-  Special opcode .*: advance Address by 4 to 0x88 and Line by 1 to 51
-  Special opcode .*: advance Address by 4 to 0x8c and Line by 1 to 52
-  Special opcode .*: advance Address by 4 to 0x90 and Line by 2 to 54
-  Special opcode .*: advance Address by 4 to 0x94 and Line by 1 to 55
-  Special opcode .*: advance Address by 4 to 0x98 and Line by 1 to 56
-  Advance Line by 9 to 65
-  Special opcode .*: advance Address by 4 to 0x9c and Line by 0 to 65
-  Special opcode .*: advance Address by 4 to 0xa0 and Line by 1 to 66
-  Special opcode .*: advance Address by 4 to 0xa4 and Line by 1 to 67
-  Special opcode .*: advance Address by 4 to 0xa8 and Line by 2 to 69
-  Special opcode .*: advance Address by 4 to 0xac and Line by 1 to 70
-  Special opcode .*: advance Address by 4 to 0xb0 and Line by 1 to 71
-  Special opcode .*: advance Address by 4 to 0xb4 and Line by 2 to 73
-  Special opcode .*: advance Address by 4 to 0xb8 and Line by 1 to 74
-  Special opcode .*: advance Address by 4 to 0xbc and Line by 1 to 75
-  Special opcode .*: advance Address by 4 to 0xc0 and Line by 2 to 77
-  Special opcode .*: advance Address by 4 to 0xc4 and Line by 1 to 78
-  Special opcode .*: advance Address by 4 to 0xc8 and Line by 1 to 79
-  Special opcode .*: advance Address by 4 to 0xcc and Line by 2 to 81
-  Special opcode .*: advance Address by 4 to 0xd0 and Line by 1 to 82
-  Special opcode .*: advance Address by 4 to 0xd4 and Line by 1 to 83
-  Special opcode .*: advance Address by 4 to 0xd8 and Line by 2 to 85
-  Special opcode .*: advance Address by 4 to 0xdc and Line by 1 to 86
-  Special opcode .*: advance Address by 4 to 0xe0 and Line by 1 to 87
-  Special opcode .*: advance Address by 4 to 0xe4 and Line by 2 to 89
-  Special opcode .*: advance Address by 4 to 0xe8 and Line by 1 to 90
-  Special opcode .*: advance Address by 4 to 0xec and Line by 1 to 91
-  Special opcode .*: advance Address by 4 to 0xf0 and Line by 2 to 93
-  Special opcode .*: advance Address by 4 to 0xf4 and Line by 1 to 94
-  Special opcode .*: advance Address by 4 to 0xf8 and Line by 1 to 95
-  Special opcode .*: advance Address by 4 to 0xfc and Line by 2 to 97
-  Special opcode .*: advance Address by 4 to 0x100 and Line by 1 to 98
-  Special opcode .*: advance Address by 4 to 0x104 and Line by 1 to 99
-  Special opcode .*: advance Address by 4 to 0x108 and Line by 2 to 101
-  Special opcode .*: advance Address by 4 to 0x10c and Line by 1 to 102
-  Special opcode .*: advance Address by 4 to 0x110 and Line by 1 to 103
-  Special opcode .*: advance Address by 4 to 0x114 and Line by 2 to 105
-  Special opcode .*: advance Address by 4 to 0x118 and Line by 1 to 106
-  Special opcode .*: advance Address by 4 to 0x11c and Line by 1 to 107
-  Special opcode .*: advance Address by 4 to 0x120 and Line by 2 to 109
-  Special opcode .*: advance Address by 4 to 0x124 and Line by 1 to 110
-  Special opcode .*: advance Address by 4 to 0x128 and Line by 1 to 111
-  Special opcode .*: advance Address by 4 to 0x12c and Line by 2 to 113
-  Special opcode .*: advance Address by 4 to 0x130 and Line by 1 to 114
-  Special opcode .*: advance Address by 4 to 0x134 and Line by 1 to 115
-  Special opcode .*: advance Address by 4 to 0x138 and Line by 2 to 117
-  Special opcode .*: advance Address by 4 to 0x13c and Line by 1 to 118
-  Special opcode .*: advance Address by 2 to 0x13e and Line by 1 to 119
-  Special opcode .*: advance Address by 2 to 0x140 and Line by 1 to 120
-  Advance PC by 4 to 0x144
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 4 to 5
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x4 and Line by 1 to 6
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8 and Line by 1 to 7
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xc and Line by 2 to 9
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x10 and Line by 1 to 10
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x14 and Line by 1 to 11
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x18 and Line by 2 to 13
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x1c and Line by 1 to 14
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x20 and Line by 1 to 15
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x24 and Line by 2 to 17
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x28 and Line by 1 to 18
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x2c and Line by 2 to 20
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x30 and Line by 1 to 21
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x34 and Line by 1 to 22
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x38 and Line by 2 to 24
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x3c and Line by 1 to 25
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x40 and Line by 2 to 27
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x44 and Line by 1 to 28
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x48 and Line by 2 to 30
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x4c and Line by 1 to 31
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x50 and Line by 1 to 32
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x54 and Line by 2 to 34
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x58 and Line by 1 to 35
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5c and Line by 1 to 36
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x60 and Line by 2 to 38
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x64 and Line by 1 to 39
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x68 and Line by 1 to 40
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x6c and Line by 2 to 42
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x70 and Line by 1 to 43
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x74 and Line by 1 to 44
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x78 and Line by 2 to 46
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7c and Line by 1 to 47
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x80 and Line by 1 to 48
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x84 and Line by 2 to 50
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x88 and Line by 1 to 51
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8c and Line by 1 to 52
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x90 and Line by 2 to 54
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x94 and Line by 1 to 55
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x98 and Line by 1 to 56
+  \[0x.*\]  Advance Line by 9 to 65
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x9c and Line by 0 to 65
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xa0 and Line by 1 to 66
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xa4 and Line by 1 to 67
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xa8 and Line by 2 to 69
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xac and Line by 1 to 70
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xb0 and Line by 1 to 71
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xb4 and Line by 2 to 73
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xb8 and Line by 1 to 74
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xbc and Line by 1 to 75
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xc0 and Line by 2 to 77
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xc4 and Line by 1 to 78
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xc8 and Line by 1 to 79
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xcc and Line by 2 to 81
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xd0 and Line by 1 to 82
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xd4 and Line by 1 to 83
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xd8 and Line by 2 to 85
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xdc and Line by 1 to 86
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xe0 and Line by 1 to 87
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xe4 and Line by 2 to 89
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xe8 and Line by 1 to 90
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xec and Line by 1 to 91
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xf0 and Line by 2 to 93
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xf4 and Line by 1 to 94
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xf8 and Line by 1 to 95
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xfc and Line by 2 to 97
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x100 and Line by 1 to 98
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x104 and Line by 1 to 99
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x108 and Line by 2 to 101
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x10c and Line by 1 to 102
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x110 and Line by 1 to 103
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x114 and Line by 2 to 105
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x118 and Line by 1 to 106
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x11c and Line by 1 to 107
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x120 and Line by 2 to 109
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x124 and Line by 1 to 110
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x128 and Line by 1 to 111
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x12c and Line by 2 to 113
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x130 and Line by 1 to 114
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x134 and Line by 1 to 115
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x138 and Line by 2 to 117
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x13c and Line by 1 to 118
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x13e and Line by 1 to 119
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x140 and Line by 1 to 120
+  \[0x.*\]  Advance PC by 4 to 0x144
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-13.d b/gas/testsuite/gas/cris/rd-dw2-13.d
index 7c985e4..79234e3 100644
--- a/gas/testsuite/gas/cris/rd-dw2-13.d
+++ b/gas/testsuite/gas/cris/rd-dw2-13.d
@@ -5,30 +5,30 @@
 # PIC prefix relocs.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 5 to 6
-  Special opcode .*: advance Address by 6 to 0x6 and Line by 1 to 7
-  Special opcode .*: advance Address by 8 to 0xe and Line by 1 to 8
-  Special opcode .*: advance Address by 6 to 0x14 and Line by 1 to 9
-  Special opcode .*: advance Address by 6 to 0x1a and Line by 1 to 10
-  Special opcode .*: advance Address by 6 to 0x20 and Line by 1 to 11
-  Special opcode .*: advance Address by 8 to 0x28 and Line by 1 to 12
-  Special opcode .*: advance Address by 6 to 0x2e and Line by 1 to 13
-  Special opcode .*: advance Address by 4 to 0x32 and Line by 3 to 16
-  Special opcode .*: advance Address by 8 to 0x3a and Line by 1 to 17
-  Special opcode .*: advance Address by 6 to 0x40 and Line by 1 to 18
-  Special opcode .*: advance Address by 6 to 0x46 and Line by 1 to 19
-  Special opcode .*: advance Address by 8 to 0x4e and Line by 1 to 20
-  Special opcode .*: advance Address by 8 to 0x56 and Line by 1 to 21
-  Special opcode .*: advance Address by 8 to 0x5e and Line by 1 to 22
-  Special opcode .*: advance Address by 8 to 0x66 and Line by 1 to 23
-  Special opcode .*: advance Address by 8 to 0x6e and Line by 1 to 24
-  Special opcode .*: advance Address by 8 to 0x76 and Line by 1 to 25
-  Special opcode .*: advance Address by 6 to 0x7c and Line by 1 to 26
-  Special opcode .*: advance Address by 6 to 0x82 and Line by 1 to 27
-  Special opcode .*: advance Address by 6 to 0x88 and Line by 1 to 28
-  Special opcode .*: advance Address by 6 to 0x8e and Line by 1 to 29
-  Special opcode .*: advance Address by 6 to 0x94 and Line by 1 to 30
-  Special opcode .*: advance Address by 6 to 0x9a and Line by 1 to 31
-  Advance PC by 8 to 0xa2
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 5 to 6
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x6 and Line by 1 to 7
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0xe and Line by 1 to 8
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x14 and Line by 1 to 9
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x1a and Line by 1 to 10
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x20 and Line by 1 to 11
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x28 and Line by 1 to 12
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x2e and Line by 1 to 13
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x32 and Line by 3 to 16
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x3a and Line by 1 to 17
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x40 and Line by 1 to 18
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x46 and Line by 1 to 19
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x4e and Line by 1 to 20
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x56 and Line by 1 to 21
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x5e and Line by 1 to 22
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x66 and Line by 1 to 23
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x6e and Line by 1 to 24
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x76 and Line by 1 to 25
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x7c and Line by 1 to 26
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x82 and Line by 1 to 27
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x88 and Line by 1 to 28
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x8e and Line by 1 to 29
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x94 and Line by 1 to 30
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x9a and Line by 1 to 31
+  \[0x.*\]  Advance PC by 8 to 0xa2
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-14.d b/gas/testsuite/gas/cris/rd-dw2-14.d
index 297d83c..d34fa46 100644
--- a/gas/testsuite/gas/cris/rd-dw2-14.d
+++ b/gas/testsuite/gas/cris/rd-dw2-14.d
@@ -5,26 +5,26 @@
 # Prefixes of various sizes.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 8 to 9
-  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 10
-  Special opcode .*: advance Address by 4 to 0x6 and Line by 1 to 11
-  Special opcode .*: advance Address by 4 to 0xa and Line by 1 to 12
-  Special opcode .*: advance Address by 8 to 0x12 and Line by 1 to 13
-  Special opcode .*: advance Address by 8 to 0x1a and Line by 1 to 14
-  Special opcode .*: advance Address by 2 to 0x1c and Line by 1 to 15
-  Special opcode .*: advance Address by 4 to 0x20 and Line by 1 to 16
-  Special opcode .*: advance Address by 4 to 0x24 and Line by 1 to 17
-  Special opcode .*: advance Address by 8 to 0x2c and Line by 1 to 18
-  Special opcode .*: advance Address by 8 to 0x34 and Line by 1 to 19
-  Special opcode .*: advance Address by 2 to 0x36 and Line by 1 to 20
-  Special opcode .*: advance Address by 2 to 0x38 and Line by 1 to 21
-  Special opcode .*: advance Address by 2 to 0x3a and Line by 1 to 22
-  Special opcode .*: advance Address by 2 to 0x3c and Line by 1 to 23
-  Special opcode .*: advance Address by 2 to 0x3e and Line by 1 to 24
-  Special opcode .*: advance Address by 2 to 0x40 and Line by 1 to 25
-  Special opcode .*: advance Address by 2 to 0x42 and Line by 1 to 26
-  Special opcode .*: advance Address by 2 to 0x44 and Line by 1 to 27
-  Special opcode .*: advance Address by 2 to 0x46 and Line by 1 to 28
-  Advance PC by 2 to 0x48
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 8 to 9
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 10
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x6 and Line by 1 to 11
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xa and Line by 1 to 12
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x12 and Line by 1 to 13
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x1a and Line by 1 to 14
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1c and Line by 1 to 15
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x20 and Line by 1 to 16
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x24 and Line by 1 to 17
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x2c and Line by 1 to 18
+  \[0x.*\]  Special opcode .*: advance Address by 8 to 0x34 and Line by 1 to 19
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x36 and Line by 1 to 20
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x38 and Line by 1 to 21
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x3a and Line by 1 to 22
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x3c and Line by 1 to 23
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x3e and Line by 1 to 24
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x40 and Line by 1 to 25
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x42 and Line by 1 to 26
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x44 and Line by 1 to 27
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x46 and Line by 1 to 28
+  \[0x.*\]  Advance PC by 2 to 0x48
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-15.d b/gas/testsuite/gas/cris/rd-dw2-15.d
index bbb8289..361d7fe 100644
--- a/gas/testsuite/gas/cris/rd-dw2-15.d
+++ b/gas/testsuite/gas/cris/rd-dw2-15.d
@@ -5,158 +5,158 @@
 # Various prefixes, assembled standalone.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 8 to 9
-  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 10
-  Special opcode .*: advance Address by 2 to 0x4 and Line by 2 to 12
-  Special opcode .*: advance Address by 2 to 0x6 and Line by 1 to 13
-  Special opcode .*: advance Address by 2 to 0x8 and Line by 2 to 15
-  Special opcode .*: advance Address by 2 to 0xa and Line by 1 to 16
-  Special opcode .*: advance Address by 2 to 0xc and Line by 2 to 18
-  Special opcode .*: advance Address by 2 to 0xe and Line by 1 to 19
-  Special opcode .*: advance Address by 2 to 0x10 and Line by 2 to 21
-  Special opcode .*: advance Address by 2 to 0x12 and Line by 1 to 22
-  Special opcode .*: advance Address by 2 to 0x14 and Line by 2 to 24
-  Special opcode .*: advance Address by 2 to 0x16 and Line by 1 to 25
-  Special opcode .*: advance Address by 2 to 0x18 and Line by 2 to 27
-  Special opcode .*: advance Address by 2 to 0x1a and Line by 1 to 28
-  Special opcode .*: advance Address by 2 to 0x1c and Line by 2 to 30
-  Special opcode .*: advance Address by 2 to 0x1e and Line by 1 to 31
-  Special opcode .*: advance Address by 2 to 0x20 and Line by 6 to 37
-  Special opcode .*: advance Address by 4 to 0x24 and Line by 1 to 38
-  Special opcode .*: advance Address by 2 to 0x26 and Line by 2 to 40
-  Special opcode .*: advance Address by 4 to 0x2a and Line by 1 to 41
-  Special opcode .*: advance Address by 2 to 0x2c and Line by 2 to 43
-  Special opcode .*: advance Address by 4 to 0x30 and Line by 1 to 44
-  Special opcode .*: advance Address by 2 to 0x32 and Line by 2 to 46
-  Special opcode .*: advance Address by 4 to 0x36 and Line by 1 to 47
-  Special opcode .*: advance Address by 2 to 0x38 and Line by 2 to 49
-  Special opcode .*: advance Address by 4 to 0x3c and Line by 1 to 50
-  Special opcode .*: advance Address by 2 to 0x3e and Line by 2 to 52
-  Special opcode .*: advance Address by 4 to 0x42 and Line by 1 to 53
-  Special opcode .*: advance Address by 2 to 0x44 and Line by 2 to 55
-  Special opcode .*: advance Address by 4 to 0x48 and Line by 1 to 56
-  Special opcode .*: advance Address by 2 to 0x4a and Line by 2 to 58
-  Special opcode .*: advance Address by 4 to 0x4e and Line by 1 to 59
-  Special opcode .*: advance Address by 2 to 0x50 and Line by 2 to 61
-  Special opcode .*: advance Address by 4 to 0x54 and Line by 1 to 62
-  Special opcode .*: advance Address by 2 to 0x56 and Line by 2 to 64
-  Special opcode .*: advance Address by 4 to 0x5a and Line by 1 to 65
-  Special opcode .*: advance Address by 2 to 0x5c and Line by 2 to 67
-  Special opcode .*: advance Address by 4 to 0x60 and Line by 1 to 68
-  Special opcode .*: advance Address by 2 to 0x62 and Line by 2 to 70
-  Special opcode .*: advance Address by 4 to 0x66 and Line by 1 to 71
-  Special opcode .*: advance Address by 2 to 0x68 and Line by 2 to 73
-  Special opcode .*: advance Address by 4 to 0x6c and Line by 1 to 74
-  Special opcode .*: advance Address by 2 to 0x6e and Line by 2 to 76
-  Special opcode .*: advance Address by 4 to 0x72 and Line by 1 to 77
-  Special opcode .*: advance Address by 2 to 0x74 and Line by 2 to 79
-  Special opcode .*: advance Address by 6 to 0x7a and Line by 1 to 80
-  Special opcode .*: advance Address by 2 to 0x7c and Line by 2 to 82
-  Special opcode .*: advance Address by 6 to 0x82 and Line by 1 to 83
-  Special opcode .*: advance Address by 2 to 0x84 and Line by 2 to 85
-  Special opcode .*: advance Address by 6 to 0x8a and Line by 1 to 86
-  Special opcode .*: advance Address by 2 to 0x8c and Line by 2 to 88
-  Special opcode .*: advance Address by 6 to 0x92 and Line by 1 to 89
-  Special opcode .*: advance Address by 2 to 0x94 and Line by 2 to 91
-  Special opcode .*: advance Address by 6 to 0x9a and Line by 1 to 92
-  Special opcode .*: advance Address by 2 to 0x9c and Line by 2 to 94
-  Special opcode .*: advance Address by 6 to 0xa2 and Line by 1 to 95
-  Special opcode .*: advance Address by 2 to 0xa4 and Line by 2 to 97
-  Special opcode .*: advance Address by 6 to 0xaa and Line by 1 to 98
-  Special opcode .*: advance Address by 2 to 0xac and Line by 2 to 100
-  Special opcode .*: advance Address by 6 to 0xb2 and Line by 1 to 101
-  Special opcode .*: advance Address by 2 to 0xb4 and Line by 2 to 103
-  Special opcode .*: advance Address by 6 to 0xba and Line by 1 to 104
-  Special opcode .*: advance Address by 2 to 0xbc and Line by 2 to 106
-  Special opcode .*: advance Address by 6 to 0xc2 and Line by 1 to 107
-  Special opcode .*: advance Address by 2 to 0xc4 and Line by 2 to 109
-  Special opcode .*: advance Address by 6 to 0xca and Line by 1 to 110
-  Special opcode .*: advance Address by 2 to 0xcc and Line by 2 to 112
-  Special opcode .*: advance Address by 6 to 0xd2 and Line by 1 to 113
-  Special opcode .*: advance Address by 2 to 0xd4 and Line by 2 to 115
-  Special opcode .*: advance Address by 6 to 0xda and Line by 1 to 116
-  Special opcode .*: advance Address by 2 to 0xdc and Line by 2 to 118
-  Special opcode .*: advance Address by 6 to 0xe2 and Line by 1 to 119
-  Special opcode .*: advance Address by 2 to 0xe4 and Line by 2 to 121
-  Special opcode .*: advance Address by 6 to 0xea and Line by 1 to 122
-  Special opcode .*: advance Address by 2 to 0xec and Line by 2 to 124
-  Special opcode .*: advance Address by 6 to 0xf2 and Line by 1 to 125
-  Special opcode .*: advance Address by 2 to 0xf4 and Line by 2 to 127
-  Special opcode .*: advance Address by 2 to 0xf6 and Line by 1 to 128
-  Special opcode .*: advance Address by 2 to 0xf8 and Line by 2 to 130
-  Special opcode .*: advance Address by 2 to 0xfa and Line by 1 to 131
-  Special opcode .*: advance Address by 2 to 0xfc and Line by 2 to 133
-  Special opcode .*: advance Address by 2 to 0xfe and Line by 1 to 134
-  Special opcode .*: advance Address by 2 to 0x100 and Line by 2 to 136
-  Special opcode .*: advance Address by 2 to 0x102 and Line by 1 to 137
-  Special opcode .*: advance Address by 2 to 0x104 and Line by 2 to 139
-  Special opcode .*: advance Address by 2 to 0x106 and Line by 1 to 140
-  Special opcode .*: advance Address by 2 to 0x108 and Line by 2 to 142
-  Special opcode .*: advance Address by 2 to 0x10a and Line by 1 to 143
-  Special opcode .*: advance Address by 2 to 0x10c and Line by 2 to 145
-  Special opcode .*: advance Address by 2 to 0x10e and Line by 1 to 146
-  Special opcode .*: advance Address by 2 to 0x110 and Line by 2 to 148
-  Special opcode .*: advance Address by 2 to 0x112 and Line by 1 to 149
-  Special opcode .*: advance Address by 2 to 0x114 and Line by 2 to 151
-  Special opcode .*: advance Address by 2 to 0x116 and Line by 1 to 152
-  Special opcode .*: advance Address by 2 to 0x118 and Line by 6 to 158
-  Special opcode .*: advance Address by 2 to 0x11a and Line by 1 to 159
-  Special opcode .*: advance Address by 2 to 0x11c and Line by 2 to 161
-  Special opcode .*: advance Address by 2 to 0x11e and Line by 1 to 162
-  Special opcode .*: advance Address by 2 to 0x120 and Line by 2 to 164
-  Special opcode .*: advance Address by 2 to 0x122 and Line by 1 to 165
-  Special opcode .*: advance Address by 2 to 0x124 and Line by 2 to 167
-  Special opcode .*: advance Address by 2 to 0x126 and Line by 1 to 168
-  Special opcode .*: advance Address by 2 to 0x128 and Line by 2 to 170
-  Special opcode .*: advance Address by 2 to 0x12a and Line by 1 to 171
-  Special opcode .*: advance Address by 2 to 0x12c and Line by 2 to 173
-  Special opcode .*: advance Address by 2 to 0x12e and Line by 1 to 174
-  Special opcode .*: advance Address by 2 to 0x130 and Line by 2 to 176
-  Special opcode .*: advance Address by 2 to 0x132 and Line by 1 to 177
-  Special opcode .*: advance Address by 2 to 0x134 and Line by 2 to 179
-  Special opcode .*: advance Address by 2 to 0x136 and Line by 1 to 180
-  Special opcode .*: advance Address by 2 to 0x138 and Line by 2 to 182
-  Special opcode .*: advance Address by 2 to 0x13a and Line by 1 to 183
-  Special opcode .*: advance Address by 2 to 0x13c and Line by 5 to 188
-  Special opcode .*: advance Address by 6 to 0x142 and Line by 1 to 189
-  Special opcode .*: advance Address by 2 to 0x144 and Line by 2 to 191
-  Special opcode .*: advance Address by 6 to 0x14a and Line by 1 to 192
-  Special opcode .*: advance Address by 2 to 0x14c and Line by 2 to 194
-  Special opcode .*: advance Address by 6 to 0x152 and Line by 1 to 195
-  Special opcode .*: advance Address by 2 to 0x154 and Line by 2 to 197
-  Special opcode .*: advance Address by 6 to 0x15a and Line by 1 to 198
-  Special opcode .*: advance Address by 2 to 0x15c and Line by 2 to 200
-  Special opcode .*: advance Address by 6 to 0x162 and Line by 1 to 201
-  Special opcode .*: advance Address by 2 to 0x164 and Line by 2 to 203
-  Special opcode .*: advance Address by 6 to 0x16a and Line by 1 to 204
-  Special opcode .*: advance Address by 2 to 0x16c and Line by 2 to 206
-  Special opcode .*: advance Address by 6 to 0x172 and Line by 1 to 207
-  Special opcode .*: advance Address by 2 to 0x174 and Line by 2 to 209
-  Special opcode .*: advance Address by 6 to 0x17a and Line by 1 to 210
-  Special opcode .*: advance Address by 2 to 0x17c and Line by 2 to 212
-  Special opcode .*: advance Address by 6 to 0x182 and Line by 1 to 213
-  Special opcode .*: advance Address by 2 to 0x184 and Line by 2 to 215
-  Special opcode .*: advance Address by 6 to 0x18a and Line by 1 to 216
-  Special opcode .*: advance Address by 2 to 0x18c and Line by 2 to 218
-  Special opcode .*: advance Address by 6 to 0x192 and Line by 1 to 219
-  Special opcode .*: advance Address by 2 to 0x194 and Line by 2 to 221
-  Special opcode .*: advance Address by 6 to 0x19a and Line by 1 to 222
-  Special opcode .*: advance Address by 2 to 0x19c and Line by 2 to 224
-  Special opcode .*: advance Address by 6 to 0x1a2 and Line by 1 to 225
-  Special opcode .*: advance Address by 2 to 0x1a4 and Line by 2 to 227
-  Special opcode .*: advance Address by 6 to 0x1aa and Line by 1 to 228
-  Special opcode .*: advance Address by 2 to 0x1ac and Line by 2 to 230
-  Special opcode .*: advance Address by 6 to 0x1b2 and Line by 1 to 231
-  Special opcode .*: advance Address by 2 to 0x1b4 and Line by 2 to 233
-  Special opcode .*: advance Address by 6 to 0x1ba and Line by 1 to 234
-  Special opcode .*: advance Address by 2 to 0x1bc and Line by 2 to 236
-  Special opcode .*: advance Address by 2 to 0x1be and Line by 1 to 237
-  Special opcode .*: advance Address by 2 to 0x1c0 and Line by 2 to 239
-  Special opcode .*: advance Address by 2 to 0x1c2 and Line by 1 to 240
-  Special opcode .*: advance Address by 2 to 0x1c4 and Line by 2 to 242
-  Special opcode .*: advance Address by 2 to 0x1c6 and Line by 1 to 243
-  Special opcode .*: advance Address by 2 to 0x1c8 and Line by 2 to 245
-  Special opcode .*: advance Address by 2 to 0x1ca and Line by 1 to 246
-  Advance PC by 2 to 0x1cc
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 8 to 9
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 10
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x4 and Line by 2 to 12
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x6 and Line by 1 to 13
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8 and Line by 2 to 15
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xa and Line by 1 to 16
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xc and Line by 2 to 18
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xe and Line by 1 to 19
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x10 and Line by 2 to 21
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x12 and Line by 1 to 22
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x14 and Line by 2 to 24
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x16 and Line by 1 to 25
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x18 and Line by 2 to 27
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1a and Line by 1 to 28
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1c and Line by 2 to 30
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1e and Line by 1 to 31
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x20 and Line by 6 to 37
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x24 and Line by 1 to 38
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x26 and Line by 2 to 40
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x2a and Line by 1 to 41
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2c and Line by 2 to 43
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x30 and Line by 1 to 44
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x32 and Line by 2 to 46
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x36 and Line by 1 to 47
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x38 and Line by 2 to 49
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x3c and Line by 1 to 50
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x3e and Line by 2 to 52
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x42 and Line by 1 to 53
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x44 and Line by 2 to 55
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x48 and Line by 1 to 56
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x4a and Line by 2 to 58
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x4e and Line by 1 to 59
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x50 and Line by 2 to 61
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x54 and Line by 1 to 62
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x56 and Line by 2 to 64
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5a and Line by 1 to 65
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x5c and Line by 2 to 67
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x60 and Line by 1 to 68
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x62 and Line by 2 to 70
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x66 and Line by 1 to 71
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x68 and Line by 2 to 73
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x6c and Line by 1 to 74
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x6e and Line by 2 to 76
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x72 and Line by 1 to 77
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x74 and Line by 2 to 79
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x7a and Line by 1 to 80
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7c and Line by 2 to 82
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x82 and Line by 1 to 83
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x84 and Line by 2 to 85
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x8a and Line by 1 to 86
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8c and Line by 2 to 88
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x92 and Line by 1 to 89
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x94 and Line by 2 to 91
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x9a and Line by 1 to 92
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x9c and Line by 2 to 94
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xa2 and Line by 1 to 95
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xa4 and Line by 2 to 97
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xaa and Line by 1 to 98
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xac and Line by 2 to 100
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xb2 and Line by 1 to 101
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xb4 and Line by 2 to 103
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xba and Line by 1 to 104
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xbc and Line by 2 to 106
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xc2 and Line by 1 to 107
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xc4 and Line by 2 to 109
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xca and Line by 1 to 110
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xcc and Line by 2 to 112
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xd2 and Line by 1 to 113
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xd4 and Line by 2 to 115
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xda and Line by 1 to 116
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xdc and Line by 2 to 118
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xe2 and Line by 1 to 119
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xe4 and Line by 2 to 121
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xea and Line by 1 to 122
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xec and Line by 2 to 124
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0xf2 and Line by 1 to 125
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xf4 and Line by 2 to 127
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xf6 and Line by 1 to 128
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xf8 and Line by 2 to 130
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xfa and Line by 1 to 131
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xfc and Line by 2 to 133
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xfe and Line by 1 to 134
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x100 and Line by 2 to 136
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x102 and Line by 1 to 137
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x104 and Line by 2 to 139
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x106 and Line by 1 to 140
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x108 and Line by 2 to 142
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x10a and Line by 1 to 143
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x10c and Line by 2 to 145
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x10e and Line by 1 to 146
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x110 and Line by 2 to 148
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x112 and Line by 1 to 149
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x114 and Line by 2 to 151
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x116 and Line by 1 to 152
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x118 and Line by 6 to 158
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x11a and Line by 1 to 159
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x11c and Line by 2 to 161
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x11e and Line by 1 to 162
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x120 and Line by 2 to 164
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x122 and Line by 1 to 165
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x124 and Line by 2 to 167
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x126 and Line by 1 to 168
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x128 and Line by 2 to 170
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x12a and Line by 1 to 171
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x12c and Line by 2 to 173
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x12e and Line by 1 to 174
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x130 and Line by 2 to 176
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x132 and Line by 1 to 177
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x134 and Line by 2 to 179
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x136 and Line by 1 to 180
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x138 and Line by 2 to 182
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x13a and Line by 1 to 183
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x13c and Line by 5 to 188
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x142 and Line by 1 to 189
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x144 and Line by 2 to 191
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x14a and Line by 1 to 192
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x14c and Line by 2 to 194
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x152 and Line by 1 to 195
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x154 and Line by 2 to 197
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x15a and Line by 1 to 198
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x15c and Line by 2 to 200
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x162 and Line by 1 to 201
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x164 and Line by 2 to 203
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x16a and Line by 1 to 204
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x16c and Line by 2 to 206
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x172 and Line by 1 to 207
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x174 and Line by 2 to 209
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x17a and Line by 1 to 210
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x17c and Line by 2 to 212
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x182 and Line by 1 to 213
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x184 and Line by 2 to 215
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x18a and Line by 1 to 216
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x18c and Line by 2 to 218
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x192 and Line by 1 to 219
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x194 and Line by 2 to 221
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x19a and Line by 1 to 222
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x19c and Line by 2 to 224
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x1a2 and Line by 1 to 225
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1a4 and Line by 2 to 227
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x1aa and Line by 1 to 228
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1ac and Line by 2 to 230
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x1b2 and Line by 1 to 231
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1b4 and Line by 2 to 233
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x1ba and Line by 1 to 234
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1bc and Line by 2 to 236
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1be and Line by 1 to 237
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1c0 and Line by 2 to 239
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1c2 and Line by 1 to 240
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1c4 and Line by 2 to 242
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1c6 and Line by 1 to 243
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1c8 and Line by 2 to 245
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x1ca and Line by 1 to 246
+  \[0x.*\]  Advance PC by 2 to 0x1cc
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-2.d b/gas/testsuite/gas/cris/rd-dw2-2.d
index 7d58ab5..a567e11 100644
--- a/gas/testsuite/gas/cris/rd-dw2-2.d
+++ b/gas/testsuite/gas/cris/rd-dw2-2.d
@@ -5,31 +5,31 @@
 # Simple instruction sequence with content-emitting pseudo-ops.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x5005a
-  Advance Line by 36 to 37
-  Copy
-  Special opcode .*: advance Address by 4 to 0x5005e and Line by 1 to 38
-  Special opcode .*: advance Address by 4 to 0x50062 and Line by 1 to 39
-  Special opcode .*: advance Address by 4 to 0x50066 and Line by 1 to 40
-  Special opcode .*: advance Address by 4 to 0x5006a and Line by 2 to 42
-  Special opcode .*: advance Address by 4 to 0x5006e and Line by 1 to 43
-  Special opcode .*: advance Address by 4 to 0x50072 and Line by 1 to 44
-  Special opcode .*: advance Address by 4 to 0x50076 and Line by 1 to 45
-  Special opcode .*: advance Address by 4 to 0x5007a and Line by 2 to 47
-  Special opcode .*: advance Address by 4 to 0x5007e and Line by 1 to 48
-  Special opcode .*: advance Address by 4 to 0x50082 and Line by 1 to 49
-  Special opcode .*: advance Address by 4 to 0x50086 and Line by 1 to 50
-  Special opcode .*: advance Address by 4 to 0x5008a and Line by 2 to 52
-  Special opcode .*: advance Address by 6 to 0x50090 and Line by 1 to 53
-  Special opcode .*: advance Address by 6 to 0x50096 and Line by 1 to 54
-  Special opcode .*: advance Address by 6 to 0x5009c and Line by 1 to 55
-  Special opcode .*: advance Address by 6 to 0x500a2 and Line by 2 to 57
-  Special opcode .*: advance Address by 6 to 0x500a8 and Line by 1 to 58
-  Special opcode .*: advance Address by 6 to 0x500ae and Line by 1 to 59
-  Special opcode .*: advance Address by 6 to 0x500b4 and Line by 1 to 60
-  Special opcode .*: advance Address by 6 to 0x500ba and Line by 2 to 62
-  Special opcode .*: advance Address by 6 to 0x500c0 and Line by 1 to 63
-  Special opcode .*: advance Address by 6 to 0x500c6 and Line by 1 to 64
-  Special opcode .*: advance Address by 6 to 0x500cc and Line by 1 to 65
-  Advance PC by 327776 to 0xa012c
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x5005a
+  \[0x.*\]  Advance Line by 36 to 37
+  \[0x.*\]  Copy
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5005e and Line by 1 to 38
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x50062 and Line by 1 to 39
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x50066 and Line by 1 to 40
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5006a and Line by 2 to 42
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5006e and Line by 1 to 43
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x50072 and Line by 1 to 44
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x50076 and Line by 1 to 45
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5007a and Line by 2 to 47
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5007e and Line by 1 to 48
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x50082 and Line by 1 to 49
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x50086 and Line by 1 to 50
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x5008a and Line by 2 to 52
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x50090 and Line by 1 to 53
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x50096 and Line by 1 to 54
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x5009c and Line by 1 to 55
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500a2 and Line by 2 to 57
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500a8 and Line by 1 to 58
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500ae and Line by 1 to 59
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500b4 and Line by 1 to 60
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500ba and Line by 2 to 62
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500c0 and Line by 1 to 63
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500c6 and Line by 1 to 64
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x500cc and Line by 1 to 65
+  \[0x.*\]  Advance PC by 327776 to 0xa012c
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-3.d b/gas/testsuite/gas/cris/rd-dw2-3.d
index 272fbf1..dadf66c 100644
--- a/gas/testsuite/gas/cris/rd-dw2-3.d
+++ b/gas/testsuite/gas/cris/rd-dw2-3.d
@@ -5,8 +5,8 @@
 # Simple branch-expansion, type 1.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
-  Special opcode .*: advance Address by 12 to 0xc and Line by 1 to 9
-  Advance PC by 2 to 0xe
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0xc and Line by 1 to 9
+  \[0x.*\]  Advance PC by 2 to 0xe
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-4.d b/gas/testsuite/gas/cris/rd-dw2-4.d
index 9a3fbd3..f8fb7b0 100644
--- a/gas/testsuite/gas/cris/rd-dw2-4.d
+++ b/gas/testsuite/gas/cris/rd-dw2-4.d
@@ -5,9 +5,9 @@
 # Simple branch-expansion, type 2.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
-  Advance PC by 32780 to 0x800c
-  Special opcode .*: advance Address by 0 to 0x800c and Line by 3 to 11
-  Advance PC by 2 to 0x800e
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Advance PC by 32780 to 0x800c
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x800c and Line by 3 to 11
+  \[0x.*\]  Advance PC by 2 to 0x800e
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-5.d b/gas/testsuite/gas/cris/rd-dw2-5.d
index be35ca9..ee4c6ffa 100644
--- a/gas/testsuite/gas/cris/rd-dw2-5.d
+++ b/gas/testsuite/gas/cris/rd-dw2-5.d
@@ -5,10 +5,10 @@
 # Simple branch-expansion, type 3.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
-  Advance PC by 32770 to 0x8002
-  Special opcode .*: advance Address by 0 to 0x8002 and Line by 2 to 10
-  Special opcode .*: advance Address by 12 to 0x800e and Line by 1 to 11
-  Advance PC by 2 to 0x8010
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Advance PC by 32770 to 0x8002
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8002 and Line by 2 to 10
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x800e and Line by 1 to 11
+  \[0x.*\]  Advance PC by 2 to 0x8010
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-6.d b/gas/testsuite/gas/cris/rd-dw2-6.d
index 658e511..0771ac0 100644
--- a/gas/testsuite/gas/cris/rd-dw2-6.d
+++ b/gas/testsuite/gas/cris/rd-dw2-6.d
@@ -5,226 +5,226 @@
 # Complicated branch expansion.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
-  Special opcode .*: advance Address by 2 to 0x2 and Line by 2 to 10
-  Advance PC by 32360 to 0x7e6a
-  Special opcode .*: advance Address by 0 to 0x7e6a and Line by 3 to 13
-  Advance PC by 196 to 0x7f2e
-  Special opcode .*: advance Address by 0 to 0x7f2e and Line by 6 to 19
-  Special opcode .*: advance Address by 2 to 0x7f30 and Line by 1 to 20
-  Special opcode .*: advance Address by 2 to 0x7f32 and Line by 1 to 21
-  Special opcode .*: advance Address by 2 to 0x7f34 and Line by 1 to 22
-  Special opcode .*: advance Address by 2 to 0x7f36 and Line by 1 to 23
-  Special opcode .*: advance Address by 2 to 0x7f38 and Line by 1 to 24
-  Special opcode .*: advance Address by 2 to 0x7f3a and Line by 1 to 25
-  Special opcode .*: advance Address by 2 to 0x7f3c and Line by 1 to 26
-  Special opcode .*: advance Address by 2 to 0x7f3e and Line by 1 to 27
-  Special opcode .*: advance Address by 2 to 0x7f40 and Line by 1 to 28
-  Special opcode .*: advance Address by 2 to 0x7f42 and Line by 1 to 29
-  Special opcode .*: advance Address by 2 to 0x7f44 and Line by 1 to 30
-  Special opcode .*: advance Address by 2 to 0x7f46 and Line by 1 to 31
-  Special opcode .*: advance Address by 2 to 0x7f48 and Line by 1 to 32
-  Special opcode .*: advance Address by 2 to 0x7f4a and Line by 1 to 33
-  Special opcode .*: advance Address by 2 to 0x7f4c and Line by 1 to 34
-  Special opcode .*: advance Address by 2 to 0x7f4e and Line by 1 to 35
-  Special opcode .*: advance Address by 2 to 0x7f50 and Line by 1 to 36
-  Special opcode .*: advance Address by 2 to 0x7f52 and Line by 1 to 37
-  Special opcode .*: advance Address by 2 to 0x7f54 and Line by 1 to 38
-  Special opcode .*: advance Address by 2 to 0x7f56 and Line by 1 to 39
-  Special opcode .*: advance Address by 2 to 0x7f58 and Line by 2 to 41
-  Special opcode .*: advance Address by 2 to 0x7f5a and Line by 1 to 42
-  Special opcode .*: advance Address by 2 to 0x7f5c and Line by 1 to 43
-  Special opcode .*: advance Address by 2 to 0x7f5e and Line by 1 to 44
-  Special opcode .*: advance Address by 2 to 0x7f60 and Line by 1 to 45
-  Special opcode .*: advance Address by 2 to 0x7f62 and Line by 1 to 46
-  Special opcode .*: advance Address by 2 to 0x7f64 and Line by 1 to 47
-  Special opcode .*: advance Address by 2 to 0x7f66 and Line by 1 to 48
-  Special opcode .*: advance Address by 2 to 0x7f68 and Line by 1 to 49
-  Special opcode .*: advance Address by 2 to 0x7f6a and Line by 1 to 50
-  Special opcode .*: advance Address by 4 to 0x7f6e and Line by 1 to 51
-  Special opcode .*: advance Address by 4 to 0x7f72 and Line by 1 to 52
-  Special opcode .*: advance Address by 4 to 0x7f76 and Line by 1 to 53
-  Special opcode .*: advance Address by 4 to 0x7f7a and Line by 1 to 54
-  Special opcode .*: advance Address by 4 to 0x7f7e and Line by 1 to 55
-  Special opcode .*: advance Address by 4 to 0x7f82 and Line by 1 to 56
-  Special opcode .*: advance Address by 4 to 0x7f86 and Line by 1 to 57
-  Special opcode .*: advance Address by 4 to 0x7f8a and Line by 1 to 58
-  Special opcode .*: advance Address by 4 to 0x7f8e and Line by 1 to 59
-  Special opcode .*: advance Address by 4 to 0x7f92 and Line by 1 to 60
-  Special opcode .*: advance Address by 4 to 0x7f96 and Line by 1 to 61
-  Special opcode .*: advance Address by 4 to 0x7f9a and Line by 4 to 65
-  Special opcode .*: advance Address by 2 to 0x7f9c and Line by 1 to 66
-  Special opcode .*: advance Address by 4 to 0x7fa0 and Line by 1 to 67
-  Special opcode .*: advance Address by 4 to 0x7fa4 and Line by 1 to 68
-  Special opcode .*: advance Address by 4 to 0x7fa8 and Line by 1 to 69
-  Special opcode .*: advance Address by 4 to 0x7fac and Line by 1 to 70
-  Special opcode .*: advance Address by 4 to 0x7fb0 and Line by 1 to 71
-  Special opcode .*: advance Address by 4 to 0x7fb4 and Line by 1 to 72
-  Special opcode .*: advance Address by 4 to 0x7fb8 and Line by 1 to 73
-  Special opcode .*: advance Address by 4 to 0x7fbc and Line by 1 to 74
-  Special opcode .*: advance Address by 4 to 0x7fc0 and Line by 1 to 75
-  Special opcode .*: advance Address by 4 to 0x7fc4 and Line by 1 to 76
-  Special opcode .*: advance Address by 4 to 0x7fc8 and Line by 1 to 77
-  Special opcode .*: advance Address by 4 to 0x7fcc and Line by 1 to 78
-  Special opcode .*: advance Address by 4 to 0x7fd0 and Line by 1 to 79
-  Special opcode .*: advance Address by 4 to 0x7fd4 and Line by 1 to 80
-  Special opcode .*: advance Address by 4 to 0x7fd8 and Line by 1 to 81
-  Special opcode .*: advance Address by 4 to 0x7fdc and Line by 1 to 82
-  Special opcode .*: advance Address by 4 to 0x7fe0 and Line by 1 to 83
-  Special opcode .*: advance Address by 4 to 0x7fe4 and Line by 1 to 84
-  Special opcode .*: advance Address by 4 to 0x7fe8 and Line by 1 to 85
-  Special opcode .*: advance Address by 4 to 0x7fec and Line by 6 to 91
-  Special opcode .*: advance Address by 2 to 0x7fee and Line by 1 to 92
-  Special opcode .*: advance Address by 4 to 0x7ff2 and Line by 1 to 93
-  Special opcode .*: advance Address by 4 to 0x7ff6 and Line by 1 to 94
-  Special opcode .*: advance Address by 4 to 0x7ffa and Line by 1 to 95
-  Special opcode .*: advance Address by 4 to 0x7ffe and Line by 1 to 96
-  Special opcode .*: advance Address by 4 to 0x8002 and Line by 1 to 97
-  Special opcode .*: advance Address by 12 to 0x800e and Line by 1 to 98
-  Special opcode .*: advance Address by 12 to 0x801a and Line by 1 to 99
-  Special opcode .*: advance Address by 12 to 0x8026 and Line by 1 to 100
-  Special opcode .*: advance Address by 12 to 0x8032 and Line by 1 to 101
-  Special opcode .*: advance Address by 12 to 0x803e and Line by 1 to 102
-  Special opcode .*: advance Address by 12 to 0x804a and Line by 1 to 103
-  Special opcode .*: advance Address by 12 to 0x8056 and Line by 1 to 104
-  Special opcode .*: advance Address by 12 to 0x8062 and Line by 1 to 105
-  Special opcode .*: advance Address by 12 to 0x806e and Line by 1 to 106
-  Special opcode .*: advance Address by 12 to 0x807a and Line by 1 to 107
-  Special opcode .*: advance Address by 12 to 0x8086 and Line by 1 to 108
-  Special opcode .*: advance Address by 12 to 0x8092 and Line by 1 to 109
-  Special opcode .*: advance Address by 12 to 0x809e and Line by 1 to 110
-  Special opcode .*: advance Address by 12 to 0x80aa and Line by 1 to 111
-  Special opcode .*: advance Address by 12 to 0x80b6 and Line by 5 to 116
-  Special opcode .*: advance Address by 2 to 0x80b8 and Line by 1 to 117
-  Special opcode .*: advance Address by 12 to 0x80c4 and Line by 1 to 118
-  Special opcode .*: advance Address by 12 to 0x80d0 and Line by 1 to 119
-  Special opcode .*: advance Address by 12 to 0x80dc and Line by 1 to 120
-  Special opcode .*: advance Address by 12 to 0x80e8 and Line by 1 to 121
-  Special opcode .*: advance Address by 12 to 0x80f4 and Line by 1 to 122
-  Special opcode .*: advance Address by 12 to 0x8100 and Line by 1 to 123
-  Special opcode .*: advance Address by 12 to 0x810c and Line by 1 to 124
-  Special opcode .*: advance Address by 12 to 0x8118 and Line by 1 to 125
-  Special opcode .*: advance Address by 12 to 0x8124 and Line by 1 to 126
-  Special opcode .*: advance Address by 12 to 0x8130 and Line by 1 to 127
-  Special opcode .*: advance Address by 12 to 0x813c and Line by 1 to 128
-  Special opcode .*: advance Address by 12 to 0x8148 and Line by 1 to 129
-  Special opcode .*: advance Address by 12 to 0x8154 and Line by 1 to 130
-  Special opcode .*: advance Address by 12 to 0x8160 and Line by 1 to 131
-  Special opcode .*: advance Address by 12 to 0x816c and Line by 1 to 132
-  Special opcode .*: advance Address by 12 to 0x8178 and Line by 1 to 133
-  Special opcode .*: advance Address by 12 to 0x8184 and Line by 1 to 134
-  Special opcode .*: advance Address by 12 to 0x8190 and Line by 1 to 135
-  Special opcode .*: advance Address by 12 to 0x819c and Line by 1 to 136
-  Special opcode .*: advance Address by 12 to 0x81a8 and Line by 6 to 142
-  Special opcode .*: advance Address by 2 to 0x81aa and Line by 1 to 143
-  Special opcode .*: advance Address by 12 to 0x81b6 and Line by 1 to 144
-  Special opcode .*: advance Address by 12 to 0x81c2 and Line by 1 to 145
-  Special opcode .*: advance Address by 12 to 0x81ce and Line by 1 to 146
-  Special opcode .*: advance Address by 12 to 0x81da and Line by 1 to 147
-  Special opcode .*: advance Address by 12 to 0x81e6 and Line by 1 to 148
-  Special opcode .*: advance Address by 12 to 0x81f2 and Line by 1 to 149
-  Special opcode .*: advance Address by 12 to 0x81fe and Line by 1 to 150
-  Special opcode .*: advance Address by 12 to 0x820a and Line by 1 to 151
-  Special opcode .*: advance Address by 12 to 0x8216 and Line by 1 to 152
-  Special opcode .*: advance Address by 12 to 0x8222 and Line by 1 to 153
-  Special opcode .*: advance Address by 12 to 0x822e and Line by 1 to 154
-  Special opcode .*: advance Address by 12 to 0x823a and Line by 1 to 155
-  Special opcode .*: advance Address by 12 to 0x8246 and Line by 1 to 156
-  Special opcode .*: advance Address by 12 to 0x8252 and Line by 1 to 157
-  Special opcode .*: advance Address by 12 to 0x825e and Line by 1 to 158
-  Special opcode .*: advance Address by 12 to 0x826a and Line by 1 to 159
-  Special opcode .*: advance Address by 12 to 0x8276 and Line by 1 to 160
-  Special opcode .*: advance Address by 12 to 0x8282 and Line by 1 to 161
-  Special opcode .*: advance Address by 12 to 0x828e and Line by 1 to 162
-  Special opcode .*: advance Address by 12 to 0x829a and Line by 5 to 167
-  Special opcode .*: advance Address by 2 to 0x829c and Line by 1 to 168
-  Special opcode .*: advance Address by 12 to 0x82a8 and Line by 1 to 169
-  Special opcode .*: advance Address by 12 to 0x82b4 and Line by 1 to 170
-  Special opcode .*: advance Address by 12 to 0x82c0 and Line by 1 to 171
-  Special opcode .*: advance Address by 12 to 0x82cc and Line by 1 to 172
-  Special opcode .*: advance Address by 12 to 0x82d8 and Line by 1 to 173
-  Special opcode .*: advance Address by 12 to 0x82e4 and Line by 1 to 174
-  Special opcode .*: advance Address by 12 to 0x82f0 and Line by 1 to 175
-  Special opcode .*: advance Address by 12 to 0x82fc and Line by 1 to 176
-  Special opcode .*: advance Address by 12 to 0x8308 and Line by 1 to 177
-  Special opcode .*: advance Address by 12 to 0x8314 and Line by 1 to 178
-  Special opcode .*: advance Address by 12 to 0x8320 and Line by 1 to 179
-  Special opcode .*: advance Address by 12 to 0x832c and Line by 1 to 180
-  Special opcode .*: advance Address by 12 to 0x8338 and Line by 1 to 181
-  Special opcode .*: advance Address by 12 to 0x8344 and Line by 1 to 182
-  Special opcode .*: advance Address by 4 to 0x8348 and Line by 1 to 183
-  Special opcode .*: advance Address by 4 to 0x834c and Line by 1 to 184
-  Special opcode .*: advance Address by 4 to 0x8350 and Line by 1 to 185
-  Special opcode .*: advance Address by 4 to 0x8354 and Line by 1 to 186
-  Special opcode .*: advance Address by 4 to 0x8358 and Line by 1 to 187
-  Special opcode .*: advance Address by 4 to 0x835c and Line by 5 to 192
-  Special opcode .*: advance Address by 2 to 0x835e and Line by 1 to 193
-  Special opcode .*: advance Address by 4 to 0x8362 and Line by 1 to 194
-  Special opcode .*: advance Address by 4 to 0x8366 and Line by 1 to 195
-  Special opcode .*: advance Address by 4 to 0x836a and Line by 1 to 196
-  Special opcode .*: advance Address by 4 to 0x836e and Line by 1 to 197
-  Special opcode .*: advance Address by 4 to 0x8372 and Line by 1 to 198
-  Special opcode .*: advance Address by 4 to 0x8376 and Line by 1 to 199
-  Special opcode .*: advance Address by 4 to 0x837a and Line by 1 to 200
-  Special opcode .*: advance Address by 4 to 0x837e and Line by 1 to 201
-  Special opcode .*: advance Address by 4 to 0x8382 and Line by 1 to 202
-  Special opcode .*: advance Address by 4 to 0x8386 and Line by 1 to 203
-  Special opcode .*: advance Address by 4 to 0x838a and Line by 1 to 204
-  Special opcode .*: advance Address by 4 to 0x838e and Line by 1 to 205
-  Special opcode .*: advance Address by 4 to 0x8392 and Line by 1 to 206
-  Special opcode .*: advance Address by 4 to 0x8396 and Line by 1 to 207
-  Special opcode .*: advance Address by 4 to 0x839a and Line by 1 to 208
-  Special opcode .*: advance Address by 4 to 0x839e and Line by 1 to 209
-  Special opcode .*: advance Address by 4 to 0x83a2 and Line by 1 to 210
-  Special opcode .*: advance Address by 4 to 0x83a6 and Line by 1 to 211
-  Special opcode .*: advance Address by 4 to 0x83aa and Line by 1 to 212
-  Special opcode .*: advance Address by 4 to 0x83ae and Line by 5 to 217
-  Special opcode .*: advance Address by 2 to 0x83b0 and Line by 1 to 218
-  Special opcode .*: advance Address by 4 to 0x83b4 and Line by 1 to 219
-  Special opcode .*: advance Address by 4 to 0x83b8 and Line by 1 to 220
-  Special opcode .*: advance Address by 4 to 0x83bc and Line by 1 to 221
-  Special opcode .*: advance Address by 4 to 0x83c0 and Line by 1 to 222
-  Special opcode .*: advance Address by 4 to 0x83c4 and Line by 1 to 223
-  Special opcode .*: advance Address by 4 to 0x83c8 and Line by 1 to 224
-  Special opcode .*: advance Address by 4 to 0x83cc and Line by 1 to 225
-  Special opcode .*: advance Address by 4 to 0x83d0 and Line by 1 to 226
-  Special opcode .*: advance Address by 4 to 0x83d4 and Line by 1 to 227
-  Special opcode .*: advance Address by 4 to 0x83d8 and Line by 1 to 228
-  Special opcode .*: advance Address by 4 to 0x83dc and Line by 1 to 229
-  Special opcode .*: advance Address by 2 to 0x83de and Line by 1 to 230
-  Special opcode .*: advance Address by 2 to 0x83e0 and Line by 1 to 231
-  Special opcode .*: advance Address by 2 to 0x83e2 and Line by 1 to 232
-  Special opcode .*: advance Address by 2 to 0x83e4 and Line by 1 to 233
-  Special opcode .*: advance Address by 2 to 0x83e6 and Line by 1 to 234
-  Special opcode .*: advance Address by 2 to 0x83e8 and Line by 1 to 235
-  Special opcode .*: advance Address by 2 to 0x83ea and Line by 1 to 236
-  Special opcode .*: advance Address by 2 to 0x83ec and Line by 1 to 237
-  Special opcode .*: advance Address by 2 to 0x83ee and Line by 5 to 242
-  Special opcode .*: advance Address by 2 to 0x83f0 and Line by 1 to 243
-  Special opcode .*: advance Address by 2 to 0x83f2 and Line by 1 to 244
-  Special opcode .*: advance Address by 2 to 0x83f4 and Line by 1 to 245
-  Special opcode .*: advance Address by 2 to 0x83f6 and Line by 1 to 246
-  Special opcode .*: advance Address by 2 to 0x83f8 and Line by 1 to 247
-  Special opcode .*: advance Address by 2 to 0x83fa and Line by 1 to 248
-  Special opcode .*: advance Address by 2 to 0x83fc and Line by 1 to 249
-  Special opcode .*: advance Address by 2 to 0x83fe and Line by 1 to 250
-  Special opcode .*: advance Address by 2 to 0x8400 and Line by 1 to 251
-  Special opcode .*: advance Address by 2 to 0x8402 and Line by 1 to 252
-  Special opcode .*: advance Address by 2 to 0x8404 and Line by 1 to 253
-  Special opcode .*: advance Address by 2 to 0x8406 and Line by 1 to 254
-  Special opcode .*: advance Address by 2 to 0x8408 and Line by 1 to 255
-  Special opcode .*: advance Address by 2 to 0x840a and Line by 1 to 256
-  Special opcode .*: advance Address by 2 to 0x840c and Line by 1 to 257
-  Special opcode .*: advance Address by 2 to 0x840e and Line by 1 to 258
-  Special opcode .*: advance Address by 2 to 0x8410 and Line by 1 to 259
-  Special opcode .*: advance Address by 2 to 0x8412 and Line by 1 to 260
-  Special opcode .*: advance Address by 2 to 0x8414 and Line by 1 to 261
-  Special opcode .*: advance Address by 2 to 0x8416 and Line by 1 to 262
-  Special opcode .*: advance Address by 2 to 0x8418 and Line by 2 to 264
-  Advance PC by 196 to 0x84dc
-  Special opcode .*: advance Address by 0 to 0x84dc and Line by 3 to 267
-  Advance PC by 32360 to 0x10344
-  Special opcode .*: advance Address by 0 to 0x10344 and Line by 3 to 270
-  Advance PC by 2 to 0x10346
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 7 to 8
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 2 to 10
+  \[0x.*\]  Advance PC by 32360 to 0x7e6a
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x7e6a and Line by 3 to 13
+  \[0x.*\]  Advance PC by 196 to 0x7f2e
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x7f2e and Line by 6 to 19
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f30 and Line by 1 to 20
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f32 and Line by 1 to 21
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f34 and Line by 1 to 22
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f36 and Line by 1 to 23
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f38 and Line by 1 to 24
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f3a and Line by 1 to 25
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f3c and Line by 1 to 26
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f3e and Line by 1 to 27
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f40 and Line by 1 to 28
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f42 and Line by 1 to 29
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f44 and Line by 1 to 30
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f46 and Line by 1 to 31
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f48 and Line by 1 to 32
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f4a and Line by 1 to 33
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f4c and Line by 1 to 34
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f4e and Line by 1 to 35
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f50 and Line by 1 to 36
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f52 and Line by 1 to 37
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f54 and Line by 1 to 38
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f56 and Line by 1 to 39
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f58 and Line by 2 to 41
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f5a and Line by 1 to 42
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f5c and Line by 1 to 43
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f5e and Line by 1 to 44
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f60 and Line by 1 to 45
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f62 and Line by 1 to 46
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f64 and Line by 1 to 47
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f66 and Line by 1 to 48
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f68 and Line by 1 to 49
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f6a and Line by 1 to 50
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f6e and Line by 1 to 51
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f72 and Line by 1 to 52
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f76 and Line by 1 to 53
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f7a and Line by 1 to 54
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f7e and Line by 1 to 55
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f82 and Line by 1 to 56
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f86 and Line by 1 to 57
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f8a and Line by 1 to 58
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f8e and Line by 1 to 59
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f92 and Line by 1 to 60
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f96 and Line by 1 to 61
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7f9a and Line by 4 to 65
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7f9c and Line by 1 to 66
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fa0 and Line by 1 to 67
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fa4 and Line by 1 to 68
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fa8 and Line by 1 to 69
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fac and Line by 1 to 70
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fb0 and Line by 1 to 71
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fb4 and Line by 1 to 72
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fb8 and Line by 1 to 73
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fbc and Line by 1 to 74
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fc0 and Line by 1 to 75
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fc4 and Line by 1 to 76
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fc8 and Line by 1 to 77
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fcc and Line by 1 to 78
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fd0 and Line by 1 to 79
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fd4 and Line by 1 to 80
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fd8 and Line by 1 to 81
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fdc and Line by 1 to 82
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fe0 and Line by 1 to 83
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fe4 and Line by 1 to 84
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fe8 and Line by 1 to 85
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7fec and Line by 6 to 91
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x7fee and Line by 1 to 92
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7ff2 and Line by 1 to 93
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7ff6 and Line by 1 to 94
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7ffa and Line by 1 to 95
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x7ffe and Line by 1 to 96
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8002 and Line by 1 to 97
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x800e and Line by 1 to 98
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x801a and Line by 1 to 99
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8026 and Line by 1 to 100
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8032 and Line by 1 to 101
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x803e and Line by 1 to 102
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x804a and Line by 1 to 103
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8056 and Line by 1 to 104
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8062 and Line by 1 to 105
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x806e and Line by 1 to 106
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x807a and Line by 1 to 107
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8086 and Line by 1 to 108
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8092 and Line by 1 to 109
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x809e and Line by 1 to 110
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x80aa and Line by 1 to 111
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x80b6 and Line by 5 to 116
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x80b8 and Line by 1 to 117
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x80c4 and Line by 1 to 118
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x80d0 and Line by 1 to 119
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x80dc and Line by 1 to 120
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x80e8 and Line by 1 to 121
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x80f4 and Line by 1 to 122
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8100 and Line by 1 to 123
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x810c and Line by 1 to 124
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8118 and Line by 1 to 125
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8124 and Line by 1 to 126
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8130 and Line by 1 to 127
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x813c and Line by 1 to 128
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8148 and Line by 1 to 129
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8154 and Line by 1 to 130
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8160 and Line by 1 to 131
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x816c and Line by 1 to 132
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8178 and Line by 1 to 133
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8184 and Line by 1 to 134
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8190 and Line by 1 to 135
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x819c and Line by 1 to 136
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81a8 and Line by 6 to 142
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81aa and Line by 1 to 143
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81b6 and Line by 1 to 144
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81c2 and Line by 1 to 145
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81ce and Line by 1 to 146
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81da and Line by 1 to 147
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81e6 and Line by 1 to 148
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81f2 and Line by 1 to 149
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x81fe and Line by 1 to 150
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x820a and Line by 1 to 151
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8216 and Line by 1 to 152
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8222 and Line by 1 to 153
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x822e and Line by 1 to 154
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x823a and Line by 1 to 155
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8246 and Line by 1 to 156
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8252 and Line by 1 to 157
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x825e and Line by 1 to 158
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x826a and Line by 1 to 159
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8276 and Line by 1 to 160
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8282 and Line by 1 to 161
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x828e and Line by 1 to 162
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x829a and Line by 5 to 167
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x829c and Line by 1 to 168
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82a8 and Line by 1 to 169
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82b4 and Line by 1 to 170
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82c0 and Line by 1 to 171
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82cc and Line by 1 to 172
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82d8 and Line by 1 to 173
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82e4 and Line by 1 to 174
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82f0 and Line by 1 to 175
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x82fc and Line by 1 to 176
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8308 and Line by 1 to 177
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8314 and Line by 1 to 178
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8320 and Line by 1 to 179
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x832c and Line by 1 to 180
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8338 and Line by 1 to 181
+  \[0x.*\]  Special opcode .*: advance Address by 12 to 0x8344 and Line by 1 to 182
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8348 and Line by 1 to 183
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x834c and Line by 1 to 184
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8350 and Line by 1 to 185
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8354 and Line by 1 to 186
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8358 and Line by 1 to 187
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x835c and Line by 5 to 192
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x835e and Line by 1 to 193
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8362 and Line by 1 to 194
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8366 and Line by 1 to 195
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x836a and Line by 1 to 196
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x836e and Line by 1 to 197
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8372 and Line by 1 to 198
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8376 and Line by 1 to 199
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x837a and Line by 1 to 200
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x837e and Line by 1 to 201
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8382 and Line by 1 to 202
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8386 and Line by 1 to 203
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x838a and Line by 1 to 204
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x838e and Line by 1 to 205
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8392 and Line by 1 to 206
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x8396 and Line by 1 to 207
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x839a and Line by 1 to 208
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x839e and Line by 1 to 209
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83a2 and Line by 1 to 210
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83a6 and Line by 1 to 211
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83aa and Line by 1 to 212
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83ae and Line by 5 to 217
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83b0 and Line by 1 to 218
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83b4 and Line by 1 to 219
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83b8 and Line by 1 to 220
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83bc and Line by 1 to 221
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83c0 and Line by 1 to 222
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83c4 and Line by 1 to 223
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83c8 and Line by 1 to 224
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83cc and Line by 1 to 225
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83d0 and Line by 1 to 226
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83d4 and Line by 1 to 227
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83d8 and Line by 1 to 228
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x83dc and Line by 1 to 229
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83de and Line by 1 to 230
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83e0 and Line by 1 to 231
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83e2 and Line by 1 to 232
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83e4 and Line by 1 to 233
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83e6 and Line by 1 to 234
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83e8 and Line by 1 to 235
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83ea and Line by 1 to 236
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83ec and Line by 1 to 237
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83ee and Line by 5 to 242
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83f0 and Line by 1 to 243
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83f2 and Line by 1 to 244
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83f4 and Line by 1 to 245
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83f6 and Line by 1 to 246
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83f8 and Line by 1 to 247
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83fa and Line by 1 to 248
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83fc and Line by 1 to 249
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x83fe and Line by 1 to 250
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8400 and Line by 1 to 251
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8402 and Line by 1 to 252
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8404 and Line by 1 to 253
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8406 and Line by 1 to 254
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8408 and Line by 1 to 255
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x840a and Line by 1 to 256
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x840c and Line by 1 to 257
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x840e and Line by 1 to 258
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8410 and Line by 1 to 259
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8412 and Line by 1 to 260
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8414 and Line by 1 to 261
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8416 and Line by 1 to 262
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8418 and Line by 2 to 264
+  \[0x.*\]  Advance PC by 196 to 0x84dc
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x84dc and Line by 3 to 267
+  \[0x.*\]  Advance PC by 32360 to 0x10344
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x10344 and Line by 3 to 270
+  \[0x.*\]  Advance PC by 2 to 0x10346
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-7.d b/gas/testsuite/gas/cris/rd-dw2-7.d
index ad99a3f..c62fae8 100644
--- a/gas/testsuite/gas/cris/rd-dw2-7.d
+++ b/gas/testsuite/gas/cris/rd-dw2-7.d
@@ -5,11 +5,11 @@
 # Most simple broken word.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 2 to 3
-  Special opcode .*: advance Address by 4 to 0x4 and Line by 4 to 7
-  Special opcode .*: advance Address by 14 to 0x12 and Line by 8 to 15
-  Advance PC by 32768 to 0x8012
-  Special opcode .*: advance Address by 0 to 0x8012 and Line by 4 to 19
-  Advance PC by 2 to 0x8014
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x4 and Line by 4 to 7
+  \[0x.*\]  Special opcode .*: advance Address by 14 to 0x12 and Line by 8 to 15
+  \[0x.*\]  Advance PC by 32768 to 0x8012
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8012 and Line by 4 to 19
+  \[0x.*\]  Advance PC by 2 to 0x8014
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-8.d b/gas/testsuite/gas/cris/rd-dw2-8.d
index d141412..fb08aa7 100644
--- a/gas/testsuite/gas/cris/rd-dw2-8.d
+++ b/gas/testsuite/gas/cris/rd-dw2-8.d
@@ -5,13 +5,13 @@
 # Simple broken word, table with two labels.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 2 to 3
-  Special opcode .*: advance Address by 6 to 0x6 and Line by 5 to 8
-  Advance Line by 9 to 17
-  Special opcode .*: advance Address by 20 to 0x1a and Line by 0 to 17
-  Advance PC by 32768 to 0x801a
-  Special opcode .*: advance Address by 0 to 0x801a and Line by 4 to 21
-  Special opcode .*: advance Address by 2 to 0x801c and Line by 1 to 22
-  Advance PC by 2 to 0x801e
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Special opcode .*: advance Address by 6 to 0x6 and Line by 5 to 8
+  \[0x.*\]  Advance Line by 9 to 17
+  \[0x.*\]  Special opcode .*: advance Address by 20 to 0x1a and Line by 0 to 17
+  \[0x.*\]  Advance PC by 32768 to 0x801a
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x801a and Line by 4 to 21
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x801c and Line by 1 to 22
+  \[0x.*\]  Advance PC by 2 to 0x801e
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/cris/rd-dw2-9.d b/gas/testsuite/gas/cris/rd-dw2-9.d
index 0290ad2..a83d89f 100644
--- a/gas/testsuite/gas/cris/rd-dw2-9.d
+++ b/gas/testsuite/gas/cris/rd-dw2-9.d
@@ -5,59 +5,59 @@
 # Long broken word table.
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode .*: advance Address by 0 to 0x0 and Line by 3 to 4
-  Special opcode .*: advance Address by 2 to 0x2 and Line by 4 to 8
-  Special opcode .*: advance Address by 4 to 0x6 and Line by 1 to 9
-  Special opcode .*: advance Address by 4 to 0xa and Line by 1 to 10
-  Advance Line by 47 to 57
-  Advance PC by 104 to 0x72
-  Copy
-  Advance Line by 10 to 67
-  Advance PC by 260 to 0x176
-  Copy
-  Advance PC by 32770 to 0x8178
-  Special opcode .*: advance Address by 0 to 0x8178 and Line by 4 to 71
-  Special opcode .*: advance Address by 2 to 0x817a and Line by 1 to 72
-  Special opcode .*: advance Address by 2 to 0x817c and Line by 1 to 73
-  Special opcode .*: advance Address by 2 to 0x817e and Line by 1 to 74
-  Special opcode .*: advance Address by 2 to 0x8180 and Line by 1 to 75
-  Special opcode .*: advance Address by 2 to 0x8182 and Line by 1 to 76
-  Special opcode .*: advance Address by 2 to 0x8184 and Line by 1 to 77
-  Special opcode .*: advance Address by 2 to 0x8186 and Line by 1 to 78
-  Special opcode .*: advance Address by 2 to 0x8188 and Line by 1 to 79
-  Special opcode .*: advance Address by 2 to 0x818a and Line by 1 to 80
-  Special opcode .*: advance Address by 2 to 0x818c and Line by 1 to 81
-  Special opcode .*: advance Address by 2 to 0x818e and Line by 1 to 82
-  Special opcode .*: advance Address by 2 to 0x8190 and Line by 1 to 83
-  Special opcode .*: advance Address by 2 to 0x8192 and Line by 1 to 84
-  Special opcode .*: advance Address by 2 to 0x8194 and Line by 1 to 85
-  Special opcode .*: advance Address by 2 to 0x8196 and Line by 1 to 86
-  Special opcode .*: advance Address by 2 to 0x8198 and Line by 1 to 87
-  Special opcode .*: advance Address by 2 to 0x819a and Line by 1 to 88
-  Special opcode .*: advance Address by 2 to 0x819c and Line by 1 to 89
-  Special opcode .*: advance Address by 2 to 0x819e and Line by 1 to 90
-  Special opcode .*: advance Address by 2 to 0x81a0 and Line by 1 to 91
-  Special opcode .*: advance Address by 2 to 0x81a2 and Line by 1 to 92
-  Special opcode .*: advance Address by 2 to 0x81a4 and Line by 1 to 93
-  Special opcode .*: advance Address by 2 to 0x81a6 and Line by 1 to 94
-  Special opcode .*: advance Address by 2 to 0x81a8 and Line by 1 to 95
-  Special opcode .*: advance Address by 2 to 0x81aa and Line by 1 to 96
-  Special opcode .*: advance Address by 2 to 0x81ac and Line by 1 to 97
-  Special opcode .*: advance Address by 2 to 0x81ae and Line by 1 to 98
-  Special opcode .*: advance Address by 2 to 0x81b0 and Line by 1 to 99
-  Special opcode .*: advance Address by 2 to 0x81b2 and Line by 1 to 100
-  Special opcode .*: advance Address by 2 to 0x81b4 and Line by 1 to 101
-  Special opcode .*: advance Address by 2 to 0x81b6 and Line by 1 to 102
-  Special opcode .*: advance Address by 2 to 0x81b8 and Line by 1 to 103
-  Special opcode .*: advance Address by 2 to 0x81ba and Line by 1 to 104
-  Special opcode .*: advance Address by 2 to 0x81bc and Line by 1 to 105
-  Special opcode .*: advance Address by 2 to 0x81be and Line by 1 to 106
-  Special opcode .*: advance Address by 2 to 0x81c0 and Line by 1 to 107
-  Special opcode .*: advance Address by 2 to 0x81c2 and Line by 1 to 108
-  Special opcode .*: advance Address by 2 to 0x81c4 and Line by 1 to 109
-  Special opcode .*: advance Address by 2 to 0x81c6 and Line by 1 to 110
-  Special opcode .*: advance Address by 2 to 0x81c8 and Line by 1 to 111
-  Special opcode .*: advance Address by 2 to 0x81ca and Line by 1 to 112
-  Advance PC by 2 to 0x81cc
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x0 and Line by 3 to 4
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x2 and Line by 4 to 8
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x6 and Line by 1 to 9
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xa and Line by 1 to 10
+  \[0x.*\]  Advance Line by 47 to 57
+  \[0x.*\]  Advance PC by 104 to 0x72
+  \[0x.*\]  Copy
+  \[0x.*\]  Advance Line by 10 to 67
+  \[0x.*\]  Advance PC by 260 to 0x176
+  \[0x.*\]  Copy
+  \[0x.*\]  Advance PC by 32770 to 0x8178
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x8178 and Line by 4 to 71
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x817a and Line by 1 to 72
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x817c and Line by 1 to 73
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x817e and Line by 1 to 74
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8180 and Line by 1 to 75
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8182 and Line by 1 to 76
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8184 and Line by 1 to 77
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8186 and Line by 1 to 78
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8188 and Line by 1 to 79
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x818a and Line by 1 to 80
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x818c and Line by 1 to 81
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x818e and Line by 1 to 82
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8190 and Line by 1 to 83
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8192 and Line by 1 to 84
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8194 and Line by 1 to 85
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8196 and Line by 1 to 86
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x8198 and Line by 1 to 87
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x819a and Line by 1 to 88
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x819c and Line by 1 to 89
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x819e and Line by 1 to 90
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81a0 and Line by 1 to 91
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81a2 and Line by 1 to 92
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81a4 and Line by 1 to 93
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81a6 and Line by 1 to 94
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81a8 and Line by 1 to 95
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81aa and Line by 1 to 96
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81ac and Line by 1 to 97
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81ae and Line by 1 to 98
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81b0 and Line by 1 to 99
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81b2 and Line by 1 to 100
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81b4 and Line by 1 to 101
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81b6 and Line by 1 to 102
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81b8 and Line by 1 to 103
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81ba and Line by 1 to 104
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81bc and Line by 1 to 105
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81be and Line by 1 to 106
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81c0 and Line by 1 to 107
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81c2 and Line by 1 to 108
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81c4 and Line by 1 to 109
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81c6 and Line by 1 to 110
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81c8 and Line by 1 to 111
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x81ca and Line by 1 to 112
+  \[0x.*\]  Advance PC by 2 to 0x81cc
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/elf/dwarf2-1.d b/gas/testsuite/gas/elf/dwarf2-1.d
index 1a6b0ca..2b9e5be 100644
--- a/gas/testsuite/gas/elf/dwarf2-1.d
+++ b/gas/testsuite/gas/elf/dwarf2-1.d
@@ -63,17 +63,17 @@ Raw dump of debug contents of section .[z]?debug_line:
 
  The Directory Table is empty.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  Extended opcode 2: set Address to .*
-  Advance Line by 3 to 4
-  Copy
-  Copy
-  Extended opcode 2: set Address to .*
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Advance Line by 3 to 4
+  \[0x.*\]  Copy
+  \[0x.*\]  Copy
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Extended opcode 1: End of Sequence
 
 
 Contents of the .[z]?debug_abbrev section:
diff --git a/gas/testsuite/gas/elf/dwarf2-2.d b/gas/testsuite/gas/elf/dwarf2-2.d
index a463acc..dffcda0 100644
--- a/gas/testsuite/gas/elf/dwarf2-2.d
+++ b/gas/testsuite/gas/elf/dwarf2-2.d
@@ -63,17 +63,17 @@ Raw dump of debug contents of section .[z]?debug_line:
 
  The Directory Table is empty.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  Extended opcode 2: set Address to .*
-  Advance Line by 3 to 4
-  Copy
-  Copy
-  Extended opcode 2: set Address to .*
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Advance Line by 3 to 4
+  \[0x.*\]  Copy
+  \[0x.*\]  Copy
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Extended opcode 1: End of Sequence
 
 
 Contents of the .[z]?debug_abbrev section:
diff --git a/gas/testsuite/gas/elf/dwarf2-3.d b/gas/testsuite/gas/elf/dwarf2-3.d
index 0d6c580..f9f29a6 100644
--- a/gas/testsuite/gas/elf/dwarf2-3.d
+++ b/gas/testsuite/gas/elf/dwarf2-3.d
@@ -30,7 +30,7 @@ Raw dump of debug contents of section \.z?debug_line:
 
  The Directory Table is empty.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	/beginwarn.c
 
diff --git a/gas/testsuite/gas/i386/debug1.d b/gas/testsuite/gas/i386/debug1.d
index ae1eb29..f8465aa 100644
--- a/gas/testsuite/gas/i386/debug1.d
+++ b/gas/testsuite/gas/i386/debug1.d
@@ -28,19 +28,19 @@ Raw dump of debug contents of section \.z?debug_line:
   Opcode 11 has 0 args
   Opcode 12 has 1 args
 
- The Directory Table:
+ The Directory Table \(offset 0x.*\):
   .*
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	1	0	0	debug1.s
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 3
-  Special opcode 20: advance Address by 1 to 0x1 and Line by 1 to 4
-  Special opcode 20: advance Address by 1 to 0x2 and Line by 1 to 5
-  Advance PC by 1 to 0x3
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 3
+  \[0x.*\]  Special opcode 20: advance Address by 1 to 0x1 and Line by 1 to 4
+  \[0x.*\]  Special opcode 20: advance Address by 1 to 0x2 and Line by 1 to 5
+  \[0x.*\]  Advance PC by 1 to 0x3
+  \[0x.*\]  Extended opcode 1: End of Sequence
 
 
diff --git a/gas/testsuite/gas/i386/dw2-compress-1.d b/gas/testsuite/gas/i386/dw2-compress-1.d
index 64e2559..76dea43 100644
--- a/gas/testsuite/gas/i386/dw2-compress-1.d
+++ b/gas/testsuite/gas/i386/dw2-compress-1.d
@@ -89,16 +89,16 @@ Raw dump of debug contents of section .zdebug_line:
 
  The Directory Table is empty.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	file1.txt
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Advance Line by 3 to 4
-  Copy
-  Copy
-  Extended opcode 2: set Address to 0x4
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Advance Line by 3 to 4
+  \[0x.*\]  Copy
+  \[0x.*\]  Copy
+  \[0x.*\]  Extended opcode 2: set Address to 0x4
+  \[0x.*\]  Extended opcode 1: End of Sequence
 
 
diff --git a/gas/testsuite/gas/i386/ilp32/lns/lns-common-1.d b/gas/testsuite/gas/i386/ilp32/lns/lns-common-1.d
index b3e1866..7b1d5c2 100644
--- a/gas/testsuite/gas/i386/ilp32/lns/lns-common-1.d
+++ b/gas/testsuite/gas/i386/ilp32/lns/lns-common-1.d
@@ -6,24 +6,24 @@ Raw dump of debug contents of section \.z?debug_line:
   Initial value of 'is_stmt':  1
 #...
  Line Number Statements:
-  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 .*: advance Address by .* to .* and Line by 1 to 3
-  Set column to 0
-  Set epilogue_begin to true
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 4
-  Set ISA to 1
-  Set basic block
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 5
-  Set is_stmt to 0
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 6
-  Set is_stmt to 1
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 7
-  Extended opcode 4: set Discriminator to 1
-  Special opcode .*: advance Address by .* to .* and Line by 0 to 7
-  Advance PC by .* to .*
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set column to 3
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 2
+  \[0x.*\]  Set prologue_end to true
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 3
+  \[0x.*\]  Set column to 0
+  \[0x.*\]  Set epilogue_begin to true
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 4
+  \[0x.*\]  Set ISA to 1
+  \[0x.*\]  Set basic block
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 5
+  \[0x.*\]  Set is_stmt to 0
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 6
+  \[0x.*\]  Set is_stmt to 1
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 7
+  \[0x.*\]  Extended opcode 4: set Discriminator to 1
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 0 to 7
+  \[0x.*\]  Advance PC by .* to .*
+  \[0x.*\]  Extended opcode 1: End of Sequence
 #...
diff --git a/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d b/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d
index 96135aa..c4e5c6f 100644
--- a/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d
+++ b/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d
@@ -4,8 +4,8 @@
 Raw dump of debug contents of section \.z?debug_line:
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to .*
-  Copy
-  Set basic block
-  .* by 1 to 2
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set basic block
+  \[0x.*\]  .* by 1 to 2
 #pass
diff --git a/gas/testsuite/gas/ia64/pr13167.d b/gas/testsuite/gas/ia64/pr13167.d
index d75c7e9..b633917 100644
--- a/gas/testsuite/gas/ia64/pr13167.d
+++ b/gas/testsuite/gas/ia64/pr13167.d
@@ -28,16 +28,16 @@ Raw dump of debug contents of section \.debug_line:
 
  The Directory Table is empty\.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	x\.c
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x1
-  Special opcode 8: advance Address by 0 to 0x1 and Line by 3 to 4
-  Special opcode 216: advance Address by 15 to 0x10 and Line by 1 to 5
-  Special opcode 228: advance Address by 16 to 0x20 and Line by -1 to 4
-  Advance PC by 16 to 0x30
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x1
+  \[0x.*\]  Special opcode 8: advance Address by 0 to 0x1 and Line by 3 to 4
+  \[0x.*\]  Special opcode 216: advance Address by 15 to 0x10 and Line by 1 to 5
+  \[0x.*\]  Special opcode 228: advance Address by 16 to 0x20 and Line by -1 to 4
+  \[0x.*\]  Advance PC by 16 to 0x30
+  \[0x.*\]  Extended opcode 1: End of Sequence
 
 
diff --git a/gas/testsuite/gas/lns/lns-big-delta.d b/gas/testsuite/gas/lns/lns-big-delta.d
index f4bdcf4..d86f434 100644
--- a/gas/testsuite/gas/lns/lns-big-delta.d
+++ b/gas/testsuite/gas/lns/lns-big-delta.d
@@ -4,14 +4,14 @@
 Raw dump of debug contents of section \.debug_line:
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Copy
-  Advance Line by 1 to 2
-  Advance PC by fixed size amount 0 to 0x0
-  Copy
-  Advance Line by 1 to 3
-  Extended opcode 2: set Address to 0x.*
-  Copy
-  Advance PC by fixed size amount . to 0x.*
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Copy
+  \[0x.*\]  Advance Line by 1 to 2
+  \[0x.*\]  Advance PC by fixed size amount 0 to 0x0
+  \[0x.*\]  Copy
+  \[0x.*\]  Advance Line by 1 to 3
+  \[0x.*\]  Extended opcode 2: set Address to 0x.*
+  \[0x.*\]  Copy
+  \[0x.*\]  Advance PC by fixed size amount . to 0x.*
+  \[0x.*\]  Extended opcode 1: End of Sequence
 #pass
diff --git a/gas/testsuite/gas/lns/lns-common-1-alt.d b/gas/testsuite/gas/lns/lns-common-1-alt.d
index 39e65dc..e762b83 100644
--- a/gas/testsuite/gas/lns/lns-common-1-alt.d
+++ b/gas/testsuite/gas/lns/lns-common-1-alt.d
@@ -6,38 +6,38 @@ Raw dump of debug contents of section \.debug_line:
   Initial value of 'is_stmt':  1
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to .*
-  Copy
-  Set column to 3
-  Advance Line by 1 to 2
-  Advance PC by fixed size amount .* to .*
-  Copy
-  Set prologue_end to true
-  Advance Line by 1 to 3
-  Advance PC by fixed size amount .* to .*
-  Copy
-  Set column to 0
-  Set epilogue_begin to true
-  Advance Line by 1 to 4
-  Advance PC by fixed size amount .* to .*
-  Copy
-  Set ISA to 1
-  Set basic block
-  Advance Line by 1 to 5
-  Advance PC by fixed size amount .* to .*
-  Copy
-  Set is_stmt to 0
-  Advance Line by 1 to 6
-  Advance PC by fixed size amount .* to .*
-  Copy
-  Set is_stmt to 1
-  Advance Line by 1 to 7
-  Advance PC by fixed size amount .* to .*
-  Copy
-  Extended opcode 4: set Discriminator to 1
-  Advance Line by 0 to 7
-  Advance PC by fixed size amount .* to .*
-  Copy
-  Advance PC by fixed size amount .* to .*
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set column to 3
+  \[0x.*\]  Advance Line by 1 to 2
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set prologue_end to true
+  \[0x.*\]  Advance Line by 1 to 3
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set column to 0
+  \[0x.*\]  Set epilogue_begin to true
+  \[0x.*\]  Advance Line by 1 to 4
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set ISA to 1
+  \[0x.*\]  Set basic block
+  \[0x.*\]  Advance Line by 1 to 5
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set is_stmt to 0
+  \[0x.*\]  Advance Line by 1 to 6
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set is_stmt to 1
+  \[0x.*\]  Advance Line by 1 to 7
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Extended opcode 4: set Discriminator to 1
+  \[0x.*\]  Advance Line by 0 to 7
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Advance PC by fixed size amount .* to .*
+  \[0x.*\]  Extended opcode 1: End of Sequence
 #...
diff --git a/gas/testsuite/gas/lns/lns-common-1.d b/gas/testsuite/gas/lns/lns-common-1.d
index ad0d415..81a57ca 100644
--- a/gas/testsuite/gas/lns/lns-common-1.d
+++ b/gas/testsuite/gas/lns/lns-common-1.d
@@ -5,24 +5,24 @@ Raw dump of debug contents of section \.z?debug_line:
   Initial value of 'is_stmt':  1
 #...
  Line Number Statements:
-  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 .*: advance Address by .* to .* and Line by 1 to 3
-  Set column to 0
-  Set epilogue_begin to true
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 4
-  Set ISA to 1
-  Set basic block
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 5
-  Set is_stmt to 0
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 6
-  Set is_stmt to 1
-  Special opcode .*: advance Address by .* to .* and Line by 1 to 7
-  Extended opcode 4: set Discriminator to 1
-  Special opcode .*: advance Address by .* to .* and Line by 0 to 7
-  Advance PC by .* to .*
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set column to 3
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 2
+  \[0x.*\]  Set prologue_end to true
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 3
+  \[0x.*\]  Set column to 0
+  \[0x.*\]  Set epilogue_begin to true
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 4
+  \[0x.*\]  Set ISA to 1
+  \[0x.*\]  Set basic block
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 5
+  \[0x.*\]  Set is_stmt to 0
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 6
+  \[0x.*\]  Set is_stmt to 1
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 1 to 7
+  \[0x.*\]  Extended opcode 4: set Discriminator to 1
+  \[0x.*\]  Special opcode .*: advance Address by .* to .* and Line by 0 to 7
+  \[0x.*\]  Advance PC by .* to .*
+  \[0x.*\]  Extended opcode 1: End of Sequence
 #...
diff --git a/gas/testsuite/gas/lns/lns-duplicate.d b/gas/testsuite/gas/lns/lns-duplicate.d
index 1bf2b56..9fe28ab 100644
--- a/gas/testsuite/gas/lns/lns-duplicate.d
+++ b/gas/testsuite/gas/lns/lns-duplicate.d
@@ -3,8 +3,8 @@
 Raw dump of debug contents of section \.z?debug_line:
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to .*
-  Copy
-  Set basic block
-  .* by 1 to 2
+  \[0x.*\]  Extended opcode 2: set Address to .*
+  \[0x.*\]  Copy
+  \[0x.*\]  Set basic block
+  \[0x.*\]  .* by 1 to 2
 #pass
diff --git a/gas/testsuite/gas/mips/loc-swap-2.d b/gas/testsuite/gas/mips/loc-swap-2.d
index b573445..ed280a8 100644
--- a/gas/testsuite/gas/mips/loc-swap-2.d
+++ b/gas/testsuite/gas/mips/loc-swap-2.d
@@ -32,18 +32,18 @@ Raw dump of debug contents of section .debug_line:
 
  The Directory Table is empty.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	loc-swap-2.s
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7
-  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 9
-  Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 10
-  Special opcode 120: advance Address by 8 to 0x8 and Line by 3 to 13
-  Special opcode 62: advance Address by 4 to 0xc and Line by 1 to 14
-  Special opcode 6: advance Address by 0 to 0xc and Line by 1 to 15
-  Special opcode 119: advance Address by 8 to 0x14 and Line by 2 to 17
-  Advance PC by 4 to 0x18
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 9
+  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 10
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x8 and Line by 3 to 13
+  \[0x.*\]  Special opcode 62: advance Address by 4 to 0xc and Line by 1 to 14
+  \[0x.*\]  Special opcode 6: advance Address by 0 to 0xc and Line by 1 to 15
+  \[0x.*\]  Special opcode 119: advance Address by 8 to 0x14 and Line by 2 to 17
+  \[0x.*\]  Advance PC by 4 to 0x18
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/loc-swap.d b/gas/testsuite/gas/mips/loc-swap.d
index 36fc814..c4b91ed 100644
--- a/gas/testsuite/gas/mips/loc-swap.d
+++ b/gas/testsuite/gas/mips/loc-swap.d
@@ -35,27 +35,27 @@ Raw dump of debug contents of section \.debug_line:
 
  The Directory Table is empty\.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	loc-swap\.s
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x0
-  Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7
-  Special opcode 63: advance Address by 4 to 0x4 and Line by 2 to 9
-  Special opcode 120: advance Address by 8 to 0xc and Line by 3 to 12
-  Special opcode 7: advance Address by 0 to 0xc and Line by 2 to 14
-  Special opcode 120: advance Address by 8 to 0x14 and Line by 3 to 17
-  Special opcode 7: advance Address by 0 to 0x14 and Line by 2 to 19
-  Special opcode 120: advance Address by 8 to 0x1c and Line by 3 to 22
-  Special opcode 63: advance Address by 4 to 0x20 and Line by 2 to 24
-  Special opcode 120: advance Address by 8 to 0x28 and Line by 3 to 27
-  Special opcode 63: advance Address by 4 to 0x2c and Line by 2 to 29
-  Special opcode 120: advance Address by 8 to 0x34 and Line by 3 to 32
-  Special opcode 63: advance Address by 4 to 0x38 and Line by 2 to 34
-  Special opcode 120: advance Address by 8 to 0x40 and Line by 3 to 37
-  Special opcode 7: advance Address by 0 to 0x40 and Line by 2 to 39
-  Special opcode 120: advance Address by 8 to 0x48 and Line by 3 to 42
-  Special opcode 63: advance Address by 4 to 0x4c and Line by 2 to 44
-  Advance PC by 24 to 0x64
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x0
+  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7
+  \[0x.*\]  Special opcode 63: advance Address by 4 to 0x4 and Line by 2 to 9
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0xc and Line by 3 to 12
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0xc and Line by 2 to 14
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x14 and Line by 3 to 17
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x14 and Line by 2 to 19
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x1c and Line by 3 to 22
+  \[0x.*\]  Special opcode 63: advance Address by 4 to 0x20 and Line by 2 to 24
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x28 and Line by 3 to 27
+  \[0x.*\]  Special opcode 63: advance Address by 4 to 0x2c and Line by 2 to 29
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x34 and Line by 3 to 32
+  \[0x.*\]  Special opcode 63: advance Address by 4 to 0x38 and Line by 2 to 34
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x40 and Line by 3 to 37
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x40 and Line by 2 to 39
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x48 and Line by 3 to 42
+  \[0x.*\]  Special opcode 63: advance Address by 4 to 0x4c and Line by 2 to 44
+  \[0x.*\]  Advance PC by 24 to 0x64
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/micromips@loc-swap-2.d b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
index a531626..e148f25 100644
--- a/gas/testsuite/gas/mips/micromips@loc-swap-2.d
+++ b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
@@ -32,18 +32,18 @@ Raw dump of debug contents of section .debug_line:
 
  The Directory Table is empty.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	loc-swap-2.s
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x1
-  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
-  Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9
-  Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10
-  Special opcode 64: advance Address by 4 to 0x5 and Line by 3 to 13
-  Special opcode 34: advance Address by 2 to 0x7 and Line by 1 to 14
-  Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15
-  Special opcode 63: advance Address by 4 to 0xb and Line by 2 to 17
-  Advance PC by 1 to 0xc
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x1
+  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9
+  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x5 and Line by 3 to 13
+  \[0x.*\]  Special opcode 34: advance Address by 2 to 0x7 and Line by 1 to 14
+  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15
+  \[0x.*\]  Special opcode 63: advance Address by 4 to 0xb and Line by 2 to 17
+  \[0x.*\]  Advance PC by 1 to 0xc
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/micromips@loc-swap.d b/gas/testsuite/gas/mips/micromips@loc-swap.d
index 28fa77a..03a0eb3 100644
--- a/gas/testsuite/gas/mips/micromips@loc-swap.d
+++ b/gas/testsuite/gas/mips/micromips@loc-swap.d
@@ -36,27 +36,27 @@ Raw dump of debug contents of section \.debug_line:
 
  The Directory Table is empty\.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	loc-swap\.s
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x1
-  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
-  Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9
-  Special opcode 64: advance Address by 4 to 0x7 and Line by 3 to 12
-  Special opcode 7: advance Address by 0 to 0x7 and Line by 2 to 14
-  Special opcode 64: advance Address by 4 to 0xb and Line by 3 to 17
-  Special opcode 7: advance Address by 0 to 0xb and Line by 2 to 19
-  Special opcode 64: advance Address by 4 to 0xf and Line by 3 to 22
-  Special opcode 35: advance Address by 2 to 0x11 and Line by 2 to 24
-  Special opcode 64: advance Address by 4 to 0x15 and Line by 3 to 27
-  Special opcode 35: advance Address by 2 to 0x17 and Line by 2 to 29
-  Special opcode 92: advance Address by 6 to 0x1d and Line by 3 to 32
-  Special opcode 35: advance Address by 2 to 0x1f and Line by 2 to 34
-  Special opcode 92: advance Address by 6 to 0x25 and Line by 3 to 37
-  Special opcode 35: advance Address by 2 to 0x27 and Line by 2 to 39
-  Special opcode 120: advance Address by 8 to 0x2f and Line by 3 to 42
-  Special opcode 35: advance Address by 2 to 0x31 and Line by 2 to 44
-  Advance PC by 23 to 0x48
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x1
+  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x7 and Line by 3 to 12
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x7 and Line by 2 to 14
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0xb and Line by 3 to 17
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0xb and Line by 2 to 19
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0xf and Line by 3 to 22
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x11 and Line by 2 to 24
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x15 and Line by 3 to 27
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x17 and Line by 2 to 29
+  \[0x.*\]  Special opcode 92: advance Address by 6 to 0x1d and Line by 3 to 32
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x1f and Line by 2 to 34
+  \[0x.*\]  Special opcode 92: advance Address by 6 to 0x25 and Line by 3 to 37
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x27 and Line by 2 to 39
+  \[0x.*\]  Special opcode 120: advance Address by 8 to 0x2f and Line by 3 to 42
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x31 and Line by 2 to 44
+  \[0x.*\]  Advance PC by 23 to 0x48
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/mips16-dwarf2-n32.d b/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
index 4e033e5..f68564c 100644
--- a/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
+++ b/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
@@ -16,15 +16,15 @@ Relocation section '\.rela\.debug_line' at offset .* contains 1 entries:
 
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x1
-  Copy
-  Special opcode .*: advance Address by 2 to 0x3 and Line by 1 to 2
-  Special opcode .*: advance Address by 2 to 0x5 and Line by 1 to 3
-  Special opcode .*: advance Address by 4 to 0x9 and Line by 1 to 4
-  Special opcode .*: advance Address by 2 to 0xb and Line by 1 to 5
-  Special opcode .*: advance Address by 4 to 0xf and Line by 1 to 6
-  Special opcode .*: advance Address by 4 to 0x13 and Line by 1 to 7
-  Advance PC by 2286 to 0x901
-  Special opcode .*: advance Address by 0 to 0x901 and Line by 1 to 8
-  Advance PC by 15 to 0x910
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x1
+  \[0x.*\]  Copy
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x3 and Line by 1 to 2
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x5 and Line by 1 to 3
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x9 and Line by 1 to 4
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xb and Line by 1 to 5
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xf and Line by 1 to 6
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x13 and Line by 1 to 7
+  \[0x.*\]  Advance PC by 2286 to 0x901
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x901 and Line by 1 to 8
+  \[0x.*\]  Advance PC by 15 to 0x910
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/mips16-dwarf2.d b/gas/testsuite/gas/mips/mips16-dwarf2.d
index bda0feb..51935c0 100644
--- a/gas/testsuite/gas/mips/mips16-dwarf2.d
+++ b/gas/testsuite/gas/mips/mips16-dwarf2.d
@@ -16,15 +16,15 @@ Relocation section '\.rel\.debug_line' at offset .* contains 1 entries:
 
 #...
  Line Number Statements:
-  Extended opcode 2: set Address to 0x1
-  Copy
-  Special opcode .*: advance Address by 2 to 0x3 and Line by 1 to 2
-  Special opcode .*: advance Address by 2 to 0x5 and Line by 1 to 3
-  Special opcode .*: advance Address by 4 to 0x9 and Line by 1 to 4
-  Special opcode .*: advance Address by 2 to 0xb and Line by 1 to 5
-  Special opcode .*: advance Address by 4 to 0xf and Line by 1 to 6
-  Special opcode .*: advance Address by 4 to 0x13 and Line by 1 to 7
-  Advance PC by 2286 to 0x901
-  Special opcode .*: advance Address by 0 to 0x901 and Line by 1 to 8
-  Advance PC by 15 to 0x910
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x1
+  \[0x.*\]  Copy
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x3 and Line by 1 to 2
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0x5 and Line by 1 to 3
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x9 and Line by 1 to 4
+  \[0x.*\]  Special opcode .*: advance Address by 2 to 0xb and Line by 1 to 5
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0xf and Line by 1 to 6
+  \[0x.*\]  Special opcode .*: advance Address by 4 to 0x13 and Line by 1 to 7
+  \[0x.*\]  Advance PC by 2286 to 0x901
+  \[0x.*\]  Special opcode .*: advance Address by 0 to 0x901 and Line by 1 to 8
+  \[0x.*\]  Advance PC by 15 to 0x910
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/mips16@loc-swap-2.d b/gas/testsuite/gas/mips/mips16@loc-swap-2.d
index b00736c..95b9e9c 100644
--- a/gas/testsuite/gas/mips/mips16@loc-swap-2.d
+++ b/gas/testsuite/gas/mips/mips16@loc-swap-2.d
@@ -32,18 +32,18 @@ Raw dump of debug contents of section .debug_line:
 
  The Directory Table is empty.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	loc-swap-2.s
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x1
-  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
-  Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9
-  Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10
-  Special opcode 64: advance Address by 4 to 0x5 and Line by 3 to 13
-  Special opcode 34: advance Address by 2 to 0x7 and Line by 1 to 14
-  Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15
-  Special opcode 35: advance Address by 2 to 0x9 and Line by 2 to 17
-  Advance PC by 1 to 0xa
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x1
+  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9
+  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x5 and Line by 3 to 13
+  \[0x.*\]  Special opcode 34: advance Address by 2 to 0x7 and Line by 1 to 14
+  \[0x.*\]  Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x9 and Line by 2 to 17
+  \[0x.*\]  Advance PC by 1 to 0xa
+  \[0x.*\]  Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/mips16@loc-swap.d b/gas/testsuite/gas/mips/mips16@loc-swap.d
index fdae485..4d0c781 100644
--- a/gas/testsuite/gas/mips/mips16@loc-swap.d
+++ b/gas/testsuite/gas/mips/mips16@loc-swap.d
@@ -35,27 +35,27 @@ Raw dump of debug contents of section \.debug_line:
 
  The Directory Table is empty\.
 
- The File Name Table:
+ The File Name Table \(offset 0x.*\):
   Entry	Dir	Time	Size	Name
   1	0	0	0	loc-swap\.s
 
  Line Number Statements:
-  Extended opcode 2: set Address to 0x1
-  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
-  Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9
-  Special opcode 64: advance Address by 4 to 0x7 and Line by 3 to 12
-  Special opcode 7: advance Address by 0 to 0x7 and Line by 2 to 14
-  Special opcode 64: advance Address by 4 to 0xb and Line by 3 to 17
-  Special opcode 7: advance Address by 0 to 0xb and Line by 2 to 19
-  Special opcode 64: advance Address by 4 to 0xf and Line by 3 to 22
-  Special opcode 35: advance Address by 2 to 0x11 and Line by 2 to 24
-  Special opcode 64: advance Address by 4 to 0x15 and Line by 3 to 27
-  Special opcode 35: advance Address by 2 to 0x17 and Line by 2 to 29
-  Special opcode 64: advance Address by 4 to 0x1b and Line by 3 to 32
-  Special opcode 35: advance Address by 2 to 0x1d and Line by 2 to 34
-  Special opcode 64: advance Address by 4 to 0x21 and Line by 3 to 37
-  Special opcode 7: advance Address by 0 to 0x21 and Line by 2 to 39
-  Special opcode 92: advance Address by 6 to 0x27 and Line by 3 to 42
-  Special opcode 35: advance Address by 2 to 0x29 and Line by 2 to 44
-  Advance PC by 23 to 0x40
-  Extended opcode 1: End of Sequence
+  \[0x.*\]  Extended opcode 2: set Address to 0x1
+  \[0x.*\]  Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x7 and Line by 3 to 12
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x7 and Line by 2 to 14
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0xb and Line by 3 to 17
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0xb and Line by 2 to 19
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0xf and Line by 3 to 22
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x11 and Line by 2 to 24
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x15 and Line by 3 to 27
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x17 and Line by 2 to 29
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x1b and Line by 3 to 32
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x1d and Line by 2 to 34
+  \[0x.*\]  Special opcode 64: advance Address by 4 to 0x21 and Line by 3 to 37
+  \[0x.*\]  Special opcode 7: advance Address by 0 to 0x21 and Line by 2 to 39
+  \[0x.*\]  Special opcode 92: advance Address by 6 to 0x27 and Line by 3 to 42
+  \[0x.*\]  Special opcode 35: advance Address by 2 to 0x29 and Line by 2 to 44
+  \[0x.*\]  Advance PC by 23 to 0x40
+  \[0x.*\]  Extended opcode 1: End of Sequence