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

Fix continue/break for unrolled loops

This commit is contained in:
drmortalwombat 2025-05-18 14:04:14 +02:00
parent c86dc364b1
commit 6f1da4335b
6 changed files with 67 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oscar64/Declaration.cpp
View File

@ -274,6 +274,9 @@ void Expression::Dump(int ident) const
case EX_FOR: case EX_FOR:
printf("FOR"); printf("FOR");
break; break;
case EX_FORBODY:
printf("FORBODY");
break;
case EX_DO: case EX_DO:
printf("DO"); printf("DO");
break; break;
@ -3106,6 +3109,7 @@ Declaration* TheVoidFunctionTypeDeclaration, * TheConstVoidValueDeclaration;
Declaration* TheCharPointerTypeDeclaration, * TheConstCharPointerTypeDeclaration; Declaration* TheCharPointerTypeDeclaration, * TheConstCharPointerTypeDeclaration;
Expression* TheVoidExpression; Expression* TheVoidExpression;
Declaration* TheNullptrConstDeclaration, * TheZeroIntegerConstDeclaration, * TheZeroFloatConstDeclaration, * TheNullPointerTypeDeclaration; Declaration* TheNullptrConstDeclaration, * TheZeroIntegerConstDeclaration, * TheZeroFloatConstDeclaration, * TheNullPointerTypeDeclaration;
Declaration* TheTrueConstDeclaration, * TheFalseConstDeclaration;
void InitDeclarations(void) void InitDeclarations(void)
{ {
@ -3207,4 +3211,13 @@ void InitDeclarations(void)
TheZeroFloatConstDeclaration->mBase = TheFloatTypeDeclaration; TheZeroFloatConstDeclaration->mBase = TheFloatTypeDeclaration;
TheZeroFloatConstDeclaration->mSize = 4; TheZeroFloatConstDeclaration->mSize = 4;
TheTrueConstDeclaration = new Declaration(noloc, DT_CONST_INTEGER);
TheTrueConstDeclaration->mBase = TheBoolTypeDeclaration;
TheTrueConstDeclaration->mSize = 1;
TheTrueConstDeclaration->mInteger = 1;
TheFalseConstDeclaration = new Declaration(noloc, DT_CONST_INTEGER);
TheFalseConstDeclaration->mBase = TheBoolTypeDeclaration;
TheFalseConstDeclaration->mSize = 1;
TheFalseConstDeclaration->mInteger = 0;
} }

2
oscar64/Declaration.h
View File

@ -218,6 +218,7 @@ enum ExpressionType
EX_IF, EX_IF,
EX_ELSE, EX_ELSE,
EX_FOR, EX_FOR,
EX_FORBODY,
EX_DO, EX_DO,
EX_SCOPE, EX_SCOPE,
EX_BREAK, EX_BREAK,
@ -385,5 +386,6 @@ extern Declaration* TheBoolTypeDeclaration, * TheFloatTypeDeclaration, * TheVoid
extern Declaration* TheVoidFunctionTypeDeclaration, * TheConstVoidValueDeclaration; extern Declaration* TheVoidFunctionTypeDeclaration, * TheConstVoidValueDeclaration;
extern Declaration* TheCharPointerTypeDeclaration, * TheConstCharPointerTypeDeclaration; extern Declaration* TheCharPointerTypeDeclaration, * TheConstCharPointerTypeDeclaration;
extern Declaration* TheNullptrConstDeclaration, * TheZeroIntegerConstDeclaration, * TheZeroFloatConstDeclaration, * TheNullPointerTypeDeclaration; extern Declaration* TheNullptrConstDeclaration, * TheZeroIntegerConstDeclaration, * TheZeroFloatConstDeclaration, * TheNullPointerTypeDeclaration;
extern Declaration* TheTrueConstDeclaration, * TheFalseConstDeclaration;
extern Expression* TheVoidExpression; extern Expression* TheVoidExpression;

5
oscar64/GlobalAnalyzer.cpp
View File

