2006-06-06 Paul Brook <paul@codesourcery.com>

opcodes/
	* arm-dis.c (coprocessor_opcodes): Add %c to unconditional arm
	instructions.
	(neon_opcodes): Add conditional execution specifiers.
	(thumb_opcodes): Ditto.
	(thumb32_opcodes): Ditto.
	(arm_conditional): Change 0xe to "al" and add "" to end.
	(ifthen_state, ifthen_next_state, ifthen_address): New.
	(IFTHEN_COND): Define.
	(print_insn_coprocessor, print_insn_neon): Print thumb conditions.
	(print_insn_arm): Change %c to use new values of arm_conditional.
	(print_insn_thumb16): Print thumb conditions.  Add %I.
	(print_insn_thumb32): Print thumb conditions.
	(find_ifthen_state): New function.
	(print_insn): Track IT block state.
gas/testsuite/
	* gas/arm/thumb2_bcond.d: Update expected output.
	* gas/arm/thumb32.d: Ditto.
	* gas/arm/vfp1_t2.d: Ditto.
	* gas/arm/vfp1xD_t2.d: Ditto.
binutils/testsuite/
	* binutils-all/arm/objdump.exp: New file.
	* binutils-all/arm/thumb2-cond.s: New test.

5 files changed, 229 insertions, 224 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7ceef11..a526563 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-06  Paul Brook  <paul@codesourcery.com>
+
+	* gas/arm/thumb2_bcond.d: Update expected output.
+	* gas/arm/thumb32.d: Ditto.
+	* gas/arm/vfp1_t2.d: Ditto.
+	* gas/arm/vfp1xD_t2.d: Ditto.
+
 2006-06-06  Thiemo Seufer  <ths@mips.com>
             Chao-ying Fu  <fu@mips.com>
 
diff --git a/gas/testsuite/gas/arm/thumb2_bcond.d b/gas/testsuite/gas/arm/thumb2_bcond.d
index 90b8e20..02903a9 100644
--- a/gas/testsuite/gas/arm/thumb2_bcond.d
+++ b/gas/testsuite/gas/arm/thumb2_bcond.d
@@ -5,21 +5,21 @@
 
 Disassembly of section .text:
 0+000 <[^>]+> bf18      	it	ne
-0+002 <[^>]+> e7fd      	b(|ne).n	0+0 <[^>]+>
+0+002 <[^>]+> e7fd      	bne.n	0+0 <[^>]+>
 0+004 <[^>]+> bf38      	it	cc
-0+006 <[^>]+> f7ff bffb 	b(|cc).w	0+0 <[^>]+>
+0+006 <[^>]+> f7ff bffb 	bcc.w	0+0 <[^>]+>
 0+00a <[^>]+> bf28      	it	cs
-0+00c <[^>]+> f7ff fff8 	bl(|cs)	0+0 <[^>]+>
+0+00c <[^>]+> f7ff fff8 	blcs	0+0 <[^>]+>
 0+010 <[^>]+> bfb8      	it	lt
-0+012 <[^>]+> 47a8      	blx(|lr)	r5
+0+012 <[^>]+> 47a8      	blxlt	r5
 0+014 <[^>]+> bf08      	it	eq
-0+016 <[^>]+> 4740      	bx(|eq)	r8
+0+016 <[^>]+> 4740      	bxeq	r8
 0+018 <[^>]+> bfc8      	it	gt
-0+01a <[^>]+> e8d4 f001 	tbb(|gt)	\[r4, r1\]
+0+01a <[^>]+> e8d4 f001 	tbbgt	\[r4, r1\]
 0+01e <[^>]+> bfb8      	it	lt
-0+020 <[^>]+> df00      	svc(|lt)	0
+0+020 <[^>]+> df00      	svclt	0
 0+022 <[^>]+> bfdc      	itt	le
 0+024 <[^>]+> be00      	bkpt	0x0000
-0+026 <[^>]+> bf00      	nop
+0+026 <[^>]+> bf00      	nople
 0+028 <[^>]+> bf00      	nop
 0+02a <[^>]+> bf00      	nop
