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

Fix optimizer crash with volatile long ops

This commit is contained in:
drmortalwombat 2025-03-14 08:10:36 +01:00
parent 90e892dfa5
commit 242d7f1700
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar64/InterCode.cpp
View File

@ -5935,12 +5935,12 @@ void InterCodeBasicBlock::Append(InterInstruction * code)
} }
void InterCodeBasicBlock::AppendBeforeBranch(InterInstruction* code) void InterCodeBasicBlock::AppendBeforeBranch(InterInstruction* code, bool loopindex)
{ {
int ti = mInstructions.Size() - 1; int ti = mInstructions.Size() - 1;
if (mInstructions[ti]->mCode == IC_BRANCH) if (mInstructions[ti]->mCode == IC_BRANCH)
{ {
if (ti > 0 && mInstructions[ti - 1]->mDst.mTemp == mInstructions[ti]->mSrc[0].mTemp && CanBypassUp(code, mInstructions[ti - 1])) if (ti > 0 && mInstructions[ti - 1]->mDst.mTemp == mInstructions[ti]->mSrc[0].mTemp && loopindex || CanBypassUp(code, mInstructions[ti - 1]))
{ {
ti--; ti--;
if (ti > 0 && mInstructions[ti]->UsesTemp(mInstructions[ti - 1]->mDst.mTemp) && CanBypassUp(code, mInstructions[ti - 1])) if (ti > 0 && mInstructions[ti]->UsesTemp(mInstructions[ti - 1]->mDst.mTemp) && CanBypassUp(code, mInstructions[ti - 1]))
@ -16014,7 +16014,7 @@ bool InterCodeBasicBlock::SingleTailLoopOptimization(const NumberSet& aliasedPar
ains->mSrc[0].mType = lins->mDst.mType; ains->mSrc[0].mType = lins->mDst.mType;
ains->mSrc[0].mTemp = -1; ains->mSrc[0].mTemp = -1;
ains->mSrc[0].mIntConst = s; ains->mSrc[0].mIntConst = s;
tail->AppendBeforeBranch(ains); tail->AppendBeforeBranch(ains, true);
ains->mDst.mRange.AddConstValue(ains->mDst.mType, s); ains->mDst.mRange.AddConstValue(ains->mDst.mType, s);
indexScale[ains->mDst.mTemp] = s; indexScale[ains->mDst.mTemp] = s;
@ -23433,7 +23433,7 @@ void InterCodeProcedure::Close(void)
{ {
GrowingTypeArray tstack(IT_NONE); GrowingTypeArray tstack(IT_NONE);
CheckFunc = !strcmp(mIdent->mString, "shipyard_close"); CheckFunc = !strcmp(mIdent->mString, "close_op");
CheckCase = false; CheckCase = false;
mEntryBlock = mBlocks[0]; mEntryBlock = mBlocks[0];

2
oscar64/InterCode.h
View File

@ -423,7 +423,7 @@ public:
InterCodeBasicBlock* Clone(void); InterCodeBasicBlock* Clone(void);
void Append(InterInstruction * code); void Append(InterInstruction * code);
void AppendBeforeBranch(InterInstruction* code); void AppendBeforeBranch(InterInstruction* code, bool loopindex = false);
const InterInstruction* FindByDst(int dst) const; const InterInstruction* FindByDst(int dst) const;
void Close(InterCodeBasicBlock* trueJump, InterCodeBasicBlock* falseJump); void Close(InterCodeBasicBlock* trueJump, InterCodeBasicBlock* falseJump);

4
oscar64/NativeCodeGenerator.cpp
View File

@ -19444,7 +19444,7 @@ bool NativeCodeBasicBlock::MoveStoresBeforeDiamond(void)
eblock = mTrueJump; eblock = mTrueJump;
} }
if (eblock) if (eblock && eblock->mEntryRequiredRegs.Size() > 0)
{ {
bool avalid = eblock->mEntryRequiredRegs[CPU_REG_A] && !dblock->ChangesAccu(); bool avalid = eblock->mEntryRequiredRegs[CPU_REG_A] && !dblock->ChangesAccu();
bool xvalid = eblock->mEntryRequiredRegs[CPU_REG_X] && !dblock->ChangesXReg(); bool xvalid = eblock->mEntryRequiredRegs[CPU_REG_X] && !dblock->ChangesXReg();
@ -53745,7 +53745,7 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
{ {
NativeCodeBasicBlock* eblock = mExitBlock->mEntryBlocks[0]; NativeCodeBasicBlock* eblock = mExitBlock->mEntryBlocks[0];
int sz = eblock->mIns.Size(); int sz = eblock->mIns.Size();
if (sz >= 0 && eblock->mIns[sz - 1].mType == ASMIT_STA && eblock->mIns[sz - 1].mMode == ASMIM_ZERO_PAGE && eblock->mIns[sz - 1].mAddress == BC_REG_ACCU) if (sz > 0 && eblock->mIns[sz - 1].mType == ASMIT_STA && eblock->mIns[sz - 1].mMode == ASMIM_ZERO_PAGE && eblock->mIns[sz - 1].mAddress == BC_REG_ACCU)
{ {
mExitBlock->mExitRegA = true; mExitBlock->mExitRegA = true;
eblock->mIns.Remove(sz - 1); eblock->mIns.Remove(sz - 1);