From: Maciej W. Rozycki <macro@imgtec.com>
Date: Tue, 27 Jun 2017 03:23:54 +0000 (+0100)
Subject: MIPS/GAS/testsuite: Drop the `mips16e-' prefix from SAVE/RESTORE tests
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79cb3f75debfeb1355f8883143f0f6dc98f70080;p=binutils-gdb.git

MIPS/GAS/testsuite: Drop the `mips16e-' prefix from SAVE/RESTORE tests

In preparation to running these tests against regular MIPS instructions.

	gas/
	* testsuite/gas/mips/mips16e-save.d: Rename to...
	* testsuite/gas/mips/save.d: ... this.
	* testsuite/gas/mips/mips16e-save-err.d: Update the
	`error-output' option and rename to...
	* testsuite/gas/mips/save-err.d: ... this.
	* testsuite/gas/mips/mips16e-save-err.l: Rename to...
	* testsuite/gas/mips/save-err.l: ... this.
	* testsuite/gas/mips/mips16e-save.s: Rename to...
	* testsuite/gas/mips/save.s: ... this.
	* testsuite/gas/mips/mips16e-save-err.s: Rename to...
	* testsuite/gas/mips/save-err.s: ... this.
	* testsuite/gas/mips/mips.exp: Rename `mips16e-save' and
	`mips16e-save-err' invocations to `save' and `save-err'
	respectively and reorder these tests away from MIPS16 tests.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 37d45b8abb9..6a3437b6a1a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,20 @@
