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

added (u)byte and (u)word '>'

Browse Source
This commit is contained in:
Irmen de Jong 2020-09-26 13:04:11 +02:00
parent 130cee1e70
commit 43f2448789
2 changed files with 98 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
compiler/src/prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt
View File

@ -276,7 +276,6 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
private fun translateUbyteLessOrEqual(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateUbyteLessOrEqual(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
// TODO compare with optimized asm // TODO compare with optimized asm
TODO()
asmgen.translateExpression(left) asmgen.translateExpression(left)
asmgen.translateExpression(right) asmgen.translateExpression(right)
asmgen.out(" jsr prog8_lib.lesseq_ub | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel") asmgen.out(" jsr prog8_lib.lesseq_ub | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel")
@ -318,13 +317,16 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
cmp #${rightConstVal.number} cmp #${rightConstVal.number}
bcc $jumpIfFalseLabel bcc $jumpIfFalseLabel
beq $jumpIfFalseLabel""") beq $jumpIfFalseLabel""")
else
asmgen.out(" lda $name | beq $jumpIfFalseLabel")
return return
} }
else if (left is DirectMemoryRead) { else if (left is DirectMemoryRead) {
if(rightConstVal.number.toInt()!=0) {
translateDirectMemReadExpression(left, false) translateDirectMemReadExpression(left, false)
if(rightConstVal.number.toInt()!=0)
asmgen.out(" cmp #${rightConstVal.number} | bcc $jumpIfFalseLabel | beq $jumpIfFalseLabel") asmgen.out(" cmp #${rightConstVal.number} | bcc $jumpIfFalseLabel | beq $jumpIfFalseLabel")
} else
asmgen.out(" beq $jumpIfFalseLabel")
return return
} }
} }
@ -336,21 +338,106 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
} }
private fun translateByteGreater(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateByteGreater(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
// TODO compare with optimized asm if(rightConstVal!=null) {
if(leftConstVal!=null) {
if(rightConstVal<=leftConstVal)
asmgen.out(" jmp $jumpIfFalseLabel")
return
} else {
if (left is IdentifierReference) {
val name = asmgen.asmVariableName(left)
if(rightConstVal.number.toInt()!=0)
asmgen.out("""
lda $name
cmp #${rightConstVal.number}
bmi $jumpIfFalseLabel
beq $jumpIfFalseLabel""")
else
asmgen.out("""
lda $name
bmi $jumpIfFalseLabel
beq $jumpIfFalseLabel""")
return
}
else if (left is DirectMemoryRead) {
translateDirectMemReadExpression(left, false)
if(rightConstVal.number.toInt()!=0)
asmgen.out(" cmp #${rightConstVal.number} | bmi $jumpIfFalseLabel | beq $jumpIfFalseLabel")
else
asmgen.out(" bmi $jumpIfFalseLabel | beq $jumpIfFalseLabel")
return
}
}
}
asmgen.translateExpression(left) asmgen.translateExpression(left)
asmgen.translateExpression(right) asmgen.translateExpression(right)
asmgen.out(" jsr prog8_lib.greater_b | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel") asmgen.out(" jsr prog8_lib.greater_b | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel")
} }
private fun translateUwordGreater(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateUwordGreater(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
// TODO compare with optimized asm if(rightConstVal!=null) {
if(leftConstVal!=null) {
if(rightConstVal>=leftConstVal)
asmgen.out(" jmp $jumpIfFalseLabel")
return
} else {
if (left is IdentifierReference) {
val name = asmgen.asmVariableName(left)
if(rightConstVal.number.toInt()!=0)
asmgen.out("""
lda $name+1
cmp #>${rightConstVal.number}
bcc $jumpIfFalseLabel
bne +
lda $name
cmp #<${rightConstVal.number}
bcc $jumpIfFalseLabel
beq $jumpIfFalseLabel
+""")
else
asmgen.out("""
lda $name
bne +
lda $name+1
beq $jumpIfFalseLabel
+""")
return
}
}
}
asmgen.translateExpression(left) asmgen.translateExpression(left)
asmgen.translateExpression(right) asmgen.translateExpression(right)
asmgen.out(" jsr prog8_lib.greater_uw | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel") asmgen.out(" jsr prog8_lib.greater_uw | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel")
} }
private fun translateWordGreater(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) { private fun translateWordGreater(left: Expression, right: Expression, leftConstVal: NumericLiteralValue?, rightConstVal: NumericLiteralValue?, jumpIfFalseLabel: String) {
// TODO compare with optimized asm if(rightConstVal!=null) {
if(leftConstVal!=null) {
if(rightConstVal<=leftConstVal)
asmgen.out(" jmp $jumpIfFalseLabel")
return
} else {
if (left is IdentifierReference) {
val name = asmgen.asmVariableName(left)
if(rightConstVal.number.toInt()!=0)
asmgen.out("""
lda $name
cmp #<${rightConstVal.number}
lda $name+1
sbc #>${rightConstVal.number}
bvc +
eor #$80
+ bmi $jumpIfFalseLabel
beq $jumpIfFalseLabel""")
else
asmgen.out(" lda $name+1 | bmi $jumpIfFalseLabel | beq $jumpIfFalseLabel")
return
}
}
}
asmgen.translateExpression(left) asmgen.translateExpression(left)
asmgen.translateExpression(right) asmgen.translateExpression(right)
asmgen.out(" jsr prog8_lib.greater_w | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel") asmgen.out(" jsr prog8_lib.greater_w | inx | lda P8ESTACK_LO,x | beq $jumpIfFalseLabel")

8
examples/test.p8
View File

@ -253,15 +253,15 @@ main {
} }
if uww>0 { if uww>0 {
txt.print("ok 8b\n") txt.print("ok 8k\n")
} else { } else {
txt.print("fail 8b\n") txt.print("fail 8k\n")
} }
if uww>2222 { if uww>2222 {
txt.print("fail 8b\n") txt.print("fail 8l\n")
} else { } else {
txt.print("ok 8b\n") txt.print("ok 8l\n")
} }
; @($c000) *= 99 ; TODO implement ; @($c000) *= 99 ; TODO implement