More fixes for DPTR use

[fw/sdcc] / src / z80 / peeph.def

diff --git a/src/z80/peeph.def b/src/z80/peeph.def
index 4ef4a4b743eb98fba3a0e70afcf0bc21f50a5e3c..a00fd659c13633cb4d20a6532b012532a47ff28c 100644 (file)
--- a/src/z80/peeph.def
+++ b/src/z80/peeph.def
@@ -1,7 +1,12 @@
-replace restart {
+replace {
+       ld (hl),(hl)
+} by {
+       ERROR - peephole - caught (hl),(hl)
+}
+replace {
        ld %1,%1
 } by {
-       ; Removed redundent load
+        ; Removed redundent load
 }
 replace restart {
        xor a,a
@@ -9,7 +14,6 @@ replace restart {
        or a,a
        jp %2,%3
 } by {
-       ; Removed redundent or a,a
        xor     a,a
        or      a,%1
        jp      %2,%3
@@ -18,7 +22,6 @@ replace restart {
        cp a,#0x00
        jp nz,%1
 } by {
-       ; Rule 3
        or      a,a
        jp      nz,%1
 }
@@ -29,7 +32,6 @@ replace restart {
        jp      %3
 %2:
 } by {
-       ; Rule 4
        jp      z,%2
 %1:
        jp      %3
@@ -40,7 +42,6 @@ replace restart {
        jp      %2
 %1:
 } by {
-       ; Rule 5
        jp      z,%2
 %1:
 }
@@ -49,16 +50,95 @@ replace restart {
        jp      %2
 %1:
 } by {
-       ; Rule 6
        jp      nz,%2
 %1:
 }
 replace restart {
-       ld      a,%1
-       or      a,%2
+       or      a,%1
        or      a,a
 } by {
-       ; Rule 8
+       or      a,%1
+}
+replace restart {
+       or      a,%1)
+        or      a,a
+} by {
+       or      a,%1)
+}
+replace restart {
+       xor     a,a
+       or      a,%1
+       jp      nz,%2
+       xor     a,a
+       or      a,%3
+       jp      z,%2
+} by {
+       xor     a,a
+       or      a,%1
+       jp      nz,%2
+       or      a,%3
+       jp      z,%2
+}
+replace restart {
+       jp      nz,%1
+       inc     %3)
+%1:
+       jp      %2
+} by {
+       jp      nz,%2
+       inc     %3)
+%1:
+       jp      %2
+}
+replace restart {
+       xor     a,a
+       ld      a,#0x00
+} by {
+        xor     a,a
+}
+replace {
+        ld      e,#0x00
+        ld      d,#0x00
+} by {
+        ld      de,#0x0000
+}
+replace {
+       ld      l,#0x00
+       ld      h,#0x00
+} by {
+        ld      hl,#0x0000
+}
+replace restart {
+       ld      %1,a
        ld      a,%1
-       or      a,%2
+} by {
+        ld     %1,a
+}
+replace restart {
+       jp      %1,%2
+       jr      %3
+%2:
+       jp      %4
+} by {
+       jp      %1,%4
+       jr      %3
+%2:
+       jp      %4
+}
+replace {
+       ld      l,e
+       ld      h,d
+       push    hl
+       ld      l,c
+       ld      h,b
+       push    hl
+} by {
+        push   de
+        push    bc
+}
+replace {
+       and     a,#%1
+       or      a,a
+} by {
+        and     a,#%1
 }