Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-02-04 02:30:19 +00:00
Code Issues Projects Releases Wiki Activity

fix broken boolean != comparison optimization

Browse Source
This commit is contained in:
Irmen de Jong 2024-03-13 20:23:42 +01:00
parent 33c8caac8f
commit 3535c1acda
4 changed files with 90 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
codeOptimizers/src/prog8/optimizer/ExpressionSimplifier.kt
View File

@ -277,10 +277,13 @@ class ExpressionSimplifier(private val program: Program, private val options: Co
} }
if (expr.operator=="!=") { if (expr.operator=="!=") {
if(rightDt==DataType.BOOL && leftDt==DataType.BOOL) { if(rightDt==DataType.BOOL && leftDt==DataType.BOOL) {
if(rightVal?.asBooleanValue==false) val rightConstBool = rightVal?.asBooleanValue
return listOf(IAstModification.ReplaceNode(expr, expr.left, parent)) if(rightConstBool!=null) {
return if (rightConstBool)
listOf(IAstModification.ReplaceNode(expr, PrefixExpression("not", expr.left, expr.position), parent))
else else
return listOf(IAstModification.ReplaceNode(expr, PrefixExpression("not", expr.left, expr.position), parent)) listOf(IAstModification.ReplaceNode(expr, expr.left, parent))
}
} }
if (rightVal?.number == 1.0) { if (rightVal?.number == 1.0) {
if(options.strictBool) { if(options.strictBool) {

128
compiler/test/arithmetic/bitshift2.p8
View File

@ -8,6 +8,10 @@ main {
signed() signed()
} }
sub print_bool(bool b) {
txt.print_ub(b as ubyte)
}
ubyte[2] ubarray ubyte[2] ubarray
uword[2] uwarray uword[2] uwarray
byte[2] barray byte[2] barray
@ -227,15 +231,15 @@ main {
txt.print("rol_ub error ") txt.print("rol_ub error ")
txt.print_ub(original) txt.print_ub(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_ub(value) txt.print_ub(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
@ -252,15 +256,15 @@ main {
txt.print("rol_ub array error ") txt.print("rol_ub array error ")
txt.print_ub(original) txt.print_ub(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_ub(ubarray[1]) txt.print_ub(ubarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
@ -277,15 +281,15 @@ main {
txt.print("rol_ub mem error ") txt.print("rol_ub mem error ")
txt.print_ub(original) txt.print_ub(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_ub(@($8001)) txt.print_ub(@($8001))
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
} }
@ -304,15 +308,15 @@ main {
txt.print("ror_ub error ") txt.print("ror_ub error ")
txt.print_ub(original) txt.print_ub(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_ub(value) txt.print_ub(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
@ -329,15 +333,15 @@ main {
txt.print("ror_ub array error ") txt.print("ror_ub array error ")
txt.print_ub(original) txt.print_ub(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_ub(ubarray[1]) txt.print_ub(ubarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
@ -354,15 +358,15 @@ main {
txt.print("ror_ub mem error ") txt.print("ror_ub mem error ")
txt.print_ub(original) txt.print_ub(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_ub(@($8001)) txt.print_ub(@($8001))
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
} }
@ -437,15 +441,15 @@ main {
txt.print("rol_uw error ") txt.print("rol_uw error ")
txt.print_uw(original) txt.print_uw(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_uw(value) txt.print_uw(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -462,15 +466,15 @@ main {
txt.print("rol_uw array error ") txt.print("rol_uw array error ")
txt.print_uw(original) txt.print_uw(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_uw(uwarray[1]) txt.print_uw(uwarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }
@ -489,15 +493,15 @@ main {
txt.print("ror_uw error ") txt.print("ror_uw error ")
txt.print_uw(original) txt.print_uw(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_uw(value) txt.print_uw(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -514,15 +518,15 @@ main {
txt.print("ror_uw array error ") txt.print("ror_uw array error ")
txt.print_uw(original) txt.print_uw(original)
txt.spc() txt.spc()
txt.print_bool(carry) print_bool(carry)
txt.spc() txt.spc()
txt.print_uw(uwarray[1]) txt.print_uw(uwarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }
@ -540,11 +544,11 @@ main {
txt.spc() txt.spc()
txt.print_ub(value) txt.print_ub(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
@ -560,11 +564,11 @@ main {
txt.spc() txt.spc()
txt.print_ub(ubarray[1]) txt.print_ub(ubarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
} }
@ -582,11 +586,11 @@ main {
txt.spc() txt.spc()
txt.print_ub(value) txt.print_ub(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
@ -602,11 +606,11 @@ main {
txt.spc() txt.spc()
txt.print_ub(ubarray[1]) txt.print_ub(ubarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_ub(test) txt.print_ub(test)
txt.spc() txt.spc()
txt.print_bool(newcarry) print_bool(newcarry)
txt.nl() txt.nl()
} }
} }
@ -624,11 +628,11 @@ main {
txt.spc() txt.spc()
txt.print_uw(value) txt.print_uw(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -644,11 +648,11 @@ main {
txt.spc() txt.spc()
txt.print_uw(uwarray[1]) txt.print_uw(uwarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }
@ -666,11 +670,11 @@ main {
txt.spc() txt.spc()
txt.print_uw(value) txt.print_uw(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -686,11 +690,11 @@ main {
txt.spc() txt.spc()
txt.print_uw(uwarray[1]) txt.print_uw(uwarray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_uw(test) txt.print_uw(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }
@ -708,11 +712,11 @@ main {
txt.spc() txt.spc()
txt.print_b(value) txt.print_b(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_b(test) txt.print_b(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -728,11 +732,11 @@ main {
txt.spc() txt.spc()
txt.print_b(barray[1]) txt.print_b(barray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_b(test) txt.print_b(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }
@ -750,11 +754,11 @@ main {
txt.spc() txt.spc()
txt.print_b(value) txt.print_b(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_b(test) txt.print_b(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -770,11 +774,11 @@ main {
txt.spc() txt.spc()
txt.print_b(barray[1]) txt.print_b(barray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_b(test) txt.print_b(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }
@ -792,11 +796,11 @@ main {
txt.spc() txt.spc()
txt.print_w(value) txt.print_w(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_w(test) txt.print_w(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -812,11 +816,11 @@ main {
txt.spc() txt.spc()
txt.print_w(warray[1]) txt.print_w(warray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_w(test) txt.print_w(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }
@ -834,11 +838,11 @@ main {
txt.spc() txt.spc()
txt.print_w(value) txt.print_w(value)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_w(test) txt.print_w(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
@ -854,11 +858,11 @@ main {
txt.spc() txt.spc()
txt.print_w(warray[1]) txt.print_w(warray[1])
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.print(" exp: ") txt.print(" exp: ")
txt.print_w(test) txt.print_w(test)
txt.spc() txt.spc()
txt.print_bool(carrycheck) print_bool(carrycheck)
txt.nl() txt.nl()
} }
} }

3
docs/source/todo.rst
View File

@ -1,6 +1,9 @@
TODO TODO
==== ====
make bitshift2.p8 runnable on VM
bitshift2.p8 has many errors (was ok on 10.2 before bool merge)
... ...

18
examples/test.p8
View File

@ -3,13 +3,23 @@
%option no_sysinit %option no_sysinit
main { main {
bool @shared var1, var2
bool[2] barray = [false, true]
ubyte success
sub start() { sub start() {
str name = "irmen" no_else()
ubyte @shared cc='m' }
cx16.r0=9999 sub no_else() {
txt.print("bool no_else: ")
success=0
if cx16.r0<10000 and 'q' in name var1=true
var2=false
if var1!=var2
txt.print("yes") txt.print("yes")
} }
} }