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

slightly improved asm gen error messages

Browse Source
This commit is contained in:
Irmen de Jong 2020-06-01 23:49:25 +02:00
parent 6408cc46a8
commit 9200992024
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/src/prog8/ast/processing/AstChecker.kt
View File

@ -849,7 +849,7 @@ internal class AstChecker(private val program: Program,
if(functionCallStatement.target.nameInSource.last() in setOf("lsl", "lsr", "rol", "ror", "rol2", "ror2", "swap", "sort", "reverse")) { if(functionCallStatement.target.nameInSource.last() in setOf("lsl", "lsr", "rol", "ror", "rol2", "ror2", "swap", "sort", "reverse")) {
// in-place modification, can't be done on literals // in-place modification, can't be done on literals
if(functionCallStatement.args.any { it !is IdentifierReference && it !is RegisterExpr && it !is ArrayIndexedExpression && it !is DirectMemoryRead }) { if(functionCallStatement.args.any { it !is IdentifierReference && it !is RegisterExpr && it !is ArrayIndexedExpression && it !is DirectMemoryRead }) {
errors.err("can't use that as argument to a in-place modifying function", functionCallStatement.args.first().position) errors.err("invalid argument to a in-place modifying function", functionCallStatement.args.first().position)
} }
} }
super.visit(functionCallStatement) super.visit(functionCallStatement)

21
compiler/src/prog8/compiler/target/c64/codegen/AssignmentAsmGen.kt
View File

@ -88,7 +88,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
DataType.ARRAY_F -> { DataType.ARRAY_F -> {
assignFromFloatConstant(assign.target, constValue.toDouble()) assignFromFloatConstant(assign.target, constValue.toDouble())
} }
else -> throw AssemblyError("invalid array dt $arrayDt") else -> throw AssemblyError("assignment to array: invalid array dt $arrayDt")
} }
} else { } else {
TODO() TODO()
@ -156,7 +156,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
""") """)
} }
DataType.ARRAY_F -> return false // TODO optimize? DataType.ARRAY_F -> return false // TODO optimize?
else -> throw AssemblyError("invalid array dt $arrayDt") else -> throw AssemblyError("assignment to array: invalid array dt $arrayDt")
} }
return true return true
} }
@ -174,7 +174,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
when(arrayDt) { when(arrayDt) {
DataType.ARRAY_UB -> { DataType.ARRAY_UB -> {
if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR) if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR)
throw AssemblyError("expected byte array or string") throw AssemblyError("assignment to array: expected byte array or string")
if (assign.aug_op == "setvalue") { if (assign.aug_op == "setvalue") {
if (valueArrayIndex is NumericLiteralValue) if (valueArrayIndex is NumericLiteralValue)
asmgen.out(" ldy #${valueArrayIndex.number.toHex()}") asmgen.out(" ldy #${valueArrayIndex.number.toHex()}")
@ -194,7 +194,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
DataType.ARRAY_UW -> TODO() DataType.ARRAY_UW -> TODO()
DataType.ARRAY_W -> TODO() DataType.ARRAY_W -> TODO()
DataType.ARRAY_F -> TODO() DataType.ARRAY_F -> TODO()
else -> throw AssemblyError("invalid array dt") else -> throw AssemblyError("assignment to array: invalid array dt")
} }
return true return true
} }
@ -418,7 +418,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
val variablename = asmgen.asmIdentifierName(arrayExpr.identifier) val variablename = asmgen.asmIdentifierName(arrayExpr.identifier)
val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT) val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT)
if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR) if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR)
throw AssemblyError("expected byte array or string") throw AssemblyError("assign to memory byte: expected byte array or string source")
if (arrayIndex is NumericLiteralValue) if (arrayIndex is NumericLiteralValue)
asmgen.out(" ldy #${arrayIndex.number.toHex()}") asmgen.out(" ldy #${arrayIndex.number.toHex()}")
else else
@ -518,7 +518,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
val variablename = asmgen.asmIdentifierName(arrayExpr.identifier) val variablename = asmgen.asmIdentifierName(arrayExpr.identifier)
val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT) val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT)
if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR) if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR)
throw AssemblyError("expected byte array or string") throw AssemblyError("assign to identifier: expected byte array or string source")
if (arrayIndex is NumericLiteralValue) if (arrayIndex is NumericLiteralValue)
asmgen.out(" ldy #${arrayIndex.number.toHex()}") asmgen.out(" ldy #${arrayIndex.number.toHex()}")
else else
@ -637,7 +637,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
val variablename = asmgen.asmIdentifierName(arrayExpr.identifier) val variablename = asmgen.asmIdentifierName(arrayExpr.identifier)
val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT) val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT)
if (arrayDt != DataType.ARRAY_W && arrayDt != DataType.ARRAY_UW) if (arrayDt != DataType.ARRAY_W && arrayDt != DataType.ARRAY_UW)
throw AssemblyError("expected word array") throw AssemblyError("assign to identifier: expected word array source")
if (arrayIndex is NumericLiteralValue) if (arrayIndex is NumericLiteralValue)
asmgen.out(" lda #${arrayIndex.number.toHex()}") asmgen.out(" lda #${arrayIndex.number.toHex()}")
else else
@ -741,7 +741,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
val variablename = asmgen.asmIdentifierName(arrayExpr.identifier) val variablename = asmgen.asmIdentifierName(arrayExpr.identifier)
val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT) val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT)
if (arrayDt != DataType.ARRAY_F) if (arrayDt != DataType.ARRAY_F)
throw AssemblyError("expected float array") throw AssemblyError("assign to identifier: expected float array source")
if (arrayIndex is NumericLiteralValue) if (arrayIndex is NumericLiteralValue)
asmgen.out(" lda #${arrayIndex.number.toHex()}") asmgen.out(" lda #${arrayIndex.number.toHex()}")
else else
@ -775,7 +775,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
} }
} }
} }
else -> throw AssemblyError("invalid dt") else -> throw AssemblyError("assignment to identifier: invalid target datatype: $targetType")
} }
return false return false
} }
@ -1086,7 +1086,7 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
val variablename = asmgen.asmIdentifierName(arrayExpr.identifier) val variablename = asmgen.asmIdentifierName(arrayExpr.identifier)
val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT) val arrayDt = arrayExpr.identifier.inferType(program).typeOrElse(DataType.STRUCT)
if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR) if (arrayDt != DataType.ARRAY_B && arrayDt != DataType.ARRAY_UB && arrayDt != DataType.STR)
throw AssemblyError("expected byte array or string") throw AssemblyError("assign to register: expected byte array or string source")
if (arrayIndex is NumericLiteralValue) if (arrayIndex is NumericLiteralValue)
asmgen.out(" ldy #${arrayIndex.number.toHex()}") asmgen.out(" ldy #${arrayIndex.number.toHex()}")
else else
@ -1141,7 +1141,6 @@ internal class AssignmentAsmGen(private val program: Program, private val errors
// old code-generation below: // old code-generation below:
// eventually, all of this should have been replaced by newer more optimized code above. // eventually, all of this should have been replaced by newer more optimized code above.
private fun translateNormalAssignment(assign: Assignment) { private fun translateNormalAssignment(assign: Assignment) {
require(assign.aug_op == null) require(assign.aug_op == null)

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

@ -110,7 +110,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
else -> throw AssemblyError("weird type") else -> throw AssemblyError("weird type")
} }
} }
in PassByReferenceDatatypes -> throw AssemblyError("cannot case a pass-by-reference datatypes into something else") in PassByReferenceDatatypes -> throw AssemblyError("cannot cast pass-by-reference value into another type")
else -> throw AssemblyError("weird type") else -> throw AssemblyError("weird type")
} }
} }