* src/ds390/peeph.def: replaced 24bitModeAndPortDS390 by

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

diff --git a/src/mcs51/peeph.def b/src/mcs51/peeph.def
index 168866f13b164f8370f7ef32050ccaa33025813b..92570a59380be45d2a569558e2412a5f701fa8e6 100644 (file)
--- a/src/mcs51/peeph.def
+++ b/src/mcs51/peeph.def
@@ -740,17 +740,18 @@ replace {
        jc      %5
 } if operandsLiteral(%1)
 
-replace {
-       clr     c
-       mov     a,%1
-       subb    a,#%2
-       mov     %3,c
-} by {
-       ;       Peephole 132.d  optimized genCmpGt by inverse logic
-       mov     a,#0x100 - %2
-       add     a,%1
-       mov     %3,c
-} if operandsNotRelated('0x00' %2), operandsLiteral(%2)
+// disabled. See bug1734654.c
+//replace {
+//     clr     c
+//     mov     a,%1
+//     subb    a,#%2
+//     mov     %3,c
+//} by {
+//     ;       Peephole 132.d  optimized genCmpGt by inverse logic
+//     mov     a,#0x100 - %2
+//     add     a,%1
+//     mov     %3,c
+//} if operandsNotRelated('0x00' %2), operandsLiteral(%2)
 
 replace {
        clr     c
@@ -1366,6 +1367,16 @@ replace {
        mov     %1,a
 } if notVolatile %2
 
+// applies to f.e. testfwk.c
+replace {
+       mov     r%1,a
+       mov     ar%2,r%1
+} by {
+       mov     r%1,a
+       ;       peephole 177.i  optimized mov sequence
+       mov     r%2,a
+}
+
 replace {
        mov     a,%1
        mov     b,a
@@ -3723,6 +3734,29 @@ replace {
        mov     r%3,a
 }
 
+// unsigned char i=8; do{ } while(--i != 0);
+// this applies if i is kept in a register
+replace {
+       dec     %1
+       cjne    %1,#0x00,%2
+} by {
+       ;       Peephole 253.a  optimized decrement with compare
+       djnz    %1,%2
+} if notVolatile(%1)
+
+// unsigned char i=8; do{ } while(--i != 0);
+// this applies if i is kept in data memory
+// must come before 256, see bug 1721024
+replace {
+       dec     %1
+       mov     a,%1
+       jnz     %2
+} by {
+       ;       Peephole 253.b  optimized decrement with compare
+       djnz    %1,%2
+} if notVolatile(%1), operandsNotRelated(%1 '@r0' '@r1')
+
+
 // applies to f.e. funptrs.c
 // saves one byte if %1 is a register or @register
 replace {
@@ -3841,28 +3875,6 @@ replace {
 } if labelRefCount(%2 0),operandsNotRelated('a' %4 %6 %8)
 
 
-// unsigned char i=8; do{ } while(--i != 0);
-// this applies if i is kept in a register
-replace {
-       dec     %1
-       cjne    %1,#0x00,%2
-} by {
-       ;       Peephole 257.a  optimized decrement with compare
-       djnz    %1,%2
-} if notVolatile(%1)
-
-// unsigned char i=8; do{ } while(--i != 0);
-// this applies if i is kept in data memory
-replace {
-       dec     %1
-       mov     a,%1
-       jnz     %2
-} by {
-       ;       Peephole 257.b  optimized decrement with compare
-       djnz    %1,%2
-} if notVolatile(%1), operandsNotRelated(%1 '@r0' '@r1')
-
-
 // in_byte<<=1; if(in_bit) in_byte|=1;
 // helps f.e. reading data on a 3-wire (SPI) bus
 replace {
@@ -4537,7 +4549,7 @@ replace {
 } by {
        ;       Peephole 263.a  optimized loading const
        mov     %1,#(%2 + 3)
-}
+} if notVolatile(%1)
 
 replace {
        mov     %1,#%2
@@ -4546,7 +4558,7 @@ replace {
 } by {
        ;       Peephole 263.b  optimized loading const
        mov     %1,#(%2 + 2)
-}
+} if notVolatile(%1)
 
 replace {
        mov     %1,#%2
@@ -4554,7 +4566,7 @@ replace {
 } by {
        ;       Peephole 263.c  optimized loading const
        mov     %1,#(%2 + 1)
-}
+} if notVolatile(%1)
 
 
 replace {
@@ -4570,11 +4582,90 @@ replace {
 } if labelRefCount(%3 1), labelRefCountChange(%3 -1)
 
 
+replace {
+       mov     %1,c
+       cpl     %1
+} by {
+       ;       Peephole 265    optimized mov/cpl sequence (carry differs)
+       cpl     c
+       mov     %1,c
+} if notVolatile(%1)
+
+replace {
+       mov     %1,c
+       jb      %1,%2
+} by {
+       ;       Peephole 266.a  optimized mov/jump sequence
+       mov     %1,c
+        jc     %2
+} if notVolatile(%1)
+
+replace {
+       mov     %1,c
+       jnb     %1,%2
+} by {
+       ;       Peephole 266.b  optimized mov/jump sequence
+       mov     %1,c
+        jnc    %2
+} if notVolatile(%1)
+
+replace {
+       jnc     %1
+       setb    %2
+       sjmp    %3
+%1:
+       clr     %2
+%3:
+} by {
+       ;       Peephole 267.a  optimized mov bit sequence
+       mov     %2,c
+%1:
+%3:
+} if labelRefCount(%1 1), labelRefCountChange(%1 -1), labelRefCountChange(%3 -1)
+
+replace {
+       jc      %1
+       clr     %2
+       sjmp    %3
+%1:
+       setb    %2
+%3:
+} by {
+       ;       Peephole 267.b  optimized mov bit sequence
+       mov     %2,c
+%1:
+%3:
+} if labelRefCount(%1 1), labelRefCountChange(%1 -1), labelRefCountChange(%3 -1)
+
+replace {
+       mov     %1,c
+       mov     %1,c
+} by {
+       ;       Peephole 268    removed redundant mov
+       mov     %1,c
+} if notVolatile(%1)
+
+replace {
+       mov     %1,c
+       mov     c,%1
+} by {
+       ;       Peephole 269    removed redundant mov
+       mov     %1,c
+} if notVolatile(%1)
+
+//accessing struct/array on stack
+replace {
+       add     a,#%1
+       add     a,#%2
+} by {
+       ;       Peephole 270    removed redundant add
+       add     a,#%1+%2
+}
 replace restart {
        pop     ar%1
 } by {
        ;       Peephole 300    pop ar%1 removed
-} if deadMove %1
+} if deadMove(%1)
 
 replace {
        mov     r%1,%2
@@ -4615,6 +4706,22 @@ replace {
        ret
 }
 
+// for programs less than 2k
+replace {
+       lcall   %1
+} by {
+       ;       Peephole 400.d  replaced lcall with acall
+       acall   %1
+} if useAcallAjmp
+
+// for programs less than 2k
+replace {
+       ljmp    %1
+} by {
+       ;       Peephole 400.e  replaced ljmp with ajmp
+       ajmp    %1
+} if useAcallAjmp
+
 
 // should be one of the last peepholes
 replace{