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

Fix loss of dependency when propagating (zp),y single use load across basic blocks

This commit is contained in:
drmortalwombat 2024-07-12 21:02:46 +02:00
parent 96ada6e22a
commit 5909db71d5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar64/NativeCodeGenerator.cpp
View File

@ -26795,6 +26795,11 @@ bool NativeCodeBasicBlock::PatchSingleUseGlobalLoad(const NativeCodeBasicBlock*
mEntryRequiredRegs += CPU_REG_X; mEntryRequiredRegs += CPU_REG_X;
if (ains.RequiresYReg()) if (ains.RequiresYReg())
mEntryRequiredRegs += CPU_REG_Y; mEntryRequiredRegs += CPU_REG_Y;
if (ains.mMode == ASMIM_INDIRECT_Y)
{
mEntryRequiredRegs += ains.mAddress;
mEntryRequiredRegs += ains.mAddress + 1;
}
} }
while (at < mIns.Size()) while (at < mIns.Size())
@ -26832,6 +26837,11 @@ bool NativeCodeBasicBlock::PatchSingleUseGlobalLoad(const NativeCodeBasicBlock*
mExitRequiredRegs += CPU_REG_X; mExitRequiredRegs += CPU_REG_X;
if (ains.RequiresYReg()) if (ains.RequiresYReg())
mExitRequiredRegs += CPU_REG_Y; mExitRequiredRegs += CPU_REG_Y;
if (ains.mMode == ASMIM_INDIRECT_Y)
{
mExitRequiredRegs += ains.mAddress;
mExitRequiredRegs += ains.mAddress + 1;
}
if (mTrueJump && mTrueJump->PatchSingleUseGlobalLoad(block, reg, 0, ains)) if (mTrueJump && mTrueJump->PatchSingleUseGlobalLoad(block, reg, 0, ains))
changed = true; changed = true;
@ -47729,7 +47739,7 @@ bool NativeCodeBasicBlock::PeepHoleOptimizerIterate(int pass)
if (mIns[i + 1].mLive & (LIVE_CPU_REG_A | LIVE_CPU_REG_Z)) if (mIns[i + 1].mLive & (LIVE_CPU_REG_A | LIVE_CPU_REG_Z))
n--; n--;
if (n > 0 && (mIns[i + 0].mMode != ASMIM_INDIRECT_Y || (mIns[i + 1].mAddress != mIns[i + 0].mAddress && mIns[i + 1].mAddress != mIns[i + 0].mAddress + 1))) if (n > 0 && (mIns[i + 0].mMode != ASMIM_INDIRECT_Y || (mIns[i + 1].mAddress != mIns[i + 0].mAddress && mIns[i + 1].mAddress != mIns[i + 0].mAddress + 1 && pass > 1)))
{ {
mProc->ResetPatched(); mProc->ResetPatched();
if (CheckSingleUseGlobalLoad(this, mIns[i + 1].mAddress, i + 2, mIns[i], n)) if (CheckSingleUseGlobalLoad(this, mIns[i + 1].mAddress, i + 2, mIns[i], n))
@ -49541,7 +49551,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
mInterProc = proc; mInterProc = proc;
mInterProc->mLinkerObject->mNativeProc = this; mInterProc->mLinkerObject->mNativeProc = this;
CheckFunc = !strcmp(mInterProc->mIdent->mString, "format_insert2"); CheckFunc = !strcmp(mInterProc->mIdent->mString, "diggers_move");
int nblocks = proc->mBlocks.Size(); int nblocks = proc->mBlocks.Size();
tblocks = new NativeCodeBasicBlock * [nblocks]; tblocks = new NativeCodeBasicBlock * [nblocks];