From: Christoph Mallon Date: Sat, 11 Oct 2008 19:35:57 +0000 (+0000) Subject: sched_skip_cf_predicator() does not need an arch_env as environment anymore. X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=df87ac575b8844b509cf576e9432f4eeadb0880a;p=libfirm sched_skip_cf_predicator() does not need an arch_env as environment anymore. [r22727] --- diff --git a/ir/be/benode.c b/ir/be/benode.c index feef784b0..2746f1865 100644 --- a/ir/be/benode.c +++ b/ir/be/benode.c @@ -1038,7 +1038,7 @@ ir_node *be_spill(const arch_env_t *arch_env, ir_node *block, ir_node *irn) const arch_register_class_t *cls = arch_get_irn_reg_class(irn, -1); const arch_register_class_t *cls_frame = arch_get_irn_reg_class(frame, -1); ir_node *spill; - (void)arch_env; + (void)arch_env; // TODO remove parameter spill = be_new_Spill(cls, cls_frame, irg, block, frame, irn); return spill; @@ -1051,13 +1051,14 @@ ir_node *be_reload(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_graph *irg = get_irn_irg(bl); ir_node *frame = get_irg_frame(irg); const arch_register_class_t *cls_frame = arch_get_irn_reg_class(frame, -1); + (void)arch_env; // TODO remove parameter assert(be_is_Spill(spill) || (is_Phi(spill) && get_irn_mode(spill) == mode_M)); reload = be_new_Reload(cls, cls_frame, irg, bl, frame, spill, mode); if (is_Block(insert)) { - insert = sched_skip(insert, 0, sched_skip_cf_predicator, (void *) arch_env); + insert = sched_skip(insert, 0, sched_skip_cf_predicator, NULL); sched_add_after(insert, reload); } else { sched_add_before(insert, reload); diff --git a/ir/be/besched_t.h b/ir/be/besched_t.h index 8f6ddfc07..abb65acec 100644 --- a/ir/be/besched_t.h +++ b/ir/be/besched_t.h @@ -317,8 +317,7 @@ typedef int (sched_predicator_t)(const ir_node *irn, void *data); * Predicate for sched_skip(), returns non-zero if irn is a control flow changing node. * * @param irn the node to evaluate - * @param data an arch_env_t * used to determine if irn is a cf - * node for the given architecture + * @param data unused */ int sched_skip_cf_predicator(const ir_node *irn, void *data); diff --git a/ir/be/bespillremat.c b/ir/be/bespillremat.c index f215f20ba..995ea9745 100644 --- a/ir/be/bespillremat.c +++ b/ir/be/bespillremat.c @@ -403,7 +403,7 @@ set_find_spill(set * set, const ir_node * value) #define pset_foreach(s,i) for((i)=pset_first((s)); (i); (i)=pset_next((s))) #define set_foreach(s,i) for((i)=set_first((s)); (i); (i)=set_next((s))) #define foreach_post_remat(s,i) for((i)=next_post_remat((s)); (i); (i)=next_post_remat((i))) -#define foreach_pre_remat(si,s,i) for((i)=next_pre_remat((si),(s)); (i); (i)=next_pre_remat((si),(i))) +#define foreach_pre_remat(s,i) for((i)=next_pre_remat((s)); (i); (i)=next_pre_remat((i))) #define sched_foreach_op(s,i) for((i)=sched_next_op((s));!sched_is_end((i));(i)=sched_next_op((i))) static int @@ -707,10 +707,9 @@ value_is_defined_before(const spill_ilp_t * si, const ir_node * pos, const ir_no return ret; } -static INLINE ir_node * -sched_block_last_noncf(const spill_ilp_t * si, const ir_node * bb) +static INLINE ir_node *sched_block_last_noncf(const ir_node * bb) { - return sched_skip((ir_node*)bb, 0, sched_skip_cf_predicator, (void *) si->birg->main_env->arch_env); + return sched_skip((ir_node*)bb, 0, sched_skip_cf_predicator, NULL); } /** @@ -777,11 +776,10 @@ sched_put_after(ir_node * insert, ir_node * irn) sched_add_before(insert, irn); } -static void -sched_put_before(const spill_ilp_t * si, ir_node * insert, ir_node * irn) +static void sched_put_before(ir_node * insert, ir_node * irn) { if(is_Block(insert)) { - insert = sched_block_last_noncf(si, insert); + insert = sched_block_last_noncf(insert); } else { insert = sched_next_nonproj(insert, 0); insert = sched_prev(insert); @@ -814,14 +812,13 @@ next_post_remat(const ir_node * irn) } -static ir_node * -next_pre_remat(const spill_ilp_t * si, const ir_node * irn) +static ir_node *next_pre_remat(const ir_node * irn) { op_t *op; ir_node *ret; if(is_Block(irn)) { - ret = sched_block_last_noncf(si, irn); + ret = sched_block_last_noncf(irn); ret = sched_next(ret); ret = sched_prev_op(ret); } else { @@ -851,7 +848,7 @@ can_remat_before(const spill_ilp_t * si, const remat_t * remat, const ir_node * res = 1; if(is_Block(pos)) { - prev = sched_block_last_noncf(si, pos); + prev = sched_block_last_noncf(pos); prev = sched_next_nonproj(prev, 0); } else { prev = sched_prev_op(pos); @@ -936,7 +933,7 @@ insert_copy_before(const spill_ilp_t * si, const ir_node * irn, ir_node * pos) set_phi_class(si->pc, copy, NULL); set_nodes_block(copy, bb); - sched_put_before(si, pos, copy); + sched_put_before(pos, copy); return copy; } @@ -1100,7 +1097,7 @@ get_live_end(spill_ilp_t * si, ir_node * bb, pset * live) sched_foreach_reverse(bb, irn) { int i; - if(!sched_skip_cf_predicator(irn, si->birg->main_env->arch_env)) break; + if (!sched_skip_cf_predicator(irn, NULL)) break; for(i=get_irn_arity(irn)-1; i>=0; --i) { ir_node *arg = get_irn_n(irn,i); @@ -1114,7 +1111,7 @@ get_live_end(spill_ilp_t * si, ir_node * bb, pset * live) * find values that are used by remats at end of block * and insert them into live set */ - foreach_pre_remat(si, bb, irn) { + foreach_pre_remat(bb, irn) { int n; for (n=get_irn_arity(irn)-1; n>=0; --n) { @@ -1146,7 +1143,7 @@ walker_regclass_copy_insertor(ir_node * irn, void * data) if(!has_reg_class(si, phi_arg)) { ir_node *copy = be_new_Copy(si->cls, si->birg->irg, bb, phi_arg); - ir_node *pos = sched_block_last_noncf(si, bb); + ir_node *pos = sched_block_last_noncf(bb); op_t *op = obstack_alloc(si->obst, sizeof(*op)); DBG((si->dbg, LEVEL_2, "\t copy to my regclass for arg %+F of %+F\n", phi_arg, irn)); @@ -1264,7 +1261,7 @@ walker_remat_insertor(ir_node * bb, void * data) } /* do not place post remats after jumps */ - if(sched_skip_cf_predicator(irn, si->birg->main_env->arch_env)) { + if (sched_skip_cf_predicator(irn, si->birg->main_env->arch_env)) { del_pset(used); del_pset(args); break; @@ -1478,7 +1475,7 @@ luke_endwalker(ir_node * bb, void * data) * find values that are used by remats at end of block * and insert them into live set */ - foreach_pre_remat(si, bb, irn) { + foreach_pre_remat(bb, irn) { int n; for (n=get_irn_arity(irn)-1; n>=0; --n) { @@ -1495,7 +1492,7 @@ luke_endwalker(ir_node * bb, void * data) sched_foreach_reverse(bb, irn) { int n; - if(!sched_skip_cf_predicator(irn, si->birg->main_env->arch_env)) break; + if (!sched_skip_cf_predicator(irn, si->birg->main_env->arch_env)) break; for (n=get_irn_arity(irn)-1; n>=0; --n) { ir_node *irn_arg = get_irn_n(irn, n); @@ -1754,7 +1751,7 @@ insert_mem_copy_position(spill_ilp_t * si, pset * live, const ir_node * block) lpp_set_factor_fast(si->lpp, cst, to_copy_spill->reg_out, -1.0); if(reload != ILP_UNDEF) lpp_set_factor_fast(si->lpp, cst, reload, -1.0); lpp_set_factor_fast(si->lpp, cst, to_copy_op->attr.live_range.ilp, -1.0); - foreach_pre_remat(si, block, tmp) { + foreach_pre_remat(block, tmp) { op_t *remat_op = get_irn_link(tmp); if(remat_op->attr.remat.remat->value == to_copy) { lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, -1.0); @@ -1827,7 +1824,7 @@ luke_blockwalker(ir_node * bb, void * data) lpp_set_factor_fast(si->lpp, cst, spill->reg_out, 1.0); if(reload != ILP_UNDEF) lpp_set_factor_fast(si->lpp, cst, reload, -1.0); lpp_set_factor_fast(si->lpp, cst, op->attr.live_range.ilp, -1.0); - foreach_pre_remat(si, bb, tmp) { + foreach_pre_remat(bb, tmp) { op_t *remat_op = get_irn_link(tmp); if(remat_op->attr.remat.remat->value == irn) { lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, -1.0); @@ -1841,7 +1838,7 @@ luke_blockwalker(ir_node * bb, void * data) lpp_set_factor_fast(si->lpp, cst, spill->reg_out, 1.0); if(reload != ILP_UNDEF) lpp_set_factor_fast(si->lpp, cst, reload, -1.0); lpp_set_factor_fast(si->lpp, cst, op->attr.live_range.ilp, -1.0); - foreach_pre_remat(si, bb, tmp) { + foreach_pre_remat(bb, tmp) { op_t *remat_op = get_irn_link(tmp); if(remat_op->attr.remat.remat->value == irn) { lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, -1.0); @@ -1876,7 +1873,7 @@ luke_blockwalker(ir_node * bb, void * data) /* * assure the remat args are available */ - foreach_pre_remat(si, bb, tmp) { + foreach_pre_remat(bb, tmp) { op_t *remat_op = get_irn_link(tmp); int n; @@ -1922,7 +1919,7 @@ luke_blockwalker(ir_node * bb, void * data) * B A S I C B L O C K B O D Y **************************************/ - sched_foreach_reverse_from(sched_block_last_noncf(si, bb), irn) { + sched_foreach_reverse_from(sched_block_last_noncf(bb), irn) { op_t *op; op_t *tmp_op; int n, @@ -1983,7 +1980,7 @@ luke_blockwalker(ir_node * bb, void * data) } } } - foreach_pre_remat(si, irn, tmp) { + foreach_pre_remat(irn, tmp) { for (n=get_irn_arity(tmp)-1; n>=0; --n) { ir_node *remat_arg = get_irn_n(tmp, n); if(has_reg_class(si, remat_arg)) { @@ -2378,7 +2375,7 @@ skip_one_must_die: lpp_set_factor_fast(si->lpp, requirements, arg_op->attr.live_range.ilp, 1.0); lpp_set_factor_fast(si->lpp, requirements, op->attr.live_range.args.reloads[i], 1.0); - foreach_pre_remat(si, irn, tmp) { + foreach_pre_remat(irn, tmp) { op_t *remat_op = get_irn_link(tmp); if(remat_op->attr.remat.remat->value == arg) { lpp_set_factor_fast(si->lpp, requirements, remat_op->attr.remat.ilp, 1.0); @@ -2427,7 +2424,7 @@ skip_one_must_die: } /* requirements for remats */ - foreach_pre_remat(si, irn, tmp) { + foreach_pre_remat(irn, tmp) { op_t *remat_op = get_irn_link(tmp); int n; @@ -3925,7 +3922,7 @@ walker_reload_placer(ir_node * bb, void * data) { if(!is_zero(name->value)) { ir_node *reload; ir_node *insert_pos = bb; - ir_node *prev = sched_block_last_noncf(si, bb); + ir_node *prev = sched_block_last_noncf(bb); op_t *prev_op = get_irn_link(prev); while(be_is_Spill(prev)) { diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 059f4b2a9..f19ae28c2 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -173,7 +173,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in); be_stat_ev("phi_perm", n_projs); - insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, &chordal_env->birg->main_env->arch_env); + insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, NULL); sched_add_after(insert_after, perm); /* @@ -287,7 +287,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { set_irn_n(phi, i, dupl); set_reg(dupl, phi_reg); - sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, &chordal_env->birg->main_env->arch_env), dupl); + sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, NULL), dupl); pin_irn(dupl, phi_block); be_liveness_introduce(lv, dupl); be_liveness_update(lv, arg); diff --git a/ir/be/bessadestrsimple.c b/ir/be/bessadestrsimple.c index 1610076d8..97c66bbbe 100644 --- a/ir/be/bessadestrsimple.c +++ b/ir/be/bessadestrsimple.c @@ -240,7 +240,7 @@ static ir_node *insert_copies(ssa_destr_env_t *sde, const arch_register_class_t /* In case this is a 'normal' phi we insert at the * end of the pred block before cf nodes */ - last_cpy = sched_skip(pred_blk, 0, sched_skip_cf_predicator, (void *)sde->aenv); + last_cpy = sched_skip(pred_blk, 0, sched_skip_cf_predicator, NULL); last_cpy = sched_next(last_cpy); /* If we detect a loop stop recursion. */