diff --git a/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d
index 2a6e682..89b11cd 100644
--- a/gas/testsuite/gas/arm/thumb32.d
+++ b/gas/testsuite/gas/arm/thumb32.d
@@ -350,163 +350,163 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> bf90      	nop	\{9\}
 0[0-9a-f]+ <[^>]+> f3af 8081 	nop\.w	\{129\}
 0[0-9a-f]+ <[^>]+> bf08      	it	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf18      	it	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf28      	it	cs
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopcs
 0[0-9a-f]+ <[^>]+> bf28      	it	cs
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopcs
 0[0-9a-f]+ <[^>]+> bf38      	it	cc
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopcc
 0[0-9a-f]+ <[^>]+> bf38      	it	cc
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopcc
 0[0-9a-f]+ <[^>]+> bf38      	it	cc
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopcc
 0[0-9a-f]+ <[^>]+> bf48      	it	mi
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopmi
 0[0-9a-f]+ <[^>]+> bf58      	it	pl
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	noppl
 0[0-9a-f]+ <[^>]+> bf68      	it	vs
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopvs
 0[0-9a-f]+ <[^>]+> bf78      	it	vc
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopvc
 0[0-9a-f]+ <[^>]+> bf88      	it	hi
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nophi
 0[0-9a-f]+ <[^>]+> bfa8      	it	ge
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopge
 0[0-9a-f]+ <[^>]+> bfb8      	it	lt
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	noplt
 0[0-9a-f]+ <[^>]+> bfc8      	it	gt
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopgt
 0[0-9a-f]+ <[^>]+> bfd8      	it	le
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nople
 0[0-9a-f]+ <[^>]+> bfe8      	it	al
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopal
 0[0-9a-f]+ <[^>]+> bf04      	itt	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf0c      	ite	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf02      	ittt	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf0a      	itet	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf06      	itte	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf0e      	itee	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf01      	itttt	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf09      	itett	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf05      	ittet	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf03      	ittte	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf07      	ittee	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf0b      	itete	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf0d      	iteet	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf0f      	iteee	eq
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf1c      	itt	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf14      	ite	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf1e      	ittt	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf16      	itet	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf1a      	itte	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf12      	itee	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf1f      	itttt	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf17      	itett	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf1b      	ittet	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf1d      	ittte	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf19      	ittee	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf15      	itete	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> bf13      	iteet	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopne
 0[0-9a-f]+ <[^>]+> bf11      	iteee	ne
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
-0[0-9a-f]+ <[^>]+> bf00      	nop
+0[0-9a-f]+ <[^>]+> bf00      	nopne
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
+0[0-9a-f]+ <[^>]+> bf00      	nopeq
 0[0-9a-f]+ <[^>]+> f895 f000 	pld	\[r5\]
 0[0-9a-f]+ <[^>]+> f895 f330 	pld	\[r5, #816\]
 0[0-9a-f]+ <[^>]+> f815 fc30 	pld	\[r5, #-48\]
@@ -950,8 +950,8 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> e890 0300 	ldmia.w	r0, \{r8, r9\}
 0[0-9a-f]+ <[^>]+> e880 0300 	stmia.w	r0, \{r8, r9\}
 0[0-9a-f]+ <[^>]+> bf01      	itttt	eq
-0[0-9a-f]+ <[^>]+> c806      	ldmia	r0!, \{r1, r2\}
-0[0-9a-f]+ <[^>]+> c006      	stmia	r0!, \{r1, r2\}
-0[0-9a-f]+ <[^>]+> e890 0300 	ldmia.w	r0, \{r8, r9\}
-0[0-9a-f]+ <[^>]+> e880 0300 	stmia.w	r0, \{r8, r9\}
+0[0-9a-f]+ <[^>]+> c806      	ldmiaeq	r0!, \{r1, r2\}
+0[0-9a-f]+ <[^>]+> c006      	stmiaeq	r0!, \{r1, r2\}
+0[0-9a-f]+ <[^>]+> e890 0300 	ldmiaeq.w	r0, \{r8, r9\}
+0[0-9a-f]+ <[^>]+> e880 0300 	stmiaeq.w	r0, \{r8, r9\}
 0[0-9a-f]+ <[^>]+> bf00      	nop
diff --git a/gas/testsuite/gas/arm/vfp1_t2.d b/gas/testsuite/gas/arm/vfp1_t2.d
index df9ab9f..3bf1f9a 100644
--- a/gas/testsuite/gas/arm/vfp1_t2.d
+++ b/gas/testsuite/gas/arm/vfp1_t2.d
@@ -145,61 +145,60 @@ Disassembly of section .text:
 0+21c <[^>]*> eeb5 db40 	fcmpzd	d13
 0+220 <[^>]*> eeb5 eb40 	fcmpzd	d14
 0+224 <[^>]*> eeb5 fb40 	fcmpzd	d15
-# The "(eq|)" should be replaces by "eq" once the disassembler is fixed.
 0+228 <[^>]*> bf01      	itttt	eq
-0+22a <[^>]*> eeb4 1bcf 	fcmped(eq|)	d1, d15
-0+22e <[^>]*> eeb5 2bc0 	fcmpezd(eq|)	d2
-0+232 <[^>]*> eeb4 3b4e 	fcmpd(eq|)	d3, d14
-0+236 <[^>]*> eeb5 4b40 	fcmpzd(eq|)	d4
+0+22a <[^>]*> eeb4 1bcf 	fcmpedeq	d1, d15
+0+22e <[^>]*> eeb5 2bc0 	fcmpezdeq	d2
+0+232 <[^>]*> eeb4 3b4e 	fcmpdeq	d3, d14
+0+236 <[^>]*> eeb5 4b40 	fcmpzdeq	d4
 0+23a <[^>]*> bf01      	itttt	eq
-0+23c <[^>]*> eeb0 5bcd 	fabsd(eq|)	d5, d13
-0+240 <[^>]*> eeb0 6b4c 	fcpyd(eq|)	d6, d12
-0+244 <[^>]*> eeb1 7b4b 	fnegd(eq|)	d7, d11
-0+248 <[^>]*> eeb1 8bca 	fsqrtd(eq|)	d8, d10
+0+23c <[^>]*> eeb0 5bcd 	fabsdeq	d5, d13
+0+240 <[^>]*> eeb0 6b4c 	fcpydeq	d6, d12
+0+244 <[^>]*> eeb1 7b4b 	fnegdeq	d7, d11
+0+248 <[^>]*> eeb1 8bca 	fsqrtdeq	d8, d10
 0+24c <[^>]*> bf01      	itttt	eq
-0+24e <[^>]*> ee31 9b0f 	faddd(eq|)	d9, d1, d15
-0+252 <[^>]*> ee83 2b0e 	fdivd(eq|)	d2, d3, d14
-0+256 <[^>]*> ee0d 4b0c 	fmacd(eq|)	d4, d13, d12
-0+25a <[^>]*> ee16 5b0b 	fmscd(eq|)	d5, d6, d11
+0+24e <[^>]*> ee31 9b0f 	fadddeq	d9, d1, d15
+0+252 <[^>]*> ee83 2b0e 	fdivdeq	d2, d3, d14
+0+256 <[^>]*> ee0d 4b0c 	fmacdeq	d4, d13, d12
+0+25a <[^>]*> ee16 5b0b 	fmscdeq	d5, d6, d11
 0+25e <[^>]*> bf01      	itttt	eq
-0+260 <[^>]*> ee2a 7b09 	fmuld(eq|)	d7, d10, d9
-0+264 <[^>]*> ee09 8b4a 	fnmacd(eq|)	d8, d9, d10
-0+268 <[^>]*> ee16 7b4b 	fnmscd(eq|)	d7, d6, d11
-0+26c <[^>]*> ee24 5b4c 	fnmuld(eq|)	d5, d4, d12
+0+260 <[^>]*> ee2a 7b09 	fmuldeq	d7, d10, d9
+0+264 <[^>]*> ee09 8b4a 	fnmacdeq	d8, d9, d10
+0+268 <[^>]*> ee16 7b4b 	fnmscdeq	d7, d6, d11
+0+26c <[^>]*> ee24 5b4c 	fnmuldeq	d5, d4, d12
 0+270 <[^>]*> bf02      	ittt	eq
-0+272 <[^>]*> ee3d 3b4e 	fsubd(eq|)	d3, d13, d14
-0+276 <[^>]*> ed95 2b00 	vldr(eq|)	d2, \[r5\]
-0+27a <[^>]*> ed8c 1b00 	vstr(eq|)	d1, \[ip\]
+0+272 <[^>]*> ee3d 3b4e 	fsubdeq	d3, d13, d14
+0+276 <[^>]*> ed95 2b00 	vldreq	d2, \[r5\]
+0+27a <[^>]*> ed8c 1b00 	vstreq	d1, \[ip\]
 0+27e <[^>]*> bf01      	itttt	eq
-0+280 <[^>]*> ec91 1b02 	vldmia(eq|)	r1, {d1}
-0+284 <[^>]*> ec92 2b02 	vldmia(eq|)	r2, {d2}
-0+288 <[^>]*> ecb3 3b02 	vldmia(eq|)	r3!, {d3}
-0+28c <[^>]*> ecb4 4b02 	vldmia(eq|)	r4!, {d4}
+0+280 <[^>]*> ec91 1b02 	vldmiaeq	r1, {d1}
+0+284 <[^>]*> ec92 2b02 	vldmiaeq	r2, {d2}
+0+288 <[^>]*> ecb3 3b02 	vldmiaeq	r3!, {d3}
+0+28c <[^>]*> ecb4 4b02 	vldmiaeq	r4!, {d4}
 0+290 <[^>]*> bf01      	itttt	eq
-0+292 <[^>]*> ed35 5b02 	vldmdb(eq|)	r5!, {d5}
-0+296 <[^>]*> ed36 6b02 	vldmdb(eq|)	r6!, {d6}
-0+29a <[^>]*> ec87 fb02 	vstmia(eq|)	r7, {d15}
-0+29e <[^>]*> ec88 eb02 	vstmia(eq|)	r8, {d14}
+0+292 <[^>]*> ed35 5b02 	vldmdbeq	r5!, {d5}
+0+296 <[^>]*> ed36 6b02 	vldmdbeq	r6!, {d6}
+0+29a <[^>]*> ec87 fb02 	vstmiaeq	r7, {d15}
+0+29e <[^>]*> ec88 eb02 	vstmiaeq	r8, {d14}
 0+2a2 <[^>]*> bf01      	itttt	eq
-0+2a4 <[^>]*> eca9 db02 	vstmia(eq|)	r9!, {d13}
-0+2a8 <[^>]*> ecaa cb02 	vstmia(eq|)	sl!, {d12}
-0+2ac <[^>]*> ed2b bb02 	vstmdb(eq|)	fp!, {d11}
-0+2b0 <[^>]*> ed2c ab02 	vstmdb(eq|)	ip!, {d10}
+0+2a4 <[^>]*> eca9 db02 	vstmiaeq	r9!, {d13}
+0+2a8 <[^>]*> ecaa cb02 	vstmiaeq	sl!, {d12}
+0+2ac <[^>]*> ed2b bb02 	vstmdbeq	fp!, {d11}
+0+2b0 <[^>]*> ed2c ab02 	vstmdbeq	ip!, {d10}
 0+2b4 <[^>]*> bf01      	itttt	eq
-0+2b6 <[^>]*> eeb8 fbe0 	fsitod(eq|)	d15, s1
-0+2ba <[^>]*> eeb8 1b6f 	fuitod(eq|)	d1, s31
-0+2be <[^>]*> eefd 0b4f 	ftosid(eq|)	s1, d15
-0+2c2 <[^>]*> eefd fbc2 	ftosizd(eq|)	s31, d2
+0+2b6 <[^>]*> eeb8 fbe0 	fsitodeq	d15, s1
+0+2ba <[^>]*> eeb8 1b6f 	fuitodeq	d1, s31
+0+2be <[^>]*> eefd 0b4f 	ftosideq	s1, d15
+0+2c2 <[^>]*> eefd fbc2 	ftosizdeq	s31, d2
 0+2c6 <[^>]*> bf01      	itttt	eq
-0+2c8 <[^>]*> eefc 7b42 	ftouid(eq|)	s15, d2
-0+2cc <[^>]*> eefc 5bc3 	ftouizd(eq|)	s11, d3
-0+2d0 <[^>]*> eeb7 1ac5 	fcvtds(eq|)	d1, s10
-0+2d4 <[^>]*> eef7 5bc1 	fcvtsd(eq|)	s11, d1
+0+2c8 <[^>]*> eefc 7b42 	ftouideq	s15, d2
+0+2cc <[^>]*> eefc 5bc3 	ftouizdeq	s11, d3
+0+2d0 <[^>]*> eeb7 1ac5 	fcvtdseq	d1, s10
+0+2d4 <[^>]*> eef7 5bc1 	fcvtsdeq	s11, d1
 0+2d8 <[^>]*> bf01      	itttt	eq
-0+2da <[^>]*> ee31 8b10 	vmov(eq|)\.32	r8, d1\[1\]
-0+2de <[^>]*> ee1f 7b10 	vmov(eq|)\.32	r7, d15\[0\]
-0+2e2 <[^>]*> ee21 fb10 	vmov(eq|)\.32	d1\[1\], pc
-0+2e6 <[^>]*> ee0f 1b10 	vmov(eq|)\.32	d15\[0\], r1
+0+2da <[^>]*> ee31 8b10 	vmoveq\.32	r8, d1\[1\]
+0+2de <[^>]*> ee1f 7b10 	vmoveq\.32	r7, d15\[0\]
+0+2e2 <[^>]*> ee21 fb10 	vmoveq\.32	d1\[1\], pc
+0+2e6 <[^>]*> ee0f 1b10 	vmoveq\.32	d15\[0\], r1
 0+2ea <[^>]*> bf00      	nop
 0+2ec <[^>]*> bf00      	nop
 0+2ee <[^>]*> bf00      	nop
diff --git a/gas/testsuite/gas/arm/vfp1xD_t2.d b/gas/testsuite/gas/arm/vfp1xD_t2.d
index 327383d..db8a3aa 100644
--- a/gas/testsuite/gas/arm/vfp1xD_t2.d
+++ b/gas/testsuite/gas/arm/vfp1xD_t2.d
@@ -185,74 +185,73 @@ Disassembly of section .text:
 0+2bc <[^>]*> eef5 ea40 	fcmpzs	s29
 0+2c0 <[^>]*> eeb5 fa40 	fcmpzs	s30
 0+2c4 <[^>]*> eef5 fa40 	fcmpzs	s31
-# The "(eq|)" should be replaces by "eq" once the disassembler is fixed.
 0+2c8 <[^>]*> bf01      	itttt	eq
-0+2ca <[^>]*> eef1 fa10 	fmstat(eq|)
-0+2ce <[^>]*> eef4 1ae3 	fcmpes(eq|)	s3, s7
-0+2d2 <[^>]*> eef5 2ac0 	fcmpezs(eq|)	s5
-0+2d6 <[^>]*> eef4 0a41 	fcmps(eq|)	s1, s2
+0+2ca <[^>]*> eef1 fa10 	fmstateq
+0+2ce <[^>]*> eef4 1ae3 	fcmpeseq	s3, s7
+0+2d2 <[^>]*> eef5 2ac0 	fcmpezseq	s5
+0+2d6 <[^>]*> eef4 0a41 	fcmpseq	s1, s2
 0+2da <[^>]*> bf01      	itttt	eq
-0+2dc <[^>]*> eef5 0a40 	fcmpzs(eq|)	s1
-0+2e0 <[^>]*> eef0 0ae1 	fabss(eq|)	s1, s3
-0+2e4 <[^>]*> eef0 fa69 	fcpys(eq|)	s31, s19
-0+2e8 <[^>]*> eeb1 aa44 	fnegs(eq|)	s20, s8
+0+2dc <[^>]*> eef5 0a40 	fcmpzseq	s1
+0+2e0 <[^>]*> eef0 0ae1 	fabsseq	s1, s3
+0+2e4 <[^>]*> eef0 fa69 	fcpyseq	s31, s19
+0+2e8 <[^>]*> eeb1 aa44 	fnegseq	s20, s8
 0+2ec <[^>]*> bf01      	itttt	eq
-0+2ee <[^>]*> eef1 2ae3 	fsqrts(eq|)	s5, s7
-0+2f2 <[^>]*> ee32 3a82 	fadds(eq|)	s6, s5, s4
-0+2f6 <[^>]*> eec1 1a20 	fdivs(eq|)	s3, s2, s1
-0+2fa <[^>]*> ee4f fa2e 	fmacs(eq|)	s31, s30, s29
+0+2ee <[^>]*> eef1 2ae3 	fsqrtseq	s5, s7
+0+2f2 <[^>]*> ee32 3a82 	faddseq	s6, s5, s4
+0+2f6 <[^>]*> eec1 1a20 	fdivseq	s3, s2, s1
+0+2fa <[^>]*> ee4f fa2e 	fmacseq	s31, s30, s29
 0+2fe <[^>]*> bf01      	itttt	eq
-0+300 <[^>]*> ee1d ea8d 	fmscs(eq|)	s28, s27, s26
-0+304 <[^>]*> ee6c ca2b 	fmuls(eq|)	s25, s24, s23
-0+308 <[^>]*> ee0a baca 	fnmacs(eq|)	s22, s21, s20
-0+30c <[^>]*> ee59 9a68 	fnmscs(eq|)	s19, s18, s17
+0+300 <[^>]*> ee1d ea8d 	fmscseq	s28, s27, s26
+0+304 <[^>]*> ee6c ca2b 	fmulseq	s25, s24, s23
+0+308 <[^>]*> ee0a baca 	fnmacseq	s22, s21, s20
+0+30c <[^>]*> ee59 9a68 	fnmscseq	s19, s18, s17
 0+310 <[^>]*> bf01      	itttt	eq
-0+312 <[^>]*> ee27 8ac7 	fnmuls(eq|)	s16, s15, s14
-0+316 <[^>]*> ee76 6a65 	fsubs(eq|)	s13, s12, s11
-0+31a <[^>]*> ed98 5a00 	flds(eq|)	s10, \[r8\]
-0+31e <[^>]*> edc7 4a00 	fsts(eq|)	s9, \[r7\]
+0+312 <[^>]*> ee27 8ac7 	fnmulseq	s16, s15, s14
+0+316 <[^>]*> ee76 6a65 	fsubseq	s13, s12, s11
+0+31a <[^>]*> ed98 5a00 	fldseq	s10, \[r8\]
+0+31e <[^>]*> edc7 4a00 	fstseq	s9, \[r7\]
 0+322 <[^>]*> bf01      	itttt	eq
-0+324 <[^>]*> ec91 4a01 	fldmias(eq|)	r1, {s8}
-0+328 <[^>]*> ecd2 3a01 	fldmias(eq|)	r2, {s7}
-0+32c <[^>]*> ecb3 3a01 	fldmias(eq|)	r3!, {s6}
-0+330 <[^>]*> ecf4 2a01 	fldmias(eq|)	r4!, {s5}
+0+324 <[^>]*> ec91 4a01 	fldmiaseq	r1, {s8}
+0+328 <[^>]*> ecd2 3a01 	fldmiaseq	r2, {s7}
+0+32c <[^>]*> ecb3 3a01 	fldmiaseq	r3!, {s6}
+0+330 <[^>]*> ecf4 2a01 	fldmiaseq	r4!, {s5}
 0+334 <[^>]*> bf01      	itttt	eq
-0+336 <[^>]*> ed35 2a01 	fldmdbs(eq|)	r5!, {s4}
-0+33a <[^>]*> ed76 1a01 	fldmdbs(eq|)	r6!, {s3}
-0+33e <[^>]*> ec97 1b03 	fldmiax(eq|)	r7, {d1}
-0+342 <[^>]*> ec98 2b03 	fldmiax(eq|)	r8, {d2}
+0+336 <[^>]*> ed35 2a01 	fldmdbseq	r5!, {s4}
+0+33a <[^>]*> ed76 1a01 	fldmdbseq	r6!, {s3}
+0+33e <[^>]*> ec97 1b03 	fldmiaxeq	r7, {d1}
+0+342 <[^>]*> ec98 2b03 	fldmiaxeq	r8, {d2}
 0+346 <[^>]*> bf01      	itttt	eq
-0+348 <[^>]*> ecb9 3b03 	fldmiax(eq|)	r9!, {d3}
-0+34c <[^>]*> ecba 4b03 	fldmiax(eq|)	sl!, {d4}
-0+350 <[^>]*> ed3b 5b03 	fldmdbx(eq|)	fp!, {d5}
-0+354 <[^>]*> ed3c 6b03 	fldmdbx(eq|)	ip!, {d6}
+0+348 <[^>]*> ecb9 3b03 	fldmiaxeq	r9!, {d3}
+0+34c <[^>]*> ecba 4b03 	fldmiaxeq	sl!, {d4}
+0+350 <[^>]*> ed3b 5b03 	fldmdbxeq	fp!, {d5}
+0+354 <[^>]*> ed3c 6b03 	fldmdbxeq	ip!, {d6}
 0+358 <[^>]*> bf01      	itttt	eq
-0+35a <[^>]*> ec8d 1a01 	fstmias(eq|)	sp, {s2}
-0+35e <[^>]*> ecce 0a01 	fstmias(eq|)	lr, {s1}
-0+362 <[^>]*> ece1 fa01 	fstmias(eq|)	r1!, {s31}
-0+366 <[^>]*> eca2 fa01 	fstmias(eq|)	r2!, {s30}
+0+35a <[^>]*> ec8d 1a01 	fstmiaseq	sp, {s2}
+0+35e <[^>]*> ecce 0a01 	fstmiaseq	lr, {s1}
+0+362 <[^>]*> ece1 fa01 	fstmiaseq	r1!, {s31}
+0+366 <[^>]*> eca2 fa01 	fstmiaseq	r2!, {s30}
 0+36a <[^>]*> bf01      	itttt	eq
-0+36c <[^>]*> ed63 ea01 	fstmdbs(eq|)	r3!, {s29}
-0+370 <[^>]*> ed24 ea01 	fstmdbs(eq|)	r4!, {s28}
-0+374 <[^>]*> ec85 7b03 	fstmiax(eq|)	r5, {d7}
-0+378 <[^>]*> ec86 8b03 	fstmiax(eq|)	r6, {d8}
+0+36c <[^>]*> ed63 ea01 	fstmdbseq	r3!, {s29}
+0+370 <[^>]*> ed24 ea01 	fstmdbseq	r4!, {s28}
+0+374 <[^>]*> ec85 7b03 	fstmiaxeq	r5, {d7}
+0+378 <[^>]*> ec86 8b03 	fstmiaxeq	r6, {d8}
 0+37c <[^>]*> bf01      	itttt	eq
-0+37e <[^>]*> eca7 9b03 	fstmiax(eq|)	r7!, {d9}
-0+382 <[^>]*> eca8 ab03 	fstmiax(eq|)	r8!, {d10}
-0+386 <[^>]*> ed29 bb03 	fstmdbx(eq|)	r9!, {d11}
-0+38a <[^>]*> ed2a cb03 	fstmdbx(eq|)	sl!, {d12}
+0+37e <[^>]*> eca7 9b03 	fstmiaxeq	r7!, {d9}
+0+382 <[^>]*> eca8 ab03 	fstmiaxeq	r8!, {d10}
+0+386 <[^>]*> ed29 bb03 	fstmdbxeq	r9!, {d11}
+0+38a <[^>]*> ed2a cb03 	fstmdbxeq	sl!, {d12}
 0+38e <[^>]*> bf01      	itttt	eq
-0+390 <[^>]*> eef8 dac3 	fsitos(eq|)	s27, s6
-0+394 <[^>]*> eefd ca62 	ftosis(eq|)	s25, s5
-0+398 <[^>]*> eefd bac2 	ftosizs(eq|)	s23, s4
-0+39c <[^>]*> eefc aa61 	ftouis(eq|)	s21, s3
+0+390 <[^>]*> eef8 dac3 	fsitoseq	s27, s6
+0+394 <[^>]*> eefd ca62 	ftosiseq	s25, s5
+0+398 <[^>]*> eefd bac2 	ftosizseq	s23, s4
+0+39c <[^>]*> eefc aa61 	ftouiseq	s21, s3
 0+3a0 <[^>]*> bf01      	itttt	eq
-0+3a2 <[^>]*> eefc 9ac1 	ftouizs(eq|)	s19, s2
-0+3a6 <[^>]*> eef8 8a60 	fuitos(eq|)	s17, s1
-0+3aa <[^>]*> ee11 ba90 	fmrs(eq|)	fp, s3
-0+3ae <[^>]*> eef0 9a10 	fmrx(eq|)	r9, fpsid
+0+3a2 <[^>]*> eefc 9ac1 	ftouizseq	s19, s2
+0+3a6 <[^>]*> eef8 8a60 	fuitoseq	s17, s1
+0+3aa <[^>]*> ee11 ba90 	fmrseq	fp, s3
+0+3ae <[^>]*> eef0 9a10 	fmrxeq	r9, fpsid
 0+3b2 <[^>]*> bf04      	itt	eq
-0+3b4 <[^>]*> ee01 9a90 	fmsr(eq|)	s3, r9
-0+3b8 <[^>]*> eee0 8a10 	fmxr(eq|)	fpsid, r8
+0+3b4 <[^>]*> ee01 9a90 	fmsreq	s3, r9
+0+3b8 <[^>]*> eee0 8a10 	fmxreq	fpsid, r8
 0+3bc <[^>]*> bf00      	nop
 0+3be <[^>]*> bf00      	nop