From f39cb38eb3c6c09f120c3c965ec2ad58d35790b2 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Mon, 26 Feb 2024 20:38:02 +0100
Subject: [PATCH] Fix unary ops on striped struct members

---
 oscar64/NativeCodeGenerator.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
index e71818a..08101da 100644
--- a/oscar64/NativeCodeGenerator.cpp
+++ b/oscar64/NativeCodeGenerator.cpp
@@ -6487,6 +6487,11 @@ bool NativeCodeBasicBlock::LoadLoadOpStoreIndirectValue(InterCodeProcedure* proc
 bool NativeCodeBasicBlock::LoadUnopStoreIndirectValue(InterCodeProcedure* proc, const InterInstruction* rins, const InterInstruction* oins, const InterInstruction* wins)
 {
 	int size = InterTypeSize[wins->mSrc[0].mType];
+	int rstride = rins->mSrc[0].mStride;
+	int wstride = wins->mSrc[1].mStride;
+
+	if (size > 1 && rstride != wstride)
+		return false;
 
 	AsmInsMode  ram = ASMIM_INDIRECT_Y, wam = ASMIM_INDIRECT_Y;
 	bool		sfinal = wins->mSrc[0].mFinal;
@@ -6562,19 +6567,20 @@ bool NativeCodeBasicBlock::LoadUnopStoreIndirectValue(InterCodeProcedure* proc,
 	if (wins->mVolatile)
 		wflags |= NCIF_VOLATILE;
 
-	if (ram == ASMIM_INDIRECT_Y)
-		CheckFrameIndex(rins, rareg, rindex, size, BC_REG_ADDR);
-	if (wam == ASMIM_INDIRECT_Y)
-		CheckFrameIndex(wins, wareg, windex, size, BC_REG_ACCU);
-
 
 	for (int i = 0; i < size; i++)
 	{
+		if (ram == ASMIM_INDIRECT_Y)
+			CheckFrameIndex(rins, rareg, rindex, 1, BC_REG_ADDR);
+		if (wam == ASMIM_INDIRECT_Y)
+			CheckFrameIndex(wins, wareg, windex, 1, BC_REG_ACCU);
+
+
 		mIns.Push(NativeCodeInstruction(rins, ASMIT_LDA, ASMIM_IMMEDIATE, imm));
 
 		if (ram == ASMIM_INDIRECT_Y)
 		{
-			mIns.Push(NativeCodeInstruction(rins, ASMIT_LDY, ASMIM_IMMEDIATE, rindex + i));
+			mIns.Push(NativeCodeInstruction(rins, ASMIT_LDY, ASMIM_IMMEDIATE, rindex));
 			mIns.Push(NativeCodeInstruction(oins, at, ram, rareg));
 		}
 		else
@@ -6586,11 +6592,14 @@ bool NativeCodeBasicBlock::LoadUnopStoreIndirectValue(InterCodeProcedure* proc,
 		if (wam == ASMIM_INDIRECT_Y)
 		{
 			if (ram != ASMIM_INDIRECT_Y || rindex != windex)
-				mIns.Push(NativeCodeInstruction(wins, ASMIT_LDY, ASMIM_IMMEDIATE, windex + i));
+				mIns.Push(NativeCodeInstruction(wins, ASMIT_LDY, ASMIM_IMMEDIATE, windex));
 			mIns.Push(NativeCodeInstruction(wins, ASMIT_STA, wam, wareg));
 		}
 		else
 			mIns.Push(NativeCodeInstruction(wins, ASMIT_STA, wam, wareg + i));
+
+		rindex += rstride;
+		windex += wstride;
 	}
 
 	return true;