From: spth <spth@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Wed, 20 Feb 2008 11:14:03 +0000 (+0000)
Subject: Fixed #1806565
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=65413e60bfc6d3816772cd3cf8d6dc6597a18a2e;p=fw%2Fsdcc

Fixed #1806565

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

diff --git a/ChangeLog b/ChangeLog
index 15cdfbd5..ee588d7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-20 Philipp Klaus Krause <pkk AT spth.de>
+
+	* src/z80/peeph.def,
+	* src/z80/peeph-z80.def: moved peephole that breaks gbz80 to z80-specific peepholes,
+	  fixes #1806565.
+
 2008-02-20 Maarten Brock <sourceforge.brock AT dse.nl>
 
 	* src/SDCCpeeph.c (operandBaseName): added check for @Ri
diff --git a/src/z80/peeph-z80.def b/src/z80/peeph-z80.def
index 01901e87..bb740d2a 100644
--- a/src/z80/peeph-z80.def
+++ b/src/z80/peeph-z80.def
@@ -17,6 +17,15 @@
 // along with this program; if not, write to the Free Software
 // Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+// This can't go into peeph.def since %1 could be (hl+) on gbz80.
+replace restart {
+	ld	%1,%3
+	ld	%1,%2
+} by {
+	; peephole z0 removed dead load into %1
+	ld	%1,%2
+} if notVolatile(%1 %3), operandsNotSame
+
 replace restart {
 	ld	%1,#%2
 	ld	a,0(%1)
diff --git a/src/z80/peeph.def b/src/z80/peeph.def
index 02e485b7..1dc435b8 100644
--- a/src/z80/peeph.def
+++ b/src/z80/peeph.def
@@ -23,14 +23,6 @@ replace restart {
 	; peephole 1 removed redundant load.
 } if notVolatile(%1)
 
-replace restart {
-	ld	%1,%3
-	ld	%1,%2
-} by {
-	; peephole 2 removed dead load into %1
-	ld	%1,%2
-} if notVolatile(%1 %3), operandsNotSame
-
 replace restart {
 	jp	NC,%1
 	jp	%2