frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unary ops on striped struct members

This commit is contained in:
drmortalwombat 2024-02-26 20:38:02 +01:00
parent 148c288942
commit f39cb38eb3
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
oscar64/NativeCodeGenerator.cpp
View File

@ -6487,6 +6487,11 @@ bool NativeCodeBasicBlock::LoadLoadOpStoreIndirectValue(InterCodeProcedure* proc
bool NativeCodeBasicBlock::LoadUnopStoreIndirectValue(InterCodeProcedure* proc, const InterInstruction* rins, const InterInstruction* oins, const InterInstruction* wins) bool NativeCodeBasicBlock::LoadUnopStoreIndirectValue(InterCodeProcedure* proc, const InterInstruction* rins, const InterInstruction* oins, const InterInstruction* wins)
{ {
int size = InterTypeSize[wins->mSrc[0].mType]; 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; AsmInsMode ram = ASMIM_INDIRECT_Y, wam = ASMIM_INDIRECT_Y;
bool sfinal = wins->mSrc[0].mFinal; bool sfinal = wins->mSrc[0].mFinal;
@ -6562,19 +6567,20 @@ bool NativeCodeBasicBlock::LoadUnopStoreIndirectValue(InterCodeProcedure* proc,
if (wins->mVolatile) if (wins->mVolatile)
wflags |= NCIF_VOLATILE; 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++) 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)); mIns.Push(NativeCodeInstruction(rins, ASMIT_LDA, ASMIM_IMMEDIATE, imm));
if (ram == ASMIM_INDIRECT_Y) 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)); mIns.Push(NativeCodeInstruction(oins, at, ram, rareg));
} }
else else
@ -6586,11 +6592,14 @@ bool NativeCodeBasicBlock::LoadUnopStoreIndirectValue(InterCodeProcedure* proc,
if (wam == ASMIM_INDIRECT_Y) if (wam == ASMIM_INDIRECT_Y)
{ {
if (ram != ASMIM_INDIRECT_Y || rindex != windex) 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)); mIns.Push(NativeCodeInstruction(wins, ASMIT_STA, wam, wareg));
} }
else else
mIns.Push(NativeCodeInstruction(wins, ASMIT_STA, wam, wareg + i)); mIns.Push(NativeCodeInstruction(wins, ASMIT_STA, wam, wareg + i));
rindex += rstride;
windex += wstride;
} }
return true; return true;