* gas/rx/macros.inc (creg): Remove cpen.

        * gas/rx/mvfc.d: Remove expected uses of cpen register.
        * gas/rx/mvtc.d: Likewise.
        * gas/rx/popc.d: Likewise.
        * gas/rx/pushc.d: Likewise.

6 files changed, 85 insertions, 87 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8426880..452b05e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-17  Nick Clifton  <nickc@redhat.com>
+
+	* gas/rx/macros.inc (creg): Remove cpen.
+	* gas/rx/mvfc.d: Remove expected uses of cpen register.
+	* gas/rx/mvtc.d: Likewise.
+	* gas/rx/popc.d: Likewise.
+	* gas/rx/pushc.d: Likewise.
+
 2009-11-16  Viktor Kutuzov  <vkutuzov@accesssoftek.com>
 
 	* gas/arm/vfp1xD.s: Add vmrs and vmsr instructions.
diff --git a/gas/testsuite/gas/rx/macros.inc b/gas/testsuite/gas/rx/macros.inc
index d025ac9..8baebf5 100644
--- a/gas/testsuite/gas/rx/macros.inc
+++ b/gas/testsuite/gas/rx/macros.inc
@@ -3,7 +3,7 @@ macro	reg2	{r0;r14}
 macro	reg7	{r0;r7}
 macro	regPlo	{r1;r7}
 macro	regPhi	{r8;r14}
-macro	creg	{psw;fpsw;usp;isp;intb;bpsw;bpc;fintv;cpen}
+macro	creg	{psw;fpsw;usp;isp;intb;bpsw;bpc;fintv}
 macro	pswf	{U;I;O;S;Z;C}
 
 macro	simm8	{-128;127}
diff --git a/gas/testsuite/gas/rx/mvfc.d b/gas/testsuite/gas/rx/mvfc.d
index d402015..7f6ca64 100644
--- a/gas/testsuite/gas/rx/mvfc.d
+++ b/gas/testsuite/gas/rx/mvfc.d
@@ -22,5 +22,4 @@ Disassembly of section \.text:
   27:	fd 6a 9f                      	mvfc	bpc, r15
   2a:	fd 6a b0                      	mvfc	fintv, r0
   2d:	fd 6a bf                      	mvfc	fintv, r15
-  30:	fd 6a 40                      	mvfc	cpen, r0
-  33:	fd 6a 4f                      	mvfc	cpen, r15
+
diff --git a/gas/testsuite/gas/rx/mvtc.d b/gas/testsuite/gas/rx/mvtc.d
index 851ba27..1deb67e 100644
--- a/gas/testsuite/gas/rx/mvtc.d
+++ b/gas/testsuite/gas/rx/mvtc.d
@@ -14,85 +14,76 @@ Disassembly of section \.text:
   14:	fd 77 08 80                   	mvtc	#-128, bpsw
   18:	fd 77 09 80                   	mvtc	#-128, bpc
   1c:	fd 77 0b 80                   	mvtc	#-128, fintv
