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

Fix index subtract using wrong direction

This commit is contained in:
drmortalwombat 2022-09-17 22:57:01 +02:00
parent 0835b90219
commit 5156055e53
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
oscar64/InterCode.cpp
View File

@ -7670,6 +7670,7 @@ void InterCodeBasicBlock::PerformValueForwarding(const GrowingInstructionPtrArra
ins->mSrc[1].mTemp = cai->mDst.mTemp; ins->mSrc[1].mTemp = cai->mDst.mTemp;
} }
} }
#if 1
else if (mi0 && mi1 && mi0->mCode == IC_CONSTANT && mi1->mCode == IC_BINARY_OPERATOR && mi1->mOperator == IA_SUB) else if (mi0 && mi1 && mi0->mCode == IC_CONSTANT && mi1->mCode == IC_BINARY_OPERATOR && mi1->mOperator == IA_SUB)
{ {
InterInstruction* ai0 = ltvalue[mi1->mSrc[0].mTemp], * ai1 = ltvalue[mi1->mSrc[1].mTemp]; InterInstruction* ai0 = ltvalue[mi1->mSrc[0].mTemp], * ai1 = ltvalue[mi1->mSrc[1].mTemp];
@ -7697,39 +7698,12 @@ void InterCodeBasicBlock::PerformValueForwarding(const GrowingInstructionPtrArra
ltvalue[cai->mDst.mTemp] = nullptr; ltvalue[cai->mDst.mTemp] = nullptr;
ins->mOperator = IA_SUB;
ins->mSrc[1].mTemp = nai->mDst.mTemp;
ins->mSrc[0].mTemp = cai->mDst.mTemp;
}
else if (ai1 && ai1->mCode == IC_CONSTANT)
{
InterInstruction* nai = new InterInstruction();
nai->mCode = IC_BINARY_OPERATOR;
nai->mOperator = IA_MUL;
nai->mSrc[0].mTemp = mi1->mSrc[0].mTemp;
nai->mSrc[0].mType = IT_INT16;
nai->mSrc[1].mTemp = ins->mSrc[0].mTemp;
nai->mSrc[1].mType = IT_INT16;
nai->mDst.mTemp = spareTemps++;
nai->mDst.mType = IT_INT16;
mInstructions.Insert(i, nai);
ltvalue[nai->mDst.mTemp] = nullptr;
InterInstruction* cai = new InterInstruction();
cai->mCode = IC_CONSTANT;
cai->mDst.mTemp = spareTemps++;
cai->mDst.mType = IT_INT16;
cai->mConst.mIntConst = ai1->mConst.mIntConst * mi0->mConst.mIntConst;
mInstructions.Insert(i, cai);
ltvalue[cai->mDst.mTemp] = nullptr;
ins->mOperator = IA_SUB; ins->mOperator = IA_SUB;
ins->mSrc[1].mTemp = nai->mDst.mTemp; ins->mSrc[1].mTemp = nai->mDst.mTemp;
ins->mSrc[0].mTemp = cai->mDst.mTemp; ins->mSrc[0].mTemp = cai->mDst.mTemp;
} }
} }
#endif
} }
#endif #endif
#if 1 #if 1
@ -12623,11 +12597,13 @@ void InterCodeProcedure::Close(void)
do { do {
valueSet.FlushAll(); valueSet.FlushAll();
mValueForwardingTable.SetSize(numTemps, true); mValueForwardingTable.SetSize(numTemps, true);
tvalidSet.Reset(numTemps + 32); tvalidSet.Reset(numTemps + 64);
ResetVisited(); ResetVisited();
mEntryBlock->PerformValueForwarding(mValueForwardingTable, valueSet, tvalidSet, mLocalAliasedSet, mParamAliasedSet, numTemps, mModule->mGlobalVars); mEntryBlock->PerformValueForwarding(mValueForwardingTable, valueSet, tvalidSet, mLocalAliasedSet, mParamAliasedSet, numTemps, mModule->mGlobalVars);
assert(numTemps <= tvalidSet.Size());
DisassembleDebug("PerformValueForwarding"); DisassembleDebug("PerformValueForwarding");
ResetVisited(); ResetVisited();