update to Kotlin 1.6.0

This commit is contained in:
Irmen de Jong 2021-11-16 22:34:38 +01:00
parent 1f60a2d8b9
commit 964e8e0a17
4 changed files with 4 additions and 3 deletions

View File

@ -1231,6 +1231,7 @@ internal class BuiltinFunctionsAsmGen(private val program: Program, private val
}
}
}
else -> throw AssemblyError("wrong pokew arg type")
}
asmgen.assignExpressionToVariable(fcall.args[0], "P8ZP_SCRATCH_W1", DataType.UWORD, null)

View File

@ -64,7 +64,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
for ((_, reg) in returns) {
// result value is in cpu or status registers, put it on the stack instead (as we're evaluating an expression tree)
if (reg.registerOrPair != null) {
when (reg.registerOrPair) {
when (reg.registerOrPair!!) {
RegisterOrPair.A -> asmgen.out(" sta P8ESTACK_LO,x | dex")
RegisterOrPair.Y -> asmgen.out(" tya | sta P8ESTACK_LO,x | dex")
RegisterOrPair.AY -> asmgen.out(" sta P8ESTACK_LO,x | tya | sta P8ESTACK_HI,x | dex")

View File

@ -1,7 +1,7 @@
TODO
====
For next compiler release (7.3)
For next compiler release (7.4)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...

View File

@ -4,4 +4,4 @@ org.gradle.parallel=true
org.gradle.daemon=true
kotlin.code.style=official
javaVersion=11
kotlinVersion=1.5.31
kotlinVersion=1.6.0