Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-07-24 22:29:15 +00:00
Code Issues Projects Releases Wiki Activity

improved asm generation for conditions that compare floats to zero

Browse Source
This commit is contained in:
Irmen de Jong 2021-10-31 01:20:29 +02:00
parent 61fa3bc77c
commit 2df0c9503c
2 changed files with 89 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt
View File

@ -72,19 +72,17 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
leftConstVal: NumericLiteralValue?, leftConstVal: NumericLiteralValue?,
rightConstVal: NumericLiteralValue? rightConstVal: NumericLiteralValue?
) { ) {
val dt = left.inferType(program).getOrElse { throw AssemblyError("unknown dt") } when(left.inferType(program).getOr(DataType.UNDEFINED)) {
when(dt) {
DataType.UBYTE, DataType.BYTE -> { DataType.UBYTE, DataType.BYTE -> {
asmgen.assignExpressionToRegister(left, RegisterOrPair.A) asmgen.assignExpressionToRegister(left, RegisterOrPair.A)
if (left is FunctionCall && !left.isSimple)
asmgen.out(" cmp #0")
when (operator) { when (operator) {
"==", "!=" -> { "==" -> {
// simple zero (in)equality check asmgen.out(" bne $jumpIfFalseLabel")
if (left is FunctionCall && !left.isSimple) }
asmgen.out(" cmp #0") "!=" -> {
if (operator == "==") asmgen.out(" beq $jumpIfFalseLabel")
asmgen.out(" bne $jumpIfFalseLabel")
else
asmgen.out(" beq $jumpIfFalseLabel")
} }
else -> { else -> {
// TODO optimize byte other operators // TODO optimize byte other operators
@ -94,12 +92,13 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
DataType.UWORD, DataType.WORD -> { DataType.UWORD, DataType.WORD -> {
asmgen.assignExpressionToRegister(left, RegisterOrPair.AY) asmgen.assignExpressionToRegister(left, RegisterOrPair.AY)
asmgen.out(" sty P8ZP_SCRATCH_B1 | ora P8ZP_SCRATCH_B1")
when (operator) { when (operator) {
"==" -> { "==" -> {
asmgen.out(" sty P8ZP_SCRATCH_B1 | ora P8ZP_SCRATCH_B1 | bne $jumpIfFalseLabel") asmgen.out(" bne $jumpIfFalseLabel")
} }
"!=" -> { "!=" -> {
asmgen.out(" sty P8ZP_SCRATCH_B1 | ora P8ZP_SCRATCH_B1 | beq $jumpIfFalseLabel") asmgen.out(" beq $jumpIfFalseLabel")
} }
else -> { else -> {
// TODO optimize word other operators // TODO optimize word other operators
@ -109,18 +108,29 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
DataType.FLOAT -> { DataType.FLOAT -> {
asmgen.assignExpressionToRegister(left, RegisterOrPair.FAC1) asmgen.assignExpressionToRegister(left, RegisterOrPair.FAC1)
asmgen.out(" jsr floats.SIGN")
when (operator) { when (operator) {
"==" -> { "==" -> {
asmgen.out(" jsr floats.SIGN") // SIGN(fac1) to A, $ff, $0, $1 for negative, zero, positive // SIGN(fac1) to A, $ff, $0, $1 for negative, zero, positive
asmgen.out(" bne $jumpIfFalseLabel") asmgen.out(" bne $jumpIfFalseLabel")
} }
"!=" -> { "!=" -> {
asmgen.out(" jsr floats.SIGN") // SIGN(fac1) to A, $ff, $0, $1 for negative, zero, positive
asmgen.out(" beq $jumpIfFalseLabel") asmgen.out(" beq $jumpIfFalseLabel")
} }
">" -> {
asmgen.out(" bmi $jumpIfFalseLabel | beq $jumpIfFalseLabel")
}
"<" -> {
asmgen.out(" bpl $jumpIfFalseLabel")
}
">=" -> {
asmgen.out(" bmi $jumpIfFalseLabel")
}
"<=" -> {
asmgen.out(" cmp #1 | beq $jumpIfFalseLabel")
}
else -> { else -> {
// TODO optimize float other operators? throw AssemblyError("invalid comparison operator $operator")
jumpIfComparison(left, operator, right, jumpIfFalseLabel, leftConstVal, rightConstVal)
} }
} }
} }

72
examples/test.p8
View File

@ -10,19 +10,73 @@ main {
ff=0 ff=0
if ff==0 { if ff>=0 {
txt.print("ff=0\n") txt.print("ff>=0\n")
} else {
txt.print("error1\n")
} }
if ff!=0 { if ff<=0 {
txt.print("ff!=0 (error!)\n") txt.print("ff<=0\n")
} else {
txt.print("error1\n")
} }
ff=-0.22 if ff>0 {
if ff==0 { txt.print("ff>0 error\n")
txt.print("ff=0 (error!)\n") } else {
txt.print("ok1\n")
} }
if ff!=0 { if ff<0 {
txt.print("ff!=0\n") txt.print("ff<0 error\n")
} else {
txt.print("ok1\n")
} }
txt.nl()
ff=0.22
if ff>=0 {
txt.print("ff>=0\n")
} else {
txt.print("error2\n")
}
if ff<=0 {
txt.print("ff<=0 error\n")
} else {
txt.print("ok2\n")
}
if ff>0 {
txt.print("ff>0\n")
} else {
txt.print("error2\n")
}
if ff<0 {
txt.print("ff<0 error\n")
} else {
txt.print("ok2\n")
}
txt.nl()
ff=-1.11
if ff>=0 {
txt.print("ff>=0 error\n")
} else {
txt.print("ok3\n")
}
if ff<=0 {
txt.print("ff<=0\n")
} else {
txt.print("error3\n")
}
if ff>0 {
txt.print("ff>0 error\n")
} else {
txt.print("ok3\n")
}
if ff<0 {
txt.print("ff<0\n")
} else {
txt.print("error3\n")
}
if xx { ; doesn't use stack... if xx { ; doesn't use stack...