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

Add emplace_back in vector

This commit is contained in:
drmortalwombat 2023-09-17 15:40:05 +02:00
parent c674fc9a8b
commit 38274fb4f7
6 changed files with 148 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/opp/vector.h
View File

@ -164,6 +164,11 @@ public:
void insert(int at, const T & t); void insert(int at, const T & t);
void erase(int at, int n = 1); void erase(int at, int n = 1);
template <typename ...P>
void emplace_back(const P&... p);
protected:
T * add_back(void);
}; };
@ -224,19 +229,30 @@ void vector<T>::shrink_to_fit(void)
} }
template <class T> template <class T>
void vector<T>::push_back(const T & t) T * vector<T>::add_back(void)
{ {
if (_size == _capacity) if (_size == _capacity)
reserve(_size + 1 + (_size >> 1)); reserve(_size + 1 + (_size >> 1));
new (_data + _size++)T(t); return _data + _size++;
}
template <class T>
void vector<T>::push_back(const T & t)
{
new (add_back())T(t);
} }
template <class T> template <class T>
void vector<T>::push_back(T && t) void vector<T>::push_back(T && t)
{ {
if (_size == _capacity) new (add_back())T(t);
reserve(_size + 1 + (_size >> 1)); }
new (_data + _size++)T(t);
template <class T>
template <typename ...P>
void vector<T>::emplace_back(const P&... p)
{
new (add_back())T(p...);
} }
template <class T> template <class T>

18
oscar64/Constexpr.cpp
View File

