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

Fix invalid function parameter crossing

This commit is contained in:
drmortalwombat 2024-09-21 22:00:54 +02:00
parent aeceb36e2a
commit d7bfd0a668
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar64/InterCode.cpp
View File

@ -783,6 +783,8 @@ bool InterCodeBasicBlock::CollidingMem(const InterOperand& op1, InterType type1,
case IM_LOCAL: case IM_LOCAL:
case IM_FPARAM: case IM_FPARAM:
case IM_PARAM: case IM_PARAM:
case IM_FRAME:
case IM_FFRAME:
return op1.mVarIndex == op2.mVarIndex && op1.mIntConst < op2.mIntConst + op2.mOperandSize && op2.mIntConst < op1.mIntConst + op1.mOperandSize; return op1.mVarIndex == op2.mVarIndex && op1.mIntConst < op2.mIntConst + op2.mOperandSize && op2.mIntConst < op1.mIntConst + op1.mOperandSize;
case IM_ABSOLUTE: case IM_ABSOLUTE:
return op1.mIntConst < op2.mIntConst + op2.mOperandSize && op2.mIntConst < op1.mIntConst + op1.mOperandSize; return op1.mIntConst < op2.mIntConst + op2.mOperandSize && op2.mIntConst < op1.mIntConst + op1.mOperandSize;
@ -22306,7 +22308,7 @@ void InterCodeProcedure::Close(void)
{ {
GrowingTypeArray tstack(IT_NONE); GrowingTypeArray tstack(IT_NONE);
CheckFunc = !strcmp(mIdent->mString, "f"); CheckFunc = !strcmp(mIdent->mString, "main");
CheckCase = false; CheckCase = false;
mEntryBlock = mBlocks[0]; mEntryBlock = mBlocks[0];

25
oscar64/Parser.cpp
View File

@ -5813,19 +5813,34 @@ Expression* Parser::ParseCastExpression(Expression* exp)
{ {
if (mScanner->mToken == TK_OPEN_BRACE) if (mScanner->mToken == TK_OPEN_BRACE)
{ {
Declaration* cdec = new Declaration(mScanner->mLocation, DT_VARIABLE);
cdec->mBase = exp->mDecType->ToConstType();
cdec->mFlags |= DTF_CONST | DTF_STATIC | DTF_GLOBAL | DTF_DEFINED;
Expression* cexp = new Expression(mScanner->mLocation, EX_VARIABLE);
cexp->mDecValue = cdec;
cexp->mDecType = cdec->mBase;
cdec->mValue = ParseInitExpression(cdec->mBase);
cdec->mSection = mDataSection;
cdec->mSize = cdec->mBase->mSize;
Declaration* vdec = new Declaration(mScanner->mLocation, DT_VARIABLE); Declaration* vdec = new Declaration(mScanner->mLocation, DT_VARIABLE);
vdec->mBase = exp->mDecType; vdec->mBase = exp->mDecType;
vdec->mFlags |= DTF_CONST | DTF_STATIC | DTF_GLOBAL; vdec->mVarIndex = mLocalIndex++;
vdec->mFlags |= DTF_DEFINED;
vdec->mSize = vdec->mBase->mSize;
Expression* nexp = new Expression(mScanner->mLocation, EX_VARIABLE); Expression* nexp = new Expression(mScanner->mLocation, EX_VARIABLE);
nexp->mDecValue = vdec; nexp->mDecValue = vdec;
nexp->mDecType = vdec->mBase; nexp->mDecType = vdec->mBase;
vdec->mValue = ParseInitExpression(vdec->mBase); Expression* iexp = new Expression(mScanner->mLocation, EX_INITIALIZATION);
vdec->mSection = mDataSection; iexp->mLeft = nexp;
vdec->mSize = vdec->mBase->mSize; iexp->mRight = cexp;
iexp->mDecType = exp->mDecType;
exp = nexp; exp = iexp;
} }
else else
{ {