ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for interval upper bound check

Browse Source
This commit is contained in:
Ginger Bill
2017-01-03 19:22:08 +00:00
parent 70d4ca00df
commit 40f5dd56f7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ssa.c
+12 -10
View File
@@ -3910,15 +3910,15 @@ void ssa_build_range_indexed(ssaProcedure *proc, ssaValue *expr, Type *val_type,
ssaValue *index = ssa_add_local_generated(proc, t_int); ssaValue *index = ssa_add_local_generated(proc, t_int);
ssa_emit_store(proc, index, ssa_make_const_int(proc->module->allocator, -1)); ssa_emit_store(proc, index, ssa_make_const_int(proc->module->allocator, -1));
loop = ssa_add_block(proc, NULL, "range.index.loop"); loop = ssa_add_block(proc, NULL, "for.index.loop");
ssa_emit_jump(proc, loop); ssa_emit_jump(proc, loop);
proc->curr_block = loop; proc->curr_block = loop;
ssaValue *incr = ssa_emit_arith(proc, Token_Add, ssa_emit_load(proc, index), v_one, t_int); ssaValue *incr = ssa_emit_arith(proc, Token_Add, ssa_emit_load(proc, index), v_one, t_int);
ssa_emit_store(proc, index, incr); ssa_emit_store(proc, index, incr);
body = ssa_add_block(proc, NULL, "range.index.body"); body = ssa_add_block(proc, NULL, "for.index.body");
done = ssa_add_block(proc, NULL, "range.index.done"); done = ssa_add_block(proc, NULL, "for.index.done");
ssaValue *cond = ssa_emit_comp(proc, Token_Lt, incr, count); ssaValue *cond = ssa_emit_comp(proc, Token_Lt, incr, count);
ssa_emit_if(proc, cond, body, done); ssa_emit_if(proc, cond, body, done);
proc->curr_block = body; proc->curr_block = body;
@@ -3971,14 +3971,14 @@ void ssa_build_range_string(ssaProcedure *proc, ssaValue *expr, Type *val_type,
ssaValue *offset_ = ssa_add_local_generated(proc, t_int); ssaValue *offset_ = ssa_add_local_generated(proc, t_int);
ssa_emit_store(proc, index, v_zero); ssa_emit_store(proc, index, v_zero);
loop = ssa_add_block(proc, NULL, "range.string.loop"); loop = ssa_add_block(proc, NULL, "for.string.loop");
ssa_emit_jump(proc, loop); ssa_emit_jump(proc, loop);
proc->curr_block = loop; proc->curr_block = loop;
body = ssa_add_block(proc, NULL, "range.string.body"); body = ssa_add_block(proc, NULL, "for.string.body");
done = ssa_add_block(proc, NULL, "range.string.done"); done = ssa_add_block(proc, NULL, "for.string.done");
ssaValue *offset = ssa_emit_load(proc, offset_); ssaValue *offset = ssa_emit_load(proc, offset_);
@@ -4012,7 +4012,7 @@ void ssa_build_range_interval(ssaProcedure *proc, AstNodeIntervalExpr *node, Typ
ssaValue **val_, ssaValue **idx_, ssaBlock **loop_, ssaBlock **done_) { ssaValue **val_, ssaValue **idx_, ssaBlock **loop_, ssaBlock **done_) {
ssaValue *lower = ssa_build_expr(proc, node->left); ssaValue *lower = ssa_build_expr(proc, node->left);
ssaValue *upper = ssa_build_expr(proc, node->right); ssaValue *upper = NULL;
ssaValue *val = NULL; ssaValue *val = NULL;
ssaValue *idx = NULL; ssaValue *idx = NULL;
@@ -4029,12 +4029,14 @@ void ssa_build_range_interval(ssaProcedure *proc, AstNodeIntervalExpr *node, Typ
ssaValue *index = ssa_add_local_generated(proc, t_int); ssaValue *index = ssa_add_local_generated(proc, t_int);
ssa_emit_store(proc, index, ssa_make_const_int(proc->module->allocator, 0)); ssa_emit_store(proc, index, ssa_make_const_int(proc->module->allocator, 0));
loop = ssa_add_block(proc, NULL, "range.interval.loop"); loop = ssa_add_block(proc, NULL, "for.interval.loop");
ssa_emit_jump(proc, loop); ssa_emit_jump(proc, loop);
proc->curr_block = loop; proc->curr_block = loop;
body = ssa_add_block(proc, NULL, "range.interval.body"); body = ssa_add_block(proc, NULL, "for.interval.body");
done = ssa_add_block(proc, NULL, "range.interval.done"); done = ssa_add_block(proc, NULL, "for.interval.done");
upper = ssa_build_expr(proc, node->right);
ssaValue *cond = ssa_emit_comp(proc, Token_Lt, ssa_emit_load(proc, value), upper); ssaValue *cond = ssa_emit_comp(proc, Token_Lt, ssa_emit_load(proc, value), upper);
ssa_emit_if(proc, cond, body, done); ssa_emit_if(proc, cond, body, done);