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

types

Browse Source
This commit is contained in:
Irmen de Jong 2018-10-04 02:28:19 +02:00
parent d2ffb1063b
commit bf75e7c00b
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/src/prog8/compiler/Compiler.kt
View File

@ -520,13 +520,13 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram,
} }
is PrefixExpression -> { is PrefixExpression -> {
translate(expr.expression) translate(expr.expression)
translatePrefixOperator(expr.operator) translatePrefixOperator(expr.operator, expr.expression.resultingDatatype(namespace, heap))
} }
is BinaryExpression -> { is BinaryExpression -> {
checkForFloatPrecisionProblem(expr.left, expr.right) checkForFloatPrecisionProblem(expr.left, expr.right)
translate(expr.left) translate(expr.left)
translate(expr.right) translate(expr.right)
translateBinaryOperator(expr.operator) translateBinaryOperator(expr.operator, expr.left.resultingDatatype(namespace, heap), expr.right.resultingDatatype(namespace, heap))
} }
is FunctionCall -> { is FunctionCall -> {
val target = expr.target.targetStatement(namespace) val target = expr.target.targetStatement(namespace)
@ -659,8 +659,14 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram,
stackvmProg.instr(Opcode.CALL, callLabel=subroutine.scopedname) stackvmProg.instr(Opcode.CALL, callLabel=subroutine.scopedname)
} }
private fun translateBinaryOperator(operator: String) { private fun translateBinaryOperator(operator: String, leftDt: DataType?, rightDt: DataType?) {
if(leftDt==null || rightDt==null)
throw CompilerException("left and/or right operand datatype not known")
val validDt = setOf(DataType.BYTE, DataType.WORD, DataType.FLOAT)
if(leftDt !in validDt || rightDt !in validDt)
throw CompilerException("invalid datatype(s) for operand(s)")
val opcode = when(operator) { val opcode = when(operator) {
// todo variants depending on leftdt/rightdt (b/w/f)
"+" -> Opcode.ADD "+" -> Opcode.ADD
"-" -> Opcode.SUB "-" -> Opcode.SUB
"*" -> Opcode.MUL "*" -> Opcode.MUL
@ -685,12 +691,14 @@ private class StatementTranslator(private val stackvmProg: StackVmProgram,
stackvmProg.instr(opcode) stackvmProg.instr(opcode)
} }
private fun translatePrefixOperator(operator: String) { private fun translatePrefixOperator(operator: String, operandDt: DataType?) {
if(operandDt==null)
throw CompilerException("operand datatype not known")
val opcode = when(operator) { val opcode = when(operator) {
"+" -> Opcode.NOP "+" -> Opcode.NOP
"-" -> Opcode.NEG "-" -> Opcode.NEG // todo b/w/f
"~" -> Opcode.INV "~" -> Opcode.INV // todo b/w
"not" -> Opcode.NOT "not" -> Opcode.NOT // todo b/w (convert float to byte)
else -> throw FatalAstException("const evaluation for invalid prefix operator $operator") else -> throw FatalAstException("const evaluation for invalid prefix operator $operator")
} }
stackvmProg.instr(opcode) stackvmProg.instr(opcode)

8
compiler/src/prog8/stackvm/StackVm.kt
View File

@ -81,10 +81,10 @@ enum class Opcode {
W2FLOAT, // convert word into floating point W2FLOAT, // convert word into floating point
// logical operations // logical operations
AND, // todo b/w/f ? AND, // todo b/w (convert float to byte)
OR, // todo b/w/f ? OR, // todo b/w (convert float to byte)
XOR, // todo b/w/f ? XOR, // todo b/w (convert float to byte)
NOT, // todo b/w/f ? NOT, // todo b/w (convert float to byte)
// increment, decrement // increment, decrement
INC, INC,