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

improve ubyte '<' and '>' codegen

Browse Source
This commit is contained in:
Irmen de Jong 2021-03-15 23:12:52 +01:00
parent b630fae580
commit c943da1448
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,6 +367,11 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
private fun translateUbyteLessJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateUbyteLessJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
fun code(cmpOperand: String) {
asmgen.out(" cmp $cmpOperand | bcs $jumpIfFalseLabel")
}
if(rightConstVal!=null) { if(rightConstVal!=null) {
if(leftConstVal!=null) { if(leftConstVal!=null) {
if(rightConstVal>=leftConstVal) if(rightConstVal>=leftConstVal)
@ -376,7 +381,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
if (left is IdentifierReference) { if (left is IdentifierReference) {
return if(rightConstVal.number.toInt()!=0) { return if(rightConstVal.number.toInt()!=0) {
asmgen.assignExpressionToRegister(left, RegisterOrPair.A) asmgen.assignExpressionToRegister(left, RegisterOrPair.A)
asmgen.out(" cmp #${rightConstVal.number} | bcs $jumpIfFalseLabel") code("#${rightConstVal.number}")
} }
else else
asmgen.jmp(jumpIfFalseLabel) asmgen.jmp(jumpIfFalseLabel)
@ -384,7 +389,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
else if (left is DirectMemoryRead) { else if (left is DirectMemoryRead) {
return if(rightConstVal.number.toInt()!=0) { return if(rightConstVal.number.toInt()!=0) {
translateDirectMemReadExpression(left, false) translateDirectMemReadExpression(left, false)
asmgen.out(" cmp #${rightConstVal.number} | bcs $jumpIfFalseLabel") code("#${rightConstVal.number}")
} }
else else
asmgen.jmp(jumpIfFalseLabel) asmgen.jmp(jumpIfFalseLabel)
@ -392,10 +397,12 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
} }
// 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 | bcs $jumpIfFalseLabel") return code("P8ZP_SCRATCH_B1")
} }
private fun translateByteLessJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateByteLessJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
@ -517,6 +524,14 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
private fun translateUbyteGreaterJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateUbyteGreaterJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
fun code(cmpOperand: String) {
asmgen.out("""
cmp $cmpOperand
bcc $jumpIfFalseLabel
beq $jumpIfFalseLabel""")
}
if(rightConstVal!=null) { if(rightConstVal!=null) {
if(leftConstVal!=null) { if(leftConstVal!=null) {
if(rightConstVal<=leftConstVal) if(rightConstVal<=leftConstVal)
@ -526,30 +541,26 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
if (left is IdentifierReference) { if (left is IdentifierReference) {
asmgen.assignExpressionToRegister(left, RegisterOrPair.A) asmgen.assignExpressionToRegister(left, RegisterOrPair.A)
return if(rightConstVal.number.toInt()!=0) return if(rightConstVal.number.toInt()!=0)
asmgen.out(""" code("#${rightConstVal.number}")
cmp #${rightConstVal.number}
bcc $jumpIfFalseLabel
beq $jumpIfFalseLabel""")
else else
asmgen.out(" beq $jumpIfFalseLabel") asmgen.out(" beq $jumpIfFalseLabel")
} }
else if (left is DirectMemoryRead) { else if (left is DirectMemoryRead) {
translateDirectMemReadExpression(left, false) translateDirectMemReadExpression(left, false)
return if(rightConstVal.number.toInt()!=0) return if(rightConstVal.number.toInt()!=0)
asmgen.out(" cmp #${rightConstVal.number} | bcc $jumpIfFalseLabel | beq $jumpIfFalseLabel") code("#${rightConstVal.number}")
else else
asmgen.out(" beq $jumpIfFalseLabel") asmgen.out(" beq $jumpIfFalseLabel")
} }
} }
} }
// 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")
cmp P8ZP_SCRATCH_B1
bcc $jumpIfFalseLabel
beq $jumpIfFalseLabel""")
} }
private fun translateByteGreaterJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateByteGreaterJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {