* gas/z8k/jmp-cc.d: New file.

	* gas/z8k/jmp-cc.s: New file.
	* gas/z8k/ret-cc.d: New file.
	* gas/z8k/ret-cc.s: New file.
	* gas/z8k/z8k.exp: Run new tests.

6 files changed, 178 insertions, 0 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ed4ec02f80..98ac150b73 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-26  Christian Groessler  <chris@groessler.org>
+
+	* gas/z8k/jmp-cc.d: New file.
+	* gas/z8k/jmp-cc.s: New file.
+	* gas/z8k/ret-cc.d: New file.
+	* gas/z8k/ret-cc.s: New file.
+	* gas/z8k/z8k.exp: Run new tests.
+
 2003-11-26  Nick Clifton  <nickc@redhat.com>
 
 	* gas/h8300/t01_mov.s: Revert changes.
diff --git a/gas/testsuite/gas/z8k/jmp-cc.d b/gas/testsuite/gas/z8k/jmp-cc.d
new file mode 100644
index 0000000000..012e97f7b1
--- /dev/null
+++ b/gas/testsuite/gas/z8k/jmp-cc.d
@@ -0,0 +1,44 @@
+#as:
+#objdump: -d
+#name: jmp cc
+
+.*: +file format coff-z8k
+
+Disassembly of section \.text:
+
+00000000 <\.text>:
+   0:	e01f           	jr	f,0x40
+   2:	e11e           	jr	lt,0x40
+   4:	e21d           	jr	le,0x40
+   6:	5e03 0040      	jp	ule,0x40
+   a:	5e04 0040      	jp	ov/pe,0x40
+   e:	e418           	jr	ov/pe,0x40
+  10:	e517           	jr	mi,0x40
+  12:	e616           	jr	eq,0x40
+  14:	e615           	jr	eq,0x40
+  16:	e714           	jr	c/ult,0x40
+  18:	e713           	jr	c/ult,0x40
+  1a:	e812           	jr	t,0x40
+  1c:	e911           	jr	ge,0x40
+  1e:	ea10           	jr	gt,0x40
+  20:	eb0f           	jr	ugt,0x40
+  22:	5e0c 0040      	jp	nov/po,0x40
+  26:	ec0c           	jr	nov/po,0x40
+  28:	ed0b           	jr	pl,0x40
+  2a:	ee0a           	jr	ne,0x40
+  2c:	ee09           	jr	ne,0x40
+  2e:	e408           	jr	ov/pe,0x40
+  30:	e707           	jr	c/ult,0x40
+  32:	ec06           	jr	nov/po,0x40
+  34:	ef05           	jr	nc/uge,0x40
+  36:	ee04           	jr	ne,0x40
+  38:	ef03           	jr	nc/uge,0x40
+  3a:	ef02           	jr	nc/uge,0x40
+  3c:	e801           	jr	t,0x40
+  3e:	e800           	jr	t,0x40
+
+00000040 <dd>:
+  40:	e8ff           	jr	t,0x40
+  42:	e8fe           	jr	t,0x40
+  44:	8d07           	nop	
+  46:	8d07           	nop	
diff --git a/gas/testsuite/gas/z8k/jmp-cc.s b/gas/testsuite/gas/z8k/jmp-cc.s
new file mode 100644
index 0000000000..e220b35e2d
--- /dev/null
+++ b/gas/testsuite/gas/z8k/jmp-cc.s
@@ -0,0 +1,38 @@
+.text
+
+	jr	f,dd
+	jr lt,dd
+	jr le,dd
+	jp	 ule ,  dd
+	jp  ov, dd
+	jr pe,	dd
+	jr	 mi , dd
+	jr	 eq	,	dd
+	jr	z ,dd
+	jr	 c,dd
+	jr ult,dd
+jr	 t   , dd
+	jr	 ge,dd
+	jr gt,dd
+	jr ugt,dd
+	jp	 nov   ,	dd
+	jr po ,dd
+	jr pl,dd
+	jr ne,dd
+	JR NE,dd
+	jr ov/pe,dd
+	jr c/ult,dd
+	jr nov/po,dd
+	jr nc/uge,dd
+	jr	 nz,	dd
+	jr nc,dd   ! ssss
+	jr uge ,dd   ! dddd
+	 jr dd
+	jr	dd 
+dd:
+	jr	t,dd
+	jr	dd
+
+	nop
+	nop
+
diff --git a/gas/testsuite/gas/z8k/ret-cc.d b/gas/testsuite/gas/z8k/ret-cc.d
new file mode 100644
index 0000000000..86ccc1e68f
--- /dev/null
+++ b/gas/testsuite/gas/z8k/ret-cc.d
@@ -0,0 +1,44 @@
+#as:
+#objdump: -d
+#name: jmp cc
+
+.*: +file format coff-z8k
+
+Disassembly of section \.text:
+
+00000000 <\.text>:
+   0:	9e00           	ret	f
+   2:	9e01           	ret	lt
+   4:	9e02           	ret	le
+   6:	9e03           	ret	ule
+   8:	9e04           	ret	ov/pe
+   a:	9e04           	ret	ov/pe
+   c:	9e05           	ret	mi
+   e:	9e06           	ret	eq
+  10:	9e06           	ret	eq
+  12:	9e07           	ret	c/ult
+  14:	9e07           	ret	c/ult
+  16:	9e08           	ret	t
+  18:	9e09           	ret	ge
+  1a:	9e0a           	ret	gt
+  1c:	9e0b           	ret	ugt
+  1e:	9e0c           	ret	nov/po
+  20:	9e0c           	ret	nov/po
+  22:	9e0c           	ret	nov/po
+  24:	9e0d           	ret	pl
+  26:	9e0e           	ret	ne
+  28:	9e0e           	ret	ne
+  2a:	9e0f           	ret	nc/uge
+  2c:	9e0f           	ret	nc/uge
+  2e:	9e04           	ret	ov/pe
+  30:	9e07           	ret	c/ult
+  32:	9e0c           	ret	nov/po
+  34:	9e0f           	ret	nc/uge
+  36:	9e08           	ret	t
+  38:	9e08           	ret	t
+
+0000003a <dd>:
+  3a:	e8ff           	jr	t,0x3a
+  3c:	e8fe           	jr	t,0x3a
+  3e:	8d07           	nop	
+  40:	8d07           	nop	
diff --git a/gas/testsuite/gas/z8k/ret-cc.s b/gas/testsuite/gas/z8k/ret-cc.s
new file mode 100644
index 0000000000..3f58e4b3dd
--- /dev/null
+++ b/gas/testsuite/gas/z8k/ret-cc.s
@@ -0,0 +1,39 @@
+	.text
+
+	ret f
+	ret lt
+	ret le
+	ret ule
+	ret ov
+	ret pe
+	ret mi
+	ret eq
+	ret z
+	ret c
+	ret ult
+	ret t
+	ret ge
+	ret gt
+	ret ugt
+	ret nov
+	ret NOV 
+	ret po
+	ret pl
+	ret ne
+	ret nz
+	ret nc   ! ssss
+	ret uge    ! dddd
+	ret	ov/pe
+	ret	c/ult
+	ret	nov/po
+	ret	nc/uge
+	ret 
+	ret
+dd:
+	jr	t,dd
+	jr	dd
+
+
+	nop 
+	nop
+
diff --git a/gas/testsuite/gas/z8k/z8k.exp b/gas/testsuite/gas/z8k/z8k.exp
index b50f294d95..967437cd74 100644
--- a/gas/testsuite/gas/z8k/z8k.exp
+++ b/gas/testsuite/gas/z8k/z8k.exp
@@ -36,4 +36,9 @@ if [istarget z8k-*-*] then {
      run_dump_test "jr-back"
      run_dump_test "djnz"
      run_dump_test "calr"
+
+# condition code tests
+
+     run_dump_test "jmp-cc"
+     run_dump_test "ret-cc"
 }