Backport from mainline.

	opcodes/
	* arm-dis.c (coprocessor): Alter fmsrr disassembly syntax.

	gas/testsuite/
	* gas/arm/vfp-neon-syntax.d: Tweak expected fmsrr syntax.
	* gas/arm/vfp-neon-syntax_t2.d: Likewise.
	* gas/arm/vfp2.d: Likewise.
	* gas/arm/vfp2_t2.d: Likewise.

6 files changed, 22 insertions, 9 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index e63f6a1251d..d5e5b3ffe19 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,16 @@
+2006-07-20  Julian Brown  <julian@codesourcery.com>
+
+	Backport from mainline.
+
+	opcodes/
+	* arm-dis.c (coprocessor): Alter fmsrr disassembly syntax.
+
+	gas/testsuite/
+	* gas/arm/vfp-neon-syntax.d: Tweak expected fmsrr syntax.
+	* gas/arm/vfp-neon-syntax_t2.d: Likewise.
+	* gas/arm/vfp2.d: Likewise.
+	* gas/arm/vfp2_t2.d: Likewise.
+
 2006-07-19  Paul Brook  <paul@codesourcery.com>
 
 	Backport from mainline.
diff --git a/gas/testsuite/gas/arm/vfp-neon-syntax.d b/gas/testsuite/gas/arm/vfp-neon-syntax.d
index 8b6c0798e5f..22620adde62 100644
--- a/gas/testsuite/gas/arm/vfp-neon-syntax.d
+++ b/gas/testsuite/gas/arm/vfp-neon-syntax.d
@@ -12,7 +12,7 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> ee100a90 	fmrs	r0, s1
 0[0-9a-f]+ <[^>]+> ee001a10 	fmsr	s0, r1
 0[0-9a-f]+ <[^>]+> ec510a11 	fmrrs	r0, r1, {s2, s3}
-0[0-9a-f]+ <[^>]+> ec442a10 	fmsrr	r2, r4, {s0, s1}
+0[0-9a-f]+ <[^>]+> ec442a10 	fmsrr	{s0, s1}, r2, r4
 0[0-9a-f]+ <[^>]+> 0eb00a60 	fcpyseq	s0, s1
 0[0-9a-f]+ <[^>]+> 0eb00b41 	fcpydeq	d0, d1
 0[0-9a-f]+ <[^>]+> 0eb00a05 	fconstseq	s0, #80
@@ -20,7 +20,7 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> 0e100a90 	fmrseq	r0, s1
 0[0-9a-f]+ <[^>]+> 0e001a10 	fmsreq	s0, r1
 0[0-9a-f]+ <[^>]+> 0c510a11 	fmrrseq	r0, r1, {s2, s3}
-0[0-9a-f]+ <[^>]+> 0c442a10 	fmsrreq	r2, r4, {s0, s1}
+0[0-9a-f]+ <[^>]+> 0c442a10 	fmsrreq	{s0, s1}, r2, r4
 0[0-9a-f]+ <[^>]+> eeb10ae0 	fsqrts	s0, s1
 0[0-9a-f]+ <[^>]+> eeb10bc1 	fsqrtd	d0, d1
 0[0-9a-f]+ <[^>]+> 0eb10ae0 	fsqrtseq	s0, s1
diff --git a/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
index fa73b035452..49c2d2f7a57 100644
--- a/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
+++ b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
@@ -12,7 +12,7 @@ Disassembly of section \.text:
 0[0-9a-f]+ <[^>]+> ee10 0a90 	fmrs	r0, s1
 0[0-9a-f]+ <[^>]+> ee00 1a10 	fmsr	s0, r1
 0[0-9a-f]+ <[^>]+> ec51 0a11 	fmrrs	r0, r1, {s2, s3}
-0[0-9a-f]+ <[^>]+> ec44 2a10 	fmsrr	r2, r4, {s0, s1}
+0[0-9a-f]+ <[^>]+> ec44 2a10 	fmsrr	{s0, s1}, r2, r4
 0[0-9a-f]+ <[^>]+> bf01      	itttt	eq
 0[0-9a-f]+ <[^>]+> eeb0 0a60 	fcpyseq	s0, s1
 0[0-9a-f]+ <[^>]+> eeb0 0b41 	fcpydeq	d0, d1
@@ -22,7 +22,7 @@ Disassembly of section \.text:
 0[0-9a-f]+ <[^>]+> ee10 0a90 	fmrseq	r0, s1
 0[0-9a-f]+ <[^>]+> ee00 1a10 	fmsreq	s0, r1
 0[0-9a-f]+ <[^>]+> ec51 0a11 	fmrrseq	r0, r1, {s2, s3}
