X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic%2Fpeeph.def;h=8e6df14f6100431cd5e0c267ad197babd481eff0;hb=dbc215a18455517c746d70c7b53d879ded354b39;hp=e48e6d0da46916e67538690f1a0a60a5a1987fcc;hpb=bfbab54dcff5c3613d548e106c8f726f94f32638;p=fw%2Fsdcc

diff --git a/src/pic/peeph.def b/src/pic/peeph.def
index e48e6d0d..8e6df14f 100644
--- a/src/pic/peeph.def
+++ b/src/pic/peeph.def
@@ -112,7 +112,7 @@ replace restart {
 	%4
 %3:	%5
 } by {
-	;peep 1 - test/jump to test/skip
+	;     peep 1 - test/jump to test/skip
         %1
 	_INVERTBITSKIP_	%2
 	%4
@@ -126,61 +126,13 @@ replace restart {
 %4:	%5
 %3:	%6
 } by {
-	;peep 1b - test/jump to test/skip
+	;     peep 1b - test/jump to test/skip
         %1
 	_INVERTBITSKIP_	%2
 %4:	%5
 %3:	%6
 } 
 
-//replace restart {
-//        btfss	%1
-//        goto	%2
-//	%3
-//%2:	%4
-//} by {
-//	;peep 1 - test/jump to test/skip
-//	btfsc	%1
-//	%3
-//%2:	%4
-//}
-//
-//replace restart {
-//        btfsc	%1
-//        goto	%2
-//	%3
-//%2:	%4
-//} by {
-//	;peep 1a - test/jump to test/skip
-//	btfss	%1
-//	%3
-//%2:	%4
-//}
-//
-//replace restart {
-//        btfss	%1
-//        goto	%4
-//%2:	%3
-//%4:	%5
-//} by {
-//	;peep 1b - test/jump to test/skip
-//	btfsc	%1
-//%2:	%3
-//%4:	%5
-//}
-//
-//replace restart {
-//        btfsc	%1
-//        goto	%4
-//%2:	%3
-//%4:	%5
-//} by {
-//	;peep 1c - test/jump to test/skip
-//	btfss	%1
-//%2:	%3
-//%4:	%5
-//}
-
 
 //bogus test for pcode
 //replace restart {
@@ -204,7 +156,7 @@ replace restart {
 	movwf	%1
 	movf	%1,w
 } by {
-	; peep 2 - Removed redundant move
+	;     peep 2 - Removed redundant move
 	movwf	%1
 } if NZ
 
@@ -212,10 +164,10 @@ replace restart {
 replace restart {
 	decf	%1,f
 	movf	%1,w
-	btfss	status,z
+	btfss	STATUS,z
 	goto	%2
 } by {
-	; peep 3 - decf/mov/skpz to decfsz
+	;     peep 3 - decf/mov/skpz to decfsz
 	decfsz	%1,f
 	 goto	%2
 }
@@ -225,7 +177,7 @@ replace restart {
 	movf	%1,w
 	movf	%1,w
 } by {
-	; peep 4 - Removed redundant move
+	;     peep 4 - Removed redundant move
 	movf	%1,w
 }
 
@@ -235,7 +187,7 @@ replace restart {
 	movwf	%2
 	movlw	%1
 } by {
-	; peep 5 - Removed redundant move
+	;     peep 5 - Removed redundant move
 	movlw	%1
 	movwf	%2
 }
@@ -244,6 +196,136 @@ replace restart {
 	movwf	%1
 	movwf	%1
 } by {
-	; peep 6 - Removed redundant move
+	;     peep 6 - Removed redundant move
+	movwf	%1
+}
+
+replace restart {
+	movlw	0
+	iorwf	%1,w
+} by {
+	;     peep 7 - Removed redundant move
+	movf	%1,w
+}
+
+replace restart {
+	movf	%1,w
+	movwf	%2
+	decf	%2,f
+} by {
+	;     peep 8 - Removed redundant move
+	decf	%1,w
+	movwf	%2
+}
+
+replace restart {
+	movwf	%1
+	movf	%2,w
+	xorwf	%1,w
+} by {
+	;     peep 9a - Removed redundant move
+	movwf	%1
+	xorwf	%2,w
+}
+
+replace restart {
+	movwf	%1
+	movf	%2,w
+	iorwf	%1,w
+} by {
+	;     peep 9b - Removed redundant move
+	movwf	%1
+	iorwf	%2,w
+}
+
+replace restart {
+	movf	%1,w
+	movwf	%2
+	movf	%2,w
+} by {
+	;     peep 9c - Removed redundant move
+	movf	%1,w
+	movwf	%2
+}
+
+replace restart {
+	movwf	%1
+	movf	%1,w
+	movwf	%2
+} by {
+	;     peep 9d - Removed redundant move
 	movwf	%1
+	movwf	%2
+} if NZ
+
+// From: Frieder Ferlemann
+
+replace restart {
+        iorlw   0
+} by {
+        ;     peep 10a - Removed unnecessary iorlw
+} if NZ
+
+// From: Frieder Ferlemann
+
+replace restart {
+        xorlw   0
+} by {
+        ;     peep 10b - Removed unnecessary xorlw
+} if NZ
+
+// From: Frieder Ferlemann
+
+replace restart {
+        movf    %1,w
+        movwf   %1
+} by {
+        ;     peep 11 - Removed redundant move
+        movf    %1,w
+}
+
+replace restart {
+        comf    %1,w
+        movwf   %1
+} by {
+        ;     peep 12 - Removed redundant move
+        comf    %1,f
+}
+
+replace restart {
+	clrf	%1
+	rlf	%1,f
+	movlw	0x01
+	xorwf	%1,f
+	movf	%1,w
+	btfss	STATUS,2
+	goto	%2
+
+} by {
+        ;     peep 13 - Optimized carry sequence
+	clrf	%1
+	incf	%1,F
+	btfss	status,C
+	goto	%2
+	clrf	%1
+	
+}
+
+replace restart {
+	clrf	%1
+	rlf	%1,f
+	movlw	0x01
+	xorwf	%1,f
+	movf	%1,w
+	btfsc	STATUS,2
+	goto	%2
+
+} by {
+        ;     peep 13a - Optimized carry sequence
+	clrf	%1
+	incf	%1,F
+	btfsc	status,C
+	goto	%2
+	clrf	%1
+	
 }