4 files changed, 62 insertions, 0 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index a99939c..e7cd66c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-30  Paul Brook  <paul@codesourcery.com>
+
+	* gas/arm/arch6zk.d: New file.
+	* gas/arm/arch6zk.s: New file.
+	* gas/arm/arm.exp: Add them.
+
 2004-09-29  Alan Modra  <amodra@bigpond.net.au>
 
 	* gas/i386/secrel.s: Pad .rdata out to 16 byte boundary.
diff --git a/gas/testsuite/gas/arm/arch6zk.d b/gas/testsuite/gas/arm/arch6zk.d
new file mode 100644
index 0000000..318e312
--- /dev/null
+++ b/gas/testsuite/gas/arm/arch6zk.d
@@ -0,0 +1,28 @@
+#name: ARM V6 instructions
+#as: -march=armv6zk
+#objdump: -dr --prefix-addresses --show-raw-insn
+
+.*: +file format .*arm.*
+
+Disassembly of section .text:
+0+000 <[^>]*> f57ff01f ?	clrex
+0+004 <[^>]*> e1dc3f9f ?	ldrexb	r3, \[ip\]
+0+008 <[^>]*> 11d3cf9f ?	ldrexbne	ip, \[r3\]
+0+00c <[^>]*> e1bc3f9f ?	ldrexd	r3, \[ip\]
+0+010 <[^>]*> 11b3cf9f ?	ldrexdne	ip, \[r3\]
+0+014 <[^>]*> e1fc3f9f ?	ldrexh	r3, \[ip\]
+0+018 <[^>]*> 11f3cf9f ?	ldrexhne	ip, \[r3\]
+0+01c <[^>]*> e320f080 ?	nop	\{128\}
+0+020 <[^>]*> 1320f07f ?	nopne	\{127\}
+0+024 <[^>]*> e320f004 ?	sev
+0+028 <[^>]*> e1c73f9c ?	strexb	r3, ip, \[r7\]
+0+02c <[^>]*> 11c8cf93 ?	strexbne	ip, r3, \[r8\]
+0+030 <[^>]*> e1a73f9c ?	strexd	r3, ip, \[r7\]
+0+034 <[^>]*> 11a8cf93 ?	strexdne	ip, r3, \[r8\]
+0+038 <[^>]*> e1e73f9c ?	strexh	r3, ip, \[r7\]
+0+03c <[^>]*> 11e8cf93 ?	strexhne	ip, r3, \[r8\]
+0+040 <[^>]*> e320f002 ?	wfe
+0+044 <[^>]*> e320f003 ?	wfi
+0+048 <[^>]*> e320f001 ?	yield
+0+04c <[^>]*> e16ec371 ?	smi	60465
+0+050 <[^>]*> 11613c7e ?	smine	5070
diff --git a/gas/testsuite/gas/arm/arch6zk.s b/gas/testsuite/gas/arm/arch6zk.s
new file mode 100644
index 0000000..cf769be
--- /dev/null
+++ b/gas/testsuite/gas/arm/arch6zk.s
@@ -0,0 +1,27 @@
+.text
+.align 0
+
+label:
+	# ARMV6K instructions
+	clrex
+	ldrexb r3, [r12]
+	ldrexbne r12, [r3]
+	ldrexd r3, [r12]
+	ldrexdne r12, [r3]
+	ldrexh r3, [r12]
+	ldrexhne r12, [r3]
+	nop {128}
+	nopne {127}
+	sev
+	strexb r3, r12, [r7]
+	strexbne r12, r3, [r8]
+	strexd r3, r12, [r7]
+	strexdne r12, r3, [r8]
+	strexh r3, r12, [r7]
+	strexhne r12, r3, [r8]
+	wfe
+	wfi
+	yield
+	# ARMV6Z instructions
+	smi 0xec31
+	smine 0x13ce
diff --git a/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp
index 16361d9..732468a 100644
--- a/gas/testsuite/gas/arm/arm.exp
+++ b/gas/testsuite/gas/arm/arm.exp
@@ -50,6 +50,7 @@ if {[istarget *arm*-*-*] || [istarget "xscale-*-*"]} then {
     run_dump_test "maverick"    
     run_dump_test "archv6"
     run_dump_test "thumbv6"
+    run_dump_test "arch6zk"
     
     run_errors_test "vfp-bad" "-mfpu=vfp" "VFP errors"
     run_errors_test "req" "-mcpu=arm7m" ".req errors"