X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmcs51%2Fpeeph.def;h=51e251225c6122972dee40d09b6609f7d310ae41;hb=ea2c54ecaa2ebd7f1e67754a02e316ac1d7ac912;hp=96db036d26177b4da9572f2964faf8db7d7dee3e;hpb=a1028493f3e38ab0704267390c50f09d63fdc3aa;p=fw%2Fsdcc diff --git a/src/mcs51/peeph.def b/src/mcs51/peeph.def index 96db036d..51e25122 100644 --- a/src/mcs51/peeph.def +++ b/src/mcs51/peeph.def @@ -1,20 +1,3 @@ -//replace restart { -// pop %1 -// push %1 -//} by { -// ; Peephole 1 removed pop %1 push %1 (not push pop) -//} - -//replace restart { -// pop %1 -// mov %2,%3 -// push %1 -//} by { -// ; Peephole 2 removed pop %1 push %1 (not push pop) -// mov %2,%3 -//} - -// // added by Jean Louis VERN for // his shift stuff replace { @@ -193,17 +176,63 @@ replace { movx @dptr,a } if notVolatile %1 +// applies to f.e. lib/src/time.c (--model-large) replace { mov a,%1 movx @dptr,a inc dptr mov a,%1 movx @dptr,a + inc dptr + mov a,%1 + movx @dptr,a + inc dptr + mov a,%1 + movx @dptr,a } by { mov a,%1 movx @dptr,a inc dptr - ; Peephole 101 removed redundant mov + ; Peephole 101.a removed redundant moves + movx @dptr,a + inc dptr + movx @dptr,a + inc dptr + movx @dptr,a +} if notVolatile %1 + +// applies to f.e. support/regression/tests/literalop.c (--model-large) +replace { + mov a,%1 + movx @dptr,a + inc dptr + mov a,%1 + movx @dptr,a + inc dptr + mov a,%1 + movx @dptr,a +} by { + mov a,%1 + movx @dptr,a + inc dptr + ; Peephole 101.b removed redundant moves + movx @dptr,a + inc dptr + movx @dptr,a +} if notVolatile %1 + +// applies to f.e. support/regression/tests/onebyte.c (--model-large) +replace { + mov a,%1 + movx @dptr,a + inc dptr + mov a,%1 + movx @dptr,a +} by { + mov a,%1 + movx @dptr,a + inc dptr + ; Peephole 101.c removed redundant mov movx @dptr,a } if notVolatile %1 @@ -215,19 +244,19 @@ replace { %3: mov dpl,%1 %7: - mov sp,bp - pop bp + mov sp,_bp + pop _bp } by { - ; Peephole 102 removed redundant mov + ; Peephole 102 removed redundant mov to %1 mov dpl,%2 ljmp %3 %4: mov dpl,%5 %3: %7: - mov sp,bp - pop bp -} if notVolatile %1 + mov sp,_bp + pop _bp +} if notVolatile(%1), labelRefCount(%3 1) replace { mov %1,%2 @@ -237,37 +266,38 @@ replace { %3: mov dpl,%1 %7: - mov sp,bp - pop bp + mov sp,_bp + pop _bp } by { - ; Peephole 103 removed redundant mov + ; Peephole 103 removed redundant mov to %1 mov dpl,%2 ljmp %3 %4: mov dpl,%5 %3: %7: - mov sp,bp - pop bp -} + mov sp,_bp + pop _bp +} if labelRefCount(%3 1) -replace { - mov a,bp - clr c - add a,#0x01 - mov r%1,a -} by { - ; Peephole 104 optimized increment (acc not set to r%1, flags undefined) - mov r%1,bp - inc r%1 -} +// Does not seem to be triggered anymore +//replace { +// mov a,_bp +// clr c +// add a,#0x01 +// mov r%1,a +//} by { +// ; Peephole 104 optimized increment (acc not set to r%1, flags undefined) +// mov r%1,_bp +// inc r%1 +//} replace { mov %1,a mov a,%1 } by { mov %1,a -; Peephole 105 removed redundant mov + ; Peephole 105 removed redundant mov } if notVolatile %1 replace { @@ -582,11 +612,11 @@ replace { replace { push psw mov psw,%1 - push bp - mov bp,%2 + push _bp + mov _bp,%2 %3: - mov %2,bp - pop bp + mov %2,_bp + pop _bp pop psw ret } by { @@ -710,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 @@ -792,7 +823,7 @@ replace { mov %1,a mov dpl,%2 mov dph,%3 - ; Peephole 136 removed redundant move + ; Peephole 136 removed redundant mov } if notVolatile %1 // WTF? Doesn't look sensible to me... @@ -844,7 +875,8 @@ replace { } by { ; Peephole 139.b removed redundant mov orl a,%2 - mov r%1,a } + mov r%1,a +} replace { mov r%1,a @@ -874,7 +906,7 @@ replace { mov r%2,ar%1 mov ar%1,@r%2 } by { - ; Peephole 142 removed redundant moves + ; Peephole 142 removed redundant mov mov r%2,a mov ar%1,@r%2 } @@ -1283,7 +1315,7 @@ replace { mov %1,%2 mov %1,%3 } by { - ; Peephole 177.c removed redundant move + ; Peephole 177.c removed redundant mov mov %1,%3 } if notVolatile %1 %2 @@ -1296,7 +1328,7 @@ replace restart { } by { mov %1,%2 mov %3,%4 - ; Peephole 177.d removed redundant move + ; Peephole 177.d removed redundant mov } if notVolatile(%1 %2),operandsNotRelated(%1 %2 %3) // applies to f.e. bug-607243.c @@ -1305,7 +1337,7 @@ replace { mov r%1,%2 mov ar%1,%3 } by { - ; peephole 177.e removed redundant move + ; peephole 177.e removed redundant mov mov ar%1,%3 } if notVolatile %2 %3 @@ -1313,7 +1345,7 @@ replace { mov ar%1,%2 mov r%1,%3 } by { - ; peephole 177.f removed redundant move + ; peephole 177.f removed redundant mov mov r%1,%3 } if notVolatile %2 @@ -1335,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 @@ -1452,15 +1494,15 @@ replace { mov %1,a } if notVolatile %1 -replace { -// acc being incremented might cause problems - mov %1,a - inc %1 -} by { - ; Peephole 185 changed order of increment (acc incremented also!) - inc a - mov %1,a -} if notVolatile %1 +//replace { +// acc being incremented might cause problems with register tracking +// mov %1,a +// inc %1 +//} by { +// ; Peephole 185 changed order of increment (acc incremented also!) +// inc a +// mov %1,a +//} if notVolatile %1 // char indexed access to: long code table[] = {4,3,2,1}; replace restart { @@ -1659,15 +1701,26 @@ replace { ; Peephole 191 removed redundant mov } if notVolatile %1 +// applies to f.e. regression/ports/mcs51/support.c replace { mov r%1,a mov @r%2,ar%1 } by { mov r%1,a - ; Peephole 192 used a instead of ar%1 as source + ; Peephole 192.a used a instead of ar%1 as source mov @r%2,a } +// applies to f.e. printf_large.c +replace { + mov ar%1,@r%2 + mov a,r%1 +} by { + ; Peephole 192.b used a instead of ar%1 as destination + mov a,@r%2 + mov r%1,a +} + replace { jnz %3 mov a,%4 @@ -1971,16 +2024,17 @@ replace { mov %1,%1 } by { ; Peephole 206 removed redundant mov %1,%1 -} if notVolatile +} if notVolatile %1 -replace { - mov a,_bp - add a,#0x00 - mov %1,a -} by { - ; Peephole 207 removed zero add (acc not set to %1, flags undefined) - mov %1,_bp -} +// Does not seem to be triggered anymore +//replace { +// mov a,_bp +// add a,#0x00 +// mov %1,a +//} by { +// ; Peephole 207 removed zero add (acc not set to %1, flags undefined) +// mov %1,_bp +//} replace { push acc @@ -1991,16 +2045,17 @@ replace { mov r%1,_bp } -replace { - mov a,_bp - add a,#0x00 - inc a - mov %1,a -} by { - ; Peephole 209 optimized increment (acc not set to %1, flags undefined) - mov %1,_bp - inc %1 -} +// Does not seem to be triggered anymore +//replace { +// mov a,_bp +// add a,#0x00 +// inc a +// mov %1,a +//} by { +// ; Peephole 209 optimized increment (acc not set to %1, flags undefined) +// mov %1,_bp +// inc %1 +//} replace { mov dptr,#((((%1 >> 8)) <<8) + %1) @@ -2016,15 +2071,16 @@ replace { ; Peephole 211 removed redundant push %1 pop %1 } -replace { - mov a,_bp - add a,#0x01 - mov r%1,a -} by { - ; Peephole 212 reduced add sequence to inc - mov r%1,_bp - inc r%1 -} +// Does not seem to be triggered anymore +//replace { +// mov a,_bp +// add a,#0x01 +// mov r%1,a +//} by { +// ; Peephole 212 reduced add sequence to inc +// mov r%1,_bp +// inc r%1 +//} // reverts peephole 159? asx8051 cannot handle, too complex? replace { @@ -2050,7 +2106,7 @@ replace { add a,%1 } by { mov %1,a - ; Peephole 214 reduced some extra moves + ; Peephole 214.a removed redundant mov add a,%2 } if operandsNotSame @@ -2059,7 +2115,7 @@ replace { add a,%2 mov %1,a } by { - ; Peephole 215 removed some moves + ; Peephole 214.b removed redundant mov add a,%2 mov %1,a } if operandsNotSame @@ -2178,13 +2234,13 @@ replace { replace { mov %1 + %2,(%2 + %1) } by { - ; Peephole 221.a remove redundant move + ; Peephole 221.a remove redundant mov } if notVolatile replace { mov (%1 + %2 + %3),((%2 + %1) + %3) } by { - ; Peephole 221.b remove redundant move + ; Peephole 221.b remove redundant mov } if notVolatile replace { @@ -2563,7 +2619,7 @@ replace { mov %7,%15 mov %8,%16 ; Peephole 238.a removed 4 redundant moves -} if operandsNotSame8 %1 %2 %3 %4 %5 %6 %7 %8 +} if operandsNotSame8(%1 %2 %3 %4 %5 %6 %7 %8), notVolatile(%1 %2 %3 %4 %9 %10 %11 %12) // applies to device/lib/log10f.c replace { @@ -2581,7 +2637,7 @@ replace { mov %3,%7 mov %4,%8 ; Peephole 238.b removed 3 redundant moves -} if operandsNotSame7 %1 %2 %3 %4 %5 %6 %7 +} if operandsNotSame7(%1 %2 %3 %4 %5 %6 %7), notVolatile(%1 %2 %3 %5 %6 %7) // applies to f.e. device/lib/time.c replace { @@ -2600,7 +2656,7 @@ replace { mov %3,%7 mov %4,%8 ; Peephole 238.c removed 2 redundant moves -} if operandsNotSame4 %1 %2 %3 %4 +} if operandsNotSame4(%1 %2 %3 %4), notVolatile(%1 %2 %5 %6) // applies to f.e. support/regression/tests/bug-524209.c replace { @@ -2616,7 +2672,7 @@ replace { mov %2,%5 mov %3,%6 ; Peephole 238.d removed 3 redundant moves -} if operandsNotSame6 %1 %2 %3 %4 %5 %6 +} if operandsNotSame6(%1 %2 %3 %4 %5 %6), notVolatile(%1 %2 %3 %4 %5 %6) // applies to f.e. ser_ir.asm replace { @@ -3678,39 +3734,6 @@ replace { mov r%3,a } -// applies to: void test( char c ) { if( c ) func1(); else func2(); } -replace { - lcall %1 - ret -} by { - ; Peephole 253.a replaced lcall/ret with ljmp - ljmp %1 -} - -// applies to: void test( char c ) { if( c ) func1(); else func2(); } -replace { - lcall %1 -%2: - ret -} by { - ; Peephole 253.b replaced lcall/ret with ljmp - ljmp %1 - ; -} if labelRefCount %2 0 - -// applies to f.e. scott-bool1.c -replace { - lcall %1 -%2: - ret -} by { - ; Peephole 253.c replaced lcall with ljmp - ljmp %1 -%2: - ret -} - - // applies to f.e. funptrs.c // saves one byte if %1 is a register or @register replace { @@ -3830,14 +3853,26 @@ replace { // unsigned char i=8; do{ } while(--i != 0); -// this currently only applies if i is kept in a register +// this applies if i is kept in a register replace { dec %1 cjne %1,#0x00,%2 } by { - ; Peephole 257 optimized decrement with compare + ; Peephole 257.a optimized decrement with compare djnz %1,%2 -} if notVolatile %1 +} if notVolatile(%1) + +//// unsigned char i=8; do{ } while(--i != 0); +//// this applies if i is kept in data memory +// Disabled because together with 256.c it causes bug #1721024 +//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; @@ -4514,7 +4549,7 @@ replace { } by { ; Peephole 263.a optimized loading const mov %1,#(%2 + 3) -} +} if notVolatile(%1) replace { mov %1,#%2 @@ -4523,7 +4558,7 @@ replace { } by { ; Peephole 263.b optimized loading const mov %1,#(%2 + 2) -} +} if notVolatile(%1) replace { mov %1,#%2 @@ -4531,7 +4566,7 @@ replace { } by { ; Peephole 263.c optimized loading const mov %1,#(%2 + 1) -} +} if notVolatile(%1) replace { @@ -4546,9 +4581,72 @@ replace { %3: } if labelRefCount(%3 1), labelRefCountChange(%3 -1) + +replace restart { + pop ar%1 +} by { + ; Peephole 300 pop ar%1 removed +} if deadMove(%1) + +replace { + mov r%1,%2 +} by { + ; Peephole 301 mov r%1,%2 removed +} if notVolatile(%2), deadMove(%1) + + +// applies to: void test( char c ) { if( c ) func1(); else func2(); } +replace { + lcall %1 + ret +} by { + ; Peephole 400.a replaced lcall/ret with ljmp + ljmp %1 +} + +// applies to: void test( char c ) { if( c ) func1(); else func2(); } +replace { + lcall %1 +%2: + ret +} by { + ; Peephole 400.b replaced lcall/ret with ljmp + ljmp %1 + ; +} if labelRefCount %2 0 + +// applies to f.e. scott-bool1.c +replace { + lcall %1 +%2: + ret +} by { + ; Peephole 400.c replaced lcall with ljmp + ljmp %1 +%2: + 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{ %1: } by { - ; Peephole 300 removed redundant label %1 + ; Peephole 500 removed redundant label %1 } if labelRefCount(%1 0)