-  20:	fd 77 04 80                   	mvtc	#-128, cpen
-  24:	fd 77 00 7f                   	mvtc	#127, psw
-  28:	fd 77 03 7f                   	mvtc	#127, fpsw
-  2c:	fd 77 02 7f                   	mvtc	#127, usp
-  30:	fd 77 0a 7f                   	mvtc	#127, isp
-  34:	fd 77 0c 7f                   	mvtc	#127, intb
-  38:	fd 77 08 7f                   	mvtc	#127, bpsw
-  3c:	fd 77 09 7f                   	mvtc	#127, bpc
-  40:	fd 77 0b 7f                   	mvtc	#127, fintv
-  44:	fd 77 04 7f                   	mvtc	#127, cpen
-  48:	fd 7b 00 00 80                	mvtc	#0xffff8000, psw
-  4d:	fd 7b 03 00 80                	mvtc	#0xffff8000, fpsw
-  52:	fd 7b 02 00 80                	mvtc	#0xffff8000, usp
-  57:	fd 7b 0a 00 80                	mvtc	#0xffff8000, isp
-  5c:	fd 7b 0c 00 80                	mvtc	#0xffff8000, intb
-  61:	fd 7b 08 00 80                	mvtc	#0xffff8000, bpsw
-  66:	fd 7b 09 00 80                	mvtc	#0xffff8000, bpc
-  6b:	fd 7b 0b 00 80                	mvtc	#0xffff8000, fintv
-  70:	fd 7b 04 00 80                	mvtc	#0xffff8000, cpen
-  75:	fd 7f 00 00 80 00             	mvtc	#0x8000, psw
-  7b:	fd 7f 03 00 80 00             	mvtc	#0x8000, fpsw
-  81:	fd 7f 02 00 80 00             	mvtc	#0x8000, usp
-  87:	fd 7f 0a 00 80 00             	mvtc	#0x8000, isp
-  8d:	fd 7f 0c 00 80 00             	mvtc	#0x8000, intb
-  93:	fd 7f 08 00 80 00             	mvtc	#0x8000, bpsw
-  99:	fd 7f 09 00 80 00             	mvtc	#0x8000, bpc
-  9f:	fd 7f 0b 00 80 00             	mvtc	#0x8000, fintv
-  a5:	fd 7f 04 00 80 00             	mvtc	#0x8000, cpen
-  ab:	fd 7f 00 00 00 80             	mvtc	#0xff800000, psw
-  b1:	fd 7f 03 00 00 80             	mvtc	#0xff800000, fpsw
-  b7:	fd 7f 02 00 00 80             	mvtc	#0xff800000, usp
-  bd:	fd 7f 0a 00 00 80             	mvtc	#0xff800000, isp
-  c3:	fd 7f 0c 00 00 80             	mvtc	#0xff800000, intb
-  c9:	fd 7f 08 00 00 80             	mvtc	#0xff800000, bpsw
-  cf:	fd 7f 09 00 00 80             	mvtc	#0xff800000, bpc
-  d5:	fd 7f 0b 00 00 80             	mvtc	#0xff800000, fintv
-  db:	fd 7f 04 00 00 80             	mvtc	#0xff800000, cpen
-  e1:	fd 7f 00 ff ff 7f             	mvtc	#0x7fffff, psw
-  e7:	fd 7f 03 ff ff 7f             	mvtc	#0x7fffff, fpsw
-  ed:	fd 7f 02 ff ff 7f             	mvtc	#0x7fffff, usp
-  f3:	fd 7f 0a ff ff 7f             	mvtc	#0x7fffff, isp
-  f9:	fd 7f 0c ff ff 7f             	mvtc	#0x7fffff, intb
-  ff:	fd 7f 08 ff ff 7f             	mvtc	#0x7fffff, bpsw
- 105:	fd 7f 09 ff ff 7f             	mvtc	#0x7fffff, bpc
- 10b:	fd 7f 0b ff ff 7f             	mvtc	#0x7fffff, fintv
- 111:	fd 7f 04 ff ff 7f             	mvtc	#0x7fffff, cpen
- 117:	fd 73 00 00 00 00 80          	mvtc	#0x80000000, psw
- 11e:	fd 73 03 00 00 00 80          	mvtc	#0x80000000, fpsw
- 125:	fd 73 02 00 00 00 80          	mvtc	#0x80000000, usp
- 12c:	fd 73 0a 00 00 00 80          	mvtc	#0x80000000, isp
- 133:	fd 73 0c 00 00 00 80          	mvtc	#0x80000000, intb
- 13a:	fd 73 08 00 00 00 80          	mvtc	#0x80000000, bpsw
- 141:	fd 73 09 00 00 00 80          	mvtc	#0x80000000, bpc
- 148:	fd 73 0b 00 00 00 80          	mvtc	#0x80000000, fintv
- 14f:	fd 73 04 00 00 00 80          	mvtc	#0x80000000, cpen
- 156:	fd 73 00 ff ff ff 7f          	mvtc	#0x7fffffff, psw
- 15d:	fd 73 03 ff ff ff 7f          	mvtc	#0x7fffffff, fpsw
- 164:	fd 73 02 ff ff ff 7f          	mvtc	#0x7fffffff, usp
- 16b:	fd 73 0a ff ff ff 7f          	mvtc	#0x7fffffff, isp
- 172:	fd 73 0c ff ff ff 7f          	mvtc	#0x7fffffff, intb
- 179:	fd 73 08 ff ff ff 7f          	mvtc	#0x7fffffff, bpsw
- 180:	fd 73 09 ff ff ff 7f          	mvtc	#0x7fffffff, bpc
- 187:	fd 73 0b ff ff ff 7f          	mvtc	#0x7fffffff, fintv
- 18e:	fd 73 04 ff ff ff 7f          	mvtc	#0x7fffffff, cpen
- 195:	fd 68 00                      	mvtc	r0, psw
- 198:	fd 68 03                      	mvtc	r0, fpsw
- 19b:	fd 68 02                      	mvtc	r0, usp
- 19e:	fd 68 0a                      	mvtc	r0, isp
- 1a1:	fd 68 0c                      	mvtc	r0, intb
- 1a4:	fd 68 08                      	mvtc	r0, bpsw
- 1a7:	fd 68 09                      	mvtc	r0, bpc
- 1aa:	fd 68 0b                      	mvtc	r0, fintv
- 1ad:	fd 68 04                      	mvtc	r0, cpen
- 1b0:	fd 68 f0                      	mvtc	r15, psw
- 1b3:	fd 68 f3                      	mvtc	r15, fpsw
- 1b6:	fd 68 f2                      	mvtc	r15, usp
- 1b9:	fd 68 fa                      	mvtc	r15, isp
- 1bc:	fd 68 fc                      	mvtc	r15, intb
- 1bf:	fd 68 f8                      	mvtc	r15, bpsw
- 1c2:	fd 68 f9                      	mvtc	r15, bpc
- 1c5:	fd 68 fb                      	mvtc	r15, fintv
- 1c8:	fd 68 f4                      	mvtc	r15, cpen
+  20:	fd 77 00 7f                   	mvtc	#127, psw
+  24:	fd 77 03 7f                   	mvtc	#127, fpsw
+  28:	fd 77 02 7f                   	mvtc	#127, usp
+  2c:	fd 77 0a 7f                   	mvtc	#127, isp
+  30:	fd 77 0c 7f                   	mvtc	#127, intb
+  34:	fd 77 08 7f                   	mvtc	#127, bpsw
+  38:	fd 77 09 7f                   	mvtc	#127, bpc
+  3c:	fd 77 0b 7f                   	mvtc	#127, fintv
+  ..:	fd 7b 00 00 80                	mvtc	#0xffff8000, psw
+  ..:	fd 7b 03 00 80                	mvtc	#0xffff8000, fpsw
+  ..:	fd 7b 02 00 80                	mvtc	#0xffff8000, usp
+  ..:	fd 7b 0a 00 80                	mvtc	#0xffff8000, isp
+  ..:	fd 7b 0c 00 80                	mvtc	#0xffff8000, intb
+  ..:	fd 7b 08 00 80                	mvtc	#0xffff8000, bpsw
+  ..:	fd 7b 09 00 80                	mvtc	#0xffff8000, bpc
+  ..:	fd 7b 0b 00 80                	mvtc	#0xffff8000, fintv
+  ..:	fd 7f 00 00 80 00             	mvtc	#0x8000, psw
+  ..:	fd 7f 03 00 80 00             	mvtc	#0x8000, fpsw
+  ..:	fd 7f 02 00 80 00             	mvtc	#0x8000, usp
+  ..:	fd 7f 0a 00 80 00             	mvtc	#0x8000, isp
+  ..:	fd 7f 0c 00 80 00             	mvtc	#0x8000, intb
+  ..:	fd 7f 08 00 80 00             	mvtc	#0x8000, bpsw
+  ..:	fd 7f 09 00 80 00             	mvtc	#0x8000, bpc
+  ..:	fd 7f 0b 00 80 00             	mvtc	#0x8000, fintv
+  ..:	fd 7f 00 00 00 80             	mvtc	#0xff800000, psw
+  ..:	fd 7f 03 00 00 80             	mvtc	#0xff800000, fpsw
+  ..:	fd 7f 02 00 00 80             	mvtc	#0xff800000, usp
+  ..:	fd 7f 0a 00 00 80             	mvtc	#0xff800000, isp
+  ..:	fd 7f 0c 00 00 80             	mvtc	#0xff800000, intb
+  ..:	fd 7f 08 00 00 80             	mvtc	#0xff800000, bpsw
+  ..:	fd 7f 09 00 00 80             	mvtc	#0xff800000, bpc
+  ..:	fd 7f 0b 00 00 80             	mvtc	#0xff800000, fintv
+  ..:	fd 7f 00 ff ff 7f             	mvtc	#0x7fffff, psw
+  ..:	fd 7f 03 ff ff 7f             	mvtc	#0x7fffff, fpsw
+  ..:	fd 7f 02 ff ff 7f             	mvtc	#0x7fffff, usp
+  ..:	fd 7f 0a ff ff 7f             	mvtc	#0x7fffff, isp
+  ..:	fd 7f 0c ff ff 7f             	mvtc	#0x7fffff, intb
+  ..:	fd 7f 08 ff ff 7f             	mvtc	#0x7fffff, bpsw
+ ...:	fd 7f 09 ff ff 7f             	mvtc	#0x7fffff, bpc
+ ...:	fd 7f 0b ff ff 7f             	mvtc	#0x7fffff, fintv
+ ...:	fd 73 00 00 00 00 80          	mvtc	#0x80000000, psw
+ ...:	fd 73 03 00 00 00 80          	mvtc	#0x80000000, fpsw
+ ...:	fd 73 02 00 00 00 80          	mvtc	#0x80000000, usp
+ ...:	fd 73 0a 00 00 00 80          	mvtc	#0x80000000, isp
+ ...:	fd 73 0c 00 00 00 80          	mvtc	#0x80000000, intb
+ ...:	fd 73 08 00 00 00 80          	mvtc	#0x80000000, bpsw
+ ...:	fd 73 09 00 00 00 80          	mvtc	#0x80000000, bpc
+ ...:	fd 73 0b 00 00 00 80          	mvtc	#0x80000000, fintv
+ ...:	fd 73 00 ff ff ff 7f          	mvtc	#0x7fffffff, psw
+ ...:	fd 73 03 ff ff ff 7f          	mvtc	#0x7fffffff, fpsw
+ ...:	fd 73 02 ff ff ff 7f          	mvtc	#0x7fffffff, usp
+ ...:	fd 73 0a ff ff ff 7f          	mvtc	#0x7fffffff, isp
+ ...:	fd 73 0c ff ff ff 7f          	mvtc	#0x7fffffff, intb
+ ...:	fd 73 08 ff ff ff 7f          	mvtc	#0x7fffffff, bpsw
+ ...:	fd 73 09 ff ff ff 7f          	mvtc	#0x7fffffff, bpc
+ ...:	fd 73 0b ff ff ff 7f          	mvtc	#0x7fffffff, fintv
+ ...:	fd 68 00                      	mvtc	r0, psw
+ ...:	fd 68 03                      	mvtc	r0, fpsw
+ ...:	fd 68 02                      	mvtc	r0, usp
+ ...:	fd 68 0a                      	mvtc	r0, isp
+ ...:	fd 68 0c                      	mvtc	r0, intb
+ ...:	fd 68 08                      	mvtc	r0, bpsw
+ ...:	fd 68 09                      	mvtc	r0, bpc
+ ...:	fd 68 0b                      	mvtc	r0, fintv
+ ...:	fd 68 f0                      	mvtc	r15, psw
+ ...:	fd 68 f3                      	mvtc	r15, fpsw
+ ...:	fd 68 f2                      	mvtc	r15, usp
+ ...:	fd 68 fa                      	mvtc	r15, isp
+ ...:	fd 68 fc                      	mvtc	r15, intb
+ ...:	fd 68 f8                      	mvtc	r15, bpsw
+ ...:	fd 68 f9                      	mvtc	r15, bpc
+ ...:	fd 68 fb                      	mvtc	r15, fintv
+
diff --git a/gas/testsuite/gas/rx/popc.d b/gas/testsuite/gas/rx/popc.d
index e5eea80..da1b248 100644
--- a/gas/testsuite/gas/rx/popc.d
+++ b/gas/testsuite/gas/rx/popc.d
@@ -14,4 +14,4 @@ Disassembly of section \.text:
    a:	7e e8                         	popc	bpsw
    c:	7e e9                         	popc	bpc
    e:	7e eb                         	popc	fintv
-  10:	7e e4                         	popc	cpen
+
diff --git a/gas/testsuite/gas/rx/pushc.d b/gas/testsuite/gas/rx/pushc.d
index f97a06a..307a7a0 100644
--- a/gas/testsuite/gas/rx/pushc.d
+++ b/gas/testsuite/gas/rx/pushc.d
@@ -14,4 +14,4 @@ Disassembly of section \.text:
    a:	7e c8                         	pushc	bpsw
    c:	7e c9                         	pushc	bpc
    e:	7e cb                         	pushc	fintv
-  10:	7e c4                         	pushc	cpen
+