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

Fix template expansion of member functions

This commit is contained in:
drmortalwombat 2023-10-27 14:53:19 +02:00
parent 0889afbdae
commit d9a8c5ea08
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar64/InterCode.cpp
View File

@ -4989,7 +4989,7 @@ void InterCodeBasicBlock::GenerateTraces(bool expand, bool compact)
mFalseJump->mNumEntries--; mFalseJump->mNumEntries--;
mFalseJump = nullptr; mFalseJump = nullptr;
} }
#if 1
if (mFalseJump && sz > 0 && mInstructions[sz - 1]->mCode == IC_BRANCH && mTrueJump && mTrueJump == mFalseJump) if (mFalseJump && sz > 0 && mInstructions[sz - 1]->mCode == IC_BRANCH && mTrueJump && mTrueJump == mFalseJump)
{ {
mInstructions[sz - 1]->mCode = IC_JUMP; mInstructions[sz - 1]->mCode = IC_JUMP;
@ -4997,7 +4997,7 @@ void InterCodeBasicBlock::GenerateTraces(bool expand, bool compact)
mFalseJump->mNumEntries--; mFalseJump->mNumEntries--;
mFalseJump = nullptr; mFalseJump = nullptr;
} }
#endif
if (mTrueJump && mTrueJump->mInstructions.Size() == 1 && mTrueJump->mInstructions[0]->mCode == IC_JUMP && !mTrueJump->mLoopHead && mTrueJump->mTraceIndex != mIndex) if (mTrueJump && mTrueJump->mInstructions.Size() == 1 && mTrueJump->mInstructions[0]->mCode == IC_JUMP && !mTrueJump->mLoopHead && mTrueJump->mTraceIndex != mIndex)
{ {
mTrueJump->mTraceIndex = mIndex; mTrueJump->mTraceIndex = mIndex;
@ -12788,6 +12788,7 @@ bool InterCodeBasicBlock::SingleTailLoopOptimization(const NumberSet& aliasedPar
ai->mSrc[0].mIntConst = 1; ai->mSrc[0].mIntConst = 1;
ci->mOperator = IA_CMPGU; ci->mOperator = IA_CMPGU;
ci->mSrc[0].mIntConst = 0; ci->mSrc[0].mIntConst = 0;
ci->mSrc[0].mRange.SetLimit(0, 0);
InterInstruction* mins = new InterInstruction(si->mLocation, IC_CONSTANT); InterInstruction* mins = new InterInstruction(si->mLocation, IC_CONSTANT);
mins->mConst.mType = ai->mDst.mType; mins->mConst.mType = ai->mDst.mType;
@ -12835,6 +12836,7 @@ bool InterCodeBasicBlock::SingleTailLoopOptimization(const NumberSet& aliasedPar
ci->mOperator = IA_CMPGU; ci->mOperator = IA_CMPGU;
ci->mSrc[0].mTemp = -1; ci->mSrc[0].mTemp = -1;
ci->mSrc[0].mIntConst = 0; ci->mSrc[0].mIntConst = 0;
ci->mSrc[0].mRange.SetLimit(0, 0);
ai->mSrc[1].mRange.SetLimit(1, num); ai->mSrc[1].mRange.SetLimit(1, num);
ai->mDst.mRange.SetLimit(0, num - 1); ai->mDst.mRange.SetLimit(0, num - 1);
@ -18257,7 +18259,7 @@ void InterCodeProcedure::Close(void)
{ {
GrowingTypeArray tstack(IT_NONE); GrowingTypeArray tstack(IT_NONE);
CheckFunc = !strcmp(mIdent->mString, "main"); CheckFunc = !strcmp(mIdent->mString, "drawCube");
CheckCase = false; CheckCase = false;
mEntryBlock = mBlocks[0]; mEntryBlock = mBlocks[0];

3
oscar64/Parser.cpp
View File

@ -5740,6 +5740,9 @@ Expression* Parser::ParseQualify(Expression* exp)
} }
else if (mdec->mType == DT_CONST_FUNCTION) else if (mdec->mType == DT_CONST_FUNCTION)
{ {
if (mdec->mTemplate)
mdec = ParseTemplateExpansion(mdec->mTemplate, nullptr);
if (mdec->mBase->mFlags & DTF_FUNC_THIS) if (mdec->mBase->mFlags & DTF_FUNC_THIS)
{ {
ConsumeToken(TK_OPEN_PARENTHESIS); ConsumeToken(TK_OPEN_PARENTHESIS);