@ -1141,6 +1141,11 @@ Declaration * GlobalAnalyzer::Analyze(Expression* exp, Declaration* procDec, boo
if (exp->mLeft->mLeft->mRight) if (exp->mLeft->mLeft->mRight)
ldec = Analyze(exp->mLeft->mLeft->mRight, procDec, false, false); ldec = Analyze(exp->mLeft->mLeft->mRight, procDec, false, false);
break; break;
case EX_FORBODY:
ldec = Analyze(exp->mLeft, procDec, false, false);
if (exp->mRight)
Analyze(exp->mRight, procDec, false, false);
break;
case EX_DO: case EX_DO:
procDec->mComplexity += 20; procDec->mComplexity += 20;

5
oscar64/GlobalOptimizer.cpp
View File

@ -974,6 +974,11 @@ Declaration* GlobalOptimizer::Analyze(Expression* exp, Declaration* procDec, uin
if (exp->mLeft->mLeft->mRight) if (exp->mLeft->mLeft->mRight)
ldec = Analyze(exp->mLeft->mLeft->mRight, procDec, 0); ldec = Analyze(exp->mLeft->mLeft->mRight, procDec, 0);
break; break;
case EX_FORBODY:
ldec = Analyze(exp->mLeft, procDec, 0);
if (exp->mRight)
rdec = Analyze(exp->mRight, procDec, 0);
break;
case EX_DO: case EX_DO:
ldec = Analyze(exp->mRight, procDec, 0); ldec = Analyze(exp->mRight, procDec, 0);
rdec = Analyze(exp->mLeft, procDec, ANAFL_RHS); rdec = Analyze(exp->mLeft, procDec, ANAFL_RHS);

31
oscar64/InterCodeGenerator.cpp
View File

@ -5455,6 +5455,37 @@ InterCodeGenerator::ExValue InterCodeGenerator::TranslateExpression(Declaration*
return ExValue(TheVoidTypeDeclaration); return ExValue(TheVoidTypeDeclaration);
} }
case EX_FORBODY:
{
DestructStack* odestack = destack;
InterInstruction* jins0 = new InterInstruction(MapLocation(exp, inlineMapper), IC_JUMP);
InterInstruction* jins1 = new InterInstruction(MapLocation(exp, inlineMapper), IC_JUMP);
InterCodeBasicBlock* lblock = new InterCodeBasicBlock(proc);
InterCodeBasicBlock* cblock = new InterCodeBasicBlock(proc);
block->Append(jins0);
block->Close(lblock, nullptr);
DestructStack* idestack = destack;
vr = TranslateExpression(procType, proc, lblock, exp->mLeft, destack, gotos, breakBlock, BranchTarget(cblock, idestack), inlineMapper);
lblock->Append(jins1);
lblock->Close(cblock, nullptr);
UnwindDestructStack(procType, proc, cblock, destack, idestack, inlineMapper);
destack = idestack;
block = cblock;
exp = exp->mRight;
if (!exp)
return ExValue(TheVoidTypeDeclaration);
} break;
case EX_FOR: case EX_FOR:
{ {
DestructStack* odestack = destack; DestructStack* odestack = destack;

17
oscar64/Parser.cpp
View File

@ -10712,7 +10712,7 @@ Expression* Parser::ParseStatement(void)
} }
conditionExp->mRight->mDecValue->mInteger = endValue; conditionExp->mRight->mDecValue->mInteger = endValue;
Expression* unrollBody = new Expression(mScanner->mLocation, EX_SEQUENCE); Expression* unrollBody = new Expression(mScanner->mLocation, EX_FORBODY);
unrollBody->mLeft = bodyExp; unrollBody->mLeft = bodyExp;
Expression* bexp = unrollBody; Expression* bexp = unrollBody;
if ((endValue - startValue) * stepValue > 0) if ((endValue - startValue) * stepValue > 0)
@ -10722,7 +10722,7 @@ Expression* Parser::ParseStatement(void)
bexp->mRight = new Expression(mScanner->mLocation, EX_SEQUENCE); bexp->mRight = new Expression(mScanner->mLocation, EX_SEQUENCE);
bexp = bexp->mRight; bexp = bexp->mRight;
bexp->mLeft = iterateExp; bexp->mLeft = iterateExp;
bexp->mRight = new Expression(mScanner->mLocation, EX_SEQUENCE); bexp->mRight = new Expression(mScanner->mLocation, EX_FORBODY);
bexp = bexp->mRight; bexp = bexp->mRight;
bexp->mLeft = bodyExp; bexp->mLeft = bodyExp;
} }
@ -10732,16 +10732,21 @@ Expression* Parser::ParseStatement(void)
if (remain) if (remain)
{ {
finalExp = new Expression(mScanner->mLocation, EX_SEQUENCE); finalExp = new Expression(mScanner->mLocation, EX_DO);
finalExp->mLeft = bodyExp; finalExp->mLeft = new Expression(mScanner->mLocation, EX_CONSTANT);
Expression* bexp = finalExp; finalExp->mLeft->mDecType = TheBoolTypeDeclaration;
finalExp->mLeft->mDecValue = TheFalseConstDeclaration;
finalExp->mRight = new Expression(mScanner->mLocation, EX_FORBODY);
finalExp->mRight->mLeft = bodyExp;
Expression* bexp = finalExp->mRight;
for (int i = 1; i < remain; i++) for (int i = 1; i < remain; i++)
{ {
bexp->mRight = new Expression(mScanner->mLocation, EX_SEQUENCE); bexp->mRight = new Expression(mScanner->mLocation, EX_SEQUENCE);
bexp = bexp->mRight; bexp = bexp->mRight;
bexp->mLeft = iterateExp; bexp->mLeft = iterateExp;
bexp->mRight = new Expression(mScanner->mLocation, EX_SEQUENCE); bexp->mRight = new Expression(mScanner->mLocation, EX_FORBODY);
bexp = bexp->mRight; bexp = bexp->mRight;
bexp->mLeft = bodyExp; bexp->mLeft = bodyExp;
} }