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

Fix array const init by string literal

This commit is contained in:
drmortalwombat 2021-09-12 14:42:02 +02:00
parent ebdd6f0d7d
commit dac1fa70b3
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar64/InterCodeGenerator.cpp
View File

@ -449,7 +449,7 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
ins.mVarIndex = dec->mVarIndex; ins.mVarIndex = dec->mVarIndex;
ins.mMemory = IM_GLOBAL; ins.mMemory = IM_GLOBAL;
block->Append(ins); block->Append(ins);
return ExValue(dec->mBase, ins.mTTemp); return ExValue(dec->mBase, ins.mTTemp, 1);
} }
case DT_CONST_STRUCT: case DT_CONST_STRUCT:

25
oscar64/Parser.cpp
View File

@ -326,9 +326,9 @@ Declaration* Parser::ParsePostfixDeclaration(void)
{ {
Declaration* ndec = new Declaration(mScanner->mLocation, DT_TYPE_ARRAY); Declaration* ndec = new Declaration(mScanner->mLocation, DT_TYPE_ARRAY);
ndec->mSize = 0; ndec->mSize = 0;
ndec->mFlags |= DTF_DEFINED; ndec->mFlags = 0;
mScanner->NextToken(); mScanner->NextToken();
if (mScanner->mToken != TK_CLOSE_PARENTHESIS) if (mScanner->mToken != TK_CLOSE_BRACKET)
{ {
Expression* exp = ParseRExpression(); Expression* exp = ParseRExpression();
if (exp->mType == EX_CONSTANT && exp->mDecType->IsIntegerType() && exp->mDecValue->mType == DT_CONST_INTEGER) if (exp->mType == EX_CONSTANT && exp->mDecType->IsIntegerType() && exp->mDecValue->mType == DT_CONST_INTEGER)
@ -509,7 +509,7 @@ Expression* Parser::ParseInitExpression(Declaration* dtype)
if (dtype->mType == DT_TYPE_ARRAY || dtype->mType == DT_TYPE_STRUCT || dtype->mType == DT_TYPE_UNION) if (dtype->mType == DT_TYPE_ARRAY || dtype->mType == DT_TYPE_STRUCT || dtype->mType == DT_TYPE_UNION)
{ {
if (!(dtype->mFlags & DTF_DEFINED)) if (dtype->mType != DT_TYPE_ARRAY && !(dtype->mFlags & DTF_DEFINED))
{ {
if (dtype->mIdent) if (dtype->mIdent)
mErrors->Error(mScanner->mLocation, "Constant for undefined type", dtype->mIdent->mString); mErrors->Error(mScanner->mLocation, "Constant for undefined type", dtype->mIdent->mString);
@ -527,10 +527,10 @@ Expression* Parser::ParseInitExpression(Declaration* dtype)
if (dtype->mType == DT_TYPE_ARRAY) if (dtype->mType == DT_TYPE_ARRAY)
{ {
int index = 0; int index = 0;
while (index < dtype->mSize) while (!(dtype->mFlags & DTF_DEFINED) || index < dtype->mSize)
{ {
Expression* texp = ParseInitExpression(dtype->mBase); Expression* texp = ParseInitExpression(dtype->mBase);
Declaration* cdec = CopyConstantInitializer(index * dtype->mBase->mSize, dtype->mBase, texp); Declaration* cdec = CopyConstantInitializer(index, dtype->mBase, texp);
if (last) if (last)
last->mNext = cdec; last->mNext = cdec;
@ -538,12 +538,18 @@ Expression* Parser::ParseInitExpression(Declaration* dtype)
dec->mParams = cdec; dec->mParams = cdec;
last = cdec; last = cdec;
index++; index += dtype->mBase->mSize;
if (!ConsumeTokenIf(TK_COMMA)) if (!ConsumeTokenIf(TK_COMMA))
break; break;
if (mScanner->mToken == TK_CLOSE_BRACE) if (mScanner->mToken == TK_CLOSE_BRACE)
break; break;
} }
if (!(dtype->mFlags & DTF_DEFINED))
{
dtype->mFlags |= DTF_DEFINED;
dtype->mSize = index;
}
} }
else else
{ {
@ -575,6 +581,12 @@ Expression* Parser::ParseInitExpression(Declaration* dtype)
} }
else if (mScanner->mToken == TK_STRING && dtype->mType == DT_TYPE_ARRAY && dtype->mBase->mType == DT_TYPE_INTEGER && dtype->mBase->mSize == 1) else if (mScanner->mToken == TK_STRING && dtype->mType == DT_TYPE_ARRAY && dtype->mBase->mType == DT_TYPE_INTEGER && dtype->mBase->mSize == 1)
{ {
if (!(dtype->mFlags & DTF_DEFINED))
{
dtype->mFlags |= DTF_DEFINED;
dtype->mSize = strlen(mScanner->mTokenString) + 1;
}
dec = new Declaration(mScanner->mLocation, DT_CONST_DATA); dec = new Declaration(mScanner->mLocation, DT_CONST_DATA);
dec->mBase = dtype; dec->mBase = dtype;
dec->mSize = dtype->mSize; dec->mSize = dtype->mSize;
@ -737,6 +749,7 @@ Declaration* Parser::ParseDeclaration(bool variable)
{ {
mScanner->NextToken(); mScanner->NextToken();
ndec->mValue = ParseInitExpression(ndec->mBase); ndec->mValue = ParseInitExpression(ndec->mBase);
ndec->mSize = ndec->mBase->mSize;
} }
} }