fix return type error for asmsubs with >1 result values

This commit is contained in:
Irmen de Jong
2022-04-01 22:30:15 +02:00
parent 156cf7315c
commit 20d06d9f9d
2 changed files with 44 additions and 24 deletions

View File

@@ -985,9 +985,21 @@ class FunctionCallExpression(override var target: IdentifierReference,
return InferredTypes.knownFor(stmt.returntypes[0])
// multiple return values. Can occur for asmsub routines. If there is exactly one register return value, take that.
val numRegisterReturns = stmt.asmReturnvaluesRegisters.count { it.registerOrPair!=null }
if(numRegisterReturns==1)
return InferredTypes.InferredType.known(DataType.UBYTE)
val registerReturns = stmt.asmReturnvaluesRegisters.filter {it.registerOrPair != null }
if(registerReturns.size==1) {
val reg = registerReturns.single().registerOrPair!!
return when(reg) {
RegisterOrPair.A,
RegisterOrPair.X,
RegisterOrPair.Y -> InferredTypes.InferredType.known(DataType.UBYTE)
RegisterOrPair.AX,
RegisterOrPair.AY,
RegisterOrPair.XY, in Cx16VirtualRegisters -> InferredTypes.InferredType.known(DataType.UWORD)
RegisterOrPair.FAC1,
RegisterOrPair.FAC2 -> InferredTypes.InferredType.known(DataType.FLOAT)
else -> throw FatalAstException("weird reg")
}
}
return InferredTypes.unknown() // has multiple return types... so not a single resulting datatype possible
}