2010-11-02  Nick Clifton  <nickc@redhat.com>

	* testutils.inc (pass): Update parameter layout for write syscall.
	(fail): Likewise.
	* movgrgrii.cgs: Fix endianness typo in assertion.
	* movgrgriipostinc.cgs: Likewise.
	* movgrgriipredec.cgs: Likewise.
	* movgrgripostinc.cgs: Likewise.
	* movgrgripredec.cgs: Likewise.
	* movgrigr.cgs: Likewise.
	* movgriipostincgr.cgs: Likewise.
	* movgripostincgr.cgs: Likewise.
	* movgripredecgr.cgs: Likewise.
	* rrcgrgr.cgs: Rotate only inserts carry flag once.
	* rrcgrimm4.cgs: Likewise.
	* movfgrgriipostinc.cgs: New test.  Checks MOVF load with post increment.
	* movfgrgriipredec.cgs: New test.  Checks MOVF load with pre decrement.
	* movfgriipostincgr.cgs: New test.  Checks MOVF store with post increment.
	* movfgriipostincgr.cgs: New test.  Checks MOVF store with pre decrement.

Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/testutils.inc
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/testutils.inc,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 testutils.inc
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/testutils.inc	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/testutils.inc	2 Nov 2010 15:42:13 -0000
@@ -33,7 +33,8 @@ fail_str:
 	mov r1, #5	; write syscall
 	mov r2, #1	; write(fileno(stdout), "pass", 5)
 	mov.w r3, #pass_str
-	mov r4, #5
+	mov     r4, #0
+	mov     r5, #5  ; length
 	.byte 0x01
 	.byte 0x00
 	exit 0
@@ -43,7 +44,8 @@ fail_str:
 	mov r1, #5	; write syscall
 	mov r2, #1	; write(fileno(stdout), "fail", 5)
 	mov.w r3, #fail_str
-	mov r4, #5
+	mov     r4, #0
+	mov     r5, #5  ; length
 	.byte 0x01
 	.byte 0x00
 	exit 1
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgrii.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgrii.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgrgrii.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgrii.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgrii.cgs	2 Nov 2010 15:32:46 -0000
@@ -20,7 +20,7 @@ movgrgrii:
 	mov.w r2, (r1, 2)
 	assert r2, 0xadde
 	mov.w r2, (r1, 1)
-	assert r2, 0xface
+	assert r2, 0xcefa
 
 	br okay
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipostinc.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipostinc.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgrgriipostinc.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipostinc.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipostinc.cgs	2 Nov 2010 15:32:46 -0000
@@ -22,7 +22,7 @@ movgrgriipostinc:
 	assert r2, 0xadde
 	sub r1, #2
 	mov.w r2, (r1++, 1)
-	assert r2, 0xface
+	assert r2, 0xcefa
 
 	br okay
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipredec.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipredec.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgrgriipredec.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipredec.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgriipredec.cgs	2 Nov 2010 15:32:46 -0000
@@ -22,7 +22,7 @@ movgrgriipredec:
 	assert r2, 0xcefa
 	add r1, #4
 	mov.w r2, (--r1, 1)
-	assert r2, 0xface
+	assert r2, 0xcefa
 
 	br okay
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripostinc.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripostinc.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgrgripostinc.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripostinc.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripostinc.cgs	2 Nov 2010 15:32:46 -0000
@@ -22,7 +22,7 @@ movgrgripostinc:
 	assert r2, 0xcefa
 	sub r1, #1
 	mov.w r2, (r1++)
-	assert r2, 0xface
+	assert r2, 0xcefa
 
 	br okay
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripredec.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripredec.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgrgripredec.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripredec.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrgripredec.cgs	2 Nov 2010 15:32:46 -0000
@@ -24,7 +24,7 @@ movgrgripredec:
 	assert r2, 0xadde
 	add r1, #3
 	mov.w r2, (--r1)
-	assert r2, 0xdead
+	assert r2, 0xadde
 
 	br okay
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrigr.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrigr.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgrigr.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrigr.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgrigr.cgs	2 Nov 2010 15:32:46 -0000
@@ -24,12 +24,12 @@ movgrigr:
 	add r1, #1
 	mov.b (r1), r2		; fc ae de ad
 	mov.w r2, (r1)
-	assert r2, 0xfcae
+	assert r2, 0xaefc
 
 	mov.w (r1), r2		; fc ae de ad
 	sub r1, #1
 	mov.w r2, (r1)
