X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=8f257c005a2de4b41fbf6005d1cd2bd5cb4f2b60;hb=f2c2e45eb4e677fef5bf6a8e418b2a22441172d5;hp=429145e29de3bdcb1a9e4e18da16ba5657337e33;hpb=0e5f781d021c0b1e20ba08f583d4971419fedb5d;p=libfirm diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c index 429145e29..8f257c005 100644 --- a/ir/be/becopyheur2.c +++ b/ir/be/becopyheur2.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,12 +24,10 @@ * @date 14.04.2006 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif -#include -#include +#include "lc_opts.h" +#include "lc_opts_enum.h" #include #include @@ -66,7 +64,6 @@ static int subtree_iter = 4; static int max_depth = 20; static double constr_factor = 0.9; -/* Options using libcore */ static const lc_opt_enum_mask_items_t dump_items[] = { { "before", DUMP_BEFORE }, { "after", DUMP_AFTER }, @@ -205,7 +202,7 @@ static void *co2_irn_init(ir_phase *ph, const ir_node *irn, void *data) memset(ci, 0, size); INIT_LIST_HEAD(&ci->changed_list); ci->touched_next = env->touched; - ci->orig_col = get_irn_col(env->co, irn); + ci->orig_col = get_irn_col(irn); env->touched = ci; ci->irn = irn; ci->aff = a; @@ -256,18 +253,18 @@ static col_t get_col(co2_t *env, const ir_node *irn) return ci->tmp_fixed ? ci->tmp_col : ci->orig_col; } -static INLINE int color_is_fix(co2_t *env, const ir_node *irn) +static inline int color_is_fix(co2_t *env, const ir_node *irn) { co2_irn_t *ci = get_co2_irn(env, irn); return ci->fixed || ci->tmp_fixed; } -static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci) +static inline bitset_t *get_adm(co2_t *env, co2_irn_t *ci) { if(ci->adm_cache == NULL) { const arch_register_req_t *req; ci->adm_cache = bitset_obstack_alloc(phase_obst(&env->ph), env->n_regs); - req = arch_get_register_req(env->co->aenv, ci->irn, BE_OUT_POS(0)); + req = arch_get_register_req_out(ci->irn); if(arch_register_req_is(req, limited)) { int i, n; @@ -287,19 +284,19 @@ static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci) return ci->adm_cache; } -static INLINE bitset_t *admissible_colors(co2_t *env, co2_irn_t *ci, bitset_t *bs) +static inline bitset_t *admissible_colors(co2_t *env, co2_irn_t *ci, bitset_t *bs) { bitset_copy(bs, get_adm(env, ci)); return bs; } -static INLINE int is_color_admissible(co2_t *env, co2_irn_t *ci, col_t col) +static inline int is_color_admissible(co2_t *env, co2_irn_t *ci, col_t col) { bitset_t *bs = get_adm(env, ci); return bitset_is_set(bs, col); } -static INLINE int is_constrained(co2_t *env, co2_irn_t *ci) +static inline int is_constrained(co2_t *env, co2_irn_t *ci) { if(!ci->adm_cache) get_adm(env, ci); @@ -308,9 +305,7 @@ static INLINE int is_constrained(co2_t *env, co2_irn_t *ci) static void incur_constraint_costs(co2_t *env, const ir_node *irn, col_cost_pair_t *col_costs, int costs) { - const arch_register_req_t *req; - - req = arch_get_register_req(env->co->aenv, irn, BE_OUT_POS(0)); + const arch_register_req_t *req = arch_get_register_req_out(irn); if (arch_register_req_is(req, limited)) { unsigned n_regs = env->co->cls->n_regs; @@ -535,7 +530,7 @@ static int change_color_not(co2_t *env, const ir_node *irn, col_t not_col, struc /* The node has the color it should not have _and_ has not been visited yet. */ if(!color_is_fix(env, irn)) { int n_regs = env->co->cls->n_regs; - col_cost_pair_t *csts = alloca(n_regs * sizeof(csts[0])); + col_cost_pair_t *csts = ALLOCAN(col_cost_pair_t, n_regs); /* Get the costs for giving the node a specific color. */ determine_color_costs(env, ci, csts); @@ -576,7 +571,7 @@ static int change_color_single(co2_t *env, const ir_node *irn, col_t tgt_col, st if(!color_is_fix(env, irn) && is_color_admissible(env, ci, tgt_col)) { int n_regs = env->co->cls->n_regs; - col_cost_pair_t *seq = alloca(n_regs * sizeof(seq[0])); + col_cost_pair_t *seq = ALLOCAN(col_cost_pair_t, n_regs); /* Get the costs for giving the node a specific color. */ single_color_cost(env, ci, tgt_col, seq); @@ -701,7 +696,7 @@ static void unfix_subtree(co2_cloud_irn_t *ci) static int coalesce_top_down(co2_cloud_irn_t *ci, int child_nr, int depth) { co2_t *env = ci->cloud->env; - col_cost_pair_t *seq = alloca(env->n_regs * sizeof(seq[0])); + col_cost_pair_t *seq = ALLOCAN(col_cost_pair_t, env->n_regs); int is_root = ci->mst_parent == ci; col_t parent_col = is_root ? (col_t) -1 : get_col(env, ci->mst_parent->inh.irn); int min_badness = INT_MAX; @@ -893,15 +888,13 @@ static void process_cloud(co2_cloud_t *cloud) co2_t *env = cloud->env; int n_regs = env->n_regs; int n_edges = 0; - int *mst_edges = xmalloc(cloud->n_memb * cloud->n_memb * sizeof(mst_edges[0])); + int *mst_edges = XMALLOCNZ(int, cloud->n_memb * cloud->n_memb); pdeq *q; edge_t *edges; int i; int best_col; - memset(mst_edges, 0, cloud->n_memb * cloud->n_memb * sizeof(mst_edges[0])); - /* Collect all edges in the cloud on an obstack and sort the increasingly */ obstack_init(&cloud->obst); for(i = 0; i < cloud->n_memb; ++i) { @@ -1064,7 +1057,7 @@ static void process(co2_t *env) } i = 0; - clouds = xmalloc(n_clouds * sizeof(clouds[0])); + clouds = XMALLOCN(co2_cloud_t*, n_clouds); list_for_each_entry(co2_cloud_t, pos, &env->cloud_head, list) clouds[i++] = pos; qsort(clouds, n_clouds, sizeof(clouds[0]), cmp_clouds_gt); @@ -1099,12 +1092,11 @@ static void process(co2_t *env) static void writeback_colors(co2_t *env) { - const arch_env_t *aenv = env->co->aenv; co2_irn_t *irn; for(irn = env->touched; irn; irn = irn->touched_next) { const arch_register_t *reg = arch_register_for_index(env->co->cls, irn->orig_col); - arch_set_irn_register(aenv, (ir_node *) irn->irn, reg); + arch_set_irn_register((ir_node*)irn->irn, reg); } } @@ -1120,7 +1112,7 @@ static void writeback_colors(co2_t *env) static const char *get_dot_color_name(size_t col) { - static const char *names[] = { + static const char *const names[] = { "blue", "red", "green", @@ -1157,11 +1149,10 @@ static const char *get_dot_color_name(size_t col) return col < (sizeof(names)/sizeof(names[0])) ? names[col] : "white"; } -static const char *get_dot_shape_name(co2_t *env, co2_irn_t *ci) +static const char *get_dot_shape_name(co2_irn_t *ci) { - const arch_register_req_t *req; + const arch_register_req_t *req = arch_get_register_req_out(ci->irn); - req = arch_get_register_req(env->co->aenv, ci->irn, BE_OUT_POS(0)); if(arch_register_req_is(req, limited)) return "diamond"; @@ -1182,8 +1173,9 @@ static void ifg_dump_graph_attr(FILE *f, void *self) static int ifg_is_dump_node(void *self, ir_node *irn) { - co2_t *env = self; - return !arch_irn_is(env->co->aenv, irn, ignore); + const arch_register_req_t *req = arch_get_register_req_out(irn); + (void)self; + return !(req->type & arch_register_req_type_ignore); } static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn) @@ -1204,7 +1196,7 @@ static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn) } ir_fprintf(f, "label=\"%+F%s\" style=filled peripheries=%d color=%s shape=%s", irn, buf, peri, - get_dot_color_name(get_col(env, irn)), get_dot_shape_name(env, ci)); + get_dot_color_name(get_col(env, irn)), get_dot_shape_name(ci)); } static void ifg_dump_at_end(FILE *file, void *self) @@ -1262,9 +1254,7 @@ int co_solve_heuristic_new(copy_opt_t *co) env.co = co; env.n_regs = co->cls->n_regs; env.ignore_regs = bitset_alloca(co->cls->n_regs); - arch_put_non_ignore_regs(co->aenv, co->cls, env.ignore_regs); - bitset_flip_all(env.ignore_regs); - be_abi_put_ignore_regs(co->cenv->birg->abi, co->cls, env.ignore_regs); + be_put_ignore_regs(co->cenv->birg, co->cls, env.ignore_regs); FIRM_DBG_REGISTER(env.dbg, "firm.be.co2"); INIT_LIST_HEAD(&env.cloud_head);