@ -885,7 +885,11 @@ ConstexprInterpreter::Value ConstexprInterpreter::EvalCall(Expression* exp, Cons
if (dec) if (dec)
pos = dec->mVarIndex; pos = dec->mVarIndex;
if (dec)
mParams[pos] = caller->EvalCoerce(pex->mLeft, caller->Eval(pex->mLeft), dec->mBase);
else
mParams[pos] = caller->REval(pex->mLeft); mParams[pos] = caller->REval(pex->mLeft);
pos += dec->mSize; pos += dec->mSize;
pex = pex->mRight; pex = pex->mRight;
if (dec) if (dec)
@ -895,6 +899,9 @@ ConstexprInterpreter::Value ConstexprInterpreter::EvalCall(Expression* exp, Cons
{ {
if (dec) if (dec)
pos = dec->mVarIndex; pos = dec->mVarIndex;
if (dec)
mParams[pos] = caller->EvalCoerce(pex, caller->Eval(pex), dec->mBase);
else
mParams[pos] = caller->REval(pex); mParams[pos] = caller->REval(pex);
} }
@ -976,15 +983,26 @@ ConstexprInterpreter::Value ConstexprInterpreter::Eval(Expression* exp)
return Value(exp); return Value(exp);
case EX_VARIABLE: case EX_VARIABLE:
if (exp->mDecValue->mType == DT_ARGUMENT) if (exp->mDecValue->mType == DT_ARGUMENT)
{
if (mParams[exp->mDecValue->mVarIndex].mBaseValue)
return mParams[exp->mDecValue->mVarIndex];
else
return Value(&mParams[exp->mDecValue->mVarIndex]); return Value(&mParams[exp->mDecValue->mVarIndex]);
}
else if (exp->mDecValue->mType == DT_VARIABLE) else if (exp->mDecValue->mType == DT_VARIABLE)
{ {
if (!(exp->mDecValue->mFlags & (DTF_STATIC | DTF_GLOBAL))) if (!(exp->mDecValue->mFlags & (DTF_STATIC | DTF_GLOBAL)))
{ {
if (!mLocals[exp->mDecValue->mVarIndex].mDataSize) if (!mLocals[exp->mDecValue->mVarIndex].mDataSize)
{
mLocals[exp->mDecValue->mVarIndex] = Value(exp->mDecValue->mLocation, exp->mDecValue->mBase); mLocals[exp->mDecValue->mVarIndex] = Value(exp->mDecValue->mLocation, exp->mDecValue->mBase);
return Value(&mLocals[exp->mDecValue->mVarIndex]); return Value(&mLocals[exp->mDecValue->mVarIndex]);
} }
else if (mLocals[exp->mDecValue->mVarIndex].mBaseValue)
return mLocals[exp->mDecValue->mVarIndex];
else
return Value(&mLocals[exp->mDecValue->mVarIndex]);
}
} }
break; break;
case EX_BINARY: case EX_BINARY:

40
oscar64/Declaration.cpp
View File

@ -1240,6 +1240,10 @@ bool Declaration::ResolveTemplate(Expression* pexp, Declaration* tdec)
Declaration* tpdec = ex->mDecType; Declaration* tpdec = ex->mDecType;
if (tpdec->IsReference()) if (tpdec->IsReference())
tpdec = tpdec->mBase; tpdec = tpdec->mBase;
if (tpdec->mType == DT_TYPE_ARRAY)
tpdec = tpdec->mBase->BuildPointer(tpdec->mLocation);
else
tpdec = tpdec->Clone(); tpdec = tpdec->Clone();
if (ptail) if (ptail)
@ -1338,6 +1342,8 @@ bool Declaration::ResolveTemplate(Declaration* fdec, Declaration* tdec)
{ {
if (tdec->IsSame(fdec)) if (tdec->IsSame(fdec))
return true; return true;
else if (fdec->IsReference())
return ResolveTemplate(fdec->mBase, tdec);
else if (tdec->mType == DT_TYPE_FUNCTION) else if (tdec->mType == DT_TYPE_FUNCTION)
{ {
if (fdec->mType == DT_TYPE_FUNCTION) if (fdec->mType == DT_TYPE_FUNCTION)
@ -1369,16 +1375,10 @@ bool Declaration::ResolveTemplate(Declaration* fdec, Declaration* tdec)
} }
else if (tdec->mType == DT_TYPE_REFERENCE) else if (tdec->mType == DT_TYPE_REFERENCE)
{ {
if (fdec->mType == DT_TYPE_REFERENCE)
return ResolveTemplate(fdec->mBase, tdec->mBase);
else
return ResolveTemplate(fdec, tdec->mBase); return ResolveTemplate(fdec, tdec->mBase);
} }
else if (tdec->mType == DT_TYPE_RVALUEREF) else if (tdec->mType == DT_TYPE_RVALUEREF)
{ {
if (fdec->mType == DT_TYPE_RVALUEREF)
return ResolveTemplate(fdec->mBase, tdec->mBase);
else
return ResolveTemplate(fdec, tdec->mBase); return ResolveTemplate(fdec, tdec->mBase);
} }
else if (tdec->mType == DT_TYPE_POINTER) else if (tdec->mType == DT_TYPE_POINTER)
@ -1390,6 +1390,9 @@ bool Declaration::ResolveTemplate(Declaration* fdec, Declaration* tdec)
} }
else if (tdec->mType == DT_TYPE_TEMPLATE) else if (tdec->mType == DT_TYPE_TEMPLATE)
{ {
if (fdec->mType == DT_TYPE_ARRAY)
fdec = fdec->mBase->BuildPointer(fdec->mLocation);
Declaration* pdec; Declaration* pdec;
if (tdec->mBase) if (tdec->mBase)
{ {
@ -1871,6 +1874,11 @@ bool Declaration::IsSameParams(const Declaration* dec) const
if (ld->mValue != rd->mValue) if (ld->mValue != rd->mValue)
return false; return false;
} }
else if (ld->mType == DT_PACK_TEMPLATE && rd->mType == DT_PACK_TEMPLATE)
{
if (!ld->mBase->IsSameParams(rd->mBase))
return false;
}
else if (!ld->mBase || !rd->mBase) else if (!ld->mBase || !rd->mBase)
return false; return false;
else if (!ld->mBase->IsSame(rd->mBase)) else if (!ld->mBase->IsSame(rd->mBase))
@ -1881,6 +1889,19 @@ bool Declaration::IsSameParams(const Declaration* dec) const
return !ld && !rd; return !ld && !rd;
} }
else if (mType == DT_PACK_TYPE && dec->mType == DT_PACK_TYPE)
{
Declaration* ld = mBase, * rd = dec->mBase;
while (ld && rd)
{
if (!ld->IsSame(rd))
return false;
ld = ld->mNext;
rd = rd->mNext;
}
return !ld && !rd;
}
else else
return false; return false;
} }
@ -1989,6 +2010,13 @@ bool Declaration::IsTemplateSame(const Declaration* dec, const Declaration * tde
return true; return true;
dflags |= dec->mFlags; dflags |= dec->mFlags;
} }
else if (dec->mType == DT_PACK_TEMPLATE)
{
dec = tdec->mScope->Lookup(dec->mIdent);
if (!dec)
return true;
dflags |= dec->mFlags;
}
if (this == dec) if (this == dec)
return true; return true;