-	assert r2, 0xfcae
+	assert r2, 0xaefc
 
 	br okay
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgriipostincgr.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgriipostincgr.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgriipostincgr.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgriipostincgr.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgriipostincgr.cgs	2 Nov 2010 15:32:46 -0000
@@ -18,7 +18,7 @@ movgriipostincgr:
 	mov r2, #0xfc
 	mov.b (r1++, 1), r2		; fa fc de ad
 	mov.w r2, (r1)
-	assert r2, 0xfafc
+	assert r2, 0xfcfa
 
 	mov r2, #0xae
 	sub r1, #1
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripostincgr.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripostincgr.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgripostincgr.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripostincgr.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripostincgr.cgs	2 Nov 2010 15:32:46 -0000
@@ -12,15 +12,14 @@ data:	.byte 0xfa,0xce,0xde,0xad
 	.global movgripostincgr
 movgripostincgr:
 	mov r1, #data
-
 	mov r2, #0xfc
 	mov.b (r1++), r2		; fc ce de ad
 	mov.w r2, (r1)
-	assert r2, 0xfcce
+	assert r2, 0xcefc
 
 	mov r2, #0xae
 	add r1, #1
-	mov.b (r1++), r2		; fa fc ae ad
+	mov.b  (r1++), r2		; fc ce ae ad
 	mov.w r2, (r1, -1)
 	assert r2, 0xadae
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripredecgr.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripredecgr.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 movgripredecgr.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripredecgr.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movgripredecgr.cgs	2 Nov 2010 15:32:46 -0000
@@ -14,11 +14,10 @@ edata:
 movgripredecgr:
 	;mov.b (--r0),r0
 	mov r1, #edata
-
 	mov r2, #0xfc
 	mov.b (--r1), r2		; fa ce de fc
 	mov.w r2, (r1)
-	assert r2, 0xdefc
+	assert r2, 0xfcde
 
 	mov r2, #0xae
 	sub r1, #1
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrgr.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrgr.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 rrcgrgr.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrgr.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrgr.cgs	2 Nov 2010 15:32:46 -0000
@@ -12,7 +12,7 @@ rrcgrgr:
 	mov r3, #0xffff
 	add r3, #1
 	rrc r1, r2
-	assert r1, 0xc021
+	assert r1, 0x4021
 
 	br okay
 
Index: sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrimm4.cgs
===================================================================
RCS file: /cvs/src/src/sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrimm4.cgs,v
retrieving revision 1.1
diff -u -3 -p -w -r1.1 rrcgrimm4.cgs
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrimm4.cgs	17 Dec 2001 09:31:21 -0000	1.1
+++ sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/rrcgrimm4.cgs	2 Nov 2010 15:32:46 -0000
@@ -11,7 +11,7 @@ rrcgrimm4:
 	mov r3, #0xffff
 	add r3, #1
 	rrc r1, #2
-	assert r1, 0xc021
+	assert r1, 0x4021
 
 	br okay
 
