Index: cop_insn.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/crx/cop_insn.d,v
retrieving revision 1.2
diff -u -p -r1.2 cop_insn.d
--- cop_insn.d	25 Oct 2004 09:36:06 -0000	1.2
+++ cop_insn.d	27 Oct 2004 10:03:07 -0000
@@ -6,62 +6,67 @@
 
 Disassembly of section .text:
 
-00000000 <mtcr>:
-   0:	1f 30 1e 30 	mtcr	\$0xf, r1, c14
+00000000 <cpi>:
+   0:	12 30 34 12 	cpi	\$0x2, \$0x1234
+   4:	13 31 65 87 	cpi	\$0x3, \$0x4321, \$0x8765
+   8:	21 43 
 
-00000004 <mfcr>:
-   4:	13 30 72 31 	mfcr	\$0x3, c7, r2
+0000000a <mtcr>:
+   a:	1f 30 10 30 	mtcr	\$0xf, r1, c0
 
-00000008 <mtcsr>:
-   8:	12 30 51 32 	mtcsr	\$0x2, r5, cs1
+0000000e <mfcr>:
+   e:	13 30 02 31 	mfcr	\$0x3, c0, r2
 
-0000000c <mfcsr>:
-   c:	11 30 ce 33 	mfcsr	\$0x1, cs12, r14
+00000012 <mtcsr>:
+  12:	12 30 50 32 	mtcsr	\$0x2, r5, cs0
 
-00000010 <ldcr>:
-  10:	11 30 38 34 	ldcr	\$0x1, r3, c8
+00000016 <mfcsr>:
+  16:	11 30 0e 33 	mfcsr	\$0x1, cs0, r14
 
-00000014 <stcr>:
-  14:	12 30 b4 35 	stcr	\$0x2, c11, r4
+0000001a <ldcr>:
+  1a:	11 30 30 34 	ldcr	\$0x1, r3, c0
 
-00000018 <ldcsr>:
-  18:	14 30 6c 36 	ldcsr	\$0x4, r6, cs12
+0000001e <stcr>:
+  1e:	12 30 04 35 	stcr	\$0x2, c0, r4
 
-0000001c <stcsr>:
-  1c:	17 30 ad 37 	stcsr	\$0x7, cs10, r13
+00000022 <ldcsr>:
+  22:	14 30 60 36 	ldcsr	\$0x4, r6, cs0
 
-00000020 <loadmcr>:
-  20:	13 31 01 30 	loadmcr	\$0x3, r1, {c2,c3,c5}
-  24:	2c 00 
+00000026 <stcsr>:
+  26:	17 30 0d 37 	stcsr	\$0x7, cs0, r13
 
-00000026 <stormcr>:
-  26:	1f 31 1e 30 	stormcr	\$0xf, r14, {c4,c7,c9,c10}
-  2a:	90 06 
+0000002a <loadmcr>:
+  2a:	13 31 01 30 	loadmcr	\$0x3, r1, {c0,c12,c13}
+  2e:	2c 00 
 
-0000002c <loadmcsr>:
-  2c:	1c 31 28 30 	loadmcsr	\$0xc, r8, {cs7,cs8,cs9,cs10,cs11}
-  30:	80 0f 
+00000030 <stormcr>:
+  30:	1f 31 1e 30 	stormcr	\$0xf, r14, {c1,c2,c3,c4,c12,c13}
+  34:	90 06 
 
-00000032 <stormcsr>:
-  32:	19 31 39 30 	stormcsr	\$0x9, r9, {cs4,cs7,cs10}
-  36:	90 04 
+00000036 <loadmcsr>:
+  36:	1c 31 28 30 	loadmcsr	\$0xc, r8, {cs3,cs5,cs12,cs13}
+  3a:	80 0f 
 
-00000038 <bcop>:
-  38:	13 30 48 77 	bcop	\$0x7, \$0x3, \*\+0x90
-  3c:	1c 31 fa 76 	bcop	\$0x6, \$0xc, \*\-0xbcdfe
-  40:	01 19 
+0000003c <stormcsr>:
+  3c:	19 31 39 30 	stormcsr	\$0x9, r9, {cs0,cs3,cs4,cs5,cs12,cs13}
+  40:	90 04 
 
-00000042 <cpdop>:
-  42:	13 30 45 b2 	cpdop	\$0x3, \$0x2, r4, r5
-  46:	17 31 12 ba 	cpdop	\$0x7, \$0xa, r1, r2, \$0x1234
-  4a:	34 12 
+00000042 <bcop>:
+  42:	13 30 48 77 	bcop	\$0x7, \$0x3, \*\+0x90
+  46:	1c 31 fa 76 	bcop	\$0x6, \$0xc, \*\-0xbcdfe
+  4a:	01 19 
 
-0000004c <mtpr>:
-  4c:	09 30 10 00 	mtpr	r0, hi
+0000004c <cpdop>:
+  4c:	13 30 45 b2 	cpdop	\$0x3, \$0x2, r4, r5
+  50:	17 31 12 ba 	cpdop	\$0x7, \$0xa, r1, r2, \$0xba12
+  54:	34 12 
 
-00000050 <mfpr>:
-  50:	0a 30 05 11 	mfpr	lo, r5
-  54:	0a 30 0a 90 	mfpr	uhi, r10
+00000056 <mtpr>:
+  56:	09 30 10 00 	mtpr	r0, hi
 
-00000058 <cinv>:
-  58:	10 30 0f 00 	cinv	\[b,d,i,u\]
+0000005a <mfpr>:
+  5a:	0a 30 05 11 	mfpr	lo, r5
+  5e:	0a 30 0a 90 	mfpr	uhi, r10
+
+00000062 <cinv>:
+  62:	10 30 0f 00 	cinv	\[b,d,i,u\]
Index: cop_insn.s
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/crx/cop_insn.s,v
retrieving revision 1.2
diff -u -p -r1.2 cop_insn.s
--- cop_insn.s	25 Oct 2004 09:36:06 -0000	1.2
+++ cop_insn.s	27 Oct 2004 10:03:07 -0000
@@ -4,6 +4,11 @@ foodata: .word 42
 	 .text
 footext:
 
+	.global cpi
+cpi:
+cpi $0x2, $0x1234
+cpi $3, $0x8765, $0x4321
+
 	.global mtcr
 mtcr:
 mtcr $0xf, r1, c14
Index: list_insn.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/crx/list_insn.d,v
retrieving revision 1.2
diff -u -p -r1.2 list_insn.d
--- list_insn.d	25 Oct 2004 09:36:26 -0000	1.2
+++ list_insn.d	27 Oct 2004 10:03:07 -0000
@@ -12,26 +12,28 @@ Disassembly of section .text:
 
 00000006 <pushx>:
    6:	7f 34 ff 00 	pushx	r15, {r0,r1,r2,r3,r4,r5,r6,r7}
+   a:	76 34 00 00 	pushx	r6, {lo,hi}
 
-0000000a <pop>:
-   a:	40 32 00 04 	loadm	r0, {r10}
-   e:	c2 ff       	pop	r2
+0000000e <pop>:
+   e:	40 32 00 04 	loadm	r0, {r10}
+  12:	c2 ff       	pop	r2
 
-00000010 <popx>:
-  10:	7f 32 fb 00 	popx	r15, {r0,r1,r3,r4,r5,r6,r7}
+00000014 <popx>:
+  14:	7f 32 fb 00 	popx	r15, {r0,r1,r3,r4,r5,r6,r7}
+  18:	77 32 00 00 	popx	r7, {lo,hi}
 
-00000014 <popret>:
-  14:	6e 32 02 40 	popret	r14, {r1,r14}
-  18:	de ff       	popret	r14
+0000001c <popret>:
+  1c:	6d 32 02 40 	popret	r13, {r1,r14}
+  20:	de ff       	popret	r14
 
-0000001a <loadm>:
-  1a:	40 32 03 00 	loadm	r0, {r0,r1}
+00000022 <loadm>:
+  22:	40 32 42 00 	loadm	r0, {r1,r6}
 
-0000001e <loadma>:
-  1e:	5d 32 14 10 	loadma	r13, {r2,r4,r12}
+00000026 <loadma>:
+  26:	5d 32 14 10 	loadma	r13, {u2,u4,u12}
 
-00000022 <storm>:
-  22:	4f 34 00 40 	storm	r15, {r14}
+0000002a <storm>:
+  2a:	4f 34 00 40 	storm	r15, {r14}
 
-00000026 <storma>:
-  26:	53 34 01 00 	storma	r3, {r0}
+0000002e <storma>:
+  2e:	53 34 05 00 	storma	r3, {u0,u2}
Index: list_insn.s
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/crx/list_insn.s,v
retrieving revision 1.2
diff -u -p -r1.2 list_insn.s
--- list_insn.s	25 Oct 2004 09:36:26 -0000	1.2
+++ list_insn.s	27 Oct 2004 10:03:07 -0000
@@ -12,6 +12,7 @@ push r2
 	.global pushx
 pushx:
 pushx sp, {r0, r1, r2, r3, r4, r5, r6, r7}
+pushx r6, {hi, lo}
 
 	.global pop
 pop:
@@ -21,19 +22,20 @@ pop r2
 	.global popx
 popx:
 popx sp, {r0, r1, r3, r4, r5, r6, r7}
+popx r7, {lo, hi}
 
 	.global popret
 popret:
-popret r14, {ra, r1}
+popret r13, {ra, r1}
 popret ra
 
 	.global loadm
 loadm:
-loadm r0, {r1, r0}
+loadm r0, {r1, r6}
 
 	.global loadma
 loadma:
-loadma r13, {r12, r4, r2}
+loadma r13, {u12, u4, u2}
 
 	.global storm
 storm:
@@ -41,5 +43,5 @@ storm r15, {ra}
 
 	.global storma
 storma:
-storma r3, {r0}
+storma r3, {u0, u2}