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

Fix propagate of compare result over potential dual entry empty basic block

This commit is contained in:
drmortalwombat 2023-01-22 15:18:07 +01:00
parent 946b1fe53d
commit dbd0fb6a56
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oscar64/NativeCodeGenerator.cpp
View File

@ -17064,9 +17064,11 @@ bool NativeCodeBasicBlock::JoinTailCodeSequences(NativeCodeProcedure* proc, bool
int sz = b->mIns.Size(); int sz = b->mIns.Size();
b->mIns[sz - 1].mType = ASMIT_LDX; b->mIns[sz - 1].mType = ASMIT_LDX;
b->mIns[sz - 1].mLive |= LIVE_CPU_REG_X; b->mIns[sz - 1].mLive |= LIVE_CPU_REG_X;
b->mExitRequiredRegs += CPU_REG_X;
changed = true; changed = true;
} }
mEntryRequiredRegs += CPU_REG_X;
mIns[0].mType = ASMIT_NOP; mIns[0].mMode = ASMIM_IMPLIED; mIns[0].mType = ASMIT_NOP; mIns[0].mMode = ASMIM_IMPLIED;
} }
} }
@ -17085,9 +17087,11 @@ bool NativeCodeBasicBlock::JoinTailCodeSequences(NativeCodeProcedure* proc, bool
int sz = b->mIns.Size(); int sz = b->mIns.Size();
b->mIns[sz - 1].mType = ASMIT_LDY; b->mIns[sz - 1].mType = ASMIT_LDY;
b->mIns[sz - 1].mLive |= LIVE_CPU_REG_Y; b->mIns[sz - 1].mLive |= LIVE_CPU_REG_Y;
b->mExitRequiredRegs += CPU_REG_Y;
changed = true; changed = true;
} }
mEntryRequiredRegs += CPU_REG_Y;
mIns[0].mType = ASMIT_NOP; mIns[0].mMode = ASMIM_IMPLIED; mIns[0].mType = ASMIT_NOP; mIns[0].mMode = ASMIM_IMPLIED;
} }
} }
@ -22797,7 +22801,7 @@ bool NativeCodeBasicBlock::ValueForwarding(const NativeRegisterDataSet& data, bo
mFalseJump = nullptr; mFalseJump = nullptr;
changed = true; changed = true;
} }
else if (global && mIns.Size() > 0) else if (global && mIns.Size() > 0 && fork == this)
{ {
NativeCodeInstruction& lins(mIns[mIns.Size() - 1]); NativeCodeInstruction& lins(mIns[mIns.Size() - 1]);
@ -22881,7 +22885,7 @@ bool NativeCodeBasicBlock::ValueForwarding(const NativeRegisterDataSet& data, bo
mFalseJump = nullptr; mFalseJump = nullptr;
changed = true; changed = true;
} }
else if (global && mIns.Size() > 0) else if (global && mIns.Size() > 0 && fork == this)
{ {
NativeCodeInstruction& lins(mIns[mIns.Size() - 1]); NativeCodeInstruction& lins(mIns[mIns.Size() - 1]);
@ -33678,7 +33682,7 @@ void NativeCodeProcedure::RebuildEntry(void)
void NativeCodeProcedure::Optimize(void) void NativeCodeProcedure::Optimize(void)
{ {
CheckFunc = !strcmp(mInterProc->mIdent->mString, "main"); CheckFunc = !strcmp(mInterProc->mIdent->mString, "joy_interrupt");
#if 1 #if 1
int step = 0; int step = 0;
@ -33750,6 +33754,7 @@ void NativeCodeProcedure::Optimize(void)
mEntryBlock->ReplaceFinalZeroPageUse(this); mEntryBlock->ReplaceFinalZeroPageUse(this);
} }
#endif #endif
#if 1 #if 1
do do
{ {
@ -33790,9 +33795,13 @@ void NativeCodeProcedure::Optimize(void)
} }
} }
} while (changed); } while (changed);
#endif #endif
#if _DEBUG #if _DEBUG
ResetVisited(); ResetVisited();
mEntryBlock->CheckBlocks(); mEntryBlock->CheckBlocks();