X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=07e3bdc1bd7b5c763a891dfe9606c3c261a6864d;hb=4d7a9507baf1737297cd4f7fc91eab209fd5d398;hp=24744ec1450dcde5f16de7fc53974b33b1a8ca32;hpb=5f838fb985ea51236990ec8a17693a3052abb936;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 24744ec14..07e3bdc1b 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -16,6 +16,7 @@ #include "irnode_t.h" #include "ircons_t.h" #include "iredges_t.h" +#include "irgwalk.h" #include "irgmod.h" #include "irdump.h" #include "irprintf.h" @@ -31,7 +32,7 @@ static firm_dbg_module_t *dbg = NULL; #define DUMP_GRAPHS -#define get_chordal_arch(ce) ((ce)->main_env->arch_env) +#define get_chordal_arch(ce) ((ce)->birg->main_env->arch_env) #define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn) #define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg) @@ -84,7 +85,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { be_chordal_env_t *chordal_env = data; pmap *perm_map = chordal_env->data; ir_graph *irg = chordal_env->irg; - const be_node_factory_t *fact = chordal_env->main_env->node_factory; int i, n; assert(is_Block(bl)); @@ -138,9 +138,9 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) in[pp->pos] = pp->arg; - perm = new_Perm(fact, chordal_env->cls, irg, pred_bl, n_projs, in); + perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in); free(in); - insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->main_env->arch_env); + insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env); sched_add_after(insert_after, perm); /* @@ -222,60 +222,71 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { * insert it into schedule, * pin it */ - ir_node *dupl = new_Copy(chordal_env->main_env->node_factory, cls, chordal_env->irg, arg_block, arg); + ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg); assert(get_irn_mode(phi) == get_irn_mode(dupl)); 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->main_env->arch_env), dupl); + sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env), dupl); pin_irn(dupl, phi_block); DBG((dbg, LEVEL_1, " they do interfere: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); - } else { - /* - * First check if there is a phi - * - in the same block - * - having arg at the current pos in its arg-list - * - having the same color as arg - * - * If found, then pin the arg + continue; /* with next argument */ + } + + if (phi_reg == arg_reg) { + /* Phi and arg have the same register, + * so pin and continue */ - DBG((dbg, LEVEL_1, " they do not interfere\n")); - assert(is_Proj(arg)); - if (!is_pinned(arg)) { - ir_node *other_phi; - DBG((dbg, LEVEL_1, " searching for phi with same arg having args register\n")); - for(other_phi = get_irn_link(phi_block); other_phi; other_phi = get_irn_link(other_phi)) { - assert(is_Phi(other_phi) && get_nodes_block(phi) == get_nodes_block(other_phi) && "link fields are screwed up"); - if (get_irn_n(other_phi, i) == arg && get_reg(other_phi) == arg_reg) { - DBG((dbg, LEVEL_1, " found %+F(%s)\n", other_phi, get_reg(other_phi)->name)); - pin_irn(arg, phi_block); - } + pin_irn(arg, phi_block); + DBG((dbg, LEVEL_1, " arg has same reg: pin %+F(%s)\n", arg, get_reg(arg)->name)); + continue; + } + + DBG((dbg, LEVEL_1, " they do not interfere\n")); + assert(is_Proj(arg)); + /* + * First check if there is an other phi + * - in the same block + * - having arg at the current pos in its arg-list + * - having the same color as arg + * + * If found, then pin the arg (for that phi) + */ + if (!is_pinned(arg)) { + ir_node *other_phi; + DBG((dbg, LEVEL_1, " searching for phi with same arg having args register\n")); + for(other_phi = get_irn_link(phi_block); other_phi; other_phi = get_irn_link(other_phi)) { + assert(is_Phi(other_phi) && get_nodes_block(phi) == get_nodes_block(other_phi) && "link fields are screwed up"); + if (get_irn_n(other_phi, i) == arg && get_reg(other_phi) == arg_reg) { + DBG((dbg, LEVEL_1, " found %+F(%s)\n", other_phi, get_reg(other_phi)->name)); + pin_irn(arg, phi_block); + break; } } + } - if (is_pinned(arg)) { - /* Insert a duplicate of the original value in arguments block, - * make it the new phi arg, - * set its register, - * insert it into schedule, - * pin it - */ - ir_node *perm = get_Proj_pred(arg); - ir_node *orig_val = get_irn_n(perm, get_Proj_proj(arg)); - ir_node *dupl = new_Copy(chordal_env->main_env->node_factory, cls, chordal_env->irg, arg_block, orig_val); - assert(get_irn_mode(phi) == get_irn_mode(dupl)); - set_irn_n(phi, i, dupl); - set_reg(dupl, phi_reg); - sched_add_before(perm, dupl); - pin_irn(dupl, phi_block); - DBG((dbg, LEVEL_1, " arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); - } else { - /* No other phi has the same color (else arg would have been pinned), - * so just set the register and pin - */ - set_reg(arg, phi_reg); - pin_irn(arg, phi_block); - DBG((dbg, LEVEL_1, " arg is not pinned: so pin %+F(%s)\n", arg, get_reg(arg)->name)); - } + if (is_pinned(arg)) { + /* Insert a duplicate of the original value in arguments block, + * make it the new phi arg, + * set its register, + * insert it into schedule, + * pin it + */ + ir_node *perm = get_Proj_pred(arg); + ir_node *orig_val = get_irn_n(perm, get_Proj_proj(arg)); + ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, orig_val); + assert(get_irn_mode(phi) == get_irn_mode(dupl)); + set_irn_n(phi, i, dupl); + set_reg(dupl, phi_reg); + sched_add_before(perm, dupl); + pin_irn(dupl, phi_block); + DBG((dbg, LEVEL_1, " arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); + } else { + /* No other phi has the same color (else arg would have been pinned), + * so just set the register and pin + */ + set_reg(arg, phi_reg); + pin_irn(arg, phi_block); + DBG((dbg, LEVEL_1, " arg is not pinned: so pin %+F(%s)\n", arg, get_reg(arg)->name)); } } }