Allow adrCCl. [Patch from Phillip BLundel]

Updated ARM tests.

6 files changed, 23 insertions, 10 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 441cbd9..01e5ebb 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* gas/arm/arm.exp: Remove msr-bad.s test.
+	Select processor type for architecture specific instruction tests.
+
+	* gas/arm/adrl.s: Add adrEQl as a test.
+	* gas/arm/adrl.d: Adjusted expected output.
+
+	* gas/arm/arm7dm.s: Add "msr CPSR_x, #0" as a test instruction.
+	* gas/arm/msr-bad.s: Delete.
+
 2001-06-18  Tom Rix  <trix@redhat.com>
 
 	* gas/ppc/aix.exp: New file, aix specific tests.
diff --git a/gas/testsuite/gas/arm/adrl.d b/gas/testsuite/gas/arm/adrl.d
index 8b8e04e..badab1a 100644
--- a/gas/testsuite/gas/arm/adrl.d
+++ b/gas/testsuite/gas/arm/adrl.d
@@ -9,10 +9,12 @@ Disassembly of section .text:
 	...
 0+2000 <.*> e24f0008 	sub	r0, pc, #8	; 0x8
 0+2004 <.*> e2400c20 	sub	r0, r0, #8192	; 0x2000
-0+2008 <.*> e28f0018 	add	r0, pc, #24	; 0x18
+0+2008 <.*> e28f0020 	add	r0, pc, #32	; 0x20
 0+200c <.*> e2800c20 	add	r0, r0, #8192	; 0x2000
 0+2010 <.*> e24f0018 	sub	r0, pc, #24	; 0x18
 0+2014 <.*> e1a00000 	nop			\(mov r0,r0\)
-0+2018 <.*> e28f0000 	add	r0, pc, #0	; 0x0
+0+2018 <.*> e28f0008 	add	r0, pc, #8	; 0x8
 0+201c <.*> e1a00000 	nop			\(mov r0,r0\)
+0+2020 <.*> 028f0000 	addeq	r0, pc, #0	; 0x0
+0+2024 <.*> e1a00000 	nop			\(mov r0,r0\)
 	...
diff --git a/gas/testsuite/gas/arm/adrl.s b/gas/testsuite/gas/arm/adrl.s
index 5c01a17..1a96d0b 100644
--- a/gas/testsuite/gas/arm/adrl.s
+++ b/gas/testsuite/gas/arm/adrl.s
@@ -9,6 +9,7 @@ foo:
 	adrl	r0, 1f
         adrl    r0, 2b
 	adrl	r0, 2f
+	adrEQl	r0, 2f
 2:
 	.space 8200
 1:
diff --git a/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp
index ba900c9..4f8bf7a 100644
--- a/gas/testsuite/gas/arm/arm.exp
+++ b/gas/testsuite/gas/arm/arm.exp
@@ -4,18 +4,17 @@
 if {[istarget *arm*-*-*] || [istarget "xscale-*-*"]} then {
     run_dump_test "inst"
 
-    gas_test "arm3.s" "" $stdoptlist "Arm 3 instructions"
+    gas_test "arm3.s" "-marm3" $stdoptlist "Arm 3 instructions"
 
-    gas_test "arm6.s" "" $stdoptlist "Arm 6 instructions"
-    gas_test_error "msr-bad.s" "-marmv3" "immediate value cannot be used to set this field"
+    gas_test "arm6.s" "-marm6" $stdoptlist "Arm 6 instructions"
 
-    gas_test "arm7dm.s" "" $stdoptlist "Arm 7DM instructions"
+    gas_test "arm7dm.s" "-marm7dm" $stdoptlist "Arm 7DM instructions"
 
     run_dump_test "arm7t"
 
-    gas_test "thumb.s" "" $stdoptlist "Thumb instructions"
+    gas_test "thumb.s" "-marm7t" $stdoptlist "Thumb instructions"
 
-    gas_test "arch4t.s" "" $stdoptlist "Arm architecture 4t instructions"
+    gas_test "arch4t.s" "-marmv4t" $stdoptlist "Arm architecture 4t instructions"
 
     gas_test "copro.s" "" $stdoptlist "Co processor instructions"
 
diff --git a/gas/testsuite/gas/arm/arm7dm.s b/gas/testsuite/gas/arm/arm7dm.s
index 7496c70..99eaa9f 100644
--- a/gas/testsuite/gas/arm/arm7dm.s
+++ b/gas/testsuite/gas/arm/arm7dm.s
@@ -10,3 +10,5 @@
 	smulls	r1, r0, r9, r11
 	umlaleqs r2, r9, r4, r9
 	smlalge r14, r10, r8, r14
+
+	msr	CPSR_x, #0	@ This used to be illegal, but rev 2 of the ARM ARM allows it.
diff --git a/gas/testsuite/gas/arm/msr-bad.s b/gas/testsuite/gas/arm/msr-bad.s
deleted file mode 100644
index a50eece..0000000
--- a/gas/testsuite/gas/arm/msr-bad.s
+++ /dev/null
@@ -1,2 +0,0 @@
-@ illegal set of CPSR from immediate value
-	msr	cpsr, #0