Hubert Sack <sack AT digiplan.de>

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

diff --git a/src/mcs51/peeph.def b/src/mcs51/peeph.def
index 1e44366c20c7f75dd96424cf29843fe492465ee6..0cd59b8352b24f618ca53b9571d218e4b0c4d5be 100644 (file)
--- a/src/mcs51/peeph.def
+++ b/src/mcs51/peeph.def
@@ -117,6 +117,70 @@ replace {
        ;       Peephole 3.g    removed redundant clr
 }
 
+replace {
+       clr     a
+       mov     %1,a
+       mov     %2,a
+       mov     %3,#0x00
+} by {
+       clr     a
+       mov     %1,a
+       mov     %2,a
+       ;       Peephole 3.h    changed mov %3,#0x00 to %3,a
+       mov     %3,a
+}
+
+replace {
+       clr     a
+       mov     %1,a
+       mov     %2,a
+       mov     %3,a
+       mov     %4,#0x00
+} by {
+       clr     a
+       mov     %1,a
+       mov     %2,a
+       mov     %3,a
+       ;       Peephole 3.i    changed mov %4,#0x00 to %4,a
+       mov     %4,a
+}
+
+replace {
+       clr     a
+       mov     %1,a
+       mov     %2,a
+       mov     %3,a
+       mov     %4,a
+       mov     %5,#0x00
+} by {
+       clr     a
+       mov     %1,a
+       mov     %2,a
+       mov     %3,a
+       mov     %4,a
+       ;       Peephole 3.j    changed mov %5,#0x00 to %5,a
+       mov     %5,a
+}
+
+replace {
+       clr     a
+       mov     %1,a
+       mov     %2,a
+       mov     %3,a
+       mov     %4,a
+       mov     %5,a
+       mov     %6,#0x00
+} by {
+       clr a
+       mov %1,a
+       mov %2,a
+       mov %3,a
+       mov %4,a
+       mov %5,a
+       ;       Peephole 3.k    changed mov %6,#0x00 to %6,a
+       mov %6,a
+}
+
 replace {
        mov     %1,a
        mov     dptr,#%2
@@ -283,7 +347,6 @@ replace {
 %1:
 } if labelInRange
 
-
 replace {
        clr     a
        cjne    %1,%2,%3
@@ -323,12 +386,24 @@ replace {
 %3:
        jnz     %4
 } by {
-       ;       Peephole 115    jump optimization
+       ;       Peephole 115.a  jump optimization
        cjne    %1,%2,%3
        sjmp    %4
 %3:
 } if labelRefCount %3 1
 
+replace {
+       mov     %1,a
+       cjne    %1,#0x00,%2
+       sjmp    %3
+%2:
+} by {
+       ;       Peephole 115.b  jump optimization
+       mov     %1,a
+       jz      %3
+%2:
+}
+
 replace {
        clr     a
        cjne    %1,%2,%3
@@ -555,6 +630,80 @@ replace {
        mov     %2,%1
 }
 
+// ideally the optimizations of rules 132.x should be done in genCmpXX
+replace {
+       clr     c
+       mov     a,#%1
+       subb    a,%2
+       mov     %3,c
+} by {
+       ;       Peephole 132.a  optimized genCmpGt by inverse logic (acc differs)
+       mov     a,%2
+       add     a,#0xff - %1
+       mov     %3,c
+}
+
+replace {
+       clr     c
+       mov     a,#%1
+       subb    a,%2
+       jnc     %5
+} by {
+       ;       Peephole 132.b  optimized genCmpGt by inverse logic (acc differs)
+       mov     a,%2
+       add     a,#0xff - %1
+       jnc     %5
+}
+
+replace {
+       clr     c
+       mov     a,#%1
+       subb    a,%2
+       jc      %5
+} by {
+       ;       Peephole 132.c  optimized genCmpGt by inverse logic (acc differs)
+       mov     a,%2
+       add     a,#0xff - %1
+       jc      %5
+}
+
+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)
+
+replace {
+       clr     c
+       mov     a,%1
+       subb    a,#%2
+       jnc     %5
+} by {
+       ;       Peephole 132.e  optimized genCmpLt by inverse logic (carry differs)
+       mov     a,#0x100 - %2
+       add     a,%1
+       jc      %5
+} if operandsNotRelated('0x00' %2)
+
+replace {
+       clr     c
+       mov     a,%1
+       subb    a,#%2
+       jc      %5
+} by {
+       ;       Peephole 132.f  optimized genCmpLt by inverse logic (carry differs)
+       mov     a,#0x100 - %2
+       add     a,%1
+       jnc     %5
+} if operandsNotRelated('0x00' %2)
+
+
 replace {
        mov     r%1,%2
        mov     ar%3,@r%1
@@ -1090,7 +1239,7 @@ replace restart {
        ;       Peephole 177.d  removed redundant move
        mov     %1,%2
        mov     %3,%4
-} if notVolatile %1 %2
+} if notVolatile(%1 %2),operandsNotRelated(%1 %3)
 
 // applies to f.e. bug-607243.c
 // also check notVolatile %3, as it will return FALSE if it's @r%1
@@ -3496,29 +3645,63 @@ replace {
 %2:
 } if labelRefCount %2 0
 
-// applies to f.e. malloc.c
+// applies to f.e. bug-905492.c
 replace {
        jnz     %1
 %2:
        mov     %3,#0x00
-       mov     %4,#0x00
 } by {
-       ;       Peephole 256.c  loading %3,%4 with zero from a
+       ;       Peephole 256.c  loading %3 with zero from a
        jnz     %1
+%2:
        mov     %3,a
-       mov     %4,a
 } if labelRefCount %2 0
 
-// applies to f.e. bug-905492.c
+// applies to f.e. malloc.c
 replace {
        jnz     %1
 %2:
+       mov     %4,%5
        mov     %3,#0x00
 } by {
        ;       Peephole 256.d  loading %3 with zero from a
        jnz     %1
+%2:
+       mov     %4,%5
        mov     %3,a
-} if labelRefCount %2 0
+} if labelRefCount(%2 0),operandsNotRelated('a' %4)
+
+replace {
+       jnz     %1
+%2:
+       mov     %4,%5
+       mov     %6,%7
+       mov     %3,#0x00
+} by {
+       ;       Peephole 256.e  loading %3 with zero from a
+       jnz     %1
+%2:
+       mov     %4,%5
+       mov     %6,%7
+       mov     %3,a
+} if labelRefCount(%2 0),operandsNotRelated('a' %4 %6)
+
+replace {
+       jnz     %1
+%2:
+       mov     %4,%5
+       mov     %6,%7
+       mov     %8,%9
+       mov     %3,#0x00
+} by {
+       ;       Peephole 256.f  loading %2 with zero from a
+       jnz     %1
+%2:
+       mov     %4,%5
+       mov     %6,%7
+       mov     %8,%9
+       mov     %3,a
+} if labelRefCount(%2 0),operandsNotRelated('a' %4 %6 %8)
 
 
 // unsigned char i=8; do{ } while(--i != 0);
@@ -3615,7 +3798,7 @@ replace {
 // helps f.e. writing data on a 3-wire (SPI) bus
 replace {
        mov     a,%1
-       mov     c,acc.7
+       rlc     a
        mov     %2,c
        mov     a,%1
        add     a,%1
@@ -3631,7 +3814,7 @@ replace {
 // out_bit=out_byte&0x01; out_byte>>=1;
 replace {
        mov     a,%1
-       mov     c,acc.0
+       rrc     a
        mov     %2,c
        mov     a,%1
        clr     c
@@ -4148,3 +4331,47 @@ replace {
        sjmp    %20
 %3:
 } if labelJTInRange
+
+// applies to: a = (a << 1) | (a >> 15);
+replace {
+       mov     a,%1
+       rlc     a
+       mov     %1,a
+       mov     a,%2
+       rlc     a
+       mov     %2,a
+       mov     a,%1
+       mov     acc.0,c
+       mov     %1,a
+} by {
+       ;       Peephole 261.a  optimized left rol
+       mov     a,%1
+       rlc     a
+       xch     a,%2
+       rlc     a
+       xch     a,%2
+       mov     acc.0,c
+       mov     %1,a
+}
+
+// applies to: a = (a << 15) | (a >> 1);
+replace {
+       mov     a,%1
+       rrc     a
+       mov     %1,a
+       mov     a,%2
+       rrc     a
+       mov     %2,a
+       mov     a,%1
+       mov     acc.7,c
+       mov     %1,a
+} by {
+       ;       Peephole 261.b  optimized right rol
+       mov     a,%1
+       rrc     a
+       xch     a,%2
+       rrc     a
+       xch     a,%2
+       mov     acc.7,c
+       mov     %1,a
+}