X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=3191c4887914530f9e3509228ed622513396326b;hb=ce470efc35a72852c338aa15623b2a661dec1b34;hp=c0f66b6831473285cb89796df14968303047ca67;hpb=3c2f7c0c9e0bff5d97a973bc224579922bb7df81;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index c0f66b683..3191c4887 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -24,9 +24,7 @@ * @date 25.05.2005 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "debug.h" #include "set.h" @@ -42,26 +40,21 @@ #include "be_t.h" #include "beutil.h" #include "bechordal_t.h" -#include "bearch_t.h" +#include "bearch.h" #include "belive_t.h" -#include "benode_t.h" -#include "besched_t.h" -#include "benodesets.h" +#include "benode.h" +#include "besched.h" #include "bestatevent.h" -#include "beirg_t.h" +#include "beirg.h" #include "beintlive_t.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -#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) - -#define is_Perm(irn) (arch_irn_class_is(arch_env, irn, perm)) -#define get_reg_cls(irn) (arch_get_irn_reg_class(arch_env, irn, -1)) -#define is_curr_reg_class(irn) (get_reg_cls(p) == chordal_env->cls) +#define get_reg(irn) arch_get_irn_register(irn) +#define set_reg(irn, reg) arch_set_irn_register(irn, reg) static void clear_link(ir_node *irn, void *data) { + (void) data; set_irn_link(irn, NULL); } @@ -96,6 +89,8 @@ typedef struct { static int cmp_perm_proj(const void *a, const void *b, size_t n) { const perm_proj_t *p = a; const perm_proj_t *q = b; + (void) n; + return !(p->arg == q->arg); } @@ -111,7 +106,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { insert_all_perms_env_t *env = data; be_chordal_env_t *chordal_env = env->chordal_env; pmap *perm_map = env->perm_map; - ir_graph *irg = chordal_env->irg; be_lv_t *lv = chordal_env->birg->lv; int i, n; @@ -136,10 +130,15 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * register class by construction. */ for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { - perm_proj_t templ; - ir_node *arg = get_irn_n(phi, i); - unsigned hash = nodeset_hash(arg); + ir_node *arg = get_irn_n(phi, i); + const arch_register_req_t *req = arch_get_register_req_out(arg); + unsigned hash; + perm_proj_t templ; + + if (req->type & arch_register_req_type_ignore) + continue; + hash = hash_irn(arg); templ.arg = arg; pp = set_find(arg_set, &templ, sizeof(templ), hash); @@ -148,7 +147,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * create one. The only restriction is, that the phi argument * may not be live in at the current block, since this argument * interferes with the phi and must thus not be member of a - * Perm. A copy will be inserted for this argument alter on. + * Perm. A copy will be inserted for this argument later on. */ if(!pp && !be_is_live_in(lv, bl, arg)) { templ.pos = n_projs++; @@ -162,14 +161,14 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * Create a new Perm with the arguments just collected * above in the arg_set and insert it into the schedule. */ - in = xmalloc(n_projs * sizeof(in[0])); + in = XMALLOCN(ir_node*, n_projs); for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) in[pp->pos] = pp->arg; - perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in); + perm = be_new_Perm(chordal_env->cls, 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); /* @@ -179,11 +178,10 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { */ insert_after = perm; for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) { - ir_node *proj = new_r_Proj(irg, pred_bl, perm, get_irn_mode(pp->arg), pp->pos); + ir_node *proj = new_r_Proj(pred_bl, perm, get_irn_mode(pp->arg), pp->pos); pp->proj = proj; assert(get_reg(pp->arg)); set_reg(proj, get_reg(pp->arg)); - sched_add_after(insert_after, proj); insert_after = proj; DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", get_reg(pp->arg)->name, pp->arg, pp->proj)); } @@ -195,7 +193,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { perm_proj_t templ; templ.arg = get_irn_n(phi, i); - pp = set_find(arg_set, &templ, sizeof(templ), nodeset_hash(templ.arg)); + pp = set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg)); /* If not found, it was an interfering argument */ if (pp) { @@ -235,20 +233,24 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { /* Consider all phis of this block */ for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { - int i, max; - ir_node *arg, *phi_block, *arg_block; - const arch_register_t *phi_reg, *arg_reg; - const arch_register_class_t *cls; + ir_node *phi_block = get_nodes_block(phi); + const arch_register_t *phi_reg = get_reg(phi); + const arch_register_class_t *cls = phi_reg->reg_class; + int max; + int i; assert(is_Phi(phi) && "Can only handle phi-destruction :)"); - phi_block = get_nodes_block(phi); - phi_reg = get_reg(phi); - cls = arch_get_irn_reg_class(get_chordal_arch(chordal_env), phi, -1); - /* process all arguments of the phi */ for (i = 0, max = get_irn_arity(phi); i < max; ++i) { - arg = get_irn_n(phi, i); + ir_node *arg = get_irn_n(phi, i); + const arch_register_req_t *req = arch_get_register_req_out(arg); + const arch_register_t *arg_reg; + ir_node *arg_block; + + if (req->type & arch_register_req_type_ignore) + continue; + arg_block = get_Block_cfgpred_block(phi_block, i); arg_reg = get_reg(arg); @@ -256,7 +258,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { DBG((dbg, LEVEL_1, " for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name)); - if (values_interfere(chordal_env->birg, phi, arg)) { + if (be_values_interfere(lv, phi, arg)) { /* Insert a duplicate in arguments block, make it the new phi arg, @@ -264,7 +266,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { insert it into schedule, pin it */ - ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg); + ir_node *dupl = be_new_Copy(cls, arg_block, arg); /* this is commented out because it will fail in case of unknown float */ #if 0 @@ -281,7 +283,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); @@ -333,8 +335,8 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { insert it into schedule, pin it */ - ir_node *perm = get_Proj_pred(arg); - ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg); + ir_node *perm = get_Proj_pred(arg); + ir_node *dupl = be_new_Copy(cls, arg_block, arg); ir_node *ins; /* this is commented out because it will fail in case of unknown float */ @@ -381,7 +383,7 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) { FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr"); - be_liveness_assure_sets(lv); + be_liveness_invalidate(lv); /* create a map for fast lookup of perms: block --> perm */ irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env); @@ -403,7 +405,7 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) { DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n")); irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env); - /* TODO: unfortunaltely updating doesn't work yet. */ + /* TODO: unfortunately updating doesn't work yet. */ be_liveness_invalidate(lv); if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) @@ -413,9 +415,9 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) { } static void ssa_destruction_check_walker(ir_node *bl, void *data) { - be_chordal_env_t *chordal_env = data; ir_node *phi; int i, max; + (void)data; for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { const arch_register_t *phi_reg, *arg_reg; @@ -423,7 +425,11 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) { phi_reg = get_reg(phi); /* iterate over all args of phi */ for (i = 0, max = get_irn_arity(phi); i < max; ++i) { - ir_node *arg = get_irn_n(phi, i); + ir_node *arg = get_irn_n(phi, i); + const arch_register_req_t *req = arch_get_register_req_out(arg); + + if (req->type & arch_register_req_type_ignore) + continue; arg_reg = get_reg(arg); @@ -441,5 +447,5 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) { } void be_ssa_destruction_check(be_chordal_env_t *chordal_env) { - irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, chordal_env); + irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, NULL); }