-0[0-9a-f]+ <[^>]+> ec44 2a10 	fmsrreq	r2, r4, {s0, s1}
+0[0-9a-f]+ <[^>]+> ec44 2a10 	fmsrreq	{s0, s1}, r2, r4
 0[0-9a-f]+ <[^>]+> eeb1 0ae0 	fsqrts	s0, s1
 0[0-9a-f]+ <[^>]+> eeb1 0bc1 	fsqrtd	d0, d1
 0[0-9a-f]+ <[^>]+> bf04      	itt	eq
diff --git a/gas/testsuite/gas/arm/vfp2.d b/gas/testsuite/gas/arm/vfp2.d
index 94827f727b4..438019fc12e 100644
--- a/gas/testsuite/gas/arm/vfp2.d
+++ b/gas/testsuite/gas/arm/vfp2.d
@@ -9,9 +9,9 @@
 Disassembly of section .text:
 0+000 <[^>]*> ec4a5b10 	vmov	d0, r5, sl
 0+004 <[^>]*> ec5a5b10 	vmov	r5, sl, d0
-0+008 <[^>]*> ec4a5a37 	fmsrr	r5, sl, {s15, s16}
+0+008 <[^>]*> ec4a5a37 	fmsrr	{s15, s16}, r5, sl
 0+00c <[^>]*> ec5a5a37 	fmrrs	r5, sl, {s15, s16}
 0+010 <[^>]*> ec45ab1f 	vmov	d15, sl, r5
 0+014 <[^>]*> ec55ab1f 	vmov	sl, r5, d15
-0+018 <[^>]*> ec45aa38 	fmsrr	sl, r5, {s17, s18}
+0+018 <[^>]*> ec45aa38 	fmsrr	{s17, s18}, sl, r5
 0+01c <[^>]*> ec55aa38 	fmrrs	sl, r5, {s17, s18}
diff --git a/gas/testsuite/gas/arm/vfp2_t2.d b/gas/testsuite/gas/arm/vfp2_t2.d
index 8710e4e0a9d..f07b6a58bcb 100644
--- a/gas/testsuite/gas/arm/vfp2_t2.d
+++ b/gas/testsuite/gas/arm/vfp2_t2.d
@@ -9,9 +9,9 @@
 Disassembly of section .text:
 0+000 <[^>]*> ec4a 5b10 	vmov	d0, r5, sl
 0+004 <[^>]*> ec5a 5b10 	vmov	r5, sl, d0
-0+008 <[^>]*> ec4a 5a37 	fmsrr	r5, sl, {s15, s16}
+0+008 <[^>]*> ec4a 5a37 	fmsrr	{s15, s16}, r5, sl
 0+00c <[^>]*> ec5a 5a37 	fmrrs	r5, sl, {s15, s16}
 0+010 <[^>]*> ec45 ab1f 	vmov	d15, sl, r5
 0+014 <[^>]*> ec55 ab1f 	vmov	sl, r5, d15
-0+018 <[^>]*> ec45 aa38 	fmsrr	sl, r5, {s17, s18}
+0+018 <[^>]*> ec45 aa38 	fmsrr	{s17, s18}, sl, r5
 0+01c <[^>]*> ec55 aa38 	fmrrs	sl, r5, {s17, s18}
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 434456c568a..2798f53a534 100644
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -280,7 +280,7 @@ static const struct opcode32 coprocessor_opcodes[] =
   {FPU_VFP_EXT_V1, 0x0c500b10, 0x0fb00ff0, "fmrrd%c\t%12-15r, %16-19r, %z0"},
   {FPU_VFP_EXT_V3, 0x0eb00a00, 0x0fb00ff0, "fconsts%c\t%y1, #%16-19,0-3d"},
   {FPU_VFP_EXT_V3, 0x0eb00b00, 0x0fb00ff0, "fconstd%c\t%z1, #%16-19,0-3d"},
-  {FPU_VFP_EXT_V2, 0x0c400a10, 0x0ff00fd0, "fmsrr%c\t%12-15r, %16-19r, %y4"},
+  {FPU_VFP_EXT_V2, 0x0c400a10, 0x0ff00fd0, "fmsrr%c\t%y4, %12-15r, %16-19r"},
   {FPU_VFP_EXT_V2, 0x0c400b10, 0x0ff00fd0, "fmdrr%c\t%z0, %12-15r, %16-19r"},
   {FPU_VFP_EXT_V2, 0x0c500a10, 0x0ff00fd0, "fmrrs%c\t%12-15r, %16-19r, %y4"},
   {FPU_VFP_EXT_V1xD, 0x0e000a00, 0x0fb00f50, "fmacs%c\t%y1, %y2, %y0"},