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

diff --git a/ChangeLog b/ChangeLog
index 34aff3353c8b44eca74964126c49b25547c14125..fae104233ce64d86d3989ec1e6fbb0b3adf275c0 100644 (file)
--- 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 cccda960d297a6b39555d53133627e7b64e5a33b..9341d6b77f0aa28a5ac8152cbca47e1b46c6ce2c 100644 (file)
--- 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 948531d9b19fbd006dddd7359bd306a08ccedf71..ee3f701b0a17e209fa91af39f4a35dce52c22186 100644 (file)
--- 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
 }
-
-