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

cleanups.

Browse Source 
also checked that value(12) < x < value(100) is indeed properly shortcircuited if x is 12 or less
This commit is contained in:
Irmen de Jong 2023-12-30 04:34:07 +01:00
parent 89cc7e5fa9
commit 1e1f444cab
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt
View File

@ -1056,7 +1056,6 @@ internal class AssignmentAsmGen(private val program: PtProgram,
when (expr.operator) { when (expr.operator) {
"and" -> { "and" -> {
// short-circuit LEFT and RIGHT --> if LEFT then RIGHT else LEFT (== if !LEFT then LEFT else RIGHT) // short-circuit LEFT and RIGHT --> if LEFT then RIGHT else LEFT (== if !LEFT then LEFT else RIGHT)
println("SHORTCUT AND ${expr.position}") // TODO weg
assignExpressionToRegister(expr.left, RegisterOrPair.A, false) assignExpressionToRegister(expr.left, RegisterOrPair.A, false)
asmgen.out(" beq $shortcutLabel") asmgen.out(" beq $shortcutLabel")
assignExpressionToRegister(expr.right, RegisterOrPair.A, false) assignExpressionToRegister(expr.right, RegisterOrPair.A, false)
@ -1064,7 +1063,6 @@ internal class AssignmentAsmGen(private val program: PtProgram,
} }
"or" -> { "or" -> {
// short-circuit LEFT or RIGHT --> if LEFT then LEFT else RIGHT // short-circuit LEFT or RIGHT --> if LEFT then LEFT else RIGHT
println("SHORTCUT OR ${expr.position}") // TODO weg
assignExpressionToRegister(expr.left, RegisterOrPair.A, false) assignExpressionToRegister(expr.left, RegisterOrPair.A, false)
asmgen.out(" bne $shortcutLabel") asmgen.out(" bne $shortcutLabel")
assignExpressionToRegister(expr.right, RegisterOrPair.A, false) assignExpressionToRegister(expr.right, RegisterOrPair.A, false)

2
codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AugmentableAssignmentAsmGen.kt
View File

@ -798,7 +798,6 @@ internal class AugmentableAssignmentAsmGen(private val program: PtProgram,
when (operator) { when (operator) {
"and" -> { "and" -> {
// short-circuit LEFT and RIGHT --> if LEFT then RIGHT else LEFT (== if !LEFT then LEFT else RIGHT) // short-circuit LEFT and RIGHT --> if LEFT then RIGHT else LEFT (== if !LEFT then LEFT else RIGHT)
println("SHORTCUT AND ${value.position}") // TODO weg
asmgen.out(" lda $name | beq $shortcutLabel") asmgen.out(" lda $name | beq $shortcutLabel")
asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes) asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes)
asmgen.out(""" asmgen.out("""
@ -809,7 +808,6 @@ $shortcutLabel:""")
} }
"or" -> { "or" -> {
// short-circuit LEFT or RIGHT --> if LEFT then LEFT else RIGHT // short-circuit LEFT or RIGHT --> if LEFT then LEFT else RIGHT
println("SHORTCUT OR ${value.position}") // TODO weg
asmgen.out(" lda $name | bne $shortcutLabel") asmgen.out(" lda $name | bne $shortcutLabel")
asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes) asmgen.assignExpressionToRegister(value, RegisterOrPair.A, dt in SignedDatatypes)
asmgen.out(""" asmgen.out("""

18
examples/test.p8
View File

@ -2,13 +2,29 @@
%zeropage dontuse %zeropage dontuse
main { main {
sub start() {
ubyte @shared x = 10
if value(12) < x < value(100)
txt.print("gottem")
sub value(ubyte v) -> ubyte {
cx16.r0++
txt.print("value(): ")
txt.print_ub(v)
txt.nl()
return v
}
bigtest()
}
ubyte @shared a1 = 10 ubyte @shared a1 = 10
ubyte @shared a2 = 20 ubyte @shared a2 = 20
ubyte @shared x1 = 30 ubyte @shared x1 = 30
ubyte @shared x2 = 40 ubyte @shared x2 = 40
ubyte @shared zero = 0 ubyte @shared zero = 0
sub start () { sub bigtest () {
txt.print("1a:\n") txt.print("1a:\n")
if calc_a1()<calc_x1() and calc_a2()<=calc_x2() if calc_a1()<calc_x1() and calc_a2()<=calc_x2()
txt.print("* 1a and ok\n") txt.print("* 1a and ok\n")