From 73749db6b40fb1fc35f3a7f3589074c177c12ead Mon Sep 17 00:00:00 2001 From: "Wolfgang (Blub) Bumiller" Date: Fri, 4 May 2012 12:24:44 +0200 Subject: [PATCH] What was I thinking... fixing loop's jump creation so it doesn't try creating multiple jumps... this code is also much more readable --- ast.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/ast.c b/ast.c index ce89fc9..be69671 100644 --- a/ast.c +++ b/ast.c @@ -949,6 +949,8 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value ir_block *old_bcontinue; ir_block *old_bbreak; + ir_block *btemp; + (void)lvalue; (void)out; @@ -1081,14 +1083,13 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value /* Now all blocks are in place */ /* From 'bin' we jump to whatever comes first */ - if (bprecond && !ir_block_create_jump(bin, bprecond)) - return false; - else if (bbody && !ir_block_create_jump(bin, bbody)) - return false; - else if (bpostcond && !ir_block_create_jump(bin, bpostcond)) - return false; - else if ( !ir_block_create_jump(bin, bout)) + if (bprecond) tmpblock = bprecond; + else if (bbody) tmpblock = bbody; + else if (bpostcond) tmpblock = bpostcond; + else tmpblock = bout; + if (!ir_block_create_jump(bin, tmpblock)) return false; + } /* From precond */ if (bprecond) @@ -1106,27 +1107,25 @@ bool ast_loop_codegen(ast_loop *self, ast_function *func, bool lvalue, ir_value /* from body */ if (bbody) { - if (bincrement && !ir_block_create_jump(end_bbody, bincrement)) - return false; - else if (bpostcond && !ir_block_create_jump(end_bbody, bpostcond)) - return false; - else if (bprecond && !ir_block_create_jump(end_bbody, bprecond)) - return false; - else if (!ir_block_create_jump(end_bbody, bout)) + if (bincrement) tmpblock = bincrement; + else if (bpostcond) tmpblock = bpostcond; + else if (bprecond) tmpblock = bprecond; + else tmpblock = bout; + if (!ir_block_create_jump(end_bbody, tmpblock)) return false; + } } /* from increment */ if (bincrement) { - if (bpostcond && !ir_block_create_jump(end_bincrement, bpostcond)) - return false; - else if (bprecond && !ir_block_create_jump(end_bincrement, bprecond)) - return false; - else if (bbody && !ir_block_create_jump(end_bincrement, bbody)) - return false; - else if (!ir_block_create_jump(end_bincrement, bout)) + if (bpostcond) tmpblock = bpostcond; + else if (bprecond) tmpblock = bprecond; + else if (bbody) tmpblock = bbody; + else tmpblock = bout; + if (!ir_block_create_jump(end_bincrement, tmpblock)) return false; + } } /* from postcond */ -- 2.39.2