X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fds390%2Fpeeph.def;h=f5f9261eac15887e13134cbc6eb181be7f6d8d28;hb=5a1d5e778e85664f4e6657019348b4756b16eacb;hp=9cefcc7d217567053c4b76876f0945111fbc2b3b;hpb=c1f59c961baefb83d1186f61ee8bd764a86ed56a;p=fw%2Fsdcc diff --git a/src/ds390/peeph.def b/src/ds390/peeph.def index 9cefcc7d..f5f9261e 100644 --- a/src/ds390/peeph.def +++ b/src/ds390/peeph.def @@ -11,7 +11,7 @@ // push %1 //} by { // ; Peephole 2 removed pop %1 push %1 (not push pop) -// mov %2,%3 +// mov %2,%3 //} // @@ -164,7 +164,7 @@ replace { clr c mov a,%1 } by { - ; Peephole 106 removed redundant mov + ; Peephole 106 removed redundant mov mov %1,a clr c } @@ -276,7 +276,7 @@ replace { %3: jnz %4 } by { - ; Peephole 115 jump optimization + ; Peephole 115 jump optimization cjne %1,%2,%3 sjmp %4 %3: @@ -490,22 +490,22 @@ replace { jc %1 } -replace { +replace { mov r%1,@r%2 } by { ; Peephole 130 changed target address mode r%1 to ar%1 mov ar%1,@r%2 } -replace { +replace { mov a,%1 subb a,#0x01 mov %2,a mov %1,%2 } by { ; Peephole 131 optimized decrement (not caring for c) - dec %1 - mov %2,%1 + dec %1 + mov %2,%1 } replace { @@ -661,7 +661,7 @@ replace { clr c addc a,%1 } by { - ; Peephole 145 changed to add without carry + ; Peephole 145 changed to add without carry add a,%1 } @@ -1082,7 +1082,7 @@ replace { } by { ; Peephole 182a used 24 bit load of dptr mov dptr,#0x%3%2%1 -} if 24bitModeAndPortDS390 +} if 24bitMode(), portIsDS390 // saves 2 bytes, ?? cycles. replace { @@ -1092,7 +1092,7 @@ replace { } by { ; Peephole 182b used 24 bit load of dptr mov dptr,#((%3 << 16) + (%2 << 8) + %1) -} if 24bitModeAndPortDS390 +} if 24bitMode(), portIsDS390 // saving 3 byte, 2 cycles, return(float_constant) profits here replace { @@ -1140,14 +1140,15 @@ replace { mov %1,a } -replace { - add a,#%1 - mov dpl,a - clr a - addc a,#(%1 >> 8) - mov dph,a - clr a - movc a,@a+dptr +// char indexed access to: long code table[] = {4,3,2,1}; +replace restart { + add a,#%1 + mov dpl,a + clr a + addc a,#(%1 >> 8) + mov dph,a + clr a + movc a,@a+dptr mov %2,a inc dptr clr a @@ -1158,32 +1159,36 @@ replace { movc a,@a+dptr mov %4,a inc dptr - clr a + clr a + movc a,@a+dptr } by { - ; Peephole 186.a optimized movc sequence - mov dptr,#%1 - mov b,acc - movc a,@a+dptr + ; Peephole 186.a optimized movc sequence + mov b,a + mov dptr,#%1 + movc a,@a+dptr mov %2,a - mov acc,b - inc dptr + inc dptr + mov a,b movc a,@a+dptr mov %3,a - mov acc,b inc dptr + mov a,b + movc a,@a+dptr mov %4,a - mov acc,b inc dptr + mov a,b + movc a,@a+dptr } -replace { - add a,#%1 - mov dpl,a - clr a - addc a,#(%1 >> 8) - mov dph,a - clr a - movc a,@a+dptr +// char indexed access to: void* code table[] = {4,3,2,1}; +replace restart { + add a,#%1 + mov dpl,a + clr a + addc a,#(%1 >> 8) + mov dph,a + clr a + movc a,@a+dptr mov %2,a inc dptr clr a @@ -1191,53 +1196,58 @@ replace { mov %3,a inc dptr clr a + movc a,@a+dptr } by { - ; Peephole 186.b optimized movc sequence - mov dptr,#%1 - mov b,acc - movc a,@a+dptr + ; Peephole 186.b optimized movc sequence + mov b,a + mov dptr,#%1 + movc a,@a+dptr mov %2,a - mov acc,b - inc dptr + inc dptr + mov a,b movc a,@a+dptr mov %3,a - mov acc,b - inc dptr + inc dptr + mov a,b + movc a,@a+dptr } -replace { - add a,#%1 - mov dpl,a - clr a - addc a,#(%1 >> 8) - mov dph,a - clr a - movc a,@a+dptr +// char indexed access to: int code table[] = {4,3,2,1}; +replace restart { + add a,#%1 + mov dpl,a + clr a + addc a,#(%1 >> 8) + mov dph,a + clr a + movc a,@a+dptr mov %2,a inc dptr clr a + movc a,@a+dptr } by { - ; Peephole 186.c optimized movc sequence - mov dptr,#%1 - mov b,acc - movc a,@a+dptr + ; Peephole 186.c optimized movc sequence mov %2,a - mov acc,b + mov dptr,#%1 + movc a,@a+dptr + xch a,%2 inc dptr + movc a,@a+dptr } +// char indexed access to: char code table[] = {4,3,2,1}; replace { - add a,#%1 - mov dpl,a - clr a - addc a,#(%1 >> 8) - mov dph,a - clr a - movc a,@a+dptr + add a,#%1 + mov dpl,a + clr a + addc a,#(%1 >> 8) + mov dph,a + clr a + movc a,@a+dptr } by { - ; Peephole 186 optimized movc sequence - mov dptr,#%1 - movc a,@a+dptr + ; Peephole 186.d optimized movc sequence + mov dptr,#%1 + movc a,@a+dptr } replace { @@ -1480,14 +1490,14 @@ replace { cjne %5,%6,%3 sjmp %7 %3: - sjmp %8 + sjmp %8 } by { ; Peephole 197.a optimized misc jump sequence jnz %8 mov a,%4 cjne %5,%6,%8 sjmp %7 -;%3: +;%3: } if labelRefCount %3 2 replace { @@ -1575,6 +1585,13 @@ replace { mov dptr,%1 } +replace { + push acc + pop acc +} by { + ; Peephole 202b removed redundant push pop +} + replace { mov r%1,_spx lcall %2 @@ -1660,8 +1677,8 @@ replace restart { push ar%1 pop ar%1 } by { - ; Peephole 211 removed redundant push r%1 pop r%1 -} + ; Peephole 211 removed redundant push r%1 pop r%1 +} replace { mov a,_bp @@ -1675,14 +1692,24 @@ replace { replace { mov %1,#(( %2 >> 8 ) ^ 0x80) -} by { +} by { + ; Peephole 213.a inserted fix mov %1,#(%2 >> 8) xrl %1,#0x80 } if portIsDS390 +replace { + mov %1,#(( %2 >> 16 ) ^ 0x80) +} by { + ; Peephole 213.b inserted fix + mov %1,#(%2 >> 16) + xrl %1,#0x80 +} if portIsDS390 + replace { mov %1,#(( %2 + %3 >> 8 ) ^ 0x80) -} by { +} by { + ; Peephole 213.c inserted fix mov %1,#((%2 + %3) >> 8) xrl %1,#0x80 } if portIsDS390 @@ -1694,7 +1721,7 @@ replace { } by { ; Peephole 214 reduced some extra movs mov %1,a - add a,%2 + add a,%2 } if operandsNotSame replace { @@ -1973,20 +2000,125 @@ replace { } -replace { - add a,#%2 +// char indexed access to: long code table[] = {4,3,2,1}; +replace restart { + add a,#%1 mov dpl,a clr a - addc a,#(%2 >> 8) + addc a,#(%1 >> 8) mov dph,a clr a - addc a,#(%2 >> 16) + addc a,#(%1 >> 16) mov dpx,a clr a movc a,@a+dptr + inc dptr + mov %2,a + clr a + movc a,@a+dptr + inc dptr + mov %3,a + clr a + movc a,@a+dptr + inc dptr + mov %4,a + clr a + movc a,@a+dptr } by { ; Peephole 227.a movc optimize - mov dptr,#%2 + mov b,a + mov dptr,#%1 + movc a,@a+dptr + inc dptr + mov %2,a + mov a,b + movc a,@a+dptr + inc dptr + mov %3,a + mov a,b + movc a,@a+dptr + inc dptr + mov %4,a + mov a,b + movc a,@a+dptr +} + +// char indexed access to: void* code table[] = {4,3,2,1}; +replace restart { + add a,#%1 + mov dpl,a + clr a + addc a,#(%1 >> 8) + mov dph,a + clr a + addc a,#(%1 >> 16) + mov dpx,a + clr a + movc a,@a+dptr + inc dptr + mov %2,a + clr a + movc a,@a+dptr + inc dptr + mov %3,a + clr a + movc a,@a+dptr +} by { + ; Peephole 227.b movc optimize + mov b,a + mov dptr,#%1 + movc a,@a+dptr + inc dptr + mov %2,a + mov a,b + movc a,@a+dptr + inc dptr + mov %3,a + mov a,b + movc a,@a+dptr +} + +// char indexed access to: int code table[] = {4,3,2,1}; +replace restart { + add a,#%1 + mov dpl,a + clr a + addc a,#(%1 >> 8) + mov dph,a + clr a + addc a,#(%1 >> 16) + mov dpx,a + clr a + movc a,@a+dptr + inc dptr + mov %2,a + clr a + movc a,@a+dptr +} by { + ; Peephole 227.c movc optimize + mov %2,a + mov dptr,#%1 + movc a,@a+dptr + inc dptr + xch a,%2 + movc a,@a+dptr +} + +// char indexed access to: char code table[] = {4,3,2,1}; +replace { + add a,#%1 + mov dpl,a + clr a + addc a,#(%1 >> 8) + mov dph,a + clr a + addc a,#(%1 >> 16) + mov dpx,a + clr a + movc a,@a+dptr +} by { + ; Peephole 227.d movc optimize + mov dptr,#%1 movc a,@a+dptr } @@ -2051,7 +2183,7 @@ replace { mov dpx,r%3 movx a,@dptr mov r%4,a - add a,#0x01 + add a,#0x01 mov r%5,a mov dpl,r%1 mov dph,r%2 @@ -2064,7 +2196,7 @@ replace { mov dpx,r%3 movx a,@dptr mov r%4,a - add a,#0x01 + add a,#0x01 mov r%5,a movx @dptr,a } @@ -2114,7 +2246,7 @@ replace { mov r%4,a movx @dptr,a } - + replace { mov r%1,dpl mov r%2,dph @@ -2151,7 +2283,7 @@ replace { mov r%4,a movx @dptr,a } - + replace { mov dpl,r%1 mov dph,r%2 @@ -2198,7 +2330,7 @@ replace { inc dptr mov dps,#0 } - + replace { mov ar%1,r%2 mov ar%3,r%1 @@ -2264,7 +2396,7 @@ replace { inc dps mov dptr,#%1 dec dps -} +} // 14 rules by Fiorenzo D. Ramaglia @@ -2367,10 +2499,358 @@ replace { } replace { - mov r%1,a - mov a,ar%1 + sjmp %1 +%2: + mov %3,%4 +%1: + ret } by { + ; Peephole 237a removed sjmp to ret + ret +%2: + mov %3,%4 +%1: + ret +} + +replace { + sjmp %1 +%2: + mov %3,%4 + mov dpl,%5 + mov dph,%6 +%1: + ret +} by { + ; Peephole 237b removed sjmp to ret + ret +%2: + mov %3,%4 + mov dpl,%5 + mov dph,%6 +%1: + ret +} + +// applies to f.e. device/lib/log10f.c +replace { + mov %1,%9 + mov %2,%10 + mov %3,%11 + mov %4,%12 + + mov %5,%13 + mov %6,%14 + mov %7,%15 + mov %8,%16 + + mov %9,%1 + mov %10,%2 + mov %11,%3 + mov %12,%4 +} by { + mov %1,%9 + mov %2,%10 + mov %3,%11 + mov %4,%12 + + mov %5,%13 + mov %6,%14 + mov %7,%15 + mov %8,%16 + ; Peephole 238.a removed 4 redundant moves +} if operandsNotSame8 %1 %2 %3 %4 %5 %6 %7 %8 + +// applies to device/lib/log10f.c +replace { + mov %1,%5 + mov %2,%6 + mov %3,%7 + mov %4,%8 + + mov %5,%1 + mov %6,%2 + mov %7,%3 +} by { + mov %1,%5 + mov %2,%6 + mov %3,%7 + mov %4,%8 + ; Peephole 238.b removed 3 redundant moves +} if operandsNotSame7 %1 %2 %3 %4 %5 %6 %7 + +// applies to f.e. device/lib/time.c +replace { + mov %1,%5 + mov %2,%6 + + mov %3,%7 + mov %4,%8 + + mov %5,%1 + mov %6,%2 +} by { + mov %1,%5 + mov %2,%6 + + mov %3,%7 + mov %4,%8 + ; Peephole 238.c removed 2 redundant moves +} if operandsNotSame4 %1 %2 %3 %4 + +// applies to f.e. support/regression/tests/bug-524209.c +replace { + mov %1,%4 + mov %2,%5 + mov %3,%6 + + mov %4,%1 + mov %5,%2 + mov %6,%3 +} by { + mov %1,%4 + mov %2,%5 + mov %3,%6 + ; Peephole 238.d removed 3 redundant moves +} if operandsNotSame6 %1 %2 %3 %4 %5 %6 + +// applies to f.e. ser_ir.asm +replace { + mov r%1,acc +} by { + ; Peephole 239 used a instead of acc mov r%1,a - ; Peephole 237 removed redundant move } +replace restart { + mov a,%1 + addc a,#0x00 +} by { + ; Peephole 240 use clr instead of addc a,#0 + clr a + addc a,%1 +} + +// peepholes 241.a to 241.c and 241.d to 241.f need to be in order +replace { + cjne r%1,#%2,%3 + cjne r%4,#%5,%3 + cjne r%6,#%7,%3 + cjne r%8,#%9,%3 + mov a,#0x01 + sjmp %10 +%3: + clr a +%10: +} by { + ; Peephole 241.a optimized compare + clr a + cjne r%1,#%2,%3 + cjne r%4,#%5,%3 + cjne r%6,#%7,%3 + cjne r%8,#%9,%3 + inc a +%3: +%10: +} + +// applies to f.e. time.c +replace { + cjne r%1,#%2,%3 + cjne r%4,#%5,%3 + mov a,#0x01 + sjmp %6 +%3: + clr a +%6: +} by { + ; Peephole 241.b optimized compare + clr a + cjne r%1,#%2,%3 + cjne r%4,#%5,%3 + inc a +%3: +%6: +} + +// applies to f.e. malloc.c +replace { + cjne r%1,#%2,%3 + mov a,#0x01 + sjmp %4 +%3: + clr a +%4: +} by { + ; Peephole 241.c optimized compare + clr a + cjne r%1,#%2,%3 + inc a +%3: +%4: +} + +// applies to f.e. j = (k!=0x1000); +// with volatile idata long k; +replace { + cjne @r%1,#%2,%3 + inc r%1 + cjne @r%1,#%4,%3 + inc r%1 + cjne @r%1,#%5,%3 + inc r%1 + cjne @r%1,#%6,%3 + mov a,#0x01 + sjmp %7 +%3: + clr a +%7: +} by { + ; Peephole 241.d optimized compare + clr a + cjne @r%1,#%2,%3 + inc r%1 + cjne @r%1,#%4,%3 + inc r%1 + cjne @r%1,#%5,%3 + inc r%1 + cjne @r%1,#%6,%3 + inc a +%3: +%7: +} + +// applies to f.e. j = (k!=0x1000); +// with volatile idata int k; +replace { + cjne @r%1,#%2,%3 + inc r%1 + cjne @r%1,#%4,%3 + mov a,#0x01 + sjmp %7 +%3: + clr a +%7: +} by { + ; Peephole 241.e optimized compare + clr a + cjne @r%1,#%2,%3 + inc r%1 + cjne @r%1,#%4,%3 + inc a +%3: +%7: +} + +// applies to f.e. vprintf.asm (--stack-auto) +replace { + cjne @r%1,#%2,%3 + mov a,#0x01 + sjmp %7 +%3: + clr a +%7: +} by { + ; Peephole 241.f optimized compare + clr a + cjne @r%1,#%2,%3 + inc a +%3: +%7: +} + +// applies to f.e. scott-bool1.c +replace { + jnz %1 + mov %2,%3 +%1: + jz %4 +} by { + ; Peephole 242.a avoided branch jnz to jz + jnz %1 + mov %2,%3 + jz %4 +%1: +} if labelRefCount %1 1 + +// applies to f.e. scott-bool1.c +replace { + jnz %1 + mov %2,%3 + orl a,%5 +%1: + jz %4 +} by { + ; Peephole 242.b avoided branch jnz to jz + jnz %1 + mov %2,%3 + orl a,%5 + jz %4 +%1: +} if labelRefCount %1 1 + +// applies to f.e. logic.c +replace { + jnz %1 + mov %2,%3 + orl a,%5 + orl a,%6 + orl a,%7 +%1: + jz %4 +} by { + ; Peephole 242.c avoided branch jnz to jz + jnz %1 + mov %2,%3 + orl a,%5 + orl a,%6 + orl a,%7 + jz %4 +%1: +} if labelRefCount %1 1 + +replace { + jnz %1 +%1: +} by { + ; Peephole 243a jump optimization +} if labelRefCount %1 1 + +replace { + jz %1 +%1: +} by { + ; Peephole 243b jump optimization +} if labelRefCount %1 1 + + +// This allows non-interrupt and interrupt code to safely compete +// for a resource without the non-interrupt code having to disable +// interrupts: +// volatile bit resource_is_free; +// if( resource_is_free ) { +// resource_is_free=0; do_something; resource_is_free=1; +// } +replace { + jnb %1,%2 +%3: + clr %1 +} by { + ; Peephole 244.a using atomic test and clear + jbc %1,%3 + sjmp %2 +%3: +} if labelRefCount %3 0 + +replace { + jb %1,%2 + ljmp %3 +%2: + clr %1 +} by { + ; Peephole 244.b using atomic test and clear + jbc %1,%2 + ljmp %3 +%2: +} if labelRefCount %2 1 +