+2017-06-27  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* testsuite/gas/mips/mips16e-save.d: Rename to...
+	* testsuite/gas/mips/save.d: ... this.
+	* testsuite/gas/mips/mips16e-save-err.d: Update the
+	`error-output' option and rename to...
+	* testsuite/gas/mips/save-err.d: ... this.
+	* testsuite/gas/mips/mips16e-save-err.l: Rename to...
+	* testsuite/gas/mips/save-err.l: ... this.
+	* testsuite/gas/mips/mips16e-save.s: Rename to...
+	* testsuite/gas/mips/save.s: ... this.
+	* testsuite/gas/mips/mips16e-save-err.s: Rename to...
+	* testsuite/gas/mips/save-err.s: ... this.
+	* testsuite/gas/mips/mips.exp: Rename `mips16e-save' and
+	`mips16e-save-err' invocations to `save' and `save-err'
+	respectively and reorder these tests away from MIPS16 tests.
+
 2017-06-27  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* testsuite/gas/mips/mips16e-save.d: Remove `-mmips:isa32
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index b9787045b9d..2e3b3d58c08 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -1376,6 +1376,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips64-dsp"
     run_dump_test "mips32-mt"
 
+    run_dump_test_arches "save"		[mips_arch_list_matching mips16e-32]
+    run_dump_test_arches "save-err"	[mips_arch_list_matching mips16e-32]
+
     run_dump_test "mips16-dwarf2"
     if $has_newabi {
 	run_dump_test "mips16-dwarf2-n32"
@@ -1383,9 +1386,6 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips16-stabs"
 
     run_dump_test "mips16e-jrc"
-    run_dump_test_arches "mips16e-save"	[mips_arch_list_matching mips16e-32]
-    run_dump_test_arches "mips16e-save-err" \
-					[mips_arch_list_matching mips16e-32]
     run_dump_test "mips16e2-lui"
 
     run_dump_test "mips16-intermix"
diff --git a/gas/testsuite/gas/mips/mips16e-save-err.d b/gas/testsuite/gas/mips/mips16e-save-err.d
deleted file mode 100644
index fd6b9cadbe1..00000000000
--- a/gas/testsuite/gas/mips/mips16e-save-err.d
+++ /dev/null
@@ -1,3 +0,0 @@
-#name: MIPS16e SAVE/RESTORE errors
-#as: -32
-#error-output: mips16e-save-err.l
diff --git a/gas/testsuite/gas/mips/mips16e-save-err.l b/gas/testsuite/gas/mips/mips16e-save-err.l
deleted file mode 100644
index 0af16c27525..00000000000
--- a/gas/testsuite/gas/mips/mips16e-save-err.l
+++ /dev/null
@@ -1,13 +0,0 @@
-.*: Assembler messages:
-.*:2: Error: invalid operands `save \$3,100'
-.*:3: Error: missing frame size `save \$4'
-.*:4: Error: frame size specified twice `save \$4,100,200'
-.*:5: Error: operand 2 must be constant `save \$4,foo'
-.*:7: Error: invalid frame size `save \$4,1'
-.*:8: Error: invalid frame size `save \$4,7'
-.*:10: Error: invalid frame size `save \$4,12'
-.*:11: Error: invalid frame size `save \$4,2048'
-.*:12: Error: invalid frame size `save \$4,2052'
-.*:14: Error: invalid operands `save \$4,\$6,0'
-.*:15: Error: invalid operands `save 0,\$5,\$7'
-.*:18: Error: invalid operands `save \$16,\$18,\$20,0'
diff --git a/gas/testsuite/gas/mips/mips16e-save-err.s b/gas/testsuite/gas/mips/mips16e-save-err.s
deleted file mode 100644
index 7642235c42c..00000000000
--- a/gas/testsuite/gas/mips/mips16e-save-err.s
+++ /dev/null
@@ -1,18 +0,0 @@
-
-	save	$3,100		# error
-	save	$4		# error
-	save	$4,100,200	# error
-	save	$4,foo		# error
-	save	$4,0		# OK
-	save	$4,1		# error
-	save	$4,7		# error
-	save	$4,8		# OK
-	save	$4,12		# error
-	save	$4,2048		# OK
-	save	$4,2052		# error
-	save	$4,0,$7		# error
-	save	$4,$6,0		# error
-	save	0,$5,$7		# error
-	save	$16,$18,0	# OK
-	save	$16,$18,$19,0	# OK
-	save	$16,$18,$20,0	# error
diff --git a/gas/testsuite/gas/mips/mips16e-save.d b/gas/testsuite/gas/mips/mips16e-save.d
deleted file mode 100644
index 792b99ae51a..00000000000
--- a/gas/testsuite/gas/mips/mips16e-save.d
+++ /dev/null
@@ -1,43 +0,0 @@
-#objdump: -dr
-#as: -32
-#name: MIPS16e SAVE/RESTORE
-
-.*: +file format .*mips.*
-
-Disassembly of section .text:
-00000000 <func>:
-   0:[ 	]+6481[ 	]+save[ 	]+8
-   2:[ 	]+64c2[ 	]+save[ 	]+16,ra
-   4:[ 	]+64a3[ 	]+save[ 	]+24,s0
-   6:[ 	]+6494[ 	]+save[ 	]+32,s1
-   8:[ 	]+64b5[ 	]+save[ 	]+40,s0-s1
-   a:[ 	]+64e6[ 	]+save[ 	]+48,ra,s0
-   c:[ 	]+64d7[ 	]+save[ 	]+56,ra,s1
-   e:[ 	]+64f8[ 	]+save[ 	]+64,ra,s0-s1
-  10:[ 	]+64f9[ 	]+save[ 	]+72,ra,s0-s1
-  12:[ 	]+64fa[ 	]+save[ 	]+80,ra,s0-s1
-  14:[ 	]+64fb[ 	]+save[ 	]+88,ra,s0-s1
-  16:[ 	]+64f0[ 	]+save[ 	]+128,ra,s0-s1
-  18:[ 	]+f010 6481[ 	]+save[ 	]+136
-  1c:[ 	]+f010 64c2[ 	]+save[ 	]+144,ra
-  20:[ 	]+f010 64b3[ 	]+save[ 	]+152,s0-s1
-  24:[ 	]+f100 6488[ 	]+save[ 	]+64,s2
-  28:[ 	]+f600 6489[ 	]+save[ 	]+72,s2-s7
-  2c:[ 	]+f700 648a[ 	]+save[ 	]+80,s2-s8
-  30:[ 	]+f700 64bb[ 	]+save[ 	]+88,s0-s8
-  34:[ 	]+f001 6488[ 	]+save[ 	]+64,a3
-  38:[ 	]+f012 6480[ 	]+save[ 	]+128,a2-a3
-  3c:[ 	]+f02b 6480[ 	]+save[ 	]+256,a0-a3
-  40:[ 	]+f024 6480[ 	]+save[ 	]+a0,256
-  44:[ 	]+f018 6480[ 	]+save[ 	]+a0-a1,128
-  48:[ 	]+f00e 6488[ 	]+save[ 	]+a0-a3,64
-  4c:[ 	]+f015 6480[ 	]+save[ 	]+a0,128,a3
-  50:[ 	]+f017 6480[ 	]+save[ 	]+a0,128,a1-a3
-  54:[ 	]+f01a 6480[ 	]+save[ 	]+a0-a1,128,a2-a3
-  58:[ 	]+f01d 6480[ 	]+save[ 	]+a0-a2,128,a3
-  5c:[ 	]+f71a 64f0[ 	]+save[ 	]+a0-a1,128,ra,s0-s8,a2-a3
-  60:[ 	]+6470[ 	]+restore[ 	]+128,ra,s0-s1
-  62:[ 	]+f010 6441[ 	]+restore[ 	]+136,ra
-  66:[ 	]+f100 6408[ 	]+restore[ 	]+64,s2
-  6a:[ 	]+f71a 6470[ 	]+restore[ 	]+a0-a1,128,ra,s0-s8,a2-a3
-  6e:[ 	]+6500[ 	]+nop
diff --git a/gas/testsuite/gas/mips/mips16e-save.s b/gas/testsuite/gas/mips/mips16e-save.s
deleted file mode 100644
index 5a2e9cb367a..00000000000
--- a/gas/testsuite/gas/mips/mips16e-save.s
+++ /dev/null
@@ -1,54 +0,0 @@
-# Test the generation of the mips16e save instruction
-
-	.text
-func:
-# Un-extended version
-	save	8
-	save    $31,16
-	save	$16,24
-	save	$17,32
-	save	$16-$17,40
-	save    $31,$16,48
-	save    $31,$17,56
-	save    $31,$16,$17,64
-	save    $31,$16-$17,72
-	save    80,$31,$16-$17
-	save    $31,88,$16,$17
-	save    $31,$17,128,$16
-
-# Extended version
-	save	136
-	save    $31,144
-	save	$16-$17,152
-
-	# sreg
-	save	$18,64
-	save	$18-$23,72
-	save	$18-$23,$30,80
-	save	$16-$23,$30,88
-	
-	# static areg
-	save    64,$7
-	save    128,$7,$6
-	save    256,$7,$6,$5,$4
-
-	# areg
-	save    $4,256
-	save    $4,$5,128
-	save    $4,$5,$6,$7,64
-
-	# mix areg and static areg
-	save    $4,128,$7
-	save    $4,128,$7,$6,$5
-	save    $4,$5,128,$7,$6
-	save    $4,$5,$6,128,$7
-
-	save	$4-$5,$16-$23,$30-$31,128,$6-$7
-
-	restore	$16,$17,$31,128
-	restore	$31,136
-	restore	$18,64
-	restore	$4-$5,$16-$23,$30-$31,128,$6-$7
-	
-        .p2align 4
-
diff --git a/gas/testsuite/gas/mips/save-err.d b/gas/testsuite/gas/mips/save-err.d
new file mode 100644
index 00000000000..c0a45bd21d9
--- /dev/null
+++ b/gas/testsuite/gas/mips/save-err.d
@@ -0,0 +1,3 @@
+#name: MIPS16e SAVE/RESTORE errors
+#as: -32
+#error-output: save-err.l
diff --git a/gas/testsuite/gas/mips/save-err.l b/gas/testsuite/gas/mips/save-err.l
new file mode 100644
index 00000000000..0af16c27525
--- /dev/null
+++ b/gas/testsuite/gas/mips/save-err.l
@@ -0,0 +1,13 @@
+.*: Assembler messages:
+.*:2: Error: invalid operands `save \$3,100'
+.*:3: Error: missing frame size `save \$4'
+.*:4: Error: frame size specified twice `save \$4,100,200'
+.*:5: Error: operand 2 must be constant `save \$4,foo'
+.*:7: Error: invalid frame size `save \$4,1'
+.*:8: Error: invalid frame size `save \$4,7'
+.*:10: Error: invalid frame size `save \$4,12'
+.*:11: Error: invalid frame size `save \$4,2048'
+.*:12: Error: invalid frame size `save \$4,2052'
+.*:14: Error: invalid operands `save \$4,\$6,0'
+.*:15: Error: invalid operands `save 0,\$5,\$7'
+.*:18: Error: invalid operands `save \$16,\$18,\$20,0'
diff --git a/gas/testsuite/gas/mips/save-err.s b/gas/testsuite/gas/mips/save-err.s
new file mode 100644
index 00000000000..7642235c42c
--- /dev/null
+++ b/gas/testsuite/gas/mips/save-err.s
@@ -0,0 +1,18 @@
+
+	save	$3,100		# error
+	save	$4		# error
+	save	$4,100,200	# error
+	save	$4,foo		# error
+	save	$4,0		# OK
+	save	$4,1		# error
+	save	$4,7		# error
+	save	$4,8		# OK
+	save	$4,12		# error
+	save	$4,2048		# OK
+	save	$4,2052		# error
+	save	$4,0,$7		# error
+	save	$4,$6,0		# error
+	save	0,$5,$7		# error
+	save	$16,$18,0	# OK
+	save	$16,$18,$19,0	# OK
+	save	$16,$18,$20,0	# error
diff --git a/gas/testsuite/gas/mips/save.d b/gas/testsuite/gas/mips/save.d
new file mode 100644
index 00000000000..792b99ae51a
--- /dev/null
+++ b/gas/testsuite/gas/mips/save.d
@@ -0,0 +1,43 @@
+#objdump: -dr
+#as: -32
+#name: MIPS16e SAVE/RESTORE
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+00000000 <func>:
+   0:[ 	]+6481[ 	]+save[ 	]+8
+   2:[ 	]+64c2[ 	]+save[ 	]+16,ra
+   4:[ 	]+64a3[ 	]+save[ 	]+24,s0
+   6:[ 	]+6494[ 	]+save[ 	]+32,s1
+   8:[ 	]+64b5[ 	]+save[ 	]+40,s0-s1
+   a:[ 	]+64e6[ 	]+save[ 	]+48,ra,s0
+   c:[ 	]+64d7[ 	]+save[ 	]+56,ra,s1
+   e:[ 	]+64f8[ 	]+save[ 	]+64,ra,s0-s1
+  10:[ 	]+64f9[ 	]+save[ 	]+72,ra,s0-s1
+  12:[ 	]+64fa[ 	]+save[ 	]+80,ra,s0-s1
+  14:[ 	]+64fb[ 	]+save[ 	]+88,ra,s0-s1
+  16:[ 	]+64f0[ 	]+save[ 	]+128,ra,s0-s1
+  18:[ 	]+f010 6481[ 	]+save[ 	]+136
+  1c:[ 	]+f010 64c2[ 	]+save[ 	]+144,ra
+  20:[ 	]+f010 64b3[ 	]+save[ 	]+152,s0-s1
+  24:[ 	]+f100 6488[ 	]+save[ 	]+64,s2
+  28:[ 	]+f600 6489[ 	]+save[ 	]+72,s2-s7
+  2c:[ 	]+f700 648a[ 	]+save[ 	]+80,s2-s8
+  30:[ 	]+f700 64bb[ 	]+save[ 	]+88,s0-s8
+  34:[ 	]+f001 6488[ 	]+save[ 	]+64,a3
+  38:[ 	]+f012 6480[ 	]+save[ 	]+128,a2-a3
+  3c:[ 	]+f02b 6480[ 	]+save[ 	]+256,a0-a3
+  40:[ 	]+f024 6480[ 	]+save[ 	]+a0,256
+  44:[ 	]+f018 6480[ 	]+save[ 	]+a0-a1,128
+  48:[ 	]+f00e 6488[ 	]+save[ 	]+a0-a3,64
+  4c:[ 	]+f015 6480[ 	]+save[ 	]+a0,128,a3
+  50:[ 	]+f017 6480[ 	]+save[ 	]+a0,128,a1-a3
+  54:[ 	]+f01a 6480[ 	]+save[ 	]+a0-a1,128,a2-a3
+  58:[ 	]+f01d 6480[ 	]+save[ 	]+a0-a2,128,a3
+  5c:[ 	]+f71a 64f0[ 	]+save[ 	]+a0-a1,128,ra,s0-s8,a2-a3
+  60:[ 	]+6470[ 	]+restore[ 	]+128,ra,s0-s1
+  62:[ 	]+f010 6441[ 	]+restore[ 	]+136,ra
+  66:[ 	]+f100 6408[ 	]+restore[ 	]+64,s2
+  6a:[ 	]+f71a 6470[ 	]+restore[ 	]+a0-a1,128,ra,s0-s8,a2-a3
+  6e:[ 	]+6500[ 	]+nop
diff --git a/gas/testsuite/gas/mips/save.s b/gas/testsuite/gas/mips/save.s
new file mode 100644
index 00000000000..5a2e9cb367a
--- /dev/null
+++ b/gas/testsuite/gas/mips/save.s
@@ -0,0 +1,54 @@
+# Test the generation of the mips16e save instruction
+
+	.text
+func:
+# Un-extended version
+	save	8
+	save    $31,16
+	save	$16,24
+	save	$17,32
+	save	$16-$17,40
+	save    $31,$16,48
+	save    $31,$17,56
+	save    $31,$16,$17,64
+	save    $31,$16-$17,72
+	save    80,$31,$16-$17
+	save    $31,88,$16,$17
+	save    $31,$17,128,$16
+
+# Extended version
+	save	136
+	save    $31,144
+	save	$16-$17,152
+
+	# sreg
+	save	$18,64
+	save	$18-$23,72
+	save	$18-$23,$30,80
+	save	$16-$23,$30,88
+	
+	# static areg
+	save    64,$7
+	save    128,$7,$6
+	save    256,$7,$6,$5,$4
+
+	# areg
+	save    $4,256
+	save    $4,$5,128
+	save    $4,$5,$6,$7,64
+
+	# mix areg and static areg
+	save    $4,128,$7
+	save    $4,128,$7,$6,$5
+	save    $4,$5,128,$7,$6
+	save    $4,$5,$6,128,$7
+
+	save	$4-$5,$16-$23,$30-$31,128,$6-$7
+
+	restore	$16,$17,$31,128
+	restore	$31,136
+	restore	$18,64
+	restore	$4-$5,$16-$23,$30-$31,128,$6-$7
+	
+        .p2align 4
+