X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firconsconfirm.c;h=2e7350213deee2f4a519829be9d627398aff0b8a;hb=916caec9328586dd9922020233ae419aa29facea;hp=237b99259e6c3174a63d7a0761db89b61cb16213;hpb=a1fc5d2a5ed66510bbb2199ea5ee75416755cf1c;p=libfirm diff --git a/ir/ana/irconsconfirm.c b/ir/ana/irconsconfirm.c index 237b99259..2e7350213 100644 --- a/ir/ana/irconsconfirm.c +++ b/ir/ana/irconsconfirm.c @@ -22,7 +22,6 @@ * @brief Construction of Confirm nodes * @author Michael Beck * @date 6.2005 - * @version $Id$ */ #include "config.h" @@ -41,7 +40,9 @@ #include "irtools.h" #include "array_t.h" #include "debug.h" +#include "error.h" #include "irflag.h" +#include "opt_manage.h" /** * Walker environment. @@ -75,32 +76,53 @@ static ir_node *get_effective_use_block(ir_node *node, int pos) return get_nodes_block(node); } +static ir_node *get_case_value(ir_node *switchn, long pn) +{ + ir_graph *irg = get_irn_irg(switchn); + const ir_switch_table *table = get_Switch_table(switchn); + size_t n_entries = ir_switch_table_get_n_entries(table); + ir_tarval *val = NULL; + size_t e; + for (e = 0; e < n_entries; ++e) { + const ir_switch_table_entry *entry + = ir_switch_table_get_entry_const(table, e); + if (entry->pn != pn) + continue; + /* multiple matching entries gets too complicated for a single + * Confirm */ + if (val != NULL) + return NULL; + /* case ranges are too complicated too */ + if (entry->min != entry->max) + return NULL; + val = entry->min; + } + assert(val != NULL); + return new_r_Const(irg, val); +} + /** * Handle a CASE-branch. * - * @param block the block which is entered by the branch - * @param irn the node expressing the switch value - * @param nr the branch label - * @param env statistical environment - * * Branch labels are a simple case. We can replace the value * by a Const with the branch label. */ -static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) +static void handle_case(ir_node *block, ir_node *switchn, long pn, env_t *env) { - const ir_edge_t *edge, *next; - ir_node *c = NULL; + ir_node *c = NULL; + ir_node *selector = get_Switch_selector(switchn); + const ir_edge_t *edge; + const ir_edge_t *next; - if (is_Bad(irn)) + /* we can't do usefull things with the default label */ + if (pn == pn_Switch_default) return; - for (edge = get_irn_out_edge_first(irn); edge; edge = next) { + foreach_out_edge_safe(selector, edge, next) { ir_node *succ = get_edge_src_irn(edge); int pos = get_edge_src_pos(edge); ir_node *blk = get_effective_use_block(succ, pos); - next = get_irn_out_edge_next(irn, edge); - if (block_dominates(block, blk)) { /* * Ok, we found a user of irn that is placed @@ -108,15 +130,11 @@ static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) * We can replace the input with the Constant * branch label. */ - - if (! c) { - ir_mode *mode = get_irn_mode(irn); - ir_tarval *tv = new_tarval_from_long(nr, mode); - c = new_r_Const(current_ir_graph, tv); - } + if (c == NULL) + c = get_case_value(switchn, pn); set_irn_n(succ, pos, c); - DBG_OPT_CONFIRM_C(irn, c); + DBG_OPT_CONFIRM_C(selector, c); DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, c)); env->num_consts += 1; @@ -405,9 +423,9 @@ static void handle_if(ir_node *block, ir_node *cmp, ir_relation rel, env_t *env) */ static void insert_Confirm_in_block(ir_node *block, void *data) { - ir_node *cond, *proj, *selector; - ir_mode *mode; env_t *env = (env_t*) data; + ir_node *cond; + ir_node *proj; /* * we can only handle blocks with only ONE control flow @@ -421,13 +439,11 @@ static void insert_Confirm_in_block(ir_node *block, void *data) return; cond = get_Proj_pred(proj); - if (! is_Cond(cond)) - return; - - selector = get_Cond_selector(cond); - mode = get_irn_mode(selector); - - if (mode == mode_b) { + if (is_Switch(cond)) { + long proj_nr = get_Proj_proj(proj); + handle_case(block, cond, proj_nr, env); + } else if (is_Cond(cond)) { + ir_node *selector = get_Cond_selector(cond); ir_relation rel; handle_modeb(block, selector, (pn_Cond) get_Proj_proj(proj), env); @@ -439,20 +455,11 @@ static void insert_Confirm_in_block(ir_node *block, void *data) if (get_Proj_proj(proj) != pn_Cond_true) { /* it's the false branch */ - mode = get_irn_mode(get_Cmp_left(selector)); rel = get_negated_relation(rel); } DB((dbg, LEVEL_2, "At %+F using %+F Confirm %=\n", block, selector, rel)); handle_if(block, selector, rel, env); - } else if (mode_is_int(mode)) { - long proj_nr = get_Proj_proj(proj); - - /* this is a CASE, but we cannot handle the default case */ - if (proj_nr == get_Cond_default_proj(cond)) - return; - - handle_case(block, get_Cond_selector(cond), proj_nr, env); } } @@ -559,26 +566,14 @@ static void insert_Confirm(ir_node *node, void *data) /* * Construct Confirm nodes */ -void construct_confirms(ir_graph *irg) +static ir_graph_state_t do_construct_confirms(ir_graph *irg) { env_t env; - int edges_active = edges_activated(irg); - FIRM_DBG_REGISTER(dbg, "firm.ana.confirm"); - remove_critical_cf_edges(irg); - - /* we need dominance info */ - assure_doms(irg); - assert(get_irg_pinned(irg) == op_pin_state_pinned && "Nodes must be placed to insert Confirms"); - if (! edges_active) { - /* We need edges */ - edges_activate(irg); - } - env.num_confirms = 0; env.num_consts = 0; env.num_eq = 0; @@ -596,13 +591,22 @@ void construct_confirms(ir_graph *irg) DB((dbg, LEVEL_1, "# Const replacements: %u\n", env.num_consts)); DB((dbg, LEVEL_1, "# node equalities : %u\n", env.num_eq)); DB((dbg, LEVEL_1, "# non-null Confirms : %u\n", env.num_non_null)); + return 0; +} + +static optdesc_t opt_confirms = { + "confirms", + IR_GRAPH_STATE_CONSISTENT_OUT_EDGES + | IR_GRAPH_STATE_CONSISTENT_DOMINANCE + | IR_GRAPH_STATE_NO_CRITICAL_EDGES, + do_construct_confirms +}; - /* deactivate edges if they where off */ - if (! edges_active) - edges_deactivate(irg); +void construct_confirms(ir_graph *irg) +{ + perform_irg_optimization(irg, &opt_confirms); } -/* Construct a pass. */ ir_graph_pass_t *construct_confirms_pass(const char *name) { return def_graph_pass(name ? name : "confirm", construct_confirms); @@ -620,15 +624,11 @@ static void remove_confirm(ir_node *n, void *env) exchange(n, value); } -/* - * Remove all Confirm nodes from a graph. - */ void remove_confirms(ir_graph *irg) { irg_walk_graph(irg, NULL, remove_confirm, NULL); } -/* Construct a pass. */ ir_graph_pass_t *remove_confirms_pass(const char *name) { return def_graph_pass(name ? name : "rem_confirm", remove_confirms);