*** /dev/null	2010-11-02 07:38:56.310536038 +0000
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movfgrgriipostinc.cgs	2010-11-02 15:24:54.000000000 +0000
***************
*** 0 ****
--- 1,35 ----
+ # xstormy16 testcase for movf[.b] $Rdm,($Rb,$Rs++,N) -*- Asm -*-
+ # mach: all
+ 
+ 	.include "testutils.inc"
+ 
+ 	start
+ 
+ 	.data
+ data:	.byte 0xfa,0xce,0xde,0xad
+ 	.text
+ 
+ 	.global movfgrgriipostinc
+ movfgrgriipostinc:
+ 	mov     r1, @lo(#data)
+ 	mov     r8, @hi(#data)
+ 	movf.b  r2, (r8,r1++)
+ 	assert  r2, 0xfa
+ 	movf.b  r2, (r8,r1++,1)
+ 	assert  r2, 0xde
+ 
+ 	movf.w  r2, (r8,r1++,0)
+ 	assert  r2, 0xadde
+ 
+ 	mov	r1, #0xfffe
+ 	mov     r8, #0x0000
+ 	movf.w	r2, (r8,r1++,0)
+ 	assert  r1, 0x0000
+ 	assert  r8, 0x0001
+ 	
+ 	br      okay
+ 
+ wrong:
+ 	fail
+ okay:
+ 	pass
*** /dev/null	2010-11-02 07:38:56.310536038 +0000
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movfgrgriipredec.cgs	2010-11-02 15:24:54.000000000 +0000
***************
*** 0 ****
--- 1,36 ----
+ # xstormy16 testcase for movf[.b] $Rdm,($Rb,--$Rs,N) -*- Asm -*-
+ # mach: all
+ 
+ 	.include "testutils.inc"
+ 
+ 	start
+ 
+ 	.data
+ data:	.byte 0xfa,0xce,0xde,0xad
+ mdata:	.byte 0x01,0x02,0x03,0x04
+ 	.text
+ 
+ 	.global movfgrgriipredec
+ movfgrgriipredec:
+ 	mov     r1, @lo(#mdata)
+ 	mov     r8, @hi(#mdata)
+ 	movf.b  r2, (r8,--r1)
+ 	assert  r2, 0xad
+ 	movf.b  r2, (r8,--r1,1)
+ 	assert  r2, 0xad
+ 
+ 	movf.w  r2, (r8,--r1,0)
+ 	assert  r2, 0xcefa
+ 
+ 	mov	r1, #0x0000
+ 	mov     r8, #0x0002
+ 	movf.w	r2, (r8,--r1,0)
+ 	assert  r1, 0xfffe
+ 	assert  r8, 0x0001
+ 	
+ 	br      okay
+ 
+ wrong:
+ 	fail
+ okay:
+ 	pass
*** /dev/null	2010-11-02 07:38:56.310536038 +0000
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movfgriipostincgr.cgs	2010-11-02 15:24:54.000000000 +0000
***************
*** 0 ****
--- 1,38 ----
+ # xstormy16 testcase for movf[.b] ($Rb,--$Rs,N),$Rdm -*- Asm -*-
+ # mach: all
+ 
+ 	.include "testutils.inc"
+ 
+ 	start
+ 
+ 	.data
+ data:	.byte 0xfa,0xce,0xde,0xad
+ 	.text
+ 
+ 	.global movfgriipostincrgr
+ movfgriipostincgr:
+ 	mov     r1, @lo(#data)
+ 	mov     r8, @hi(#data)
+ 	mov	r2, #0xfc       ;    v
+ 	movf.b  (r8,++r1), r2	; fc ce de ad
+ 	movf.w  r3, (r8, r1)
+ 	assert  r3, 0xcefc
+ 
+ 	mov	r2, #0xff       ;       v
+ 	movf.b  (r8,++r1,2), r2 ; fc ce de ff
+ 	movf.w  r3, (r8, r1)
+ 	assert  r3, 0xffde
+ 
+ 	mov	r2, #0xeeee     ;             v
+ 	movf.w  (r8,r1++,0), r2 ; f1 ce ee ee
+ 	mov     r1, @lo(#data)
+ 	mov     r8, @hi(#data)
+ 	movf.w  r3, (r8, r1,2)
+ 	assert  r3, 0xeeee
+ 
+ 	br      okay
+ 
+ wrong:
+ 	fail
+ okay:
+ 	pass
*** /dev/null	2010-11-02 07:38:56.310536038 +0000
--- sid/component/testsuite/sidcomp.cgen-cpu.xstormy16/movfgriipredecgr.cgs1w	2010-11-02 15:24:54.000000000 +0000
***************
*** 0 ****
--- 1,37 ----
+ # xstormy16 testcase for movf[.b] ($Rb,--$Rs,N),$Rdm -*- Asm -*-
+ # mach: all
+ 
+ 	.include "testutils.inc"
+ 
+ 	start
+ 
+ 	.data
+ data:	.byte 0xfa,0xce,0xde,0xad
+ mdata:	.byte 0x01,0x02,0x03,0x04
+ 	.text
+ 
+ 	.global movfgriipredecgr
+ movfgriipredecgr:
+ 	mov     r1, @lo(#mdata)
+ 	mov     r8, @hi(#mdata)
+ 	mov	r2, #0xfc       ;          v
+ 	movf.b  (r8,--r1), r2	; fa ce de fc 01 02 03 04
+ 	movf.w  r3, (r8, r1)
+ 	assert  r3, 0xfcde
+ 
+ 	mov	r2, #0xff       ;       v
+ 	movf.b  (r8,--r1,3), r2 ; fa ce de fc 01 ff 03 04
+ 	movf.w  r3, (r8, r1,2)
+ 	assert  r3, 0xff01
+ 
+ 	mov	r2, #0xf1       ; v
+ 	movf.w  (r8,--r1,0), r2 ; f1 ce de fc 01 ff 03 04
+ 	movf.w  r3, (r8, r1,1)
+ 	assert  r3, 0xcef1
+ 
+ 	br      okay
+ 
+ wrong:
+ 	fail
+ okay:
+ 	pass