41
oscar64/InterCode.cpp
View File

@ -692,7 +692,19 @@ bool InterCodeBasicBlock::CanSwapInstructions(const InterInstruction* ins0, cons
ins0->mCode == IC_PUSH_FRAME || ins0->mCode == IC_POP_FRAME || ins0->mCode == IC_MALLOC || ins0->mCode == IC_FREE) ins0->mCode == IC_PUSH_FRAME || ins0->mCode == IC_POP_FRAME || ins0->mCode == IC_MALLOC || ins0->mCode == IC_FREE)
return false; return false;
if (ins0->mCode == IC_LOAD || ins0->mCode == IC_STORE || ins0->mCode == IC_COPY || ins0->mCode == IC_STRCPY) if (ins0->mCode == IC_LOAD)
{
if (ins0->mSrc[0].mTemp >= 0)
return false;
if (ins0->mSrc[0].mMemory == IM_PARAM || ins0->mSrc[0].mMemory == IM_FPARAM)
{
if (mProc->mParamAliasedSet[ins0->mSrc[0].mVarIndex])
return false;
}
else
return false;
}
else if (ins0->mCode == IC_STORE || ins0->mCode == IC_COPY || ins0->mCode == IC_STRCPY)
return false; return false;
} }
if (ins0->mCode == IC_CALL || ins0->mCode == IC_CALL_NATIVE || ins0->mCode == IC_ASSEMBLER) if (ins0->mCode == IC_CALL || ins0->mCode == IC_CALL_NATIVE || ins0->mCode == IC_ASSEMBLER)
@ -13675,6 +13687,31 @@ void InterCodeBasicBlock::SingleBlockLoopOptimisation(const NumberSet& aliasedPa
InterCodeBasicBlock* tailBlock = this == mTrueJump ? mFalseJump : mTrueJump; InterCodeBasicBlock* tailBlock = this == mTrueJump ? mFalseJump : mTrueJump;
assert(tailBlock->mNumEntries == 1); assert(tailBlock->mNumEntries == 1);
// remove counting loop without body
if (mInstructions.Size() == 3)
{
InterInstruction* ains = mInstructions[0];
InterInstruction* cins = mInstructions[1];
InterInstruction* bins = mInstructions[2];
if (ains->mCode == IC_BINARY_OPERATOR && cins->mCode == IC_RELATIONAL_OPERATOR && bins->mCode == IC_BRANCH)
{
if (ains->mSrc[1].mTemp == ains->mDst.mTemp && ains->mSrc[0].mTemp < 0 &&
cins->mSrc[1].mTemp == ains->mDst.mTemp && ains->mSrc[0].mTemp < 0 &&
bins->mSrc[0].mTemp == cins->mDst.mTemp && bins->mSrc[0].mFinal)
{
if (ains->mOperator == IA_ADD && ains->mSrc[0].mIntConst == 1 &&
cins->mOperator == IA_CMPLU && mTrueJump == this && !tailBlock->mEntryRequiredTemps[ains->mDst.mTemp])
{
cins->mCode = IC_CONSTANT;
cins->mConst.mType = IT_BOOL;
cins->mConst.mIntConst = 0;
cins->mNumOperands = 0;
}
}
}
}
if (!hasCall) if (!hasCall)
{ {
// Check forwarding globals // Check forwarding globals
@ -17142,7 +17179,7 @@ void InterCodeProcedure::Close(void)
{ {
GrowingTypeArray tstack(IT_NONE); GrowingTypeArray tstack(IT_NONE);
CheckFunc = !strcmp(mIdent->mString, "main"); CheckFunc = !strcmp(mIdent->mString, "bv");
mEntryBlock = mBlocks[0]; mEntryBlock = mBlocks[0];

2
oscar64/InterCodeGenerator.cpp
View File

@ -4997,7 +4997,7 @@ InterCodeProcedure* InterCodeGenerator::TranslateProcedure(InterCodeModule * mod
{ {
InterCodeProcedure* proc = new InterCodeProcedure(mod, dec->mLocation, dec->mQualIdent, mLinker->AddObject(dec->mLocation, dec->mQualIdent, dec->mSection, LOT_BYTE_CODE, dec->mAlignment)); InterCodeProcedure* proc = new InterCodeProcedure(mod, dec->mLocation, dec->mQualIdent, mLinker->AddObject(dec->mLocation, dec->mQualIdent, dec->mSection, LOT_BYTE_CODE, dec->mAlignment));
#if 1 #if 0
if (proc->mIdent && !strcmp(proc->mIdent->mString, "main")) if (proc->mIdent && !strcmp(proc->mIdent->mString, "main"))
exp->Dump(0); exp->Dump(0);
#endif #endif

28
oscar64/Parser.cpp
View File

@ -1201,9 +1201,15 @@ Declaration * Parser::ParseFunctionDeclaration(Declaration* bdec)
adec->mParams = apdec; adec->mParams = apdec;
if (adec->mBase->IsReference()) if (adec->mBase->IsReference())
{
if (adec->mBase->mBase->mFlags & DTF_CONST)
apdec->mBase = atdec->ToConstType()->BuildReference(adec->mLocation);
else
apdec->mBase = atdec->BuildReference(adec->mLocation); apdec->mBase = atdec->BuildReference(adec->mLocation);
}
else else
apdec->mBase = atdec; apdec->mBase = atdec;
atdec = atdec->mNext; atdec = atdec->mNext;
apdec->mFlags = DTF_DEFINED; apdec->mFlags = DTF_DEFINED;
apdec->mVarIndex = vi; apdec->mVarIndex = vi;
@ -3616,7 +3622,7 @@ Declaration* Parser::ParseDeclaration(Declaration * pdec, bool variable, bool ex
} }
else if (mScanner->mToken == TK_CONSTEXPR) else if (mScanner->mToken == TK_CONSTEXPR)
{ {
storageFlags |= DTF_CONSTEXPR; storageFlags |= DTF_CONSTEXPR | DTF_REQUEST_INLINE;
mScanner->NextToken(); mScanner->NextToken();
} }
else if (mScanner->mToken == TK_EXTERN) else if (mScanner->mToken == TK_EXTERN)
@ -7920,7 +7926,9 @@ Expression* Parser::ParseStatement(void)
switch (mScanner->mToken) switch (mScanner->mToken)
{ {
case TK_IF: case TK_IF:
{
mScanner->NextToken(); mScanner->NextToken();
bool constExp = ConsumeTokenIf(TK_CONSTEXPR);
exp = new Expression(mScanner->mLocation, EX_IF); exp = new Expression(mScanner->mLocation, EX_IF);
exp->mLeft = CoerceExpression(CleanupExpression(ParseParenthesisExpression()), TheBoolTypeDeclaration); exp->mLeft = CoerceExpression(CleanupExpression(ParseParenthesisExpression()), TheBoolTypeDeclaration);
exp->mRight = new Expression(mScanner->mLocation, EX_ELSE); exp->mRight = new Expression(mScanner->mLocation, EX_ELSE);
@ -7932,7 +7940,23 @@ Expression* Parser::ParseStatement(void)
} }
else else
exp->mRight->mRight = nullptr; exp->mRight->mRight = nullptr;
break;
if (constExp)
{
Expression * cexp = exp->mLeft->ConstantFold(mErrors, mDataSection);
if (cexp->mType == EX_CONSTANT && cexp->mDecValue->mType == DT_CONST_INTEGER)
{
if (cexp->mDecValue->mInteger)
exp = exp->mRight->mLeft;
else if (exp->mRight->mRight)
exp = exp->mRight->mRight;
else
exp = new Expression(mScanner->mLocation, EX_VOID);
}
else
mErrors->Error(exp->mLocation, EERR_INVALID_CONSTEXPR, "Condition is not constant");
}
} break;
case TK_WHILE: case TK_WHILE:
{ {
mScanner->NextToken(); mScanner->NextToken();