improve (u)byte '>=' codegen

This commit is contained in:
Irmen de Jong 2021-03-15 23:20:16 +01:00
parent a00c693f93
commit 5e0aef04fe

View File

@ -824,6 +824,11 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
private fun translateUbyteGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateUbyteGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
fun code(cmpOperand: String) {
asmgen.out(" cmp $cmpOperand | bcc $jumpIfFalseLabel")
}
if(rightConstVal!=null) { if(rightConstVal!=null) {
if(leftConstVal!=null) { if(leftConstVal!=null) {
if(rightConstVal<leftConstVal) if(rightConstVal<leftConstVal)
@ -833,27 +838,38 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
if (left is IdentifierReference) { if (left is IdentifierReference) {
if(rightConstVal.number.toInt()!=0) { if(rightConstVal.number.toInt()!=0) {
asmgen.assignExpressionToRegister(left, RegisterOrPair.A) asmgen.assignExpressionToRegister(left, RegisterOrPair.A)
asmgen.out(" cmp #${rightConstVal.number} | bcc $jumpIfFalseLabel") code("#${rightConstVal.number}")
} }
return return
} }
else if (left is DirectMemoryRead) { else if (left is DirectMemoryRead) {
if(rightConstVal.number.toInt()!=0) { if(rightConstVal.number.toInt()!=0) {
translateDirectMemReadExpression(left, false) translateDirectMemReadExpression(left, false)
asmgen.out(" cmp #${rightConstVal.number} | bcc $jumpIfFalseLabel") code("#${rightConstVal.number}")
} }
return return
} }
} }
} }
// TODO optimize if right is variable or mem-read to avoid use of ZP location if(byteJumpForSimpleRightOperands(left, right, ::code))
return
asmgen.assignExpressionToVariable(right, "P8ZP_SCRATCH_B1", DataType.UBYTE, null) asmgen.assignExpressionToVariable(right, "P8ZP_SCRATCH_B1", DataType.UBYTE, null)
asmgen.assignExpressionToRegister(left, RegisterOrPair.A) asmgen.assignExpressionToRegister(left, RegisterOrPair.A)
asmgen.out(" cmp P8ZP_SCRATCH_B1 | bcc $jumpIfFalseLabel") return code("P8ZP_SCRATCH_B1")
} }
private fun translateByteGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateByteGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
fun code(sbcOperand: String) {
asmgen.out("""
sec
sbc $sbcOperand
bvc +
eor #$80
+ bmi $jumpIfFalseLabel""")
}
if(rightConstVal!=null) { if(rightConstVal!=null) {
if(leftConstVal!=null) { if(leftConstVal!=null) {
if(rightConstVal<leftConstVal) if(rightConstVal<leftConstVal)
@ -861,34 +877,21 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
return return
} else { } else {
if (left is IdentifierReference) { if (left is IdentifierReference) {
val name = asmgen.asmVariableName(left) asmgen.assignExpressionToRegister(left, RegisterOrPair.A)
if(rightConstVal.number.toInt()!=0) { return if(rightConstVal.number.toInt()!=0)
asmgen.out(""" code("#${rightConstVal.number}")
lda $name else
sec asmgen.out(" bmi $jumpIfFalseLabel")
sbc #${rightConstVal.number}
bvc +
eor #$80
+ bmi $jumpIfFalseLabel""")
return
}
else {
asmgen.out(" lda $name | bmi $jumpIfFalseLabel")
return
}
} }
} }
} }
// TODO optimize if right is variable or mem-read to avoid use of ZP location if(byteJumpForSimpleRightOperands(left, right, ::code))
return
asmgen.assignExpressionToVariable(right, "P8ZP_SCRATCH_B1", DataType.UBYTE, null) asmgen.assignExpressionToVariable(right, "P8ZP_SCRATCH_B1", DataType.UBYTE, null)
asmgen.assignExpressionToRegister(left, RegisterOrPair.A) asmgen.assignExpressionToRegister(left, RegisterOrPair.A)
asmgen.out(""" return code("P8ZP_SCRATCH_B1")
sec
sbc P8ZP_SCRATCH_B1
bvc +
eor #$80
+ bmi $jumpIfFalseLabel""")
} }
private fun translateUwordGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateUwordGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {