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

Fix loop invariant error

This commit is contained in:
drmortalwombat 2023-06-14 16:44:03 +02:00
parent c83804a76c
commit 8a886f0a60
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oscar64/InterCode.cpp
View File

@ -15284,6 +15284,7 @@ void InterCodeProcedure::BuildTraces(bool expand, bool dominators, bool compact)
{ {
mBlocks[i]->mNumEntries = 0; mBlocks[i]->mNumEntries = 0;
mBlocks[i]->mLoopHead = false; mBlocks[i]->mLoopHead = false;
mBlocks[i]->mTraceIndex = -1;
} }
mEntryBlock->CollectEntries(); mEntryBlock->CollectEntries();

10
oscar64/NativeCodeGenerator.cpp
View File

@ -29097,8 +29097,8 @@ bool NativeCodeBasicBlock::OptimizeSimpleLoopInvariant(NativeCodeProcedure* proc
} }
else if (mIns[ai].mType == ASMIT_LDA && mIns[ai].mMode == ASMIM_ZERO_PAGE) else if (mIns[ai].mType == ASMIT_LDA && mIns[ai].mMode == ASMIM_ZERO_PAGE)
{ {
int i = ai + 1; int i = 0;
while (i < mIns.Size() && !mIns[i].ChangesAccu() && !mIns[i].ChangesZeroPage(mIns[ai].mAddress)) while (i < mIns.Size() && (i <= ai || !mIns[i].ChangesAccu()) && !mIns[i].ChangesZeroPage(mIns[ai].mAddress))
i++; i++;
if (i == mIns.Size()) if (i == mIns.Size())
{ {
@ -31008,6 +31008,8 @@ bool NativeCodeBasicBlock::OptimizeGenericLoop(NativeCodeProcedure* proc)
zxreg[ins.mAddress] += 3; zxreg[ins.mAddress] += 3;
if (zyreg[ins.mAddress] >= 0) if (zyreg[ins.mAddress] >= 0)
zyreg[ins.mAddress] += 3; zyreg[ins.mAddress] += 3;
zareg[ins.mAddress] = -1;
} }
break; break;
case ASMIT_LDA: case ASMIT_LDA:
@ -39802,7 +39804,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
{ {
mInterProc = proc; mInterProc = proc;
CheckFunc = !strcmp(mInterProc->mIdent->mString, "sieve"); CheckFunc = !strcmp(mInterProc->mIdent->mString, "main");
int nblocks = proc->mBlocks.Size(); int nblocks = proc->mBlocks.Size();
tblocks = new NativeCodeBasicBlock * [nblocks]; tblocks = new NativeCodeBasicBlock * [nblocks];
@ -40660,7 +40662,6 @@ void NativeCodeProcedure::Optimize(void)
ResetVisited(); ResetVisited();
mEntryBlock->CheckBlocks(true); mEntryBlock->CheckBlocks(true);
#endif #endif
#if 1 #if 1
if (step == 3 || step == 4) if (step == 3 || step == 4)
{ {
@ -40689,6 +40690,7 @@ void NativeCodeProcedure::Optimize(void)
changed = true; changed = true;
} }
#endif #endif
#if 1 #if 1
ResetVisited(); ResetVisited();
if (!changed && mEntryBlock->ShortcutZeroPageCopyUp(this)) if (!changed && mEntryBlock->ShortcutZeroPageCopyUp(this))