Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-03 13:07:54 +00:00
Code Issues Projects Releases Wiki Activity

improve word '>' and '>=' codegen

Browse Source
This commit is contained in:
Irmen de Jong 2021-03-16 00:48:03 +01:00
parent b5523c7077
commit 824b41d457
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,7 +670,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
sbc $msbCpyOperand sbc $msbCpyOperand
bvc + bvc +
eor #${'$'}80 eor #${'$'}80
+ bpl $jumpIfFalseLabel""") + bmi $jumpIfFalseLabel""")
} }
if(rightConstVal!=null) { if(rightConstVal!=null) {
@ -680,17 +680,14 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
return return
} else { } else {
if (left is IdentifierReference) { if (left is IdentifierReference) {
return if(rightConstVal.number.toInt()!=0) {
// TODO is this correct? word > not-0
asmgen.assignExpressionToRegister(left, RegisterOrPair.AY)
code("#>${rightConstVal.number}", "#<${rightConstVal.number}")
}
else {
// TODO is this correct? word > 0
val name = asmgen.asmVariableName(left) val name = asmgen.asmVariableName(left)
return if(rightConstVal.number.toInt()!=0)
asmgen.out("""
lda #<${rightConstVal.number}
cmp $name
lda #>${rightConstVal.number}
sbc $name+1
bvc +
eor #$80
+ bpl $jumpIfFalseLabel""")
else
asmgen.out(""" asmgen.out("""
lda #0 lda #0
cmp $name cmp $name
@ -701,12 +698,13 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
} }
} }
}
if(right is IdentifierReference) { if(right is IdentifierReference) {
// TODO optimize comparison against identifier // TODO is this correct? word > identifer
// asmgen.assignExpressionToRegister(left, RegisterOrPair.AY) asmgen.assignExpressionToRegister(left, RegisterOrPair.AY)
// val varname = asmgen.asmVariableName(right) val varname = asmgen.asmVariableName(right)
// return code("$varname+1", varname) return code("$varname+1", varname)
} }
asmgen.assignExpressionToVariable(left, "P8ZP_SCRATCH_W2", DataType.UWORD, null) asmgen.assignExpressionToVariable(left, "P8ZP_SCRATCH_W2", DataType.UWORD, null)
@ -982,6 +980,17 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
private fun translateWordGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateWordGreaterOrEqualJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
fun code(msbCpyOperand: String, lsbCmpOperand: String) {
asmgen.out("""
cmp $lsbCmpOperand
tya
sbc $msbCpyOperand
bvc +
eor #$80
+ bmi $jumpIfFalseLabel""")
}
if(rightConstVal!=null) { if(rightConstVal!=null) {
if(leftConstVal!=null) { if(leftConstVal!=null) {
if(rightConstVal<leftConstVal) if(rightConstVal<leftConstVal)
@ -989,27 +998,24 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
return return
} else { } else {
if (left is IdentifierReference) { if (left is IdentifierReference) {
return if(rightConstVal.number.toInt()!=0) {
// TODO is this correct? word >= not-0
asmgen.assignExpressionToRegister(left, RegisterOrPair.AY)
code("#>${rightConstVal.number}", "#<${rightConstVal.number}")
}
else {
val name = asmgen.asmVariableName(left) val name = asmgen.asmVariableName(left)
return if(rightConstVal.number.toInt()!=0)
asmgen.out("""
lda $name
cmp #<${rightConstVal.number}
lda $name+1
sbc #>${rightConstVal.number}
bvc +
eor #$80
+ bmi $jumpIfFalseLabel""")
else
asmgen.out(" lda $name+1 | bmi $jumpIfFalseLabel") asmgen.out(" lda $name+1 | bmi $jumpIfFalseLabel")
} }
} }
} }
}
if(right is IdentifierReference) { if(right is IdentifierReference) {
// TODO optimize comparison against identifier // TODO is this correct? word >= variable
// asmgen.assignExpressionToRegister(left, RegisterOrPair.AY) asmgen.assignExpressionToRegister(left, RegisterOrPair.AY)
// val varname = asmgen.asmVariableName(right) val varname = asmgen.asmVariableName(right)
// return code("$varname+1", varname) return code("$varname+1", varname)
} }
asmgen.assignExpressionToVariable(right, "P8ZP_SCRATCH_W2", DataType.UWORD, null) asmgen.assignExpressionToVariable(right, "P8ZP_SCRATCH_W2", DataType.UWORD, null)
@ -1139,6 +1145,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
private fun translateWordNotEqualsJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateWordNotEqualsJump(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
if(rightConstVal!=null) { if(rightConstVal!=null) {
if(leftConstVal!=null) { if(leftConstVal!=null) {
if(rightConstVal==leftConstVal) if(rightConstVal==leftConstVal)