* gas/crx/list_insn.s: Add hi/lo/u<N> registers tests, fix test bugs.

2 files changed, 24 insertions, 20 deletions

diff --git a/gas/testsuite/gas/crx/list_insn.d b/gas/testsuite/gas/crx/list_insn.d
index 8c44d03..b9b23fb 100644
--- a/gas/testsuite/gas/crx/list_insn.d
+++ b/gas/testsuite/gas/crx/list_insn.d
@@ -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}
diff --git a/gas/testsuite/gas/crx/list_insn.s b/gas/testsuite/gas/crx/list_insn.s
index 20bb86d..1b54aab 100644
--- a/gas/testsuite/gas/crx/list_insn.s
+++ b/gas/testsuite/gas/crx/list_insn.s
@@ -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}