From: MaartenBrock <MaartenBrock@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Tue, 26 Sep 2006 19:53:26 +0000 (+0000)
Subject: git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4387 4a8a32a2... 
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d0f13a719e8d75dd692d25bf09c89ede974f0f94;p=fw%2Fsdcc

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4387 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index 34aff335..fae10423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
 	* device/include/stdlib.h: added rand prototypes
 	* device/lib/rand.c: new, added
 	* device/lib/Makefile.in: added rand.c
-	* src/z80/peeph.def: updated conditonals, fixed bug 1565908
+	* src/z80/peeph.def,
+	* src/z80/peeph-gbz80.def,
+	* src/z80/peeph-z80.def: updated conditonals, fixed bug 1565908
 
 2006-09-20 Raphael Neider <rneider AT web.de>
 
diff --git a/src/z80/peeph-gbz80.def b/src/z80/peeph-gbz80.def
index cccda960..9341d6b7 100644
--- a/src/z80/peeph-gbz80.def
+++ b/src/z80/peeph-gbz80.def
@@ -1,8 +1,8 @@
 replace {
-	ld      (hl),a
-        dec     hl
+	ld	(hl),a
+	dec	hl
 } by {
-        ld      (hl-),a
+	ld	(hl-),a
 }
 replace {
 	ld	(hl),a
@@ -58,8 +58,8 @@ replace {
 	ld	(hl),a
 	ld	%1,(hl)
 } by {
-        ld      (hl),a
-        ld      %1,a
+	ld	(hl),a
+	ld	%1,a
 }
 replace {
 	ld	(hl),a
@@ -70,4 +70,4 @@ replace {
 	ld	(hl+),a
 	inc	de
 	ld	a,(de)
-}
\ No newline at end of file
+}
diff --git a/src/z80/peeph-z80.def b/src/z80/peeph-z80.def
index 948531d9..ee3f701b 100644
--- a/src/z80/peeph-z80.def
+++ b/src/z80/peeph-z80.def
@@ -17,11 +17,9 @@ replace {
 	ld	%1,a
 	xor	a,a
 	or	a,%1
-	jp	z,%2
 } by {
 	ld	%1,a
 	or	a,a
-	jp	z,%2
 }
 replace {
 	rlca
@@ -104,9 +102,9 @@ replace restart {
 
 replace {
 %1:
-	in0     a,(%2)
+	in0	a,(%2)
 	and	a,#%3
-	jp	z,%4
+	jp	Z,%4
 %5:
 	jp	%6
 %4:
@@ -116,9 +114,9 @@ replace {
 	ret
 } by {
 %1:
-	in0     a,(%2)
+	in0	a,(%2)
 	and	a,#%3
-	jp	nz,%5
+	jp	NZ,%5
 %4:
 	call	%7
 	jp	%1
@@ -126,5 +124,3 @@ replace {
 %6:
 	ret
 }
-
-