* gas/cris/rd-dw2-1.d, gas/cris/rd-dw2-2.d, gas/cris/rd-dw2-3.d,

	gas/cris/rd-dw2-4.d, gas/cris/rd-dw2-5.d, gas/cris/rd-dw2-6.d,
	gas/cris/rd-dw2-7.d, gas/cris/rd-dw2-8.d, gas/cris/rd-dw2-9.d,
	gas/cris/rd-dw2-10.d, gas/cris/rd-dw2-11.d, gas/cris/rd-dw2-12.d,
	gas/cris/rd-dw2-13.d, gas/cris/rd-dw2-14.d, gas/cris/rd-dw2-15.d:
	New tests.

16 files changed, 834 insertions, 0 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6e6ba06..476466f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2001-04-05  Hans-Peter Nilsson  <hp@axis.com>
 
+	* gas/cris/rd-dw2-1.d, gas/cris/rd-dw2-2.d, gas/cris/rd-dw2-3.d,
+	gas/cris/rd-dw2-4.d, gas/cris/rd-dw2-5.d, gas/cris/rd-dw2-6.d,
+	gas/cris/rd-dw2-7.d, gas/cris/rd-dw2-8.d, gas/cris/rd-dw2-9.d,
+	gas/cris/rd-dw2-10.d, gas/cris/rd-dw2-11.d, gas/cris/rd-dw2-12.d,
+	gas/cris/rd-dw2-13.d, gas/cris/rd-dw2-14.d, gas/cris/rd-dw2-15.d:
+	New tests.
+
+2001-04-05  Hans-Peter Nilsson  <hp@axis.com>
+
 	* lib/gas-defs.exp (run_dump_test): Support using readelf.
 	* config/default.exp: Default READELF and READELFFLAGS.
 
