6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2024-07-05 09:28:54 +00:00
Code Issues Projects Releases Wiki Activity

6502: allow functions with large return values on the right hand side of modifying operators

Browse Source
This commit is contained in:
Karol Stasiak 2018-08-01 15:28:47 +02:00
parent 69f233e378
commit bc1dc0e500
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/scala/millfork/compiler/mos/BuiltIns.scala
View File

@ -983,11 +983,15 @@ object BuiltIns {
}
}
}
case _ => Nil -> (addend match {
case _ => addend match {
case vv: VariableExpression =>
val source = env.get[Variable](vv.name)
List.tabulate(addendSize)(i => AssemblyLine.variable(ctx, LDA, source, i))
})
Nil -> List.tabulate(addendSize)(i => AssemblyLine.variable(ctx, LDA, source, i))
case f: FunctionCallExpression =>
val jsr = MosExpressionCompiler.compile(ctx, addend, None, BranchSpec.None)
val result = ctx.env.get[VariableInMemory](f.functionName + ".return")
jsr -> List.tabulate(addendSize)(i => AssemblyLine.variable(ctx, LDA, result, i))
}
}
}
val addendByteRead = addendByteRead0 ++ List.fill((targetSize - addendByteRead0.size) max 0)(List(AssemblyLine.immediate(LDA, 0)))
@ -1129,11 +1133,15 @@ object BuiltIns {
case 2 =>
val base = MosExpressionCompiler.compile(ctx, param, Some(MosExpressionCompiler.getExpressionType(ctx, param) -> RegisterVariable(MosRegister.AX, w)), NoBranching)
base -> List(Nil, List(AssemblyLine.implied(TXA)))
case _ => Nil -> (param match {
case _ => param match {
case vv: VariableExpression =>
val source = env.get[Variable](vv.name)
List.tabulate(paramSize)(i => AssemblyLine.variable(ctx, LDA, source, i))
})
Nil -> List.tabulate(paramSize)(i => AssemblyLine.variable(ctx, LDA, source, i))
case f: FunctionCallExpression =>
val jsr = MosExpressionCompiler.compile(ctx, param, None, BranchSpec.None)
val result = ctx.env.get[VariableInMemory](f.functionName + ".return")
jsr -> List.tabulate(paramSize)(i => AssemblyLine.variable(ctx, LDA, result, i))
}
}
}
if (ctx.options.flags(CompilationFlag.EmitNative65816Opcodes)) {