X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=241607d9e48577af08f01217ec72985ad68bfbe6;hb=5728d0c2eae6d6f026d1a5435f9f0e4fa67382a2;hp=e995f2d3850788e8802e93f066f02fa1eca40bb3;hpb=a3cc7125bfe7db7117be16cb3473dd5b4cd68256;p=libfirm diff --git a/ir/be/belower.c b/ir/be/belower.c index e995f2d38..241607d9e 100644 --- a/ir/be/belower.c +++ b/ir/be/belower.c @@ -38,10 +38,10 @@ #include "irgwalk.h" #include "array_t.h" -#include "bearch_t.h" +#include "bearch.h" #include "belower.h" -#include "benode_t.h" -#include "besched_t.h" +#include "benode.h" +#include "besched.h" #include "bestat.h" #include "bessaconstr.h" #include "beintlive_t.h" @@ -288,7 +288,6 @@ static void get_perm_cycle(perm_cycle_t *const cycle, static void lower_perm_node(ir_node *irn, lower_env_t *env) { const arch_register_class_t *const reg_class = arch_get_irn_register(get_irn_n(irn, 0))->reg_class; - ir_graph *const irg = get_irn_irg(irn); ir_node *const block = get_nodes_block(irn); int const arity = get_irn_arity(irn); reg_pair_t *const pairs = ALLOCAN(reg_pair_t, arity); @@ -327,9 +326,9 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env) pair = &pairs[n++]; pair->in_node = in; - pair->in_reg = arch_get_irn_register(in); + pair->in_reg = in_reg; pair->out_node = out; - pair->out_reg = arch_get_irn_register(out); + pair->out_reg = out_reg; pair->checked = 0; } @@ -418,14 +417,14 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env) DBG((dbg, LEVEL_1, "%+F (%+F, %s) and (%+F, %s)\n", irn, res1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name)); - cpyxchg = be_new_Perm(reg_class, irg, block, 2, in); + cpyxchg = be_new_Perm(reg_class, block, 2, in); if (i > 0) { /* cycle is not done yet */ int pidx = get_pairidx_for_in_regidx(pairs, n, cycle.elems[i]->index); /* create intermediate proj */ - res1 = new_r_Proj(irg, block, cpyxchg, get_irn_mode(res1), 0); + res1 = new_r_Proj(block, cpyxchg, get_irn_mode(res1), 0); /* set as in for next Perm */ pairs[pidx].in_node = res1; @@ -440,26 +439,26 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env) arch_set_irn_register(res1, cycle.elems[i]); /* insert the copy/exchange node in schedule after the magic schedule node (see above) */ - sched_add_after(sched_point, cpyxchg); + sched_add_after(skip_Proj(sched_point), cpyxchg); - DBG((dbg, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point)); + DB((dbg, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point)); /* set the new scheduling point */ sched_point = res1; } else { ir_node *cpyxchg; - DBG((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n", + DB((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n", irn, arg1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name)); - cpyxchg = be_new_Copy(reg_class, irg, block, arg1); + cpyxchg = be_new_Copy(reg_class, block, arg1); arch_set_irn_register(cpyxchg, cycle.elems[i + 1]); /* exchange copy node and proj */ exchange(res2, cpyxchg); /* insert the copy/exchange node in schedule after the magic schedule node (see above) */ - sched_add_after(sched_point, cpyxchg); + sched_add_after(skip_Proj(sched_point), cpyxchg); /* set the new scheduling point */ sched_point = cpyxchg; @@ -506,7 +505,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, if (arch_irn_is_ignore(other_different) || !mode_is_datab(get_irn_mode(other_different))) { - DBG((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn)); + DB((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn)); return; } @@ -523,38 +522,38 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, /* check if already exists such a copy in the schedule immediately before */ cpy = find_copy(skip_Proj(irn), other_different); if (! cpy) { - cpy = be_new_Copy(cls, irg, block, other_different); + cpy = be_new_Copy(cls, block, other_different); arch_irn_set_flags(cpy, arch_irn_flags_dont_spill); - DBG((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different)); + DB((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different)); } else { - DBG((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, other_different)); + DB((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, other_different)); } /* Add the Keep resp. CopyKeep and reroute the users */ /* of the other_different irn in case of CopyKeep. */ if (has_irn_users(other_different)) { - keep = be_new_CopyKeep_single(cls, irg, block, cpy, irn, get_irn_mode(other_different)); + keep = be_new_CopyKeep_single(cls, block, cpy, irn, get_irn_mode(other_different)); be_node_set_reg_class_in(keep, 1, cls); } else { ir_node *in[2]; in[0] = irn; in[1] = cpy; - keep = be_new_Keep(cls, irg, block, 2, in); + keep = be_new_Keep(block, 2, in); } - DBG((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy)); + DB((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy)); /* insert copy and keep into schedule */ assert(sched_is_scheduled(irn) && "need schedule to assure constraints"); if (! sched_is_scheduled(cpy)) sched_add_before(skip_Proj(irn), cpy); - sched_add_after(irn, keep); + sched_add_after(skip_Proj(irn), keep); /* insert the other different and it's copies into the map */ entry = ir_nodemap_get(op_set, other_different); if (! entry) { - entry = obstack_alloc(&env->obst, sizeof(*entry)); + entry = OALLOC(&env->obst, op_copy_assoc_t); entry->cls = cls; ir_nodeset_init(&entry->copies); @@ -642,8 +641,6 @@ static void assure_constraints_walker(ir_node *block, void *walk_env) { * (or Projs of the same node), copying the same operand. */ static void melt_copykeeps(constraint_env_t *cenv) { - be_irg_t *birg = cenv->birg; - ir_graph *irg = be_get_birg_irg(birg); ir_nodemap_iterator_t map_iter; ir_nodemap_entry_t map_entry; @@ -689,7 +686,7 @@ static void melt_copykeeps(constraint_env_t *cenv) { ref_mode_T = skip_Proj(get_irn_n(ref, 1)); obstack_grow(&obst, &ref, sizeof(ref)); - DBG((dbg_constr, LEVEL_1, "Trying to melt %+F:\n", ref)); + DB((dbg_constr, LEVEL_1, "Trying to melt %+F:\n", ref)); /* check for copykeeps pointing to the same mode_T node as the reference copykeep */ for (j = 0; j < num_ck; ++j) { @@ -698,7 +695,7 @@ static void melt_copykeeps(constraint_env_t *cenv) { if (j != idx && cur_ck && skip_Proj(get_irn_n(cur_ck, 1)) == ref_mode_T) { obstack_grow(&obst, &cur_ck, sizeof(cur_ck)); ir_nodeset_remove(&entry->copies, cur_ck); - DBG((dbg_constr, LEVEL_1, "\t%+F\n", cur_ck)); + DB((dbg_constr, LEVEL_1, "\t%+F\n", cur_ck)); ck_arr[j] = NULL; ++n_melt; sched_remove(cur_ck); @@ -708,7 +705,7 @@ static void melt_copykeeps(constraint_env_t *cenv) { /* check, if we found some candidates for melting */ if (n_melt == 1) { - DBG((dbg_constr, LEVEL_1, "\tno candidate found\n")); + DB((dbg_constr, LEVEL_1, "\tno candidate found\n")); continue; } @@ -728,10 +725,10 @@ static void melt_copykeeps(constraint_env_t *cenv) { } #ifdef KEEP_ALIVE_COPYKEEP_HACK - new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY); + new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY); keep_alive(new_ck); #else - new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref)); + new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref)); #endif /* KEEP_ALIVE_COPYKEEP_HACK */ /* set register class for all kept inputs */ @@ -748,7 +745,7 @@ static void melt_copykeeps(constraint_env_t *cenv) { } while (be_is_Keep(sched_pt) || be_is_CopyKeep(sched_pt)); sched_add_before(sched_pt, new_ck); - DBG((dbg_constr, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt)); + DB((dbg_constr, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt)); /* finally: kill the reference copykeep */ kill_node(ref); @@ -815,11 +812,10 @@ void assure_constraints(be_irg_t *birg) { /* so we transform unnecessary ones into Keeps. */ foreach_ir_nodeset(&entry->copies, cp, iter) { if (be_is_CopyKeep(cp) && get_irn_n_edges(cp) < 1) { - const arch_register_class_t *cls = arch_get_irn_reg_class_out(cp); - int n = get_irn_arity(cp); - ir_node *keep; + int n = get_irn_arity(cp); + ir_node *keep; - keep = be_new_Keep(cls, irg, get_nodes_block(cp), n, get_irn_in(cp) + 1); + keep = be_new_Keep(get_nodes_block(cp), n, get_irn_in(cp) + 1); sched_add_before(cp, keep); /* Set all ins (including the block) of the CopyKeep BAD to keep the verifier happy. */ @@ -871,7 +867,7 @@ static int push_through_perm(ir_node *perm, lower_env_t *env) const arch_register_class_t *cls = arch_get_irn_reg_class_out(one_proj); assert(is_Proj(one_proj)); - DBG((dbg_permmove, LEVEL_1, "perm move %+F irg %+F\n", perm, irg)); + DB((dbg_permmove, LEVEL_1, "perm move %+F irg %+F\n", perm, irg)); /* Find the point in the schedule after which the * potentially movable nodes must be defined. @@ -885,7 +881,7 @@ static int push_through_perm(ir_node *perm, lower_env_t *env) for (i = get_irn_arity(irn) - 1; i >= 0; --i) { ir_node *op = get_irn_n(irn, i); if (arch_irn_consider_in_reg_alloc(cls, op) && - !values_interfere(env->birg, op, one_proj)) { + !be_values_interfere(env->birg->lv, op, one_proj)) { frontier = irn; goto found_front; } @@ -893,7 +889,7 @@ static int push_through_perm(ir_node *perm, lower_env_t *env) } found_front: - DBG((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier)); + DB((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier)); node = sched_prev(perm); n_moved = 0;