X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firconsconfirm.c;h=c2821fb7d9414c0640e9f31c5fc375cffe68b927;hb=e775a978fff2841e0722c47f13545b54d48b8f98;hp=4db054b0c991d817253a38abf61bd173cd8815f5;hpb=a1e9069afa4fa1e16e2d176bcd7905d6a1ed4677;p=libfirm diff --git a/ir/ana/irconsconfirm.c b/ir/ana/irconsconfirm.c index 4db054b0c..c2821fb7d 100644 --- a/ir/ana/irconsconfirm.c +++ b/ir/ana/irconsconfirm.c @@ -57,7 +57,7 @@ typedef struct env_t { DEBUG_ONLY(static firm_dbg_module_t *dbg;) /** - * Return the effective use block of a node and it's predecessor on + * Return the effective use block of a node and its predecessor on * position pos. * * @param node the node @@ -110,10 +110,9 @@ static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) */ if (! c) { - ir_mode *mode = get_irn_mode(irn); - ir_type *tp = get_irn_type(irn); - tarval *tv = new_tarval_from_long(nr, mode); - c = new_r_Const_type(current_ir_graph, tv, tp); + ir_mode *mode = get_irn_mode(irn); + ir_tarval *tv = new_tarval_from_long(nr, mode); + c = new_r_Const(current_ir_graph, tv); } set_irn_n(succ, pos, c); @@ -152,7 +151,8 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * * We can replace the input with true/false. */ if (con == NULL) { - con = new_Const(pnc == pn_Cond_true ? tarval_b_true : tarval_b_false); + ir_graph *irg = get_irn_irg(block); + con = new_r_Const(irg, pnc == pn_Cond_true ? tarval_b_true : tarval_b_false); } old = get_irn_n(user, pos); set_irn_n(user, pos, con); @@ -212,8 +212,9 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * NEW_ARR_A(ir_node *, in, n); /* ok, ALL predecessors are either dominated by block OR other block */ if (c_b == NULL) { - ir_node *c_true = new_Const(tarval_b_true); - ir_node *c_false = new_Const(tarval_b_false); + ir_graph *irg = get_irn_irg(block); + ir_node *c_true = new_r_Const(irg, tarval_b_true); + ir_node *c_false = new_r_Const(irg, tarval_b_false); env->num_consts += 2; if (pnc == pn_Cond_true) { c_b = c_true; @@ -244,10 +245,10 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * * * @param block the block which is entered by the branch * @param cmp the Cmp node expressing the branch condition - * @param pnc the Compare relation for taking this branch + * @param rel the Compare relation for taking this branch * @param env statistical environment */ -static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) +static void handle_if(ir_node *block, ir_node *cmp, ir_relation rel, env_t *env) { ir_node *left = get_Cmp_left(cmp); ir_node *right = get_Cmp_right(cmp); @@ -273,14 +274,14 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) left = right; right = t; - pnc = get_inversed_pnc(pnc); + rel = get_inversed_relation(rel); } /* * First case: both values are identical. * replace the left one by the right (potentially const) one. */ - if (pnc == pn_Cmp_Eq) { + if (rel == ir_relation_equal) { cond_block = get_Block_cfgpred_block(block, 0); for (edge = get_irn_out_edge_first(left); edge; edge = next) { ir_node *user = get_edge_src_irn(edge); @@ -318,7 +319,7 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) /* * The user of the user is dominated by our true/false * block. So, create a copy of user WITH the constant - * replacing it's pos'th input. + * replacing its pos'th input. * * This is always good for unop's and might be good * for binops. @@ -338,7 +339,7 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) } } } - } else { /* not pn_Cmp_Eq cases */ + } else { /* not ir_relation_equal cases */ ir_node *c = NULL; foreach_out_edge_safe(left, edge, next) { @@ -353,7 +354,7 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) * We can replace the input with a Confirm(left, pnc, right). */ if (! c) - c = new_r_Confirm(block, left, right, pnc); + c = new_r_Confirm(block, left, right, rel); pos = get_edge_src_pos(edge); set_irn_n(succ, pos, c); @@ -367,7 +368,7 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) /* also construct inverse Confirms */ ir_node *rc = NULL; - pnc = get_inversed_pnc(pnc); + rel = get_inversed_relation(rel); foreach_out_edge_safe(right, edge, next) { ir_node *succ = get_edge_src_irn(edge); int pos; @@ -383,10 +384,10 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) /* * Ok, we found a usage of right in a block * dominated by the branch block. - * We can replace the input with a Confirm(right, pnc^-1, left). + * We can replace the input with a Confirm(right, rel^-1, left). */ if (! rc) - rc = new_r_Confirm(block, right, left, pnc); + rc = new_r_Confirm(block, right, left, rel); pos = get_edge_src_pos(edge); set_irn_n(succ, pos, rc); @@ -402,10 +403,11 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) /** * Pre-block-walker: Called for every block to insert Confirm nodes */ -static void insert_Confirm_in_block(ir_node *block, void *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; /* * we can only handle blocks with only ONE control flow @@ -426,29 +428,23 @@ static void insert_Confirm_in_block(ir_node *block, void *env) mode = get_irn_mode(selector); if (mode == mode_b) { - ir_node *cmp; - pn_Cmp pnc; + ir_relation rel; - handle_modeb(block, selector, get_Proj_proj(proj), env); + handle_modeb(block, selector, (pn_Cond) get_Proj_proj(proj), env); - /* this should be an IF, check this */ - if (! is_Proj(selector)) + if (! is_Cmp(selector)) return; - cmp = get_Proj_pred(selector); - if (! is_Cmp(cmp)) - return; - - pnc = get_Proj_proj(selector); + rel = get_Cmp_relation(selector); if (get_Proj_proj(proj) != pn_Cond_true) { /* it's the false branch */ - mode = get_irn_mode(get_Cmp_left(cmp)); - pnc = get_negated_pnc(pnc, mode); + mode = get_irn_mode(get_Cmp_left(selector)); + rel = get_negated_relation(rel); } - DB((dbg, LEVEL_2, "At %+F using %+F Confirm %=\n", block, cmp, pnc)); + DB((dbg, LEVEL_2, "At %+F using %+F Confirm %=\n", block, selector, rel)); - handle_if(block, cmp, pnc, env); + handle_if(block, selector, rel, env); } else if (mode_is_int(mode)) { long proj_nr = get_Proj_proj(proj); @@ -468,7 +464,7 @@ static int is_non_null_Confirm(const ir_node *ptr) for (;;) { if (! is_Confirm(ptr)) break; - if (get_Confirm_cmp(ptr) == pn_Cmp_Lg) { + if (get_Confirm_relation(ptr) == ir_relation_less_greater) { ir_node *bound = get_Confirm_bound(ptr); if (is_Const(bound) && is_Const_null(bound)) @@ -518,10 +514,10 @@ static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) * We can replace the input with a Confirm(ptr, !=, NULL). */ if (c == NULL) { - ir_mode *mode = get_irn_mode(ptr); - c = new_Const(get_mode_null(mode)); - - c = new_r_Confirm(block, ptr, c, pn_Cmp_Lg); + ir_mode *mode = get_irn_mode(ptr); + ir_graph *irg = get_irn_irg(block); + c = new_r_Const(irg, get_mode_null(mode)); + c = new_r_Confirm(block, ptr, c, ir_relation_less_greater); } set_irn_n(succ, pos, c); @@ -536,9 +532,10 @@ static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) /** * Pre-walker: Called for every node to insert Confirm nodes */ -static void insert_Confirm(ir_node *node, void *env) +static void insert_Confirm(ir_node *node, void *data) { ir_node *ptr; + env_t *env = (env_t*) data; switch (get_irn_opcode(node)) { case iro_Block: