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

Fix over eager cross block zp move

This commit is contained in:
drmortalwombat 2023-01-30 19:27:09 +01:00
parent e624011415
commit d15fd8a451
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
oscar64/NativeCodeGenerator.cpp
View File

@ -20572,6 +20572,19 @@ bool NativeCodeBasicBlock::MoveZeroPageCrossBlockUp(int at, const NativeCodeInst
else else
return false; return false;
if (!eb->mFalseJump)
;
else if (eb->mTrueJump == eb || eb->mFalseJump == eb)
;
else if (eb->mFalseJump->mPatched && eb->mTrueJump->mPatched)
;
else if (
eb->mTrueJump == this && !eb->mFalseJump->mEntryRequiredRegs[lins.mAddress] && !eb->mFalseJump->mEntryRequiredRegs[sins.mAddress] ||
eb->mFalseJump == this && !eb->mTrueJump->mEntryRequiredRegs[lins.mAddress] && !eb->mTrueJump->mEntryRequiredRegs[sins.mAddress])
;
else
return false;
pat = -2; pat = -2;
} }
else else
@ -30840,6 +30853,22 @@ bool NativeCodeBasicBlock::PeepHoleOptimizer(NativeCodeProcedure* proc, int pass
progress = true; progress = true;
} }
else if (
mIns[i + 0].IsShift() && (mIns[i + 0].mMode == ASMIM_ZERO_PAGE || mIns[i + 0].mMode == ASMIM_ABSOLUTE) &&
mIns[i + 3].mType == ASMIT_LDA && mIns[i + 3].SameEffectiveAddress(mIns[i + 0]) && !(mIns[i + 3].mLive & LIVE_MEM) &&
!mIns[i + 1].ChangesCarry() && !mIns[i + 2].ChangesCarry() &&
!mIns[i + 1].RequiresCarry() && !mIns[i + 2].RequiresCarry() &&
!mIns[i + 1].MayBeSameAddress(mIns[i + 0]) && !mIns[i + 2].MayBeSameAddress(mIns[i + 0]))
{
mIns.Insert(i + 4, NativeCodeInstruction(mIns[i + 0].mType, ASMIM_IMPLIED));
mIns[i + 1].mLive |= LIVE_CPU_REG_C;
mIns[i + 2].mLive |= LIVE_CPU_REG_C;
mIns[i + 3].mLive |= LIVE_CPU_REG_C;
mIns[i + 0].mType = ASMIT_NOP; mIns[i + 0].mMode = ASMIM_IMPLIED;
progress = true;
}
#endif #endif
#if 1 #if 1
else if ( else if (
@ -33768,7 +33797,7 @@ void NativeCodeProcedure::RebuildEntry(void)
void NativeCodeProcedure::Optimize(void) void NativeCodeProcedure::Optimize(void)
{ {
CheckFunc = !strcmp(mInterProc->mIdent->mString, "joy_interrupt"); CheckFunc = !strcmp(mInterProc->mIdent->mString, "missile_animate");
#if 1 #if 1
int step = 0; int step = 0;
@ -33981,6 +34010,9 @@ void NativeCodeProcedure::Optimize(void)
} }
#endif #endif
#if 1 #if 1
if (step > 4 && !changed) if (step > 4 && !changed)
@ -34009,6 +34041,7 @@ void NativeCodeProcedure::Optimize(void)
} }
#endif #endif
#if _DEBUG #if _DEBUG
ResetVisited(); ResetVisited();
mEntryBlock->CheckBlocks(true); mEntryBlock->CheckBlocks(true);
@ -34300,6 +34333,7 @@ void NativeCodeProcedure::Optimize(void)
else else
cnt++; cnt++;
} while (changed); } while (changed);
#if 1 #if 1