diff --git a/gas/testsuite/gas/cris/rd-dw2-1.d b/gas/testsuite/gas/cris/rd-dw2-1.d
new file mode 100644
index 0000000..9e934b5
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-1.d
@@ -0,0 +1,50 @@
+#readelf: -wl
+#source: addi.s
+#as: --em=criself --gdwarf2
+
+# A most simple instruction sequence.
+
+Dump of debug contents of section \.debug_line:
+
+  Length:                      .*
+  DWARF Version:               2
+  Prologue Length:             .*
+  Minimum Instruction Length:  2
+  Initial value of 'is_stmt':  1
+  Line Base:                   -5
+  Line Range:                  14
+  Opcode Base:                 10
+
+ Opcodes:
+  Opcode 1 has 0 args
+  Opcode 2 has 1 args
+  Opcode 3 has 1 args
+  Opcode 4 has 1 args
+  Opcode 5 has 1 args
+  Opcode 6 has 0 args
+  Opcode 7 has 0 args
+  Opcode 8 has 0 args
+  Opcode 9 has 1 args
+
+ The Directory Table is empty\.
+
+ The File Name Table:
+  Entry	Dir	Time	Size	Name
+  1	0	0	0	.*/addi\.s
+
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 8: advance Address by 0 to 0x0 and Line by 3 to 4
+  Special opcode 20: advance Address by 2 to 0x2 and Line by 1 to 5
+  Special opcode 20: advance Address by 2 to 0x4 and Line by 1 to 6
+  Special opcode 20: advance Address by 2 to 0x6 and Line by 1 to 7
+  Special opcode 20: advance Address by 2 to 0x8 and Line by 1 to 8
+  Special opcode 20: advance Address by 2 to 0xa and Line by 1 to 9
+  Special opcode 20: advance Address by 2 to 0xc and Line by 1 to 10
+  Special opcode 20: advance Address by 2 to 0xe and Line by 1 to 11
+  Special opcode 20: advance Address by 2 to 0x10 and Line by 1 to 12
+  Special opcode 20: advance Address by 2 to 0x12 and Line by 1 to 13
+  Special opcode 20: advance Address by 2 to 0x14 and Line by 1 to 14
+  Special opcode 20: advance Address by 2 to 0x16 and Line by 1 to 15
+  Advance PC by 2 to 18
+  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
new file mode 100644
index 0000000..e0ac86f
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-10.d
@@ -0,0 +1,11 @@
+#readelf: -wl
+#source: continue.s
+#as: --em=criself --gdwarf2
+
+# Continued line.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 10: advance Address by 0 to 0x0 and Line by 5 to 6
+  Advance PC by 4 to 4
+  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
new file mode 100644
index 0000000..da5aedb
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-11.d
@@ -0,0 +1,46 @@
+#readelf: -wl
+#source: fragtest.s
+#as: --em=criself --gdwarf2
+
+# Highly "fragmented" code.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 9: advance Address by 0 to 0x0 and Line by 4 to 5
+  Special opcode 20: advance Address by 2 to 0x2 and Line by 1 to 6
+  Advance PC by 126 to 80
+  Special opcode 7: advance Address by 0 to 0x80 and Line by 2 to 8
+  Special opcode 20: advance Address by 2 to 0x82 and Line by 1 to 9
+  Advance PC by 226 to 164
+  Special opcode 11: advance Address by 0 to 0x164 and Line by 6 to 15
+  Special opcode 34: advance Address by 4 to 0x168 and Line by 1 to 16
+  Advance PC by 126 to 1e6
+  Special opcode 7: advance Address by 0 to 0x1e6 and Line by 2 to 18
+  Special opcode 34: advance Address by 4 to 0x1ea and Line by 1 to 19
+  Advance PC by 1126 to 650
+  Special opcode 11: advance Address by 0 to 0x650 and Line by 6 to 25
+  Special opcode 34: advance Address by 4 to 0x654 and Line by 1 to 26
+  Advance PC by 126 to 6d2
+  Special opcode 7: advance Address by 0 to 0x6d2 and Line by 2 to 28
+  Special opcode 90: advance Address by 12 to 0x6de and Line by 1 to 29
+  Advance Line by 11 to 40
+  Advance PC by 33250 to 88c0
+  Copy
+  Special opcode 20: advance Address by 2 to 0x88c2 and Line by 1 to 41
+  Advance PC by 128 to 8942
+  Special opcode 7: advance Address by 0 to 0x8942 and Line by 2 to 43
+  Special opcode 20: advance Address by 2 to 0x8944 and Line by 1 to 44
+  Advance PC by 248 to 8a3c
+  Special opcode 11: advance Address by 0 to 0x8a3c and Line by 6 to 50
+  Special opcode 34: advance Address by 4 to 0x8a40 and Line by 1 to 51
+  Advance PC by 128 to 8ac0
+  Special opcode 7: advance Address by 0 to 0x8ac0 and Line by 2 to 53
+  Special opcode 34: advance Address by 4 to 0x8ac4 and Line by 1 to 54
+  Advance PC by 252 to 8bc0
+  Special opcode 11: advance Address by 0 to 0x8bc0 and Line by 6 to 60
+  Special opcode 34: advance Address by 4 to 0x8bc4 and Line by 1 to 61
+  Advance PC by 128 to 8c44
+  Special opcode 7: advance Address by 0 to 0x8c44 and Line by 2 to 63
+  Special opcode 34: advance Address by 4 to 0x8c48 and Line by 1 to 64
+  Advance PC by 124 to 8cc4
+  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
new file mode 100644
index 0000000..f4d8e8c
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-12.d
@@ -0,0 +1,93 @@
+#readelf: -wl
+#source: pushpop.s
+#as: --em=criself --gdwarf2
+
+# Pushes and other prefixes.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 8: advance Address by 0 to 0x0 and Line by 3 to 4
+  Special opcode 34: advance Address by 4 to 0x4 and Line by 1 to 5
+  Special opcode 34: advance Address by 4 to 0x8 and Line by 1 to 6
+  Special opcode 36: advance Address by 4 to 0xc and Line by 3 to 9
+  Special opcode 34: advance Address by 4 to 0x10 and Line by 1 to 10
+  Special opcode 34: advance Address by 4 to 0x14 and Line by 1 to 11
+  Special opcode 35: advance Address by 4 to 0x18 and Line by 2 to 13
+  Special opcode 34: advance Address by 4 to 0x1c and Line by 1 to 14
+  Special opcode 34: advance Address by 4 to 0x20 and Line by 1 to 15
+  Special opcode 35: advance Address by 4 to 0x24 and Line by 2 to 17
+  Special opcode 34: advance Address by 4 to 0x28 and Line by 1 to 18
+  Special opcode 35: advance Address by 4 to 0x2c and Line by 2 to 20
+  Special opcode 34: advance Address by 4 to 0x30 and Line by 1 to 21
+  Special opcode 34: advance Address by 4 to 0x34 and Line by 1 to 22
+  Special opcode 35: advance Address by 4 to 0x38 and Line by 2 to 24
+  Special opcode 34: advance Address by 4 to 0x3c and Line by 1 to 25
+  Special opcode 35: advance Address by 4 to 0x40 and Line by 2 to 27
+  Special opcode 34: advance Address by 4 to 0x44 and Line by 1 to 28
+  Special opcode 35: advance Address by 4 to 0x48 and Line by 2 to 30
+  Special opcode 34: advance Address by 4 to 0x4c and Line by 1 to 31
+  Special opcode 34: advance Address by 4 to 0x50 and Line by 1 to 32
+  Special opcode 35: advance Address by 4 to 0x54 and Line by 2 to 34
+  Special opcode 34: advance Address by 4 to 0x58 and Line by 1 to 35
+  Special opcode 34: advance Address by 4 to 0x5c and Line by 1 to 36
+  Special opcode 35: advance Address by 4 to 0x60 and Line by 2 to 38
+  Special opcode 34: advance Address by 4 to 0x64 and Line by 1 to 39
+  Special opcode 34: advance Address by 4 to 0x68 and Line by 1 to 40
+  Special opcode 35: advance Address by 4 to 0x6c and Line by 2 to 42
+  Special opcode 34: advance Address by 4 to 0x70 and Line by 1 to 43
+  Special opcode 34: advance Address by 4 to 0x74 and Line by 1 to 44
+  Special opcode 35: advance Address by 4 to 0x78 and Line by 2 to 46
+  Special opcode 34: advance Address by 4 to 0x7c and Line by 1 to 47
+  Special opcode 34: advance Address by 4 to 0x80 and Line by 1 to 48
+  Special opcode 35: advance Address by 4 to 0x84 and Line by 2 to 50
+  Special opcode 34: advance Address by 4 to 0x88 and Line by 1 to 51
+  Special opcode 34: advance Address by 4 to 0x8c and Line by 1 to 52
+  Special opcode 35: advance Address by 4 to 0x90 and Line by 2 to 54
+  Special opcode 34: advance Address by 4 to 0x94 and Line by 1 to 55
+  Special opcode 34: advance Address by 4 to 0x98 and Line by 1 to 56
+  Advance Line by 9 to 65
+  Special opcode 33: advance Address by 4 to 0x9c and Line by 0 to 65
+  Special opcode 34: advance Address by 4 to 0xa0 and Line by 1 to 66
+  Special opcode 34: advance Address by 4 to 0xa4 and Line by 1 to 67
+  Special opcode 35: advance Address by 4 to 0xa8 and Line by 2 to 69
+  Special opcode 34: advance Address by 4 to 0xac and Line by 1 to 70
+  Special opcode 34: advance Address by 4 to 0xb0 and Line by 1 to 71
+  Special opcode 35: advance Address by 4 to 0xb4 and Line by 2 to 73
+  Special opcode 34: advance Address by 4 to 0xb8 and Line by 1 to 74
+  Special opcode 34: advance Address by 4 to 0xbc and Line by 1 to 75
+  Special opcode 35: advance Address by 4 to 0xc0 and Line by 2 to 77
+  Special opcode 34: advance Address by 4 to 0xc4 and Line by 1 to 78
+  Special opcode 34: advance Address by 4 to 0xc8 and Line by 1 to 79
+  Special opcode 35: advance Address by 4 to 0xcc and Line by 2 to 81
+  Special opcode 34: advance Address by 4 to 0xd0 and Line by 1 to 82
+  Special opcode 34: advance Address by 4 to 0xd4 and Line by 1 to 83
+  Special opcode 35: advance Address by 4 to 0xd8 and Line by 2 to 85
+  Special opcode 34: advance Address by 4 to 0xdc and Line by 1 to 86
+  Special opcode 34: advance Address by 4 to 0xe0 and Line by 1 to 87
+  Special opcode 35: advance Address by 4 to 0xe4 and Line by 2 to 89
+  Special opcode 34: advance Address by 4 to 0xe8 and Line by 1 to 90
+  Special opcode 34: advance Address by 4 to 0xec and Line by 1 to 91
+  Special opcode 35: advance Address by 4 to 0xf0 and Line by 2 to 93
+  Special opcode 34: advance Address by 4 to 0xf4 and Line by 1 to 94
+  Special opcode 34: advance Address by 4 to 0xf8 and Line by 1 to 95
+  Special opcode 35: advance Address by 4 to 0xfc and Line by 2 to 97
+  Special opcode 34: advance Address by 4 to 0x100 and Line by 1 to 98
+  Special opcode 34: advance Address by 4 to 0x104 and Line by 1 to 99
+  Special opcode 35: advance Address by 4 to 0x108 and Line by 2 to 101
+  Special opcode 34: advance Address by 4 to 0x10c and Line by 1 to 102
+  Special opcode 34: advance Address by 4 to 0x110 and Line by 1 to 103
+  Special opcode 35: advance Address by 4 to 0x114 and Line by 2 to 105
+  Special opcode 34: advance Address by 4 to 0x118 and Line by 1 to 106
+  Special opcode 34: advance Address by 4 to 0x11c and Line by 1 to 107
+  Special opcode 35: advance Address by 4 to 0x120 and Line by 2 to 109
+  Special opcode 34: advance Address by 4 to 0x124 and Line by 1 to 110
+  Special opcode 34: advance Address by 4 to 0x128 and Line by 1 to 111
+  Special opcode 35: advance Address by 4 to 0x12c and Line by 2 to 113
+  Special opcode 34: advance Address by 4 to 0x130 and Line by 1 to 114
+  Special opcode 34: advance Address by 4 to 0x134 and Line by 1 to 115
+  Special opcode 35: advance Address by 4 to 0x138 and Line by 2 to 117
+  Special opcode 34: advance Address by 4 to 0x13c and Line by 1 to 118
+  Special opcode 20: advance Address by 2 to 0x13e and Line by 1 to 119
+  Special opcode 20: advance Address by 2 to 0x140 and Line by 1 to 120
+  Advance PC by 4 to 144
+  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
new file mode 100644
index 0000000..fa20f1f
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-13.d
@@ -0,0 +1,34 @@
+#readelf: -wl
+#source: rd-pic-1.s
+#as: --em=criself --pic --gdwarf2
+
+# PIC prefix relocs.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 10: advance Address by 0 to 0x0 and Line by 5 to 6
+  Special opcode 48: advance Address by 6 to 0x6 and Line by 1 to 7
+  Special opcode 62: advance Address by 8 to 0xe and Line by 1 to 8
+  Special opcode 48: advance Address by 6 to 0x14 and Line by 1 to 9
+  Special opcode 48: advance Address by 6 to 0x1a and Line by 1 to 10
+  Special opcode 48: advance Address by 6 to 0x20 and Line by 1 to 11
+  Special opcode 62: advance Address by 8 to 0x28 and Line by 1 to 12
+  Special opcode 48: advance Address by 6 to 0x2e and Line by 1 to 13
+  Special opcode 36: advance Address by 4 to 0x32 and Line by 3 to 16
+  Special opcode 62: advance Address by 8 to 0x3a and Line by 1 to 17
+  Special opcode 48: advance Address by 6 to 0x40 and Line by 1 to 18
+  Special opcode 48: advance Address by 6 to 0x46 and Line by 1 to 19
+  Special opcode 62: advance Address by 8 to 0x4e and Line by 1 to 20
+  Special opcode 62: advance Address by 8 to 0x56 and Line by 1 to 21
+  Special opcode 62: advance Address by 8 to 0x5e and Line by 1 to 22
+  Special opcode 62: advance Address by 8 to 0x66 and Line by 1 to 23
+  Special opcode 62: advance Address by 8 to 0x6e and Line by 1 to 24
+  Special opcode 62: advance Address by 8 to 0x76 and Line by 1 to 25
+  Special opcode 48: advance Address by 6 to 0x7c and Line by 1 to 26
+  Special opcode 48: advance Address by 6 to 0x82 and Line by 1 to 27
+  Special opcode 48: advance Address by 6 to 0x88 and Line by 1 to 28
+  Special opcode 48: advance Address by 6 to 0x8e and Line by 1 to 29
+  Special opcode 48: advance Address by 6 to 0x94 and Line by 1 to 30
+  Special opcode 48: advance Address by 6 to 0x9a and Line by 1 to 31
+  Advance PC by 8 to a2
+  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
new file mode 100644
index 0000000..fd76906
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-14.d
@@ -0,0 +1,30 @@
+#readelf: -wl
+#source: unimplemented.s
+#as: --em=criself --gdwarf2
+
+# Prefixes of various sizes.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 13: advance Address by 0 to 0x0 and Line by 8 to 9
+  Special opcode 20: advance Address by 2 to 0x2 and Line by 1 to 10
+  Special opcode 34: advance Address by 4 to 0x6 and Line by 1 to 11
+  Special opcode 34: advance Address by 4 to 0xa and Line by 1 to 12
+  Special opcode 62: advance Address by 8 to 0x12 and Line by 1 to 13
+  Special opcode 62: advance Address by 8 to 0x1a and Line by 1 to 14
+  Special opcode 20: advance Address by 2 to 0x1c and Line by 1 to 15
+  Special opcode 34: advance Address by 4 to 0x20 and Line by 1 to 16
+  Special opcode 34: advance Address by 4 to 0x24 and Line by 1 to 17
+  Special opcode 62: advance Address by 8 to 0x2c and Line by 1 to 18
+  Special opcode 62: advance Address by 8 to 0x34 and Line by 1 to 19
+  Special opcode 20: advance Address by 2 to 0x36 and Line by 1 to 20
+  Special opcode 20: advance Address by 2 to 0x38 and Line by 1 to 21
+  Special opcode 20: advance Address by 2 to 0x3a and Line by 1 to 22
+  Special opcode 20: advance Address by 2 to 0x3c and Line by 1 to 23
+  Special opcode 20: advance Address by 2 to 0x3e and Line by 1 to 24
+  Special opcode 20: advance Address by 2 to 0x40 and Line by 1 to 25
+  Special opcode 20: advance Address by 2 to 0x42 and Line by 1 to 26
+  Special opcode 20: advance Address by 2 to 0x44 and Line by 1 to 27
+  Special opcode 20: advance Address by 2 to 0x46 and Line by 1 to 28
+  Advance PC by 2 to 48
+  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
new file mode 100644
index 0000000..589fdf6
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-15.d
@@ -0,0 +1,162 @@
+#readelf: -wl
+#source: prefix.s
+#as: --em=criself --gdwarf2
+
+# Various prefixes, assembled standalone.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 13: advance Address by 0 to 0x0 and Line by 8 to 9
+  Special opcode 20: advance Address by 2 to 0x2 and Line by 1 to 10
+  Special opcode 21: advance Address by 2 to 0x4 and Line by 2 to 12
+  Special opcode 20: advance Address by 2 to 0x6 and Line by 1 to 13
+  Special opcode 21: advance Address by 2 to 0x8 and Line by 2 to 15
+  Special opcode 20: advance Address by 2 to 0xa and Line by 1 to 16
+  Special opcode 21: advance Address by 2 to 0xc and Line by 2 to 18
+  Special opcode 20: advance Address by 2 to 0xe and Line by 1 to 19
+  Special opcode 21: advance Address by 2 to 0x10 and Line by 2 to 21
+  Special opcode 20: advance Address by 2 to 0x12 and Line by 1 to 22
+  Special opcode 21: advance Address by 2 to 0x14 and Line by 2 to 24
+  Special opcode 20: advance Address by 2 to 0x16 and Line by 1 to 25
+  Special opcode 21: advance Address by 2 to 0x18 and Line by 2 to 27
+  Special opcode 20: advance Address by 2 to 0x1a and Line by 1 to 28
+  Special opcode 21: advance Address by 2 to 0x1c and Line by 2 to 30
+  Special opcode 20: advance Address by 2 to 0x1e and Line by 1 to 31
+  Special opcode 25: advance Address by 2 to 0x20 and Line by 6 to 37
+  Special opcode 34: advance Address by 4 to 0x24 and Line by 1 to 38
+  Special opcode 21: advance Address by 2 to 0x26 and Line by 2 to 40
+  Special opcode 34: advance Address by 4 to 0x2a and Line by 1 to 41
+  Special opcode 21: advance Address by 2 to 0x2c and Line by 2 to 43
+  Special opcode 34: advance Address by 4 to 0x30 and Line by 1 to 44
+  Special opcode 21: advance Address by 2 to 0x32 and Line by 2 to 46
+  Special opcode 34: advance Address by 4 to 0x36 and Line by 1 to 47
+  Special opcode 21: advance Address by 2 to 0x38 and Line by 2 to 49
+  Special opcode 34: advance Address by 4 to 0x3c and Line by 1 to 50
+  Special opcode 21: advance Address by 2 to 0x3e and Line by 2 to 52
+  Special opcode 34: advance Address by 4 to 0x42 and Line by 1 to 53
+  Special opcode 21: advance Address by 2 to 0x44 and Line by 2 to 55
+  Special opcode 34: advance Address by 4 to 0x48 and Line by 1 to 56
+  Special opcode 21: advance Address by 2 to 0x4a and Line by 2 to 58
+  Special opcode 34: advance Address by 4 to 0x4e and Line by 1 to 59
+  Special opcode 21: advance Address by 2 to 0x50 and Line by 2 to 61
+  Special opcode 34: advance Address by 4 to 0x54 and Line by 1 to 62
+  Special opcode 21: advance Address by 2 to 0x56 and Line by 2 to 64
+  Special opcode 34: advance Address by 4 to 0x5a and Line by 1 to 65
+  Special opcode 21: advance Address by 2 to 0x5c and Line by 2 to 67
+  Special opcode 34: advance Address by 4 to 0x60 and Line by 1 to 68
+  Special opcode 21: advance Address by 2 to 0x62 and Line by 2 to 70
+  Special opcode 34: advance Address by 4 to 0x66 and Line by 1 to 71
+  Special opcode 21: advance Address by 2 to 0x68 and Line by 2 to 73
+  Special opcode 34: advance Address by 4 to 0x6c and Line by 1 to 74
+  Special opcode 21: advance Address by 2 to 0x6e and Line by 2 to 76
+  Special opcode 34: advance Address by 4 to 0x72 and Line by 1 to 77
+  Special opcode 21: advance Address by 2 to 0x74 and Line by 2 to 79
+  Special opcode 48: advance Address by 6 to 0x7a and Line by 1 to 80
+  Special opcode 21: advance Address by 2 to 0x7c and Line by 2 to 82
+  Special opcode 48: advance Address by 6 to 0x82 and Line by 1 to 83
+  Special opcode 21: advance Address by 2 to 0x84 and Line by 2 to 85
+  Special opcode 48: advance Address by 6 to 0x8a and Line by 1 to 86
+  Special opcode 21: advance Address by 2 to 0x8c and Line by 2 to 88
+  Special opcode 48: advance Address by 6 to 0x92 and Line by 1 to 89
+  Special opcode 21: advance Address by 2 to 0x94 and Line by 2 to 91
+  Special opcode 48: advance Address by 6 to 0x9a and Line by 1 to 92
+  Special opcode 21: advance Address by 2 to 0x9c and Line by 2 to 94
+  Special opcode 48: advance Address by 6 to 0xa2 and Line by 1 to 95
+  Special opcode 21: advance Address by 2 to 0xa4 and Line by 2 to 97
+  Special opcode 48: advance Address by 6 to 0xaa and Line by 1 to 98
+  Special opcode 21: advance Address by 2 to 0xac and Line by 2 to 100
+  Special opcode 48: advance Address by 6 to 0xb2 and Line by 1 to 101
+  Special opcode 21: advance Address by 2 to 0xb4 and Line by 2 to 103
+  Special opcode 48: advance Address by 6 to 0xba and Line by 1 to 104
+  Special opcode 21: advance Address by 2 to 0xbc and Line by 2 to 106
+  Special opcode 48: advance Address by 6 to 0xc2 and Line by 1 to 107
+  Special opcode 21: advance Address by 2 to 0xc4 and Line by 2 to 109
+  Special opcode 48: advance Address by 6 to 0xca and Line by 1 to 110
+  Special opcode 21: advance Address by 2 to 0xcc and Line by 2 to 112
+  Special opcode 48: advance Address by 6 to 0xd2 and Line by 1 to 113
+  Special opcode 21: advance Address by 2 to 0xd4 and Line by 2 to 115
+  Special opcode 48: advance Address by 6 to 0xda and Line by 1 to 116
+  Special opcode 21: advance Address by 2 to 0xdc and Line by 2 to 118
+  Special opcode 48: advance Address by 6 to 0xe2 and Line by 1 to 119
+  Special opcode 21: advance Address by 2 to 0xe4 and Line by 2 to 121
+  Special opcode 48: advance Address by 6 to 0xea and Line by 1 to 122
+  Special opcode 21: advance Address by 2 to 0xec and Line by 2 to 124
+  Special opcode 48: advance Address by 6 to 0xf2 and Line by 1 to 125
+  Special opcode 21: advance Address by 2 to 0xf4 and Line by 2 to 127
+  Special opcode 20: advance Address by 2 to 0xf6 and Line by 1 to 128
+  Special opcode 21: advance Address by 2 to 0xf8 and Line by 2 to 130
+  Special opcode 20: advance Address by 2 to 0xfa and Line by 1 to 131
+  Special opcode 21: advance Address by 2 to 0xfc and Line by 2 to 133
+  Special opcode 20: advance Address by 2 to 0xfe and Line by 1 to 134
+  Special opcode 21: advance Address by 2 to 0x100 and Line by 2 to 136
+  Special opcode 20: advance Address by 2 to 0x102 and Line by 1 to 137
+  Special opcode 21: advance Address by 2 to 0x104 and Line by 2 to 139
+  Special opcode 20: advance Address by 2 to 0x106 and Line by 1 to 140
+  Special opcode 21: advance Address by 2 to 0x108 and Line by 2 to 142
+  Special opcode 20: advance Address by 2 to 0x10a and Line by 1 to 143
+  Special opcode 21: advance Address by 2 to 0x10c and Line by 2 to 145
+  Special opcode 20: advance Address by 2 to 0x10e and Line by 1 to 146
+  Special opcode 21: advance Address by 2 to 0x110 and Line by 2 to 148
+  Special opcode 20: advance Address by 2 to 0x112 and Line by 1 to 149
+  Special opcode 21: advance Address by 2 to 0x114 and Line by 2 to 151
+  Special opcode 20: advance Address by 2 to 0x116 and Line by 1 to 152
+  Special opcode 25: advance Address by 2 to 0x118 and Line by 6 to 158
+  Special opcode 20: advance Address by 2 to 0x11a and Line by 1 to 159
+  Special opcode 21: advance Address by 2 to 0x11c and Line by 2 to 161
+  Special opcode 20: advance Address by 2 to 0x11e and Line by 1 to 162
+  Special opcode 21: advance Address by 2 to 0x120 and Line by 2 to 164
+  Special opcode 20: advance Address by 2 to 0x122 and Line by 1 to 165
+  Special opcode 21: advance Address by 2 to 0x124 and Line by 2 to 167
+  Special opcode 20: advance Address by 2 to 0x126 and Line by 1 to 168
+  Special opcode 21: advance Address by 2 to 0x128 and Line by 2 to 170
+  Special opcode 20: advance Address by 2 to 0x12a and Line by 1 to 171
+  Special opcode 21: advance Address by 2 to 0x12c and Line by 2 to 173
+  Special opcode 20: advance Address by 2 to 0x12e and Line by 1 to 174
+  Special opcode 21: advance Address by 2 to 0x130 and Line by 2 to 176
+  Special opcode 20: advance Address by 2 to 0x132 and Line by 1 to 177
+  Special opcode 21: advance Address by 2 to 0x134 and Line by 2 to 179
+  Special opcode 20: advance Address by 2 to 0x136 and Line by 1 to 180
+  Special opcode 21: advance Address by 2 to 0x138 and Line by 2 to 182
+  Special opcode 20: advance Address by 2 to 0x13a and Line by 1 to 183
+  Special opcode 24: advance Address by 2 to 0x13c and Line by 5 to 188
+  Special opcode 48: advance Address by 6 to 0x142 and Line by 1 to 189
+  Special opcode 21: advance Address by 2 to 0x144 and Line by 2 to 191
+  Special opcode 48: advance Address by 6 to 0x14a and Line by 1 to 192
+  Special opcode 21: advance Address by 2 to 0x14c and Line by 2 to 194
+  Special opcode 48: advance Address by 6 to 0x152 and Line by 1 to 195
+  Special opcode 21: advance Address by 2 to 0x154 and Line by 2 to 197
+  Special opcode 48: advance Address by 6 to 0x15a and Line by 1 to 198
+  Special opcode 21: advance Address by 2 to 0x15c and Line by 2 to 200
+  Special opcode 48: advance Address by 6 to 0x162 and Line by 1 to 201
+  Special opcode 21: advance Address by 2 to 0x164 and Line by 2 to 203
+  Special opcode 48: advance Address by 6 to 0x16a and Line by 1 to 204
+  Special opcode 21: advance Address by 2 to 0x16c and Line by 2 to 206
+  Special opcode 48: advance Address by 6 to 0x172 and Line by 1 to 207
+  Special opcode 21: advance Address by 2 to 0x174 and Line by 2 to 209
+  Special opcode 48: advance Address by 6 to 0x17a and Line by 1 to 210
+  Special opcode 21: advance Address by 2 to 0x17c and Line by 2 to 212
+  Special opcode 48: advance Address by 6 to 0x182 and Line by 1 to 213
+  Special opcode 21: advance Address by 2 to 0x184 and Line by 2 to 215
+  Special opcode 48: advance Address by 6 to 0x18a and Line by 1 to 216
+  Special opcode 21: advance Address by 2 to 0x18c and Line by 2 to 218
+  Special opcode 48: advance Address by 6 to 0x192 and Line by 1 to 219
+  Special opcode 21: advance Address by 2 to 0x194 and Line by 2 to 221
+  Special opcode 48: advance Address by 6 to 0x19a and Line by 1 to 222
+  Special opcode 21: advance Address by 2 to 0x19c and Line by 2 to 224
+  Special opcode 48: advance Address by 6 to 0x1a2 and Line by 1 to 225
+  Special opcode 21: advance Address by 2 to 0x1a4 and Line by 2 to 227
+  Special opcode 48: advance Address by 6 to 0x1aa and Line by 1 to 228
+  Special opcode 21: advance Address by 2 to 0x1ac and Line by 2 to 230
+  Special opcode 48: advance Address by 6 to 0x1b2 and Line by 1 to 231
+  Special opcode 21: advance Address by 2 to 0x1b4 and Line by 2 to 233
+  Special opcode 48: advance Address by 6 to 0x1ba and Line by 1 to 234
+  Special opcode 21: advance Address by 2 to 0x1bc and Line by 2 to 236
+  Special opcode 20: advance Address by 2 to 0x1be and Line by 1 to 237
+  Special opcode 21: advance Address by 2 to 0x1c0 and Line by 2 to 239
+  Special opcode 20: advance Address by 2 to 0x1c2 and Line by 1 to 240
+  Special opcode 21: advance Address by 2 to 0x1c4 and Line by 2 to 242
+  Special opcode 20: advance Address by 2 to 0x1c6 and Line by 1 to 243
+  Special opcode 21: advance Address by 2 to 0x1c8 and Line by 2 to 245
+  Special opcode 20: advance Address by 2 to 0x1ca and Line by 1 to 246
+  Advance PC by 2 to 1cc
+  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
new file mode 100644
index 0000000..66a75be
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-2.d
@@ -0,0 +1,35 @@
+#readelf: -wl
+#source: binop-segref.s
+#as: --em=criself --gdwarf2
+
+# 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 34: advance Address by 4 to 0x5005e and Line by 1 to 38
+  Special opcode 34: advance Address by 4 to 0x50062 and Line by 1 to 39
+  Special opcode 34: advance Address by 4 to 0x50066 and Line by 1 to 40
+  Special opcode 35: advance Address by 4 to 0x5006a and Line by 2 to 42
+  Special opcode 34: advance Address by 4 to 0x5006e and Line by 1 to 43
+  Special opcode 34: advance Address by 4 to 0x50072 and Line by 1 to 44
+  Special opcode 34: advance Address by 4 to 0x50076 and Line by 1 to 45
+  Special opcode 35: advance Address by 4 to 0x5007a and Line by 2 to 47
+  Special opcode 34: advance Address by 4 to 0x5007e and Line by 1 to 48
+  Special opcode 34: advance Address by 4 to 0x50082 and Line by 1 to 49
+  Special opcode 34: advance Address by 4 to 0x50086 and Line by 1 to 50
+  Special opcode 35: advance Address by 4 to 0x5008a and Line by 2 to 52
+  Special opcode 48: advance Address by 6 to 0x50090 and Line by 1 to 53
+  Special opcode 48: advance Address by 6 to 0x50096 and Line by 1 to 54
+  Special opcode 48: advance Address by 6 to 0x5009c and Line by 1 to 55
+  Special opcode 49: advance Address by 6 to 0x500a2 and Line by 2 to 57
+  Special opcode 48: advance Address by 6 to 0x500a8 and Line by 1 to 58
+  Special opcode 48: advance Address by 6 to 0x500ae and Line by 1 to 59
+  Special opcode 48: advance Address by 6 to 0x500b4 and Line by 1 to 60
+  Special opcode 49: advance Address by 6 to 0x500ba and Line by 2 to 62
+  Special opcode 48: advance Address by 6 to 0x500c0 and Line by 1 to 63
+  Special opcode 48: advance Address by 6 to 0x500c6 and Line by 1 to 64
+  Special opcode 48: advance Address by 6 to 0x500cc and Line by 1 to 65
+  Advance PC by 327776 to a012c
+  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
new file mode 100644
index 0000000..8be9391
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-3.d
@@ -0,0 +1,12 @@
+#readelf: -wl
+#source: branch-warn-1.s
+#as: --em=criself --gdwarf2
+
+# Simple branch-expansion, type 1.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 12: advance Address by 0 to 0x0 and Line by 7 to 8
+  Special opcode 90: advance Address by 12 to 0xc and Line by 1 to 9
+  Advance PC by 2 to e
+  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
new file mode 100644
index 0000000..cfd8a43
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-4.d
@@ -0,0 +1,13 @@
+#readelf: -wl
+#source: branch-warn-2.s
+#as: --em=criself --gdwarf2
+
+# Simple branch-expansion, type 2.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 12: advance Address by 0 to 0x0 and Line by 7 to 8
+  Advance PC by 32780 to 800c
+  Special opcode 8: advance Address by 0 to 0x800c and Line by 3 to 11
+  Advance PC by 2 to 800e
+  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
new file mode 100644
index 0000000..9758d82
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-5.d
@@ -0,0 +1,14 @@
+#readelf: -wl
+#source: branch-warn-3.s
+#as: --em=criself --gdwarf2
+
+# Simple branch-expansion, type 3.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 12: advance Address by 0 to 0x0 and Line by 7 to 8
+  Advance PC by 32770 to 8002
+  Special opcode 7: advance Address by 0 to 0x8002 and Line by 2 to 10
+  Special opcode 90: advance Address by 12 to 0x800e and Line by 1 to 11
+  Advance PC by 2 to 8010
+  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
new file mode 100644
index 0000000..7996897
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-6.d
@@ -0,0 +1,230 @@
+#readelf: -wl
+#source: branch.s
+#as: --em=criself --gdwarf2
+
+# Complicated branch expansion.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 12: advance Address by 0 to 0x0 and Line by 7 to 8
+  Special opcode 21: advance Address by 2 to 0x2 and Line by 2 to 10
+  Advance PC by 32360 to 7e6a
+  Special opcode 8: advance Address by 0 to 0x7e6a and Line by 3 to 13
+  Advance PC by 196 to 7f2e
+  Special opcode 11: advance Address by 0 to 0x7f2e and Line by 6 to 19
+  Special opcode 20: advance Address by 2 to 0x7f30 and Line by 1 to 20
+  Special opcode 20: advance Address by 2 to 0x7f32 and Line by 1 to 21
+  Special opcode 20: advance Address by 2 to 0x7f34 and Line by 1 to 22
+  Special opcode 20: advance Address by 2 to 0x7f36 and Line by 1 to 23
+  Special opcode 20: advance Address by 2 to 0x7f38 and Line by 1 to 24
+  Special opcode 20: advance Address by 2 to 0x7f3a and Line by 1 to 25
+  Special opcode 20: advance Address by 2 to 0x7f3c and Line by 1 to 26
+  Special opcode 20: advance Address by 2 to 0x7f3e and Line by 1 to 27
+  Special opcode 20: advance Address by 2 to 0x7f40 and Line by 1 to 28
+  Special opcode 20: advance Address by 2 to 0x7f42 and Line by 1 to 29
+  Special opcode 20: advance Address by 2 to 0x7f44 and Line by 1 to 30
+  Special opcode 20: advance Address by 2 to 0x7f46 and Line by 1 to 31
+  Special opcode 20: advance Address by 2 to 0x7f48 and Line by 1 to 32
+  Special opcode 20: advance Address by 2 to 0x7f4a and Line by 1 to 33
+  Special opcode 20: advance Address by 2 to 0x7f4c and Line by 1 to 34
+  Special opcode 20: advance Address by 2 to 0x7f4e and Line by 1 to 35
+  Special opcode 20: advance Address by 2 to 0x7f50 and Line by 1 to 36
+  Special opcode 20: advance Address by 2 to 0x7f52 and Line by 1 to 37
+  Special opcode 20: advance Address by 2 to 0x7f54 and Line by 1 to 38
+  Special opcode 20: advance Address by 2 to 0x7f56 and Line by 1 to 39
+  Special opcode 21: advance Address by 2 to 0x7f58 and Line by 2 to 41
+  Special opcode 20: advance Address by 2 to 0x7f5a and Line by 1 to 42
+  Special opcode 20: advance Address by 2 to 0x7f5c and Line by 1 to 43
+  Special opcode 20: advance Address by 2 to 0x7f5e and Line by 1 to 44
+  Special opcode 20: advance Address by 2 to 0x7f60 and Line by 1 to 45
+  Special opcode 20: advance Address by 2 to 0x7f62 and Line by 1 to 46
+  Special opcode 20: advance Address by 2 to 0x7f64 and Line by 1 to 47
+  Special opcode 20: advance Address by 2 to 0x7f66 and Line by 1 to 48
+  Special opcode 20: advance Address by 2 to 0x7f68 and Line by 1 to 49
+  Special opcode 20: advance Address by 2 to 0x7f6a and Line by 1 to 50
+  Special opcode 34: advance Address by 4 to 0x7f6e and Line by 1 to 51
+  Special opcode 34: advance Address by 4 to 0x7f72 and Line by 1 to 52
+  Special opcode 34: advance Address by 4 to 0x7f76 and Line by 1 to 53
+  Special opcode 34: advance Address by 4 to 0x7f7a and Line by 1 to 54
+  Special opcode 34: advance Address by 4 to 0x7f7e and Line by 1 to 55
+  Special opcode 34: advance Address by 4 to 0x7f82 and Line by 1 to 56
+  Special opcode 34: advance Address by 4 to 0x7f86 and Line by 1 to 57
+  Special opcode 34: advance Address by 4 to 0x7f8a and Line by 1 to 58
+  Special opcode 34: advance Address by 4 to 0x7f8e and Line by 1 to 59
+  Special opcode 34: advance Address by 4 to 0x7f92 and Line by 1 to 60
+  Special opcode 34: advance Address by 4 to 0x7f96 and Line by 1 to 61
+  Special opcode 37: advance Address by 4 to 0x7f9a and Line by 4 to 65
+  Special opcode 20: advance Address by 2 to 0x7f9c and Line by 1 to 66
+  Special opcode 34: advance Address by 4 to 0x7fa0 and Line by 1 to 67
+  Special opcode 34: advance Address by 4 to 0x7fa4 and Line by 1 to 68
+  Special opcode 34: advance Address by 4 to 0x7fa8 and Line by 1 to 69
+  Special opcode 34: advance Address by 4 to 0x7fac and Line by 1 to 70
+  Special opcode 34: advance Address by 4 to 0x7fb0 and Line by 1 to 71
+  Special opcode 34: advance Address by 4 to 0x7fb4 and Line by 1 to 72
+  Special opcode 34: advance Address by 4 to 0x7fb8 and Line by 1 to 73
+  Special opcode 34: advance Address by 4 to 0x7fbc and Line by 1 to 74
+  Special opcode 34: advance Address by 4 to 0x7fc0 and Line by 1 to 75
+  Special opcode 34: advance Address by 4 to 0x7fc4 and Line by 1 to 76
+  Special opcode 34: advance Address by 4 to 0x7fc8 and Line by 1 to 77
+  Special opcode 34: advance Address by 4 to 0x7fcc and Line by 1 to 78
+  Special opcode 34: advance Address by 4 to 0x7fd0 and Line by 1 to 79
+  Special opcode 34: advance Address by 4 to 0x7fd4 and Line by 1 to 80
+  Special opcode 34: advance Address by 4 to 0x7fd8 and Line by 1 to 81
+  Special opcode 34: advance Address by 4 to 0x7fdc and Line by 1 to 82
+  Special opcode 34: advance Address by 4 to 0x7fe0 and Line by 1 to 83
+  Special opcode 34: advance Address by 4 to 0x7fe4 and Line by 1 to 84
+  Special opcode 34: advance Address by 4 to 0x7fe8 and Line by 1 to 85
+  Special opcode 39: advance Address by 4 to 0x7fec and Line by 6 to 91
+  Special opcode 20: advance Address by 2 to 0x7fee and Line by 1 to 92
+  Special opcode 34: advance Address by 4 to 0x7ff2 and Line by 1 to 93
+  Special opcode 34: advance Address by 4 to 0x7ff6 and Line by 1 to 94
+  Special opcode 34: advance Address by 4 to 0x7ffa and Line by 1 to 95
+  Special opcode 34: advance Address by 4 to 0x7ffe and Line by 1 to 96
+  Special opcode 34: advance Address by 4 to 0x8002 and Line by 1 to 97
+  Special opcode 90: advance Address by 12 to 0x800e and Line by 1 to 98
+  Special opcode 90: advance Address by 12 to 0x801a and Line by 1 to 99
+  Special opcode 90: advance Address by 12 to 0x8026 and Line by 1 to 100
+  Special opcode 90: advance Address by 12 to 0x8032 and Line by 1 to 101
+  Special opcode 90: advance Address by 12 to 0x803e and Line by 1 to 102
+  Special opcode 90: advance Address by 12 to 0x804a and Line by 1 to 103
+  Special opcode 90: advance Address by 12 to 0x8056 and Line by 1 to 104
+  Special opcode 90: advance Address by 12 to 0x8062 and Line by 1 to 105
+  Special opcode 90: advance Address by 12 to 0x806e and Line by 1 to 106
+  Special opcode 90: advance Address by 12 to 0x807a and Line by 1 to 107
+  Special opcode 90: advance Address by 12 to 0x8086 and Line by 1 to 108
+  Special opcode 90: advance Address by 12 to 0x8092 and Line by 1 to 109
+  Special opcode 90: advance Address by 12 to 0x809e and Line by 1 to 110
+  Special opcode 90: advance Address by 12 to 0x80aa and Line by 1 to 111
+  Special opcode 94: advance Address by 12 to 0x80b6 and Line by 5 to 116
+  Special opcode 20: advance Address by 2 to 0x80b8 and Line by 1 to 117
+  Special opcode 90: advance Address by 12 to 0x80c4 and Line by 1 to 118
+  Special opcode 90: advance Address by 12 to 0x80d0 and Line by 1 to 119
+  Special opcode 90: advance Address by 12 to 0x80dc and Line by 1 to 120
+  Special opcode 90: advance Address by 12 to 0x80e8 and Line by 1 to 121
+  Special opcode 90: advance Address by 12 to 0x80f4 and Line by 1 to 122
+  Special opcode 90: advance Address by 12 to 0x8100 and Line by 1 to 123
+  Special opcode 90: advance Address by 12 to 0x810c and Line by 1 to 124
+  Special opcode 90: advance Address by 12 to 0x8118 and Line by 1 to 125
+  Special opcode 90: advance Address by 12 to 0x8124 and Line by 1 to 126
+  Special opcode 90: advance Address by 12 to 0x8130 and Line by 1 to 127
+  Special opcode 90: advance Address by 12 to 0x813c and Line by 1 to 128
+  Special opcode 90: advance Address by 12 to 0x8148 and Line by 1 to 129
+  Special opcode 90: advance Address by 12 to 0x8154 and Line by 1 to 130
+  Special opcode 90: advance Address by 12 to 0x8160 and Line by 1 to 131
+  Special opcode 90: advance Address by 12 to 0x816c and Line by 1 to 132
+  Special opcode 90: advance Address by 12 to 0x8178 and Line by 1 to 133
+  Special opcode 90: advance Address by 12 to 0x8184 and Line by 1 to 134
+  Special opcode 90: advance Address by 12 to 0x8190 and Line by 1 to 135
+  Special opcode 90: advance Address by 12 to 0x819c and Line by 1 to 136
+  Special opcode 95: advance Address by 12 to 0x81a8 and Line by 6 to 142
+  Special opcode 20: advance Address by 2 to 0x81aa and Line by 1 to 143
+  Special opcode 90: advance Address by 12 to 0x81b6 and Line by 1 to 144
+  Special opcode 90: advance Address by 12 to 0x81c2 and Line by 1 to 145
+  Special opcode 90: advance Address by 12 to 0x81ce and Line by 1 to 146
+  Special opcode 90: advance Address by 12 to 0x81da and Line by 1 to 147
+  Special opcode 90: advance Address by 12 to 0x81e6 and Line by 1 to 148
+  Special opcode 90: advance Address by 12 to 0x81f2 and Line by 1 to 149
+  Special opcode 90: advance Address by 12 to 0x81fe and Line by 1 to 150
+  Special opcode 90: advance Address by 12 to 0x820a and Line by 1 to 151
+  Special opcode 90: advance Address by 12 to 0x8216 and Line by 1 to 152
+  Special opcode 90: advance Address by 12 to 0x8222 and Line by 1 to 153
+  Special opcode 90: advance Address by 12 to 0x822e and Line by 1 to 154
+  Special opcode 90: advance Address by 12 to 0x823a and Line by 1 to 155
+  Special opcode 90: advance Address by 12 to 0x8246 and Line by 1 to 156
+  Special opcode 90: advance Address by 12 to 0x8252 and Line by 1 to 157
+  Special opcode 90: advance Address by 12 to 0x825e and Line by 1 to 158
+  Special opcode 90: advance Address by 12 to 0x826a and Line by 1 to 159
+  Special opcode 90: advance Address by 12 to 0x8276 and Line by 1 to 160
+  Special opcode 90: advance Address by 12 to 0x8282 and Line by 1 to 161
+  Special opcode 90: advance Address by 12 to 0x828e and Line by 1 to 162
+  Special opcode 94: advance Address by 12 to 0x829a and Line by 5 to 167
+  Special opcode 20: advance Address by 2 to 0x829c and Line by 1 to 168
+  Special opcode 90: advance Address by 12 to 0x82a8 and Line by 1 to 169
+  Special opcode 90: advance Address by 12 to 0x82b4 and Line by 1 to 170
+  Special opcode 90: advance Address by 12 to 0x82c0 and Line by 1 to 171
+  Special opcode 90: advance Address by 12 to 0x82cc and Line by 1 to 172
+  Special opcode 90: advance Address by 12 to 0x82d8 and Line by 1 to 173
+  Special opcode 90: advance Address by 12 to 0x82e4 and Line by 1 to 174
+  Special opcode 90: advance Address by 12 to 0x82f0 and Line by 1 to 175
+  Special opcode 90: advance Address by 12 to 0x82fc and Line by 1 to 176
+  Special opcode 90: advance Address by 12 to 0x8308 and Line by 1 to 177
+  Special opcode 90: advance Address by 12 to 0x8314 and Line by 1 to 178
+  Special opcode 90: advance Address by 12 to 0x8320 and Line by 1 to 179
+  Special opcode 90: advance Address by 12 to 0x832c and Line by 1 to 180
+  Special opcode 90: advance Address by 12 to 0x8338 and Line by 1 to 181
+  Special opcode 90: advance Address by 12 to 0x8344 and Line by 1 to 182
+  Special opcode 34: advance Address by 4 to 0x8348 and Line by 1 to 183
+  Special opcode 34: advance Address by 4 to 0x834c and Line by 1 to 184
+  Special opcode 34: advance Address by 4 to 0x8350 and Line by 1 to 185
+  Special opcode 34: advance Address by 4 to 0x8354 and Line by 1 to 186
+  Special opcode 34: advance Address by 4 to 0x8358 and Line by 1 to 187
+  Special opcode 38: advance Address by 4 to 0x835c and Line by 5 to 192
+  Special opcode 20: advance Address by 2 to 0x835e and Line by 1 to 193
+  Special opcode 34: advance Address by 4 to 0x8362 and Line by 1 to 194
+  Special opcode 34: advance Address by 4 to 0x8366 and Line by 1 to 195
+  Special opcode 34: advance Address by 4 to 0x836a and Line by 1 to 196
+  Special opcode 34: advance Address by 4 to 0x836e and Line by 1 to 197
+  Special opcode 34: advance Address by 4 to 0x8372 and Line by 1 to 198
+  Special opcode 34: advance Address by 4 to 0x8376 and Line by 1 to 199
+  Special opcode 34: advance Address by 4 to 0x837a and Line by 1 to 200
+  Special opcode 34: advance Address by 4 to 0x837e and Line by 1 to 201
+  Special opcode 34: advance Address by 4 to 0x8382 and Line by 1 to 202
+  Special opcode 34: advance Address by 4 to 0x8386 and Line by 1 to 203
+  Special opcode 34: advance Address by 4 to 0x838a and Line by 1 to 204
+  Special opcode 34: advance Address by 4 to 0x838e and Line by 1 to 205
+  Special opcode 34: advance Address by 4 to 0x8392 and Line by 1 to 206
+  Special opcode 34: advance Address by 4 to 0x8396 and Line by 1 to 207
+  Special opcode 34: advance Address by 4 to 0x839a and Line by 1 to 208
+  Special opcode 34: advance Address by 4 to 0x839e and Line by 1 to 209
+  Special opcode 34: advance Address by 4 to 0x83a2 and Line by 1 to 210
+  Special opcode 34: advance Address by 4 to 0x83a6 and Line by 1 to 211
+  Special opcode 34: advance Address by 4 to 0x83aa and Line by 1 to 212
+  Special opcode 38: advance Address by 4 to 0x83ae and Line by 5 to 217
+  Special opcode 20: advance Address by 2 to 0x83b0 and Line by 1 to 218
+  Special opcode 34: advance Address by 4 to 0x83b4 and Line by 1 to 219
+  Special opcode 34: advance Address by 4 to 0x83b8 and Line by 1 to 220
+  Special opcode 34: advance Address by 4 to 0x83bc and Line by 1 to 221
+  Special opcode 34: advance Address by 4 to 0x83c0 and Line by 1 to 222
+  Special opcode 34: advance Address by 4 to 0x83c4 and Line by 1 to 223
+  Special opcode 34: advance Address by 4 to 0x83c8 and Line by 1 to 224
+  Special opcode 34: advance Address by 4 to 0x83cc and Line by 1 to 225
+  Special opcode 34: advance Address by 4 to 0x83d0 and Line by 1 to 226
+  Special opcode 34: advance Address by 4 to 0x83d4 and Line by 1 to 227
+  Special opcode 34: advance Address by 4 to 0x83d8 and Line by 1 to 228
+  Special opcode 34: advance Address by 4 to 0x83dc and Line by 1 to 229
+  Special opcode 20: advance Address by 2 to 0x83de and Line by 1 to 230
+  Special opcode 20: advance Address by 2 to 0x83e0 and Line by 1 to 231
+  Special opcode 20: advance Address by 2 to 0x83e2 and Line by 1 to 232
+  Special opcode 20: advance Address by 2 to 0x83e4 and Line by 1 to 233
+  Special opcode 20: advance Address by 2 to 0x83e6 and Line by 1 to 234
+  Special opcode 20: advance Address by 2 to 0x83e8 and Line by 1 to 235
+  Special opcode 20: advance Address by 2 to 0x83ea and Line by 1 to 236
+  Special opcode 20: advance Address by 2 to 0x83ec and Line by 1 to 237
+  Special opcode 24: advance Address by 2 to 0x83ee and Line by 5 to 242
+  Special opcode 20: advance Address by 2 to 0x83f0 and Line by 1 to 243
+  Special opcode 20: advance Address by 2 to 0x83f2 and Line by 1 to 244
+  Special opcode 20: advance Address by 2 to 0x83f4 and Line by 1 to 245
+  Special opcode 20: advance Address by 2 to 0x83f6 and Line by 1 to 246
+  Special opcode 20: advance Address by 2 to 0x83f8 and Line by 1 to 247
+  Special opcode 20: advance Address by 2 to 0x83fa and Line by 1 to 248
+  Special opcode 20: advance Address by 2 to 0x83fc and Line by 1 to 249
+  Special opcode 20: advance Address by 2 to 0x83fe and Line by 1 to 250
+  Special opcode 20: advance Address by 2 to 0x8400 and Line by 1 to 251
+  Special opcode 20: advance Address by 2 to 0x8402 and Line by 1 to 252
+  Special opcode 20: advance Address by 2 to 0x8404 and Line by 1 to 253
+  Special opcode 20: advance Address by 2 to 0x8406 and Line by 1 to 254
+  Special opcode 20: advance Address by 2 to 0x8408 and Line by 1 to 255
+  Special opcode 20: advance Address by 2 to 0x840a and Line by 1 to 256
+  Special opcode 20: advance Address by 2 to 0x840c and Line by 1 to 257
+  Special opcode 20: advance Address by 2 to 0x840e and Line by 1 to 258
+  Special opcode 20: advance Address by 2 to 0x8410 and Line by 1 to 259
+  Special opcode 20: advance Address by 2 to 0x8412 and Line by 1 to 260
+  Special opcode 20: advance Address by 2 to 0x8414 and Line by 1 to 261
+  Special opcode 20: advance Address by 2 to 0x8416 and Line by 1 to 262
+  Special opcode 21: advance Address by 2 to 0x8418 and Line by 2 to 264
+  Advance PC by 196 to 84dc
+  Special opcode 8: advance Address by 0 to 0x84dc and Line by 3 to 267
+  Advance PC by 32360 to 10344
+  Special opcode 8: advance Address by 0 to 0x10344 and Line by 3 to 270
+  Advance PC by 2 to 10346
+  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
new file mode 100644
index 0000000..14765aa
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-7.d
@@ -0,0 +1,15 @@
+#readelf: -wl
+#source: brokw-1.s
+#as: --em=criself --gdwarf2
+
+# Most simple broken word.
+#...
+ 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 37: advance Address by 4 to 0x4 and Line by 4 to 7
+  Special opcode 111: advance Address by 14 to 0x12 and Line by 8 to 15
+  Advance PC by 32768 to 8012
+  Special opcode 9: advance Address by 0 to 0x8012 and Line by 4 to 19
+  Advance PC by 2 to 8014
+  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
new file mode 100644
index 0000000..a9e1c85
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-8.d
@@ -0,0 +1,17 @@
+#readelf: -wl
+#source: brokw-2.s
+#as: --em=criself --gdwarf2
+
+# Simple broken word, table with two labels.
+#...
+ 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 52: advance Address by 6 to 0x6 and Line by 5 to 8
+  Advance Line by 9 to 17
+  Special opcode 145: advance Address by 20 to 0x1a and Line by 0 to 17
+  Advance PC by 32768 to 801a
+  Special opcode 9: advance Address by 0 to 0x801a and Line by 4 to 21
+  Special opcode 20: advance Address by 2 to 0x801c and Line by 1 to 22
+  Advance PC by 2 to 801e
+  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
new file mode 100644
index 0000000..53ec1e0
--- /dev/null
+++ b/gas/testsuite/gas/cris/rd-dw2-9.d
@@ -0,0 +1,63 @@
+#readelf: -wl
+#source: brokw-3.s
+#as: --em=criself --gdwarf2
+
+# Long broken word table.
+#...
+ Line Number Statements:
+  Extended opcode 2: set Address to 0x0
+  Special opcode 8: advance Address by 0 to 0x0 and Line by 3 to 4
+  Special opcode 23: advance Address by 2 to 0x2 and Line by 4 to 8
+  Special opcode 34: advance Address by 4 to 0x6 and Line by 1 to 9
+  Special opcode 34: advance Address by 4 to 0xa and Line by 1 to 10
+  Advance Line by 47 to 57
+  Advance PC by 104 to 72
+  Copy
+  Advance Line by 10 to 67
+  Advance PC by 260 to 176
+  Copy
+  Advance PC by 32770 to 8178
+  Special opcode 9: advance Address by 0 to 0x8178 and Line by 4 to 71
+  Special opcode 20: advance Address by 2 to 0x817a and Line by 1 to 72
+  Special opcode 20: advance Address by 2 to 0x817c and Line by 1 to 73
+  Special opcode 20: advance Address by 2 to 0x817e and Line by 1 to 74
+  Special opcode 20: advance Address by 2 to 0x8180 and Line by 1 to 75
+  Special opcode 20: advance Address by 2 to 0x8182 and Line by 1 to 76
+  Special opcode 20: advance Address by 2 to 0x8184 and Line by 1 to 77
+  Special opcode 20: advance Address by 2 to 0x8186 and Line by 1 to 78
+  Special opcode 20: advance Address by 2 to 0x8188 and Line by 1 to 79
+  Special opcode 20: advance Address by 2 to 0x818a and Line by 1 to 80
+  Special opcode 20: advance Address by 2 to 0x818c and Line by 1 to 81
+  Special opcode 20: advance Address by 2 to 0x818e and Line by 1 to 82
+  Special opcode 20: advance Address by 2 to 0x8190 and Line by 1 to 83
+  Special opcode 20: advance Address by 2 to 0x8192 and Line by 1 to 84
+  Special opcode 20: advance Address by 2 to 0x8194 and Line by 1 to 85
+  Special opcode 20: advance Address by 2 to 0x8196 and Line by 1 to 86
+  Special opcode 20: advance Address by 2 to 0x8198 and Line by 1 to 87
+  Special opcode 20: advance Address by 2 to 0x819a and Line by 1 to 88
+  Special opcode 20: advance Address by 2 to 0x819c and Line by 1 to 89
+  Special opcode 20: advance Address by 2 to 0x819e and Line by 1 to 90
+  Special opcode 20: advance Address by 2 to 0x81a0 and Line by 1 to 91
+  Special opcode 20: advance Address by 2 to 0x81a2 and Line by 1 to 92
+  Special opcode 20: advance Address by 2 to 0x81a4 and Line by 1 to 93
+  Special opcode 20: advance Address by 2 to 0x81a6 and Line by 1 to 94
+  Special opcode 20: advance Address by 2 to 0x81a8 and Line by 1 to 95
+  Special opcode 20: advance Address by 2 to 0x81aa and Line by 1 to 96
+  Special opcode 20: advance Address by 2 to 0x81ac and Line by 1 to 97
+  Special opcode 20: advance Address by 2 to 0x81ae and Line by 1 to 98
+  Special opcode 20: advance Address by 2 to 0x81b0 and Line by 1 to 99
+  Special opcode 20: advance Address by 2 to 0x81b2 and Line by 1 to 100
+  Special opcode 20: advance Address by 2 to 0x81b4 and Line by 1 to 101
+  Special opcode 20: advance Address by 2 to 0x81b6 and Line by 1 to 102
+  Special opcode 20: advance Address by 2 to 0x81b8 and Line by 1 to 103
+  Special opcode 20: advance Address by 2 to 0x81ba and Line by 1 to 104
+  Special opcode 20: advance Address by 2 to 0x81bc and Line by 1 to 105
+  Special opcode 20: advance Address by 2 to 0x81be and Line by 1 to 106
+  Special opcode 20: advance Address by 2 to 0x81c0 and Line by 1 to 107
+  Special opcode 20: advance Address by 2 to 0x81c2 and Line by 1 to 108
+  Special opcode 20: advance Address by 2 to 0x81c4 and Line by 1 to 109
+  Special opcode 20: advance Address by 2 to 0x81c6 and Line by 1 to 110
+  Special opcode 20: advance Address by 2 to 0x81c8 and Line by 1 to 111
+  Special opcode 20: advance Address by 2 to 0x81ca and Line by 1 to 112
+  Advance PC by 2 to 81cc
+  Extended opcode 1: End of Sequence