From a1fda2b957f204e483f3d265ca36e156d4b14a0c Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Thu, 9 Dec 2021 21:38:36 +0100
Subject: [PATCH] Fix float parameter and return values

---
 oscar64/InterCodeGenerator.cpp  |  2 +-
 oscar64/NativeCodeGenerator.cpp | 11 +++++++----
 oscar64/Parser.cpp              | 10 ++++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/oscar64/InterCodeGenerator.cpp b/oscar64/InterCodeGenerator.cpp
index 481c936..dd0ef61 100644
--- a/oscar64/InterCodeGenerator.cpp
+++ b/oscar64/InterCodeGenerator.cpp
@@ -3297,7 +3297,7 @@ InterCodeProcedure* InterCodeGenerator::TranslateProcedure(InterCodeModule * mod
 
 		dec->mLinkerObject->mNumTemporaries = 1;
 		dec->mLinkerObject->mTemporaries[0] = BC_REG_FPARAMS;
-		dec->mLinkerObject->mTempSizes[0] = 8;
+		dec->mLinkerObject->mTempSizes[0] = BC_REG_FPARAMS_END - BC_REG_FPARAMS;
 	}
 
 	InterCodeBasicBlock* entryBlock = new InterCodeBasicBlock();
diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
index e035922..5fb7f2f 100644
--- a/oscar64/NativeCodeGenerator.cpp
+++ b/oscar64/NativeCodeGenerator.cpp
@@ -2880,22 +2880,25 @@ void NativeCodeBasicBlock::StoreValue(InterCodeProcedure* proc, const InterInstr
 			{
 				if (ins->mSrc[1].mMemory == IM_INDIRECT)
 				{
+					union { float f; unsigned int v; } cc;
+					cc.f = ins->mSrc[0].mFloatConst;
+
 					int	reg = BC_REG_TMP + proc->mTempOffset[ins->mSrc[1].mTemp];
 					int index = ins->mSrc[1].mIntConst;
 
 					CheckFrameIndex(reg, index, 4);
 
 					mIns.Push(NativeCodeInstruction(ASMIT_LDY, ASMIM_IMMEDIATE, index));
-					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, ins->mSrc[0].mIntConst & 0xff));
+					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, cc.v & 0xff));
 					mIns.Push(NativeCodeInstruction(ASMIT_STA, ASMIM_INDIRECT_Y, reg));
 					mIns.Push(NativeCodeInstruction(ASMIT_LDY, ASMIM_IMMEDIATE, index + 1));
-					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, (ins->mSrc[0].mIntConst >> 8) & 0xff));
+					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, (cc.v >> 8) & 0xff));
 					mIns.Push(NativeCodeInstruction(ASMIT_STA, ASMIM_INDIRECT_Y, reg));
 					mIns.Push(NativeCodeInstruction(ASMIT_LDY, ASMIM_IMMEDIATE, index + 2));
-					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, (ins->mSrc[0].mIntConst >> 16) & 0xff));
+					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, (cc.v >> 16) & 0xff));
 					mIns.Push(NativeCodeInstruction(ASMIT_STA, ASMIM_INDIRECT_Y, reg));
 					mIns.Push(NativeCodeInstruction(ASMIT_LDY, ASMIM_IMMEDIATE, index + 3));
-					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, (ins->mSrc[0].mIntConst >> 24) & 0xff));
+					mIns.Push(NativeCodeInstruction(ASMIT_LDA, ASMIM_IMMEDIATE, (cc.v >> 24) & 0xff));
 					mIns.Push(NativeCodeInstruction(ASMIT_STA, ASMIM_INDIRECT_Y, reg));
 				}
 			}
diff --git a/oscar64/Parser.cpp b/oscar64/Parser.cpp
index b650226..9bf64f0 100644
--- a/oscar64/Parser.cpp
+++ b/oscar64/Parser.cpp
@@ -807,16 +807,22 @@ Declaration* Parser::ParseDeclaration(bool variable)
 
 		ndec = ReverseDeclaration(ndec, bdec);
 
+		Declaration* npdec = ndec;
+
+		if (npdec->mBase->mType == DT_TYPE_POINTER)
+			npdec = npdec->mBase;
+
 		// Make room for return value pointer on struct return
-		if (ndec->mBase->mType == DT_TYPE_FUNCTION && ndec->mBase->mBase->mType == DT_TYPE_STRUCT)
+		if (npdec->mBase->mType == DT_TYPE_FUNCTION && npdec->mBase->mBase->mType == DT_TYPE_STRUCT)
 		{
-			Declaration* pdec = ndec->mBase->mParams;
+			Declaration* pdec = npdec->mBase->mParams;
 			while (pdec)
 			{
 				pdec->mVarIndex += 2;
 				pdec = pdec->mNext;
 			}
 		}
+		
 
 		if (definingType)
 		{