marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Aul: Enable better for loop generation 

Instead of jumping forward and back repeatedly per iteration, we're
moving the incrementor past the body, which is when it's supposed to be
executed anyway.
alut-include-path
Nicolas Hake 2016-11-30 14:00:06 +01:00
parent 220d427915
commit eeea131674
1 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/script/C4AulCompiler.cpp
View File

@ -1410,7 +1410,6 @@ void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::Return *n)
void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::ForLoop *n)
{
#if 0
// Bytecode arranged like this:
// initializer
// cond: condition
@ -1423,84 +1422,41 @@ void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::ForLoop *n)
// continue jumps to incr
// break jumps to exit
if (n->init)
{
n->init->accept(this);
MaybePopValueOf(n->init);
}
int cond = -1, condition_jump = -1;
PushLoop();
if (n->cond)
{
cond = AddJumpTarget();
n->cond->accept(this);
active_loops.top().breaks.push_back(AddBCC(n->cond->loc, AB_CONDN));
}
int body = AddJumpTarget();
if (!n->cond)
cond = body;
n->body->accept(this);
MaybePopValueOf(n->body);
int incr = -1;
if (n->incr)
{
incr = AddJumpTarget();
n->incr->accept(this);
MaybePopValueOf(n->incr);
}
else
{
// If no incrementor exists, just jump straight to the condition
incr = cond;
}
// start the next iteration of the loop
AddJumpTo(AB_JUMP, cond);
PopLoop(incr);
#else
// Bytecode arranged like this:
// initializer
// cond: condition
// CONDN exit
// JUMP body
// incr: incrementor
// JUMP cond
// body: body
// JUMP incr
// exit:
//
// continue jumps to incr
// break jumps to exit
if (n->init)
{
if (SafeVisit(n->init))
MaybePopValueOf(n->init);
}
int cond = -1, condition_jump = -1;
PushLoop();
int cond = AddJumpTarget();
if (n->cond)
{
cond = AddJumpTarget();
SafeVisit(n->cond);
active_loops.top().breaks.push_back(AddBCC(n->cond->loc, AB_CONDN));
}
int incr = cond;
int body = AddJumpTarget();
if (!n->cond)
cond = body;
if (SafeVisit(n->body))
MaybePopValueOf(n->body);
int incr = -1;
if (n->incr)
{
int cond_jump = AddBCC(n->loc, AB_JUMP);
incr = AddJumpTarget();
if (SafeVisit(n->incr))
MaybePopValueOf(n->incr);
AddJumpTo(n->loc, AB_JUMP, cond);
UpdateJump(cond_jump, AddJumpTarget());
}
if (SafeVisit(n->body))
MaybePopValueOf(n->body);
AddJumpTo(n->loc, AB_JUMP, incr);
else
{
// If no incrementor exists, just jump straight to the condition
incr = cond;
}
// start the next iteration of the loop
AddJumpTo(n->loc, AB_JUMP, cond);
PopLoop(incr);
#endif
}
void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::RangeLoop *n)