X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=fc0bda722a42481780e6a1952dbc0268b65e3df6;hb=b4647d67ab7885d5da32c2a30242fbc4ed93d81b;hp=d800fc9a700a6aa57d59f2e1d2a93139ae82305b;hpb=44a4fc91e7377498303b66f98d105d4ff870cf41;p=libfirm diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index d800fc9a7..fc0bda722 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -26,6 +26,7 @@ #include "config.h" #include +#include #include "irnode_t.h" #include "irgraph_t.h" @@ -34,7 +35,7 @@ #include "iropt_t.h" #include "ircons_t.h" #include "irgmod.h" -#include "irvrfy.h" +#include "irverify.h" #include "tv_t.h" #include "dbginfo_t.h" #include "iropt_dbg.h" @@ -47,6 +48,10 @@ #include "irtools.h" #include "irhooks.h" #include "array_t.h" +#include "vrp.h" +#include "firm_types.h" +#include "bitfiddle.h" +#include "be.h" /* Make types visible to allow most efficient access */ #include "entity_t.h" @@ -54,7 +59,8 @@ /** * Returns the tarval of a Const node or tarval_bad for all other nodes. */ -static tarval *default_value_of(const ir_node *n) { +static ir_tarval *default_value_of(const ir_node *n) +{ if (is_Const(n)) return get_Const_tarval(n); /* might return tarval_bad */ else @@ -64,7 +70,8 @@ static tarval *default_value_of(const ir_node *n) { value_of_func value_of_ptr = default_value_of; /* * Set a new value_of function. */ -void set_value_of_func(value_of_func func) { +void set_value_of_func(value_of_func func) +{ if (func != NULL) value_of_ptr = func; else @@ -74,14 +81,16 @@ void set_value_of_func(value_of_func func) { /** * Return the value of a Constant. */ -static tarval *computed_value_Const(const ir_node *n) { +static ir_tarval *computed_value_Const(const ir_node *n) +{ return get_Const_tarval(n); } /* computed_value_Const */ /** * Return the value of a 'sizeof', 'alignof' or 'offsetof' SymConst. */ -static tarval *computed_value_SymConst(const ir_node *n) { +static ir_tarval *computed_value_SymConst(const ir_node *n) +{ ir_type *type; ir_entity *ent; @@ -111,12 +120,13 @@ static tarval *computed_value_SymConst(const ir_node *n) { /** * Return the value of an Add. */ -static tarval *computed_value_Add(const ir_node *n) { +static ir_tarval *computed_value_Add(const ir_node *n) +{ ir_node *a = get_Add_left(n); ir_node *b = get_Add_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) return tarval_add(ta, tb); @@ -128,12 +138,13 @@ static tarval *computed_value_Add(const ir_node *n) { * Return the value of a Sub. * Special case: a - a */ -static tarval *computed_value_Sub(const ir_node *n) { - ir_mode *mode = get_irn_mode(n); - ir_node *a = get_Sub_left(n); - ir_node *b = get_Sub_right(n); - tarval *ta; - tarval *tb; +static ir_tarval *computed_value_Sub(const ir_node *n) +{ + ir_mode *mode = get_irn_mode(n); + ir_node *a = get_Sub_left(n); + ir_node *b = get_Sub_right(n); + ir_tarval *ta; + ir_tarval *tb; /* NaN - NaN != 0 */ if (! mode_is_float(mode)) { @@ -155,13 +166,13 @@ static tarval *computed_value_Sub(const ir_node *n) { * Return the value of a Carry. * Special : a op 0, 0 op b */ -static tarval *computed_value_Carry(const ir_node *n) { - ir_node *a = get_binop_left(n); - ir_node *b = get_binop_right(n); - ir_mode *m = get_irn_mode(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); +static ir_tarval *computed_value_Carry(const ir_node *n) +{ + ir_node *a = get_binop_left(n); + ir_node *b = get_binop_right(n); + ir_mode *m = get_irn_mode(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { tarval_add(ta, tb); @@ -177,13 +188,13 @@ static tarval *computed_value_Carry(const ir_node *n) { * Return the value of a Borrow. * Special : a op 0 */ -static tarval *computed_value_Borrow(const ir_node *n) { - ir_node *a = get_binop_left(n); - ir_node *b = get_binop_right(n); - ir_mode *m = get_irn_mode(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); +static ir_tarval *computed_value_Borrow(const ir_node *n) +{ + ir_node *a = get_binop_left(n); + ir_node *b = get_binop_right(n); + ir_mode *m = get_irn_mode(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_cmp(ta, tb) == pn_Cmp_Lt ? get_mode_one(m) : get_mode_null(m); @@ -196,9 +207,10 @@ static tarval *computed_value_Borrow(const ir_node *n) { /** * Return the value of an unary Minus. */ -static tarval *computed_value_Minus(const ir_node *n) { - ir_node *a = get_Minus_op(n); - tarval *ta = value_of(a); +static ir_tarval *computed_value_Minus(const ir_node *n) +{ + ir_node *a = get_Minus_op(n); + ir_tarval *ta = value_of(a); if (ta != tarval_bad) return tarval_neg(ta); @@ -209,13 +221,13 @@ static tarval *computed_value_Minus(const ir_node *n) { /** * Return the value of a Mul. */ -static tarval *computed_value_Mul(const ir_node *n) { - ir_node *a = get_Mul_left(n); - ir_node *b = get_Mul_right(n); - ir_mode *mode; - - tarval *ta = value_of(a); - tarval *tb = value_of(b); +static ir_tarval *computed_value_Mul(const ir_node *n) +{ + ir_node *a = get_Mul_left(n); + ir_node *b = get_Mul_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); + ir_mode *mode; mode = get_irn_mode(n); if (mode != get_irn_mode(a)) { @@ -239,29 +251,16 @@ static tarval *computed_value_Mul(const ir_node *n) { return tarval_bad; } /* computed_value_Mul */ -/** - * Return the value of an Abs. - */ -static tarval *computed_value_Abs(const ir_node *n) { - ir_node *a = get_Abs_op(n); - tarval *ta = value_of(a); - - if (ta != tarval_bad) - return tarval_abs(ta); - - return tarval_bad; -} /* computed_value_Abs */ - /** * Return the value of an And. * Special case: a & 0, 0 & b */ -static tarval *computed_value_And(const ir_node *n) { - ir_node *a = get_And_left(n); - ir_node *b = get_And_right(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); +static ir_tarval *computed_value_And(const ir_node *n) +{ + ir_node *a = get_And_left(n); + ir_node *b = get_And_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_and (ta, tb); @@ -276,12 +275,12 @@ static tarval *computed_value_And(const ir_node *n) { * Return the value of an Or. * Special case: a | 1...1, 1...1 | b */ -static tarval *computed_value_Or(const ir_node *n) { - ir_node *a = get_Or_left(n); - ir_node *b = get_Or_right(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); +static ir_tarval *computed_value_Or(const ir_node *n) +{ + ir_node *a = get_Or_left(n); + ir_node *b = get_Or_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_or (ta, tb); @@ -295,11 +294,12 @@ static tarval *computed_value_Or(const ir_node *n) { /** * Return the value of an Eor. */ -static tarval *computed_value_Eor(const ir_node *n) { +static ir_tarval *computed_value_Eor(const ir_node *n) +{ ir_node *a = get_Eor_left(n); ir_node *b = get_Eor_right(n); - tarval *ta, *tb; + ir_tarval *ta, *tb; if (a == b) return get_mode_null(get_irn_mode(n)); @@ -316,9 +316,10 @@ static tarval *computed_value_Eor(const ir_node *n) { /** * Return the value of a Not. */ -static tarval *computed_value_Not(const ir_node *n) { - ir_node *a = get_Not_op(n); - tarval *ta = value_of(a); +static ir_tarval *computed_value_Not(const ir_node *n) +{ + ir_node *a = get_Not_op(n); + ir_tarval *ta = value_of(a); if (ta != tarval_bad) return tarval_not(ta); @@ -329,12 +330,13 @@ static tarval *computed_value_Not(const ir_node *n) { /** * Return the value of a Shl. */ -static tarval *computed_value_Shl(const ir_node *n) { +static ir_tarval *computed_value_Shl(const ir_node *n) +{ ir_node *a = get_Shl_left(n); ir_node *b = get_Shl_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_shl(ta, tb); @@ -345,12 +347,13 @@ static tarval *computed_value_Shl(const ir_node *n) { /** * Return the value of a Shr. */ -static tarval *computed_value_Shr(const ir_node *n) { +static ir_tarval *computed_value_Shr(const ir_node *n) +{ ir_node *a = get_Shr_left(n); ir_node *b = get_Shr_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_shr(ta, tb); @@ -361,12 +364,13 @@ static tarval *computed_value_Shr(const ir_node *n) { /** * Return the value of a Shrs. */ -static tarval *computed_value_Shrs(const ir_node *n) { +static ir_tarval *computed_value_Shrs(const ir_node *n) +{ ir_node *a = get_Shrs_left(n); ir_node *b = get_Shrs_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_shrs(ta, tb); @@ -377,12 +381,13 @@ static tarval *computed_value_Shrs(const ir_node *n) { /** * Return the value of a Rotl. */ -static tarval *computed_value_Rotl(const ir_node *n) { +static ir_tarval *computed_value_Rotl(const ir_node *n) +{ ir_node *a = get_Rotl_left(n); ir_node *b = get_Rotl_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_rotl(ta, tb); @@ -393,9 +398,10 @@ static tarval *computed_value_Rotl(const ir_node *n) { /** * Return the value of a Conv. */ -static tarval *computed_value_Conv(const ir_node *n) { +static ir_tarval *computed_value_Conv(const ir_node *n) +{ ir_node *a = get_Conv_op(n); - tarval *ta = value_of(a); + ir_tarval *ta = value_of(a); if (ta != tarval_bad) return tarval_convert_to(ta, get_irn_mode(n)); @@ -407,9 +413,10 @@ static tarval *computed_value_Conv(const ir_node *n) { * Calculate the value of a Mux: can be evaluated, if the * sel and the right input are known. */ -static tarval *computed_value_Mux(const ir_node *n) { +static ir_tarval *computed_value_Mux(const ir_node *n) +{ ir_node *sel = get_Mux_sel(n); - tarval *ts = value_of(sel); + ir_tarval *ts = value_of(sel); if (ts == get_tarval_b_true()) { ir_node *v = get_Mux_true(n); @@ -426,18 +433,12 @@ static tarval *computed_value_Mux(const ir_node *n) { * Calculate the value of a Confirm: can be evaluated, * if it has the form Confirm(x, '=', Const). */ -static tarval *computed_value_Confirm(const ir_node *n) { - /* - * Beware: we might produce Phi(Confirm(x == true), Confirm(x == false)). - * Do NOT optimize them away (jump threading wants them), so wait until - * remove_confirm is activated. - */ - if (get_opt_remove_confirm()) { - if (get_Confirm_cmp(n) == pn_Cmp_Eq) { - tarval *tv = value_of(get_Confirm_bound(n)); - if (tv != tarval_bad) - return tv; - } +static ir_tarval *computed_value_Confirm(const ir_node *n) +{ + if (get_Confirm_cmp(n) == pn_Cmp_Eq) { + ir_tarval *tv = value_of(get_Confirm_bound(n)); + if (tv != tarval_bad) + return tv; } return value_of(get_Confirm_value(n)); } /* computed_value_Confirm */ @@ -451,115 +452,104 @@ static tarval *computed_value_Confirm(const ir_node *n) { * only 1 is used. * There are several case where we can evaluate a Cmp node, see later. */ -static tarval *computed_value_Proj_Cmp(const ir_node *n) { - ir_node *a = get_Proj_pred(n); - ir_node *aa = get_Cmp_left(a); - ir_node *ab = get_Cmp_right(a); - long proj_nr = get_Proj_proj(n); +static ir_tarval *computed_value_Proj_Cmp(const ir_node *n) +{ + ir_node *cmp = get_Proj_pred(n); + ir_node *left = get_Cmp_left(cmp); + ir_node *right = get_Cmp_right(cmp); + long pn_cmp = get_Proj_proj(n); + ir_mode *mode = get_irn_mode(left); + ir_tarval *tv_l, *tv_r; /* * BEWARE: a == a is NOT always True for floating Point values, as * NaN != NaN is defined, so we must check this here. */ - if (aa == ab && ( - !mode_is_float(get_irn_mode(aa)) || proj_nr == pn_Cmp_Lt || proj_nr == pn_Cmp_Gt) - ) { /* 1.: */ - + if (left == right && (!mode_is_float(mode) || pn_cmp == pn_Cmp_Lt || pn_cmp == pn_Cmp_Gt)) { /* This is a trick with the bits used for encoding the Cmp Proj numbers, the following statement is not the same: - return new_tarval_from_long (proj_nr == pn_Cmp_Eq, mode_b) */ - return new_tarval_from_long (proj_nr & pn_Cmp_Eq, mode_b); + return new_tarval_from_long(pn_cmp == pn_Cmp_Eq, mode_b) */ + return new_tarval_from_long(pn_cmp & pn_Cmp_Eq, mode_b); } - else { - tarval *taa = value_of(aa); - tarval *tab = value_of(ab); - ir_mode *mode = get_irn_mode(aa); + tv_l = value_of(left); + tv_r = value_of(right); + if ((tv_l != tarval_bad) && (tv_r != tarval_bad)) { /* * The predecessors of Cmp are target values. We can evaluate * the Cmp. */ - if ((taa != tarval_bad) && (tab != tarval_bad)) { - /* strange checks... */ - pn_Cmp flags = tarval_cmp(taa, tab); - if (flags != pn_Cmp_False) { - return new_tarval_from_long (proj_nr & flags, mode_b); - } + pn_Cmp flags = tarval_cmp(tv_l, tv_r); + if (flags != pn_Cmp_False) { + return new_tarval_from_long (pn_cmp & flags, mode_b); } + } else if (mode_is_int(mode)) { /* for integer values, we can check against MIN/MAX */ - else if (mode_is_int(mode)) { + pn_Cmp cmp_result; + + if (tv_l == get_mode_min(mode)) { /* MIN <=/> x. This results in true/false. */ - if (taa == get_mode_min(mode)) { - /* a compare with the MIN value */ - if (proj_nr == pn_Cmp_Le) - return get_tarval_b_true(); - else if (proj_nr == pn_Cmp_Gt) - return get_tarval_b_false(); - } + if (pn_cmp == pn_Cmp_Le) + return tarval_b_true; + else if (pn_cmp == pn_Cmp_Gt) + return tarval_b_false; + } else if (tv_r == get_mode_min(mode)) { /* x >=/< MIN. This results in true/false. */ - else - if (tab == get_mode_min(mode)) { - /* a compare with the MIN value */ - if (proj_nr == pn_Cmp_Ge) - return get_tarval_b_true(); - else if (proj_nr == pn_Cmp_Lt) - return get_tarval_b_false(); - } - /* MAX >=/< x. This results in true/false. */ - else if (taa == get_mode_max(mode)) { - if (proj_nr == pn_Cmp_Ge) - return get_tarval_b_true(); - else if (proj_nr == pn_Cmp_Lt) - return get_tarval_b_false(); - } - /* x <=/> MAX. This results in true/false. */ - else if (tab == get_mode_max(mode)) { - if (proj_nr == pn_Cmp_Le) - return get_tarval_b_true(); - else if (proj_nr == pn_Cmp_Gt) - return get_tarval_b_false(); + if (pn_cmp == pn_Cmp_Ge) + return tarval_b_true; + else if (pn_cmp == pn_Cmp_Lt) + return tarval_b_false; + } else if (tv_l == get_mode_max(mode)) { + /* MAX >=/< x. This results in true/false. */ + if (pn_cmp == pn_Cmp_Ge) + return tarval_b_true; + else if (pn_cmp == pn_Cmp_Lt) + return tarval_b_false; + } else if (tv_r == get_mode_max(mode)) { + /* x <=/> MAX. This results in true/false. */ + if (pn_cmp == pn_Cmp_Le) + return tarval_b_true; + else if (pn_cmp == pn_Cmp_Gt) + return tarval_b_false; + } + + cmp_result = vrp_cmp(left, right); + if (cmp_result != pn_Cmp_False) { + if (cmp_result == pn_Cmp_Lg) { + if (pn_cmp == pn_Cmp_Eq) { + return tarval_b_false; + } else if (pn_cmp == pn_Cmp_Lg) { + return tarval_b_true; } + } else { + return new_tarval_from_long(cmp_result & pn_cmp, mode_b); + } } - /* - * The predecessors are Allocs or (void*)(0) constants. Allocs never - * return NULL, they raise an exception. Therefore we can predict - * the Cmp result. - */ - else { - ir_node *aaa = skip_Proj(aa); - ir_node *aba = skip_Proj(ab); - - if ( ( (/* aa is ProjP and aaa is Alloc */ - is_Proj(aa) - && mode_is_reference(get_irn_mode(aa)) - && is_Alloc(aaa)) - && ( (/* ab is NULL */ - mode_is_reference(get_irn_mode(ab)) - && tarval_is_null(tab)) - || (/* ab is other Alloc */ - is_Proj(ab) - && mode_is_reference(get_irn_mode(ab)) - && is_Alloc(aba) - && (aaa != aba)))) - || (/* aa is NULL and aba is Alloc */ - mode_is_reference(get_irn_mode(aa)) - && tarval_is_null(taa) - && is_Proj(ab) - && mode_is_reference(get_irn_mode(ab)) - && is_Alloc(aba))) - /* 3.: */ - return new_tarval_from_long(proj_nr & pn_Cmp_Lg, mode_b); - } - } - return computed_value_Cmp_Confirm(a, aa, ab, proj_nr); + } else if (mode_is_reference(mode)) { + /* pointer compare */ + ir_node *s_l = skip_Proj(left); + ir_node *s_r = skip_Proj(right); + + if ((is_Alloc(s_l) && tarval_is_null(tv_r)) || + (tarval_is_null(tv_l) && is_Alloc(s_r))) { + /* + * The predecessors are Allocs and (void*)(0) constants. In Firm Allocs never + * return NULL, they raise an exception. Therefore we can predict + * the Cmp result. + */ + return new_tarval_from_long(pn_cmp & pn_Cmp_Lg, mode_b); + } + } + return computed_value_Cmp_Confirm(cmp, left, right, pn_cmp); } /* computed_value_Proj_Cmp */ /** * Return the value of a floating point Quot. */ -static tarval *do_computed_value_Quot(const ir_node *a, const ir_node *b) { - tarval *ta = value_of(a); - tarval *tb = value_of(b); +static ir_tarval *do_computed_value_Quot(const ir_node *a, const ir_node *b) +{ + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); /* cannot optimize 0 / b = 0 because of NaN */ if (ta != tarval_bad && tb != tarval_bad) @@ -571,9 +561,10 @@ static tarval *do_computed_value_Quot(const ir_node *a, const ir_node *b) { * Calculate the value of an integer Div of two nodes. * Special case: 0 / b */ -static tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) { - tarval *ta = value_of(a); - tarval *tb; +static ir_tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) +{ + ir_tarval *ta = value_of(a); + ir_tarval *tb; const ir_node *dummy; /* Compute c1 / c2 or 0 / a, a != 0 */ @@ -589,9 +580,10 @@ static tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) { * Calculate the value of an integer Mod of two nodes. * Special case: a % 1 */ -static tarval *do_computed_value_Mod(const ir_node *a, const ir_node *b) { - tarval *ta = value_of(a); - tarval *tb = value_of(b); +static ir_tarval *do_computed_value_Mod(const ir_node *a, const ir_node *b) +{ + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); /* Compute a % 1 or c1 % c2 */ if (tarval_is_one(tb)) @@ -604,7 +596,8 @@ static tarval *do_computed_value_Mod(const ir_node *a, const ir_node *b) { /** * Return the value of a Proj(DivMod). */ -static tarval *computed_value_Proj_DivMod(const ir_node *n) { +static ir_tarval *computed_value_Proj_DivMod(const ir_node *n) +{ long proj_nr = get_Proj_proj(n); /* compute either the Div or the Mod part */ @@ -621,7 +614,8 @@ static tarval *computed_value_Proj_DivMod(const ir_node *n) { /** * Return the value of a Proj(Div). */ -static tarval *computed_value_Proj_Div(const ir_node *n) { +static ir_tarval *computed_value_Proj_Div(const ir_node *n) +{ long proj_nr = get_Proj_proj(n); if (proj_nr == pn_Div_res) { @@ -634,7 +628,8 @@ static tarval *computed_value_Proj_Div(const ir_node *n) { /** * Return the value of a Proj(Mod). */ -static tarval *computed_value_Proj_Mod(const ir_node *n) { +static ir_tarval *computed_value_Proj_Mod(const ir_node *n) +{ long proj_nr = get_Proj_proj(n); if (proj_nr == pn_Mod_res) { @@ -647,7 +642,8 @@ static tarval *computed_value_Proj_Mod(const ir_node *n) { /** * Return the value of a Proj(Quot). */ -static tarval *computed_value_Proj_Quot(const ir_node *n) { +static ir_tarval *computed_value_Proj_Quot(const ir_node *n) +{ long proj_nr = get_Proj_proj(n); if (proj_nr == pn_Quot_res) { @@ -660,7 +656,8 @@ static tarval *computed_value_Proj_Quot(const ir_node *n) { /** * Return the value of a Proj. */ -static tarval *computed_value_Proj(const ir_node *proj) { +static ir_tarval *computed_value_Proj(const ir_node *proj) +{ ir_node *n = get_Proj_pred(proj); if (n->op->ops.computed_value_Proj != NULL) @@ -674,7 +671,12 @@ static tarval *computed_value_Proj(const ir_node *proj) { * * @param n The node this should be evaluated */ -tarval *computed_value(const ir_node *n) { +ir_tarval *computed_value(const ir_node *n) +{ + vrp_attr *vrp = vrp_get_info(n); + if (vrp && vrp->valid && tarval_cmp(vrp->bits_set, vrp->bits_not_set) == pn_Cmp_Eq) { + return vrp->bits_set; + } if (n->op->ops.computed_value) return n->op->ops.computed_value(n); return tarval_bad; @@ -709,7 +711,6 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops CASE(Borrow); CASE(Minus); CASE(Mul); - CASE(Abs); CASE(And); CASE(Or); CASE(Eor); @@ -728,7 +729,8 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops CASE_PROJ(Quot); CASE(Proj); default: - /* leave NULL */; + /* leave NULL */ + break; } return ops; @@ -756,6 +758,7 @@ static ir_node *equivalent_node_Block(ir_node *n) { ir_node *oldn = n; int n_preds; + ir_graph *irg; /* don't optimize dead or labeled blocks */ if (is_Block_dead(n) || has_Block_entity(n)) @@ -767,6 +770,8 @@ static ir_node *equivalent_node_Block(ir_node *n) calls the optimization. */ assert(get_Block_matured(n)); + irg = get_irn_irg(n); + /* Straightening: a single entry Block following a single exit Block can be merged, if it is not the Start block. */ /* !!! Beware, all Phi-nodes of n must have been optimized away. @@ -782,7 +787,7 @@ static ir_node *equivalent_node_Block(ir_node *n) /* Jmp jumps into the block it is in -- deal self cycle. */ n = set_Block_dead(n); DBG_OPT_DEAD_BLOCK(oldn, n); - } else if (get_opt_control_flow_straightening()) { + } else { n = predblock; DBG_OPT_STG(oldn, n); } @@ -794,8 +799,7 @@ static ir_node *equivalent_node_Block(ir_node *n) DBG_OPT_DEAD_BLOCK(oldn, n); } } - } else if ((n_preds == 2) && - (get_opt_control_flow_weak_simplification())) { + } else if (n_preds == 2) { /* Test whether Cond jumps twice to this block * The more general case which more than 2 predecessors is handles * in optimize_cf(), we handle only this special case for speed here. @@ -815,8 +819,8 @@ static ir_node *equivalent_node_Block(ir_node *n) } } } else if (get_opt_unreachable_code() && - (n != get_irg_start_block(current_ir_graph)) && - (n != get_irg_end_block(current_ir_graph)) ) { + (n != get_irg_start_block(irg)) && + (n != get_irg_end_block(irg))) { int i; /* If all inputs are dead, this block is dead too, except if it is @@ -849,12 +853,14 @@ static ir_node *equivalent_node_Block(ir_node *n) * Returns a equivalent node for a Jmp, a Bad :-) * Of course this only happens if the Block of the Jmp is dead. */ -static ir_node *equivalent_node_Jmp(ir_node *n) { +static ir_node *equivalent_node_Jmp(ir_node *n) +{ ir_node *oldn = n; /* unreachable code elimination */ if (is_Block_dead(get_nodes_block(n))) { - n = get_irg_bad(current_ir_graph); + ir_graph *irg = get_irn_irg(n); + n = get_irg_bad(irg); DBG_OPT_DEAD_BLOCK(oldn, n); } return n; @@ -871,13 +877,14 @@ static ir_node *equivalent_node_Jmp(ir_node *n) { * Optimize operations that are commutative and have neutral 0, * so a op 0 = 0 op a = a. */ -static ir_node *equivalent_node_neutral_zero(ir_node *n) { +static ir_node *equivalent_node_neutral_zero(ir_node *n) +{ ir_node *oldn = n; ir_node *a = get_binop_left(n); ir_node *b = get_binop_right(n); - tarval *tv; + ir_tarval *tv; ir_node *on; /* After running compute_node there is only one constant predecessor. @@ -908,7 +915,8 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n) { /** * Eor is commutative and has neutral 0. */ -static ir_node *equivalent_node_Eor(ir_node *n) { +static ir_node *equivalent_node_Eor(ir_node *n) +{ ir_node *oldn = n; ir_node *a; ir_node *b; @@ -963,7 +971,8 @@ static ir_node *equivalent_node_Eor(ir_node *n) { * Beware: The Mode of an Add may be different than the mode of its * predecessors, so we could not return a predecessors in all cases. */ -static ir_node *equivalent_node_Add(ir_node *n) { +static ir_node *equivalent_node_Add(ir_node *n) +{ ir_node *oldn = n; ir_node *left, *right; ir_mode *mode = get_irn_mode(n); @@ -973,8 +982,11 @@ static ir_node *equivalent_node_Add(ir_node *n) { return n; /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } left = get_Add_left(n); right = get_Add_right(n); @@ -1008,12 +1020,13 @@ static ir_node *equivalent_node_Add(ir_node *n) { * optimize operations that are not commutative but have neutral 0 on left, * so a op 0 = a. */ -static ir_node *equivalent_node_left_zero(ir_node *n) { +static ir_node *equivalent_node_left_zero(ir_node *n) +{ ir_node *oldn = n; - ir_node *a = get_binop_left(n); - ir_node *b = get_binop_right(n); - tarval *tb = value_of(b); + ir_node *a = get_binop_left(n); + ir_node *b = get_binop_right(n); + ir_tarval *tb = value_of(b); if (tarval_is_null(tb)) { n = a; @@ -1037,15 +1050,19 @@ static ir_node *equivalent_node_left_zero(ir_node *n) { * Beware: The Mode of a Sub may be different than the mode of its * predecessors, so we could not return a predecessors in all cases. */ -static ir_node *equivalent_node_Sub(ir_node *n) { - ir_node *oldn = n; - ir_node *b; - ir_mode *mode = get_irn_mode(n); - tarval *tb; +static ir_node *equivalent_node_Sub(ir_node *n) +{ + ir_node *oldn = n; + ir_node *b; + ir_mode *mode = get_irn_mode(n); + ir_tarval *tb; /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } b = get_Sub_right(n); tb = value_of(b); @@ -1071,7 +1088,8 @@ static ir_node *equivalent_node_Sub(ir_node *n) { * We handle it anyway here but the better way would be a * flag. This would be needed for Pascal for instance. */ -static ir_node *equivalent_node_idempotent_unop(ir_node *n) { +static ir_node *equivalent_node_idempotent_unop(ir_node *n) +{ ir_node *oldn = n; ir_node *pred = get_unop_op(n); @@ -1093,14 +1111,15 @@ static ir_node *equivalent_node_idempotent_unop(ir_node *n) { /** * Optimize a * 1 = 1 * a = a. */ -static ir_node *equivalent_node_Mul(ir_node *n) { +static ir_node *equivalent_node_Mul(ir_node *n) +{ ir_node *oldn = n; ir_node *a = get_Mul_left(n); /* we can handle here only the n * n = n bit cases */ if (get_irn_mode(n) == get_irn_mode(a)) { - ir_node *b = get_Mul_right(n); - tarval *tv; + ir_node *b = get_Mul_right(n); + ir_tarval *tv; /* * Mul is commutative and has again an other neutral element. @@ -1124,12 +1143,13 @@ static ir_node *equivalent_node_Mul(ir_node *n) { /** * Use algebraic simplification a | a = a | 0 = 0 | a = a. */ -static ir_node *equivalent_node_Or(ir_node *n) { +static ir_node *equivalent_node_Or(ir_node *n) +{ ir_node *oldn = n; - ir_node *a = get_Or_left(n); - ir_node *b = get_Or_right(n); - tarval *tv; + ir_node *a = get_Or_left(n); + ir_node *b = get_Or_right(n); + ir_tarval *tv; if (a == b) { n = a; /* Or has it's own neutral element */ @@ -1156,12 +1176,13 @@ static ir_node *equivalent_node_Or(ir_node *n) { /** * Optimize a & 0b1...1 = 0b1...1 & a = a & a = (a|X) & a = a. */ -static ir_node *equivalent_node_And(ir_node *n) { +static ir_node *equivalent_node_And(ir_node *n) +{ ir_node *oldn = n; - ir_node *a = get_And_left(n); - ir_node *b = get_And_right(n); - tarval *tv; + ir_node *a = get_And_left(n); + ir_node *b = get_And_right(n); + ir_tarval *tv; if (a == b) { n = a; /* And has it's own neutral element */ @@ -1218,7 +1239,8 @@ static ir_node *equivalent_node_And(ir_node *n) { /** * Try to remove useless Conv's: */ -static ir_node *equivalent_node_Conv(ir_node *n) { +static ir_node *equivalent_node_Conv(ir_node *n) +{ ir_node *oldn = n; ir_node *a = get_Conv_op(n); @@ -1230,13 +1252,11 @@ restart: if (get_Conv_strict(n)) { ir_node *p = a; - /* neither Minus nor Abs nor Confirm change the precision, + /* neither Minus nor Confirm change the precision, so we can "look-through" */ for (;;) { if (is_Minus(p)) { p = get_Minus_op(p); - } else if (is_Abs(p)) { - p = get_Abs_op(p); } else if (is_Confirm(p)) { p = get_Confirm_value(p); } else { @@ -1246,7 +1266,7 @@ restart: } if (is_Conv(p) && get_Conv_strict(p)) { /* we known already, that a_mode == n_mode, and neither - Abs nor Minus change the mode, so the second Conv + Minus change the mode, so the second Conv can be kicked */ assert(get_irn_mode(p) == n_mode); n = a; @@ -1347,39 +1367,30 @@ restart: return n; } /* equivalent_node_Conv */ -/** - * A Cast may be removed if the type of the previous node - * is already the type of the Cast. - */ -static ir_node *equivalent_node_Cast(ir_node *n) { - ir_node *oldn = n; - ir_node *pred = get_Cast_op(n); - - if (get_irn_type(pred) == get_Cast_type(n)) { - n = pred; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CAST); - } - return n; -} /* equivalent_node_Cast */ - /** * - fold Phi-nodes, iff they have only one predecessor except * themselves. */ -static ir_node *equivalent_node_Phi(ir_node *n) { +static ir_node *equivalent_node_Phi(ir_node *n) +{ int i, n_preds; ir_node *oldn = n; ir_node *block; ir_node *first_val = NULL; /* to shutup gcc */ - if (!get_opt_normalize()) return n; + if (!get_opt_optimize() && + get_irg_phase_state(get_irn_irg(n)) != phase_building) + return n; n_preds = get_Phi_n_preds(n); block = get_nodes_block(n); - if (is_Block_dead(block)) /* Control dead */ - return get_irg_bad(current_ir_graph); + /* Control dead */ + if (is_Block_dead(block)) { + ir_graph *irg = get_irn_irg(n); + return get_irg_bad(irg); + } if (n_preds == 0) return n; /* Phi of dead Region without predecessors. */ @@ -1404,8 +1415,9 @@ static ir_node *equivalent_node_Phi(ir_node *n) { } if (i >= n_preds) { + ir_graph *irg = get_irn_irg(n); /* A totally Bad or self-referencing Phi (we didn't break the above loop) */ - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } /* search for rest of inputs, determine if any of these @@ -1423,7 +1435,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) { } } - if (i >= n_preds) { + if (i >= n_preds && !is_Dummy(first_val)) { /* Fold, if no multiple distinct non-self-referencing inputs */ n = first_val; DBG_OPT_PHI(oldn, n); @@ -1436,7 +1448,8 @@ static ir_node *equivalent_node_Phi(ir_node *n) { * - fold Sync-nodes, iff they have only one predecessor except * themselves. */ -static ir_node *equivalent_node_Sync(ir_node *n) { +static ir_node *equivalent_node_Sync(ir_node *n) +{ int arity = get_Sync_n_preds(n); int i; @@ -1465,7 +1478,10 @@ static ir_node *equivalent_node_Sync(ir_node *n) { } } - if (arity == 0) return get_irg_bad(current_ir_graph); + if (arity == 0) { + ir_graph *irg = get_irn_irg(n); + return get_irg_bad(irg); + } if (arity == 1) return get_Sync_pred(n, 0); return n; } /* equivalent_node_Sync */ @@ -1473,7 +1489,8 @@ static ir_node *equivalent_node_Sync(ir_node *n) { /** * Optimize Proj(Tuple). */ -static ir_node *equivalent_node_Proj_Tuple(ir_node *proj) { +static ir_node *equivalent_node_Proj_Tuple(ir_node *proj) +{ ir_node *oldn = proj; ir_node *tuple = get_Proj_pred(proj); @@ -1487,11 +1504,12 @@ static ir_node *equivalent_node_Proj_Tuple(ir_node *proj) { /** * Optimize a / 1 = a. */ -static ir_node *equivalent_node_Proj_Div(ir_node *proj) { - ir_node *oldn = proj; - ir_node *div = get_Proj_pred(proj); - ir_node *b = get_Div_right(div); - tarval *tb = value_of(b); +static ir_node *equivalent_node_Proj_Div(ir_node *proj) +{ + ir_node *oldn = proj; + ir_node *div = get_Proj_pred(proj); + ir_node *b = get_Div_right(div); + ir_tarval *tb = value_of(b); /* Div is not commutative. */ if (tarval_is_one(tb)) { /* div(x, 1) == x */ @@ -1518,11 +1536,12 @@ static ir_node *equivalent_node_Proj_Div(ir_node *proj) { /** * Optimize a / 1.0 = a. */ -static ir_node *equivalent_node_Proj_Quot(ir_node *proj) { - ir_node *oldn = proj; - ir_node *quot = get_Proj_pred(proj); - ir_node *b = get_Quot_right(quot); - tarval *tb = value_of(b); +static ir_node *equivalent_node_Proj_Quot(ir_node *proj) +{ + ir_node *oldn = proj; + ir_node *quot = get_Proj_pred(proj); + ir_node *b = get_Quot_right(quot); + ir_tarval *tb = value_of(b); /* Div is not commutative. */ if (tarval_is_one(tb)) { /* Quot(x, 1) == x */ @@ -1549,11 +1568,12 @@ static ir_node *equivalent_node_Proj_Quot(ir_node *proj) { /** * Optimize a / 1 = a. */ -static ir_node *equivalent_node_Proj_DivMod(ir_node *proj) { - ir_node *oldn = proj; - ir_node *divmod = get_Proj_pred(proj); - ir_node *b = get_DivMod_right(divmod); - tarval *tb = value_of(b); +static ir_node *equivalent_node_Proj_DivMod(ir_node *proj) +{ + ir_node *oldn = proj; + ir_node *divmod = get_Proj_pred(proj); + ir_node *b = get_DivMod_right(divmod); + ir_tarval *tb = value_of(b); /* Div is not commutative. */ if (tarval_is_one(tb)) { /* div(x, 1) == x */ @@ -1582,7 +1602,8 @@ static ir_node *equivalent_node_Proj_DivMod(ir_node *proj) { /** * Optimize CopyB(mem, x, x) into a Nop. */ -static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) { +static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) +{ ir_node *oldn = proj; ir_node *copyb = get_Proj_pred(proj); ir_node *a = get_CopyB_dst(copyb); @@ -1591,16 +1612,18 @@ static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) { if (a == b) { /* Turn CopyB into a tuple (mem, jmp, bad, bad) */ switch (get_Proj_proj(proj)) { - case pn_CopyB_M_regular: + case pn_CopyB_M: proj = get_CopyB_mem(copyb); DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP); break; - case pn_CopyB_X_except: + case pn_CopyB_X_except: { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - proj = get_irg_bad(current_ir_graph); + proj = get_irg_bad(irg); break; } + } } return proj; } /* equivalent_node_Proj_CopyB */ @@ -1608,7 +1631,8 @@ static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) { /** * Optimize Bounds(idx, idx, upper) into idx. */ -static ir_node *equivalent_node_Proj_Bound(ir_node *proj) { +static ir_node *equivalent_node_Proj_Bound(ir_node *proj) +{ ir_node *oldn = proj; ir_node *bound = get_Proj_pred(proj); ir_node *idx = get_Bound_index(bound); @@ -1619,14 +1643,13 @@ static ir_node *equivalent_node_Proj_Bound(ir_node *proj) { ret_tuple = 1; else if (is_Bound(pred)) { /* - * idx was Bounds checked in the same MacroBlock previously, - * it is still valid if lower <= pred_lower && pred_upper <= upper. + * idx was Bounds checked previously, it is still valid if + * lower <= pred_lower && pred_upper <= upper. */ ir_node *lower = get_Bound_lower(bound); ir_node *upper = get_Bound_upper(bound); if (get_Bound_lower(pred) == lower && - get_Bound_upper(pred) == upper && - get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) { + get_Bound_upper(pred) == upper) { /* * One could expect that we simply return the previous * Bound here. However, this would be wrong, as we could @@ -1643,17 +1666,19 @@ static ir_node *equivalent_node_Proj_Bound(ir_node *proj) { DBG_OPT_EXC_REM(proj); proj = get_Bound_mem(bound); break; - case pn_Bound_X_except: + case pn_Bound_X_except: { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - proj = get_irg_bad(current_ir_graph); + proj = get_irg_bad(irg); break; + } case pn_Bound_res: proj = idx; DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP); break; default: /* cannot optimize pn_Bound_X_regular, handled in transform ... */ - ; + break; } } return proj; @@ -1662,7 +1687,8 @@ static ir_node *equivalent_node_Proj_Bound(ir_node *proj) { /** * Optimize an Exception Proj(Load) with a non-null address. */ -static ir_node *equivalent_node_Proj_Load(ir_node *proj) { +static ir_node *equivalent_node_Proj_Load(ir_node *proj) +{ if (get_opt_ldst_only_null_ptr_exceptions()) { if (get_irn_mode(proj) == mode_X) { ir_node *load = get_Proj_pred(proj); @@ -1673,8 +1699,9 @@ static ir_node *equivalent_node_Proj_Load(ir_node *proj) { if (value_not_null(addr, &confirm)) { if (get_Proj_proj(proj) == pn_Load_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } } } @@ -1685,7 +1712,8 @@ static ir_node *equivalent_node_Proj_Load(ir_node *proj) { /** * Optimize an Exception Proj(Store) with a non-null address. */ -static ir_node *equivalent_node_Proj_Store(ir_node *proj) { +static ir_node *equivalent_node_Proj_Store(ir_node *proj) +{ if (get_opt_ldst_only_null_ptr_exceptions()) { if (get_irn_mode(proj) == mode_X) { ir_node *store = get_Proj_pred(proj); @@ -1696,8 +1724,9 @@ static ir_node *equivalent_node_Proj_Store(ir_node *proj) { if (value_not_null(addr, &confirm)) { if (get_Proj_proj(proj) == pn_Store_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } } } @@ -1709,13 +1738,15 @@ static ir_node *equivalent_node_Proj_Store(ir_node *proj) { * Does all optimizations on nodes that must be done on it's Proj's * because of creating new nodes. */ -static ir_node *equivalent_node_Proj(ir_node *proj) { +static ir_node *equivalent_node_Proj(ir_node *proj) +{ ir_node *n = get_Proj_pred(proj); if (get_irn_mode(proj) == mode_X) { if (is_Block_dead(get_nodes_block(n))) { /* Remove dead control flow -- early gigo(). */ - return get_irg_bad(current_ir_graph); + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); } } if (n->op->ops.equivalent_node_Proj) @@ -1726,7 +1757,8 @@ static ir_node *equivalent_node_Proj(ir_node *proj) { /** * Remove Id's. */ -static ir_node *equivalent_node_Id(ir_node *n) { +static ir_node *equivalent_node_Id(ir_node *n) +{ ir_node *oldn = n; do { @@ -1742,9 +1774,9 @@ static ir_node *equivalent_node_Id(ir_node *n) { */ static ir_node *equivalent_node_Mux(ir_node *n) { - ir_node *oldn = n, *sel = get_Mux_sel(n); - ir_node *n_t, *n_f; - tarval *ts = value_of(sel); + ir_node *oldn = n, *sel = get_Mux_sel(n); + ir_node *n_t, *n_f; + ir_tarval *ts = value_of(sel); /* Mux(true, f, t) == t */ if (ts == tarval_b_true) { @@ -1844,7 +1876,8 @@ static ir_node *equivalent_node_Mux(ir_node *n) * Remove Confirm nodes if setting is on. * Replace Confirms(x, '=', Constlike) by Constlike. */ -static ir_node *equivalent_node_Confirm(ir_node *n) { +static ir_node *equivalent_node_Confirm(ir_node *n) +{ ir_node *pred = get_Confirm_value(n); pn_Cmp pnc = get_Confirm_cmp(n); @@ -1857,8 +1890,6 @@ static ir_node *equivalent_node_Confirm(ir_node *n) { pred = get_Confirm_value(n); pnc = get_Confirm_cmp(n); } - if (get_opt_remove_confirm()) - return get_Confirm_value(n); return n; } @@ -1869,7 +1900,8 @@ static ir_node *equivalent_node_Confirm(ir_node *n) { * If a node returns a Tuple we can not just skip it. If the size of the * in array fits, we transform n into a tuple (e.g., Div). */ -ir_node *equivalent_node(ir_node *n) { +ir_node *equivalent_node(ir_node *n) +{ if (n->op->ops.equivalent_node) return n->op->ops.equivalent_node(n); return n; @@ -1912,7 +1944,6 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op CASE(Or); CASE(And); CASE(Conv); - CASE(Cast); CASE(Phi); CASE(Sync); CASE_PROJ(Tuple); @@ -1928,7 +1959,8 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op CASE(Mux); CASE(Confirm); default: - /* leave NULL */; + /* leave NULL */ + break; } return ops; @@ -1940,7 +1972,8 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op * Returns non-zero if a node is a Phi node * with all predecessors constant. */ -static int is_const_Phi(ir_node *n) { +static int is_const_Phi(ir_node *n) +{ int i; if (! is_Phi(n) || get_irn_arity(n) == 0) @@ -1952,8 +1985,8 @@ static int is_const_Phi(ir_node *n) { return 1; } /* is_const_Phi */ -typedef tarval *(*tarval_sub_type)(tarval *a, tarval *b, ir_mode *mode); -typedef tarval *(*tarval_binop_type)(tarval *a, tarval *b); +typedef ir_tarval *(*tarval_sub_type)(ir_tarval *a, ir_tarval *b, ir_mode *mode); +typedef ir_tarval *(*tarval_binop_type)(ir_tarval *a, ir_tarval *b); /** * in reality eval_func should be tarval (*eval_func)() but incomplete @@ -1964,7 +1997,7 @@ typedef void (*eval_func)(void); /** * Wrapper for the tarval binop evaluation, tarval_sub has one more parameter. */ -static tarval *do_eval(eval_func eval, tarval *a, tarval *b, ir_mode *mode) +static ir_tarval *do_eval(eval_func eval, ir_tarval *a, ir_tarval *b, ir_mode *mode) { if (eval == (eval_func) tarval_sub) { tarval_sub_type func = (tarval_sub_type)eval; @@ -1988,12 +2021,13 @@ static tarval *do_eval(eval_func eval, tarval *a, tarval *b, ir_mode *mode) * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, eval_func eval, ir_mode *mode, int left) { - tarval *tv; - void **res; - ir_node *pred; - ir_graph *irg; - int i, n = get_irn_arity(phi); +static ir_node *apply_binop_on_phi(ir_node *phi, ir_tarval *other, eval_func eval, ir_mode *mode, int left) +{ + ir_tarval *tv; + void **res; + ir_node *pred; + ir_graph *irg; + int i, n = get_irn_arity(phi); NEW_ARR_A(void *, res, n); if (left) { @@ -2021,10 +2055,10 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, eval_func eval, res[i] = tv; } } - irg = current_ir_graph; + irg = get_irn_irg(phi); for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, res[i]); } return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_binop_on_phi */ @@ -2039,8 +2073,9 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, eval_func eval, * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir_mode *mode) { - tarval *tv_l, *tv_r, *tv; +static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir_mode *mode) +{ + ir_tarval *tv_l, *tv_r, *tv; void **res; ir_node *pred; ir_graph *irg; @@ -2065,10 +2100,10 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir } res[i] = tv; } - irg = current_ir_graph; + irg = get_irn_irg(a); for (i = 0; i < n; ++i) { pred = get_irn_n(a, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, res[i]); } return new_r_Phi(get_nodes_block(a), n, (ir_node **)res, mode); } /* apply_binop_on_2_phis */ @@ -2081,8 +2116,9 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) { - tarval *tv; +static ir_node *apply_unop_on_phi(ir_node *phi, ir_tarval *(*eval)(ir_tarval *)) +{ + ir_tarval *tv; void **res; ir_node *pred; ir_mode *mode; @@ -2102,10 +2138,10 @@ static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) { res[i] = tv; } mode = get_irn_mode(phi); - irg = current_ir_graph; + irg = get_irn_irg(phi); for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, res[i]); } return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_unop_on_phi */ @@ -2117,8 +2153,9 @@ static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) { * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) { - tarval *tv; +static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) +{ + ir_tarval *tv; void **res; ir_node *pred; ir_graph *irg; @@ -2136,10 +2173,10 @@ static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) { } res[i] = tv; } - irg = current_ir_graph; + irg = get_irn_irg(phi); for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, res[i]); } return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_conv_on_phi */ @@ -2149,7 +2186,8 @@ static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) { * SubP(P, ConvIs(Iu)), SubP(P, ConvIu(Is)). * If possible, remove the Conv's. */ -static ir_node *transform_node_AddSub(ir_node *n) { +static ir_node *transform_node_AddSub(ir_node *n) +{ ir_mode *mode = get_irn_mode(n); if (mode_is_reference(mode)) { @@ -2221,6 +2259,7 @@ static ir_node *transform_node_AddSub(ir_node *n) { } /* transform_node_AddSub */ #define HANDLE_BINOP_PHI(eval, a, b, c, mode) \ + do { \ c = NULL; \ if (is_Const(b) && is_const_Phi(a)) { \ /* check for Op(Phi, Const) */ \ @@ -2237,9 +2276,11 @@ static ir_node *transform_node_AddSub(ir_node *n) { if (c) { \ DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \ return c; \ - } + } \ + } while(0) #define HANDLE_UNOP_PHI(eval, a, c) \ + do { \ c = NULL; \ if (is_const_Phi(a)) { \ /* check for Op(Phi) */ \ @@ -2248,7 +2289,8 @@ static ir_node *transform_node_AddSub(ir_node *n) { DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \ return c; \ } \ - } + } \ + } while(0) /** * Do the AddSub optimization, then Transform @@ -2259,9 +2301,11 @@ static ir_node *transform_node_AddSub(ir_node *n) { * Transform Add(a,-b) into Sub(a,b). * Reassociation might fold this further. */ -static ir_node *transform_node_Add(ir_node *n) { +static ir_node *transform_node_Add(ir_node *n) +{ ir_mode *mode; ir_node *a, *b, *c, *oldn = n; + vrp_attr *a_vrp, *b_vrp; n = transform_node_AddSub(n); @@ -2273,7 +2317,7 @@ static ir_node *transform_node_Add(ir_node *n) { if (mode_is_reference(mode)) { ir_mode *lmode = get_irn_mode(a); - if (is_Const(b) && is_Const_null(b) && mode_is_int(lmode)) { + if (is_Const(b) && is_Const_null(b) && mode_is_int(lmode)) { /* an Add(a, NULL) is a hidden Conv */ dbg_info *dbg = get_irn_dbg_info(n); return new_rd_Conv(dbg, get_nodes_block(n), a, mode); @@ -2283,12 +2327,16 @@ static ir_node *transform_node_Add(ir_node *n) { HANDLE_BINOP_PHI((eval_func) tarval_add, a, b, c, mode); /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } if (mode_is_num(mode)) { + ir_graph *irg = get_irn_irg(n); /* the following code leads to endless recursion when Mul are replaced by a simple instruction chain */ - if (!is_irg_state(current_ir_graph, IR_GRAPH_STATE_ARCH_DEP) + if (!is_irg_state(irg, IR_GRAPH_STATE_ARCH_DEP) && a == b && mode_is_int(mode)) { ir_node *block = get_nodes_block(n); @@ -2296,7 +2344,7 @@ static ir_node *transform_node_Add(ir_node *n) { get_irn_dbg_info(n), block, a, - new_Const_long(mode, 2), + new_r_Const_long(irg, mode, 2), mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_A); return n; @@ -2335,7 +2383,7 @@ static ir_node *transform_node_Add(ir_node *n) { } if (op == b) { /* ~x + x = -1 */ - n = new_Const(get_mode_minus_one(mode)); + n = new_r_Const(irg, get_mode_minus_one(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X); return n; } @@ -2345,23 +2393,36 @@ static ir_node *transform_node_Add(ir_node *n) { if (op == a) { /* x + ~x = -1 */ - n = new_Const(get_mode_minus_one(mode)); + n = new_r_Const(irg, get_mode_minus_one(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X); return n; } } } } + + a_vrp = vrp_get_info(a); + b_vrp = vrp_get_info(b); + + if (a_vrp && b_vrp) { + ir_tarval *c = tarval_and(a_vrp->bits_not_set, b_vrp->bits_not_set); + + if (tarval_is_null(c)) { + dbg_info *dbgi = get_irn_dbg_info(n); + return new_rd_Or(dbgi, get_nodes_block(n), a, b, mode); + } + } return n; } /* transform_node_Add */ /** * returns -cnst or NULL if impossible */ -static ir_node *const_negate(ir_node *cnst) { - tarval *tv = tarval_neg(get_Const_tarval(cnst)); - dbg_info *dbgi = get_irn_dbg_info(cnst); - ir_graph *irg = get_irn_irg(cnst); +static ir_node *const_negate(ir_node *cnst) +{ + ir_tarval *tv = tarval_neg(get_Const_tarval(cnst)); + dbg_info *dbgi = get_irn_dbg_info(cnst); + ir_graph *irg = get_irn_irg(cnst); if (tv == tarval_bad) return NULL; return new_rd_Const(dbgi, irg, tv); } @@ -2376,7 +2437,8 @@ static ir_node *const_negate(ir_node *cnst) { * Sub(x, Add(x, a)) -> -a * Sub(x, Const) -> Add(x, -Const) */ -static ir_node *transform_node_Sub(ir_node *n) { +static ir_node *transform_node_Sub(ir_node *n) +{ ir_mode *mode; ir_node *oldn = n; ir_node *a, *b, *c; @@ -2415,8 +2477,11 @@ restart: HANDLE_BINOP_PHI((eval_func) tarval_sub, a, b, c, mode); /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } if (is_Const(b) && !mode_is_reference(get_irn_mode(b))) { /* a - C -> a + (-C) */ @@ -2519,7 +2584,7 @@ restart: return n; } else if (right == b) { if (mode != get_irn_mode(left)) { - /* This Sub is an effective Cast */ + /* This Sub is an effective Cast */ left = new_r_Conv(get_nodes_block(n), left, mode); } n = left; @@ -2549,7 +2614,7 @@ restart: n = new_r_Minus(get_nodes_block(n), left, l_mode); if (mode != l_mode) { - /* This Sub is an effective Cast */ + /* This Sub is an effective Cast */ n = new_r_Conv(get_nodes_block(n), n, mode); } DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); @@ -2585,7 +2650,8 @@ restart: ir_node *mb = get_Mul_right(a); if (ma == b) { - ir_node *blk = get_nodes_block(n); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(n); n = new_rd_Mul( get_irn_dbg_info(n), blk, @@ -2594,13 +2660,14 @@ restart: get_irn_dbg_info(n), blk, mb, - new_Const_long(mode, 1), + new_r_Const(irg, get_mode_one(mode)), mode), mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A); return n; } else if (mb == b) { - ir_node *blk = get_nodes_block(n); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(n); n = new_rd_Mul( get_irn_dbg_info(n), blk, @@ -2609,7 +2676,7 @@ restart: get_irn_dbg_info(n), blk, ma, - new_Const_long(mode, 1), + new_r_Const(irg, get_mode_one(mode)), mode), mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A); @@ -2652,12 +2719,13 @@ restart: if (get_mode_arithmetic(mode) == irma_twos_complement) { if (is_Const(a) && is_Not(b)) { /* c - ~X = X + (c+1) */ - tarval *tv = get_Const_tarval(a); + ir_tarval *tv = get_Const_tarval(a); tv = tarval_add(tv, get_mode_one(mode)); if (tv != tarval_bad) { - ir_node *blk = get_nodes_block(n); - ir_node *c = new_Const(tv); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(n); + ir_node *c = new_r_Const(irg, tv); n = new_rd_Add(get_irn_dbg_info(n), blk, get_Not_op(b), c, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_C_NOT_X); return n; @@ -2671,13 +2739,14 @@ restart: * Several transformation done on n*n=2n bits mul. * These transformations must be done here because new nodes may be produced. */ -static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) { - ir_node *oldn = n; - ir_node *a = get_Mul_left(n); - ir_node *b = get_Mul_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); - ir_mode *smode = get_irn_mode(a); +static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) +{ + ir_node *oldn = n; + ir_node *a = get_Mul_left(n); + ir_node *b = get_Mul_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); + ir_mode *smode = get_irn_mode(a); if (ta == get_mode_one(smode)) { /* (L)1 * (L)b = (L)b */ @@ -2717,7 +2786,8 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) { * Do constant evaluation of Phi nodes. * Do architecture dependent optimizations on Mul nodes */ -static ir_node *transform_node_Mul(ir_node *n) { +static ir_node *transform_node_Mul(ir_node *n) +{ ir_node *c, *oldn = n; ir_mode *mode = get_irn_mode(n); ir_node *a = get_Mul_left(n); @@ -2806,7 +2876,7 @@ static ir_node *transform_node_Mul(ir_node *n) { } if (get_mode_arithmetic(mode) == irma_ieee754) { if (is_Const(a)) { - tarval *tv = get_Const_tarval(a); + ir_tarval *tv = get_Const_tarval(a); if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) && !tarval_is_negative(tv)) { /* 2.0 * b = b + b */ @@ -2816,7 +2886,7 @@ static ir_node *transform_node_Mul(ir_node *n) { } } else if (is_Const(b)) { - tarval *tv = get_Const_tarval(b); + ir_tarval *tv = get_Const_tarval(b); if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) && !tarval_is_negative(tv)) { /* a * 2.0 = a + a */ @@ -2832,7 +2902,8 @@ static ir_node *transform_node_Mul(ir_node *n) { /** * Transform a Div Node. */ -static ir_node *transform_node_Div(ir_node *n) { +static ir_node *transform_node_Div(ir_node *n) +{ ir_mode *mode = get_Div_resmode(n); ir_node *a = get_Div_left(n); ir_node *b = get_Div_right(n); @@ -2867,13 +2938,14 @@ static ir_node *transform_node_Div(ir_node *n) { value = n; if (a == b && value_not_zero(a, &dummy)) { + ir_graph *irg = get_irn_irg(n); /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */ - value = new_Const(get_mode_one(mode)); + value = new_r_Const(irg, get_mode_one(mode)); DBG_OPT_CSTEVAL(n, value); goto make_tuple; } else { if (mode_is_signed(mode) && is_Const(b)) { - tarval *tv = get_Const_tarval(b); + ir_tarval *tv = get_Const_tarval(b); if (tv == get_mode_minus_one(mode)) { /* a / -1 */ @@ -2888,18 +2960,20 @@ static ir_node *transform_node_Div(ir_node *n) { if (value != n) { ir_node *mem, *blk; + ir_graph *irg; make_tuple: /* Turn Div into a tuple (mem, jmp, bad, value) */ mem = get_Div_mem(n); blk = get_nodes_block(n); + irg = get_irn_irg(blk); /* skip a potential Pin */ mem = skip_Pin(mem); turn_into_tuple(n, pn_Div_max); set_Tuple_pred(n, pn_Div_M, mem); set_Tuple_pred(n, pn_Div_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_Div_X_except, new_Bad()); + set_Tuple_pred(n, pn_Div_X_except, new_r_Bad(irg)); set_Tuple_pred(n, pn_Div_res, value); } return n; @@ -2908,12 +2982,14 @@ make_tuple: /** * Transform a Mod node. */ -static ir_node *transform_node_Mod(ir_node *n) { - ir_mode *mode = get_Mod_resmode(n); - ir_node *a = get_Mod_left(n); - ir_node *b = get_Mod_right(n); - ir_node *value; - tarval *tv; +static ir_node *transform_node_Mod(ir_node *n) +{ + ir_mode *mode = get_Mod_resmode(n); + ir_node *a = get_Mod_left(n); + ir_node *b = get_Mod_right(n); + ir_graph *irg; + ir_node *value; + ir_tarval *tv; if (is_Const(b) && is_const_Phi(a)) { /* check for Div(Phi, Const) */ @@ -2942,8 +3018,9 @@ static ir_node *transform_node_Mod(ir_node *n) { value = n; tv = value_of(n); + irg = get_irn_irg(n); if (tv != tarval_bad) { - value = new_Const(tv); + value = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(n, value); goto make_tuple; @@ -2954,16 +3031,16 @@ static ir_node *transform_node_Mod(ir_node *n) { if (a == b && value_not_zero(a, &dummy)) { /* BEWARE: we can optimize a%a to 0 only if this cannot cause a exception */ - value = new_Const(get_mode_null(mode)); + value = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, value); goto make_tuple; } else { if (mode_is_signed(mode) && is_Const(b)) { - tarval *tv = get_Const_tarval(b); + ir_tarval *tv = get_Const_tarval(b); if (tv == get_mode_minus_one(mode)) { /* a % -1 = 0 */ - value = new_Const(get_mode_null(mode)); + value = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, value); goto make_tuple; } @@ -2975,18 +3052,20 @@ static ir_node *transform_node_Mod(ir_node *n) { if (value != n) { ir_node *mem, *blk; + ir_graph *irg; make_tuple: /* Turn Mod into a tuple (mem, jmp, bad, value) */ mem = get_Mod_mem(n); blk = get_nodes_block(n); + irg = get_irn_irg(blk); /* skip a potential Pin */ mem = skip_Pin(mem); turn_into_tuple(n, pn_Mod_max); set_Tuple_pred(n, pn_Mod_M, mem); set_Tuple_pred(n, pn_Mod_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_Mod_X_except, new_Bad()); + set_Tuple_pred(n, pn_Mod_X_except, new_r_Bad(irg)); set_Tuple_pred(n, pn_Mod_res, value); } return n; @@ -2995,13 +3074,15 @@ make_tuple: /** * Transform a DivMod node. */ -static ir_node *transform_node_DivMod(ir_node *n) { +static ir_node *transform_node_DivMod(ir_node *n) +{ const ir_node *dummy; ir_node *a = get_DivMod_left(n); ir_node *b = get_DivMod_right(n); ir_mode *mode = get_DivMod_resmode(n); ir_node *va, *vb; - tarval *ta, *tb; + ir_graph *irg = get_irn_irg(n); + ir_tarval *ta, *tb; int evaluated = 0; if (is_Const(b) && is_const_Phi(a)) { @@ -3040,24 +3121,24 @@ static ir_node *transform_node_DivMod(ir_node *n) { if (tb != tarval_bad) { if (tb == get_mode_one(get_tarval_mode(tb))) { va = a; - vb = new_Const(get_mode_null(mode)); + vb = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, vb); goto make_tuple; } else if (ta != tarval_bad) { - tarval *resa, *resb; + ir_tarval *resa, *resb; resa = tarval_div(ta, tb); if (resa == tarval_bad) return n; /* Causes exception!!! Model by replacing through Jmp for X result!? */ resb = tarval_mod(ta, tb); if (resb == tarval_bad) return n; /* Causes exception! */ - va = new_Const(resa); - vb = new_Const(resb); + va = new_r_Const(irg, resa); + vb = new_r_Const(irg, resb); DBG_OPT_CSTEVAL(n, va); DBG_OPT_CSTEVAL(n, vb); goto make_tuple; } else if (mode_is_signed(mode) && tb == get_mode_minus_one(mode)) { va = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode); - vb = new_Const(get_mode_null(mode)); + vb = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, va); DBG_OPT_CSTEVAL(n, vb); goto make_tuple; @@ -3070,8 +3151,8 @@ static ir_node *transform_node_DivMod(ir_node *n) { } else if (a == b) { if (value_not_zero(a, &dummy)) { /* a/a && a != 0 */ - va = new_Const(get_mode_one(mode)); - vb = new_Const(get_mode_null(mode)); + va = new_r_Const(irg, get_mode_one(mode)); + vb = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, va); DBG_OPT_CSTEVAL(n, vb); goto make_tuple; @@ -3097,7 +3178,7 @@ make_tuple: turn_into_tuple(n, pn_DivMod_max); set_Tuple_pred(n, pn_DivMod_M, mem); set_Tuple_pred(n, pn_DivMod_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_DivMod_X_except, new_Bad()); /* no exception */ + set_Tuple_pred(n, pn_DivMod_X_except, new_r_Bad(irg)); /*no exception*/ set_Tuple_pred(n, pn_DivMod_res_div, va); set_Tuple_pred(n, pn_DivMod_res_mod, vb); } @@ -3108,13 +3189,14 @@ make_tuple: /** * Optimize x / c to x * (1/c) */ -static ir_node *transform_node_Quot(ir_node *n) { +static ir_node *transform_node_Quot(ir_node *n) +{ ir_mode *mode = get_Quot_resmode(n); ir_node *oldn = n; if (get_mode_arithmetic(mode) == irma_ieee754) { - ir_node *b = get_Quot_right(n); - tarval *tv = value_of(b); + ir_node *b = get_Quot_right(n); + ir_tarval *tv = value_of(b); if (tv != tarval_bad) { int rem = tarval_fp_ops_enabled(); @@ -3132,9 +3214,10 @@ static ir_node *transform_node_Quot(ir_node *n) { /* Do the transformation if the result is either exact or we are not using strict rules. */ if (tv != tarval_bad && - (tarval_ieee754_get_exact() || (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic) == 0)) { + (tarval_ieee754_get_exact() || (get_irg_fp_model(get_irn_irg(n)) & fp_strict_algebraic) == 0)) { ir_node *blk = get_nodes_block(n); - ir_node *c = new_Const(tv); + ir_graph *irg = get_irn_irg(blk); + ir_node *c = new_r_Const(irg, tv); ir_node *a = get_Quot_left(n); ir_node *m = new_rd_Mul(get_irn_dbg_info(n), blk, a, c, mode); ir_node *mem = get_Quot_mem(n); @@ -3144,7 +3227,7 @@ static ir_node *transform_node_Quot(ir_node *n) { turn_into_tuple(n, pn_Quot_max); set_Tuple_pred(n, pn_Quot_M, mem); set_Tuple_pred(n, pn_Quot_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_Quot_X_except, new_Bad()); + set_Tuple_pred(n, pn_Quot_X_except, new_r_Bad(irg)); set_Tuple_pred(n, pn_Quot_res, m); DBG_OPT_ALGSIM1(oldn, a, b, m, FS_OPT_FP_INV_MUL); } @@ -3153,53 +3236,6 @@ static ir_node *transform_node_Quot(ir_node *n) { return n; } /* transform_node_Quot */ -/** - * Optimize Abs(x) into x if x is Confirmed >= 0 - * Optimize Abs(x) into -x if x is Confirmed <= 0 - * Optimize Abs(-x) int Abs(x) - */ -static ir_node *transform_node_Abs(ir_node *n) { - ir_node *c, *oldn = n; - ir_node *a = get_Abs_op(n); - ir_mode *mode; - - HANDLE_UNOP_PHI(tarval_abs, a, c); - - switch (classify_value_sign(a)) { - case value_classified_negative: - mode = get_irn_mode(n); - - /* - * We can replace the Abs by -x here. - * We even could add a new Confirm here - * (if not twos complement) - * - * Note that -x would create a new node, so we could - * not run it in the equivalent_node() context. - */ - n = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode); - - DBG_OPT_CONFIRM(oldn, n); - return n; - case value_classified_positive: - /* n is positive, Abs is not needed */ - n = a; - - DBG_OPT_CONFIRM(oldn, n); - return n; - default: - break; - } - if (is_Minus(a)) { - /* Abs(-x) = Abs(x) */ - mode = get_irn_mode(n); - n = new_rd_Abs(get_irn_dbg_info(n), get_nodes_block(n), get_Minus_op(a), mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ABS_MINUS_X); - return n; - } - return n; -} /* transform_node_Abs */ - /** * Optimize -a CMP -b into b CMP a. * This works only for for modes where unary Minus @@ -3209,7 +3245,8 @@ static ir_node *transform_node_Abs(ir_node *n) { * * For == and != can be handled in Proj(Cmp) */ -static ir_node *transform_node_Cmp(ir_node *n) { +static ir_node *transform_node_Cmp(ir_node *n) +{ ir_node *oldn = n; ir_node *left = get_Cmp_left(n); ir_node *right = get_Cmp_right(n); @@ -3231,14 +3268,16 @@ static ir_node *transform_node_Cmp(ir_node *n) { * Replace the Cond by a Jmp if it branches on a constant * condition. */ -static ir_node *transform_node_Cond(ir_node *n) { +static ir_node *transform_node_Cond(ir_node *n) +{ - ir_node *jmp; - ir_node *a = get_Cond_selector(n); - tarval *ta = value_of(a); + ir_node *a = get_Cond_selector(n); + ir_tarval *ta = value_of(a); + ir_graph *irg = get_irn_irg(n); + ir_node *jmp; /* we need block info which is not available in floating irgs */ - if (get_irg_pinned(current_ir_graph) == op_pin_state_floats) + if (get_irg_pinned(irg) == op_pin_state_floats) return n; if ((ta != tarval_bad) && @@ -3250,14 +3289,14 @@ static ir_node *transform_node_Cond(ir_node *n) { jmp = new_r_Jmp(blk); turn_into_tuple(n, pn_Cond_max); if (ta == tarval_b_true) { - set_Tuple_pred(n, pn_Cond_false, new_Bad()); + set_Tuple_pred(n, pn_Cond_false, new_r_Bad(irg)); set_Tuple_pred(n, pn_Cond_true, jmp); } else { set_Tuple_pred(n, pn_Cond_false, jmp); - set_Tuple_pred(n, pn_Cond_true, new_Bad()); + set_Tuple_pred(n, pn_Cond_true, new_r_Bad(irg)); } /* We might generate an endless loop, so keep it alive. */ - add_End_keepalive(get_irg_end(current_ir_graph), blk); + add_End_keepalive(get_irg_end(irg), blk); } return n; } /* transform_node_Cond */ @@ -3282,7 +3321,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, ir_op *op = get_irn_op(a); ir_op *op_root = get_irn_op(n); - if(op != get_irn_op(b)) + if (op != get_irn_op(b)) return n; /* and(conv(a), conv(b)) -> conv(and(a,b)) */ @@ -3291,7 +3330,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, ir_node *b_op = get_Conv_op(b); ir_mode *a_mode = get_irn_mode(a_op); ir_mode *b_mode = get_irn_mode(b_op); - if(a_mode == b_mode && (mode_is_int(a_mode) || a_mode == mode_b)) { + if (a_mode == b_mode && (mode_is_int(a_mode) || a_mode == mode_b)) { ir_node *blk = get_nodes_block(n); n = exact_copy(n); @@ -3326,17 +3365,17 @@ static ir_node *transform_bitwise_distributive(ir_node *n, c = a_left; op1 = a_right; op2 = b_right; - } else if(a_left == b_right) { + } else if (a_left == b_right) { c = a_left; op1 = a_right; op2 = b_left; - } else if(a_right == b_left) { + } else if (a_right == b_left) { c = a_right; op1 = a_left; op2 = b_right; } } - if(a_right == b_right) { + if (a_right == b_right) { c = a_right; op1 = a_left; op2 = b_left; @@ -3351,7 +3390,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, set_binop_right(new_n, op2); new_n = trans_func(new_n); - if(op_root == op_Eor && op == op_Or) { + if (op_root == op_Eor && op == op_Or) { dbg_info *dbgi = get_irn_dbg_info(n); ir_mode *mode = get_irn_mode(c); @@ -3362,7 +3401,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, set_nodes_block(n, blk); set_binop_left(n, new_n); set_binop_right(n, c); - add_identities(current_ir_graph->value_table, n); + add_identities(n); } DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_SHIFT_AND); @@ -3376,11 +3415,13 @@ static ir_node *transform_bitwise_distributive(ir_node *n, /** * Transform an And. */ -static ir_node *transform_node_And(ir_node *n) { +static ir_node *transform_node_And(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_And_left(n); ir_node *b = get_And_right(n); ir_mode *mode; + vrp_attr *a_vrp, *b_vrp; mode = get_irn_mode(n); HANDLE_BINOP_PHI((eval_func) tarval_and, a, b, c, mode); @@ -3391,13 +3432,12 @@ static ir_node *transform_node_And(ir_node *n) { ir_node *pred_b = get_Proj_pred(b); if (pred_a == pred_b) { dbg_info *dbgi = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(pred_a); pn_Cmp pn_a = get_Proj_proj(a); pn_Cmp pn_b = get_Proj_proj(b); /* yes, we can simply calculate with pncs */ pn_Cmp new_pnc = pn_a & pn_b; - return new_rd_Proj(dbgi, block, pred_a, mode_b, new_pnc); + return new_rd_Proj(dbgi, pred_a, mode_b, new_pnc); } } if (is_Or(a)) { @@ -3501,15 +3541,57 @@ static ir_node *transform_node_And(ir_node *n) { return n; } + b_vrp = vrp_get_info(b); + if (is_Const(a) && b_vrp && (tarval_cmp(tarval_or(get_Const_tarval(a), + b_vrp->bits_not_set), get_Const_tarval(a)) == pn_Cmp_Eq)) { + + return b; + + } + + a_vrp = vrp_get_info(a); + if (is_Const(b) && a_vrp && (tarval_cmp(tarval_or(get_Const_tarval(b), + a_vrp->bits_not_set), get_Const_tarval(b)) == pn_Cmp_Eq)) { + return a; + } + n = transform_bitwise_distributive(n, transform_node_And); return n; } /* transform_node_And */ +/* the order of the values is important! */ +typedef enum const_class { + const_const = 0, + const_like = 1, + const_other = 2 +} const_class; + +static const_class classify_const(const ir_node* n) +{ + if (is_Const(n)) return const_const; + if (is_irn_constlike(n)) return const_like; + return const_other; +} + +/** + * Determines whether r is more constlike or has a larger index (in that order) + * than l. + */ +static bool operands_are_normalized(const ir_node *l, const ir_node *r) +{ + const const_class l_order = classify_const(l); + const const_class r_order = classify_const(r); + return + l_order > r_order || + (l_order == r_order && get_irn_idx(l) <= get_irn_idx(r)); +} + /** * Transform an Eor. */ -static ir_node *transform_node_Eor(ir_node *n) { +static ir_node *transform_node_Eor(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_Eor_left(n); ir_node *b = get_Eor_right(n); @@ -3521,47 +3603,52 @@ static ir_node *transform_node_Eor(ir_node *n) { if (mode == mode_b && is_Proj(a) && is_Proj(b)) { ir_node *pred_a = get_Proj_pred(a); ir_node *pred_b = get_Proj_pred(b); - if(pred_a == pred_b) { + if (pred_a == pred_b) { dbg_info *dbgi = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(pred_a); pn_Cmp pn_a = get_Proj_proj(a); pn_Cmp pn_b = get_Proj_proj(b); /* yes, we can simply calculate with pncs */ pn_Cmp new_pnc = pn_a ^ pn_b; - return new_rd_Proj(dbgi, block, pred_a, mode_b, new_pnc); + return new_rd_Proj(dbgi, pred_a, mode_b, new_pnc); } } - if (a == b) { - /* a ^ a = 0 */ - n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, - get_mode_null(mode)); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A); - } else if (is_Const(b)) { - if (is_Not(a)) { /* ~x ^ const -> x ^ ~const */ - ir_node *cnst = new_Const(tarval_not(get_Const_tarval(b))); - ir_node *not_op = get_Not_op(a); - dbg_info *dbg = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(n); - ir_mode *mode = get_irn_mode(n); - n = new_rd_Eor(dbg, block, not_op, cnst, mode); - return n; - } else if (is_Const_all_one(b)) { /* x ^ 1...1 -> ~1 */ - n = new_r_Not(get_nodes_block(n), a, mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); - } - } else { - n = transform_bitwise_distributive(n, transform_node_Eor); + /* normalize not nodes... ~a ^ b <=> a ^ ~b */ + if (is_Not(a) && operands_are_normalized(get_Not_op(a), b)) { + dbg_info *dbg = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_node *new_not = new_rd_Not(dbg, block, b, mode); + ir_node *new_left = get_Not_op(a); + n = new_rd_Eor(dbg, block, new_left, new_not, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + return n; + } else if (is_Not(b) && !operands_are_normalized(a, get_Not_op(b))) { + dbg_info *dbg = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_node *new_not = new_rd_Not(dbg, block, a, mode); + ir_node *new_right = get_Not_op(b); + n = new_rd_Eor(dbg, block, new_not, new_right, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + return n; + } + + /* x ^ 1...1 -> ~1 */ + if (is_Const(b) && is_Const_all_one(b)) { + n = new_r_Not(get_nodes_block(n), a, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + return n; } + n = transform_bitwise_distributive(n, transform_node_Eor); return n; } /* transform_node_Eor */ /** * Transform a Not. */ -static ir_node *transform_node_Not(ir_node *n) { +static ir_node *transform_node_Not(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_Not_op(n); ir_mode *mode = get_irn_mode(n); @@ -3572,30 +3659,29 @@ static ir_node *transform_node_Not(ir_node *n) { if (mode == mode_b && is_Proj(a)) { ir_node *a_pred = get_Proj_pred(a); if (is_Cmp(a_pred)) { - ir_node *cmp_block = get_nodes_block(a_pred); /* We negate a Cmp. The Cmp has the negated result anyways! */ - n = new_r_Proj(cmp_block, get_Proj_pred(a), + n = new_r_Proj(get_Proj_pred(a), mode_b, get_negated_pnc(get_Proj_proj(a), mode_b)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP); return n; } } - if (is_Eor(a)) { - ir_node *eor_b = get_Eor_right(a); - if (is_Const(eor_b)) { /* ~(x ^ const) -> x ^ ~const */ - ir_node *cnst = new_Const(tarval_not(get_Const_tarval(eor_b))); - ir_node *eor_a = get_Eor_left(a); - dbg_info *dbg = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(n); - ir_mode *mode = get_irn_mode(n); - n = new_rd_Eor(dbg, block, eor_a, cnst, mode); - return n; - } + + /* normalize ~(a ^ b) => a ^ ~b */ + if (is_Eor(a)) { + dbg_info *dbg = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_node *eor_right = get_Eor_right(a); + ir_node *eor_left = get_Eor_left(a); + eor_right = new_rd_Not(dbg, block, eor_right, mode); + n = new_rd_Eor(dbg, block, eor_left, eor_right, mode); + return n; } + if (get_mode_arithmetic(mode) == irma_twos_complement) { if (is_Minus(a)) { /* ~-x -> x + -1 */ dbg_info *dbg = get_irn_dbg_info(n); - ir_graph *irg = current_ir_graph; + ir_graph *irg = get_irn_irg(n); ir_node *block = get_nodes_block(n); ir_node *add_l = get_Minus_op(a); ir_node *add_r = new_rd_Const(dbg, irg, get_mode_minus_one(mode)); @@ -3623,7 +3709,8 @@ static ir_node *transform_node_Not(ir_node *n) { * -(a >>s (size-1)) = a >>u (size-1) * -(a * const) -> a * -const */ -static ir_node *transform_node_Minus(ir_node *n) { +static ir_node *transform_node_Minus(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_Minus_op(n); ir_mode *mode; @@ -3635,10 +3722,11 @@ static ir_node *transform_node_Minus(ir_node *n) { /* the following rules are only to twos-complement */ if (is_Not(a)) { /* -(~x) = x + 1 */ - ir_node *op = get_Not_op(a); - tarval *tv = get_mode_one(mode); - ir_node *blk = get_nodes_block(n); - ir_node *c = new_Const(tv); + ir_node *op = get_Not_op(a); + ir_tarval *tv = get_mode_one(mode); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(blk); + ir_node *c = new_r_Const(irg, tv); n = new_rd_Add(get_irn_dbg_info(n), blk, op, c, mode); DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT); return n; @@ -3647,7 +3735,7 @@ static ir_node *transform_node_Minus(ir_node *n) { ir_node *c = get_Shr_right(a); if (is_Const(c)) { - tarval *tv = get_Const_tarval(c); + ir_tarval *tv = get_Const_tarval(c); if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) { /* -(a >>u (size-1)) = a >>s (size-1) */ @@ -3663,7 +3751,7 @@ static ir_node *transform_node_Minus(ir_node *n) { ir_node *c = get_Shrs_right(a); if (is_Const(c)) { - tarval *tv = get_Const_tarval(c); + ir_tarval *tv = get_Const_tarval(c); if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) { /* -(a >>s (size-1)) = a >>u (size-1) */ @@ -3688,13 +3776,14 @@ static ir_node *transform_node_Minus(ir_node *n) { } if (is_Mul(a)) { /* -(a * const) -> a * -const */ - ir_node *mul_l = get_Mul_left(a); - ir_node *mul_r = get_Mul_right(a); - tarval *tv = value_of(mul_r); + ir_node *mul_l = get_Mul_left(a); + ir_node *mul_r = get_Mul_right(a); + ir_tarval *tv = value_of(mul_r); if (tv != tarval_bad) { tv = tarval_neg(tv); if (tv != tarval_bad) { - ir_node *cnst = new_Const(tv); + ir_graph *irg = get_irn_irg(n); + ir_node *cnst = new_r_Const(irg, tv); dbg_info *dbg = get_irn_dbg_info(a); ir_node *block = get_nodes_block(a); n = new_rd_Mul(dbg, block, mul_l, cnst, mode); @@ -3707,30 +3796,11 @@ static ir_node *transform_node_Minus(ir_node *n) { return n; } /* transform_node_Minus */ -/** - * Transform a Cast_type(Const) into a new Const_type - */ -static ir_node *transform_node_Cast(ir_node *n) { - ir_node *oldn = n; - ir_node *pred = get_Cast_op(n); - ir_type *tp = get_irn_type(n); - - if (is_Const(pred) && get_Const_type(pred) != tp) { - n = new_rd_Const_type(NULL, current_ir_graph, get_Const_tarval(pred), tp); - DBG_OPT_CSTEVAL(oldn, n); - } else if (is_SymConst(pred) && get_SymConst_value_type(pred) != tp) { - n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_mode(pred), - get_SymConst_symbol(pred), get_SymConst_kind(pred), tp); - DBG_OPT_CSTEVAL(oldn, n); - } - - return n; -} /* transform_node_Cast */ - /** * Transform a Proj(Load) with a non-null address. */ -static ir_node *transform_node_Proj_Load(ir_node *proj) { +static ir_node *transform_node_Proj_Load(ir_node *proj) +{ if (get_opt_ldst_only_null_ptr_exceptions()) { if (get_irn_mode(proj) == mode_X) { ir_node *load = get_Proj_pred(proj); @@ -3745,8 +3815,9 @@ static ir_node *transform_node_Proj_Load(ir_node *proj) { set_irn_pinned(load, op_pin_state_floats); } if (get_Proj_proj(proj) == pn_Load_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } else { ir_node *blk = get_nodes_block(load); return new_r_Jmp(blk); @@ -3760,7 +3831,8 @@ static ir_node *transform_node_Proj_Load(ir_node *proj) { /** * Transform a Proj(Store) with a non-null address. */ -static ir_node *transform_node_Proj_Store(ir_node *proj) { +static ir_node *transform_node_Proj_Store(ir_node *proj) +{ if (get_opt_ldst_only_null_ptr_exceptions()) { if (get_irn_mode(proj) == mode_X) { ir_node *store = get_Proj_pred(proj); @@ -3775,8 +3847,9 @@ static ir_node *transform_node_Proj_Store(ir_node *proj) { set_irn_pinned(store, op_pin_state_floats); } if (get_Proj_proj(proj) == pn_Store_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } else { ir_node *blk = get_nodes_block(store); return new_r_Jmp(blk); @@ -3791,7 +3864,8 @@ static ir_node *transform_node_Proj_Store(ir_node *proj) { * Transform a Proj(Div) with a non-zero value. * Removes the exceptions and routes the memory to the NoMem node. */ -static ir_node *transform_node_Proj_Div(ir_node *proj) { +static ir_node *transform_node_Proj_Div(ir_node *proj) +{ ir_node *div = get_Proj_pred(proj); ir_node *b = get_Div_right(div); ir_node *res, *new_mem; @@ -3813,14 +3887,17 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) { case pn_Div_X_regular: return new_r_Jmp(get_nodes_block(div)); - case pn_Div_X_except: + case pn_Div_X_except: { + ir_graph *irg = get_irn_irg(proj); /* we found an exception handler, remove it */ DBG_OPT_EXC_REM(proj); - return new_Bad(); + return new_r_Bad(irg); + } - case pn_Div_M: + case pn_Div_M: { + ir_graph *irg = get_irn_irg(proj); res = get_Div_mem(div); - new_mem = get_irg_no_mem(current_ir_graph); + new_mem = get_irg_no_mem(irg); if (confirm) { /* This node can only float up to the Confirm block */ @@ -3831,6 +3908,7 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) { set_Div_mem(div, new_mem); return res; } + } } return proj; } /* transform_node_Proj_Div */ @@ -3839,7 +3917,8 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) { * Transform a Proj(Mod) with a non-zero value. * Removes the exceptions and routes the memory to the NoMem node. */ -static ir_node *transform_node_Proj_Mod(ir_node *proj) { +static ir_node *transform_node_Proj_Mod(ir_node *proj) +{ ir_node *mod = get_Proj_pred(proj); ir_node *b = get_Mod_right(mod); ir_node *res, *new_mem; @@ -3863,14 +3942,17 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { case pn_Mod_X_regular: return new_r_Jmp(get_irn_n(mod, -1)); - case pn_Mod_X_except: + case pn_Mod_X_except: { + ir_graph *irg = get_irn_irg(proj); /* we found an exception handler, remove it */ DBG_OPT_EXC_REM(proj); - return new_Bad(); + return new_r_Bad(irg); + } - case pn_Mod_M: + case pn_Mod_M: { + ir_graph *irg = get_irn_irg(proj); res = get_Mod_mem(mod); - new_mem = get_irg_no_mem(current_ir_graph); + new_mem = get_irg_no_mem(irg); if (confirm) { /* This node can only float up to the Confirm block */ @@ -3879,11 +3961,13 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { /* this is a Mod without exception, we can remove the memory edge */ set_Mod_mem(mod, new_mem); return res; + } case pn_Mod_res: if (get_Mod_left(mod) == b) { /* a % a = 0 if a != 0 */ - ir_mode *mode = get_irn_mode(proj); - ir_node *res = new_Const(get_mode_null(mode)); + ir_graph *irg = get_irn_irg(proj); + ir_mode *mode = get_irn_mode(proj); + ir_node *res = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(mod, res); return res; @@ -3897,7 +3981,8 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { * Transform a Proj(DivMod) with a non-zero value. * Removes the exceptions and routes the memory to the NoMem node. */ -static ir_node *transform_node_Proj_DivMod(ir_node *proj) { +static ir_node *transform_node_Proj_DivMod(ir_node *proj) +{ ir_node *divmod = get_Proj_pred(proj); ir_node *b = get_DivMod_right(divmod); ir_node *res, *new_mem; @@ -3921,14 +4006,17 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) { case pn_DivMod_X_regular: return new_r_Jmp(get_nodes_block(divmod)); - case pn_DivMod_X_except: + case pn_DivMod_X_except: { /* we found an exception handler, remove it */ + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return new_Bad(); + return new_r_Bad(irg); + } - case pn_DivMod_M: + case pn_DivMod_M: { + ir_graph *irg = get_irn_irg(proj); res = get_DivMod_mem(divmod); - new_mem = get_irg_no_mem(current_ir_graph); + new_mem = get_irg_no_mem(irg); if (confirm) { /* This node can only float up to the Confirm block */ @@ -3937,12 +4025,14 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) { /* this is a DivMod without exception, we can remove the memory edge */ set_DivMod_mem(divmod, new_mem); return res; + } case pn_DivMod_res_mod: if (get_DivMod_left(divmod) == b) { /* a % a = 0 if a != 0 */ - ir_mode *mode = get_irn_mode(proj); - ir_node *res = new_Const(get_mode_null(mode)); + ir_graph *irg = get_irn_irg(proj); + ir_mode *mode = get_irn_mode(proj); + ir_node *res = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(divmod, res); return res; @@ -3955,13 +4045,14 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) { /** * Optimizes jump tables (CondIs or CondIu) by removing all impossible cases. */ -static ir_node *transform_node_Proj_Cond(ir_node *proj) { +static ir_node *transform_node_Proj_Cond(ir_node *proj) +{ if (get_opt_unreachable_code()) { ir_node *n = get_Proj_pred(proj); ir_node *b = get_Cond_selector(n); if (mode_is_int(get_irn_mode(b))) { - tarval *tb = value_of(b); + ir_tarval *tb = value_of(b); if (tb != tarval_bad) { /* we have a constant switch */ @@ -3973,9 +4064,57 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) { * in a block. This case is optimized away in optimize_cf(). */ return proj; } else { + ir_graph *irg = get_irn_irg(proj); /* this case will NEVER be taken, kill it */ - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); + } + } + } else { + long num = get_Proj_proj(proj); + vrp_attr *b_vrp = vrp_get_info(b); + if (num != get_Cond_default_proj(n) && b_vrp) { + /* Try handling with vrp data. We only remove dead parts. */ + ir_tarval *tp = new_tarval_from_long(num, get_irn_mode(b)); + + if (b_vrp->range_type == VRP_RANGE) { + pn_Cmp cmp_result = tarval_cmp(b_vrp->range_bottom, tp); + pn_Cmp cmp_result2 = tarval_cmp(b_vrp->range_top, tp); + + if ((cmp_result & pn_Cmp_Gt) == cmp_result && (cmp_result2 + & pn_Cmp_Lt) == cmp_result2) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); + } + } else if (b_vrp->range_type == VRP_ANTIRANGE) { + pn_Cmp cmp_result = tarval_cmp(b_vrp->range_bottom, tp); + pn_Cmp cmp_result2 = tarval_cmp(b_vrp->range_top, tp); + + if ((cmp_result & pn_Cmp_Le) == cmp_result && (cmp_result2 + & pn_Cmp_Ge) == cmp_result2) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); + } + } + + if (!(tarval_cmp( + tarval_and( b_vrp->bits_set, tp), + b_vrp->bits_set + ) == pn_Cmp_Eq)) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); + } + + if (!(tarval_cmp( + tarval_and( + tarval_not(tp), + tarval_not(b_vrp->bits_not_set)), + tarval_not(b_vrp->bits_not_set)) + == pn_Cmp_Eq)) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); } + + } } } @@ -3986,61 +4125,42 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) { /** * Create a 0 constant of given mode. */ -static ir_node *create_zero_const(ir_mode *mode) { - tarval *tv = get_mode_null(mode); - ir_node *cnst = new_Const(tv); - - return cnst; -} - -/* the order of the values is important! */ -typedef enum const_class { - const_const = 0, - const_like = 1, - const_other = 2 -} const_class; - -static const_class classify_const(const ir_node* n) +static ir_node *create_zero_const(ir_graph *irg, ir_mode *mode) { - if (is_Const(n)) return const_const; - if (is_irn_constlike(n)) return const_like; - return const_other; -} + ir_tarval *tv = get_mode_null(mode); + ir_node *cnst = new_r_Const(irg, tv); -/** - * Determines whether r is more constlike or has a larger index (in that order) - * than l. - */ -static int operands_are_normalized(const ir_node *l, const ir_node *r) -{ - const const_class l_order = classify_const(l); - const const_class r_order = classify_const(r); - return - l_order > r_order || - (l_order == r_order && get_irn_idx(l) <= get_irn_idx(r)); + return cnst; } /** * Normalizes and optimizes Cmp nodes. */ -static ir_node *transform_node_Proj_Cmp(ir_node *proj) { - ir_node *n = get_Proj_pred(proj); - ir_node *left = get_Cmp_left(n); - ir_node *right = get_Cmp_right(n); - tarval *tv = NULL; +static ir_node *transform_node_Proj_Cmp(ir_node *proj) +{ + ir_node *n = get_Proj_pred(proj); + ir_node *left = get_Cmp_left(n); + ir_node *right = get_Cmp_right(n); + ir_tarval *tv = NULL; int changed = 0; ir_mode *mode = NULL; long proj_nr = get_Proj_proj(proj); /* we can evaluate some cases directly */ switch (proj_nr) { - case pn_Cmp_False: - return new_Const(get_tarval_b_false()); - case pn_Cmp_True: - return new_Const(get_tarval_b_true()); + case pn_Cmp_False: { + ir_graph *irg = get_irn_irg(proj); + return new_r_Const(irg, get_tarval_b_false()); + } + case pn_Cmp_True: { + ir_graph *irg = get_irn_irg(proj); + return new_r_Const(irg, get_tarval_b_true()); + } case pn_Cmp_Leg: - if (!mode_is_float(get_irn_mode(left))) - return new_Const(get_tarval_b_true()); + if (!mode_is_float(get_irn_mode(left))) { + ir_graph *irg = get_irn_irg(proj); + return new_r_Const(irg, get_tarval_b_true()); + } break; default: break; @@ -4181,8 +4301,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { lr = tmp; } if (ll == right) { + ir_graph *irg = get_irn_irg(n); left = lr; - right = create_zero_const(get_irn_mode(left)); + right = create_zero_const(irg, get_irn_mode(left)); changed |= 1; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } @@ -4197,8 +4318,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { rr = tmp; } if (rl == left) { + ir_graph *irg = get_irn_irg(n); left = rr; - right = create_zero_const(get_irn_mode(left)); + right = create_zero_const(irg, get_irn_mode(left)); changed |= 1; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } @@ -4214,19 +4336,27 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { ir_node *llr = get_Shr_right(ll); if (is_Const(llr)) { dbg_info *dbg = get_irn_dbg_info(left); + ir_graph *irg = get_irn_irg(left); - tarval *c1 = get_Const_tarval(llr); - tarval *c2 = get_Const_tarval(lr); - tarval *c3 = get_Const_tarval(right); - tarval *mask = tarval_shl(c2, c1); - tarval *value = tarval_shl(c3, c1); + ir_tarval *c1 = get_Const_tarval(llr); + ir_tarval *c2 = get_Const_tarval(lr); + ir_tarval *c3 = get_Const_tarval(right); + ir_tarval *mask = tarval_shl(c2, c1); + ir_tarval *value = tarval_shl(c3, c1); - left = new_rd_And(dbg, block, get_Shr_left(ll), new_Const(mask), mode); - right = new_Const(value); + left = new_rd_And(dbg, block, get_Shr_left(ll), new_r_Const(irg, mask), mode); + right = new_r_Const(irg, value); changed |= 1; } } } + /* Cmp(Eor(x, y), 0) <=> Cmp(x, y) at least for the ==0,!=0 + * cases */ + if (is_Const(right) && is_Const_null(right) && is_Eor(left)) { + right = get_Eor_right(left); + left = get_Eor_left(left); + changed |= 1; + } } /* mode_is_int(...) */ } /* proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg */ @@ -4283,7 +4413,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { /* * UpConv(x) REL 0 ==> x REL 0 * Don't do this for float values as it's unclear whether it is a - * win. (on the other side it makes detection/creation of fabs hard) + * win. (on the other side it makes detection/creation of fabs hard) */ if (get_mode_size_bits(mode) > get_mode_size_bits(op_mode) && ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) || @@ -4379,7 +4509,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { /* a-c1 == c2 ==> a == c2+c1, a-c1 != c2 ==> a != c2+c1 */ if (is_Sub(left)) { ir_node *c1 = get_Sub_right(left); - tarval *tv2 = value_of(c1); + ir_tarval *tv2 = value_of(c1); if (tv2 != tarval_bad) { tv2 = tarval_add(tv, value_of(c1)); @@ -4397,7 +4527,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { ir_node *a_l = get_Add_left(left); ir_node *a_r = get_Add_right(left); ir_node *a; - tarval *tv2; + ir_tarval *tv2; if (is_Const(a_l)) { a = a_r; @@ -4420,7 +4550,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { } /* -a == c ==> a == -c, -a != c ==> a != -c */ else if (is_Minus(left)) { - tarval *tv2 = tarval_sub(get_mode_null(mode), tv, NULL); + ir_tarval *tv2 = tarval_sub(get_mode_null(mode), tv, NULL); if (tv2 != tarval_bad) { left = get_Minus_op(left); @@ -4431,14 +4561,6 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { } } } /* == or != */ - /* the following reassociations work only for <= */ - else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) { - if (tv != tarval_bad) { - /* c >= 0 : Abs(a) <= c ==> (unsigned)(a + c) <= 2*c */ - if (is_Abs(left)) { // TODO something is missing here - } - } - } } /* mode_is_int */ if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) { @@ -4452,11 +4574,12 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { * And(x, C1) == C2 ==> FALSE if C2 & C1 != C2 * And(x, C1) != C2 ==> TRUE if C2 & C1 != C2 */ - tarval *mask = tarval_and(get_Const_tarval(c1), tv); + ir_tarval *mask = tarval_and(get_Const_tarval(c1), tv); if (mask != tv) { /* TODO: move to constant evaluation */ + ir_graph *irg = get_irn_irg(n); tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); + c1 = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(proj, c1); return c1; } @@ -4492,8 +4615,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { */ if (! tarval_is_null(get_Const_tarval(c1))) { /* TODO: move to constant evaluation */ + ir_graph *irg = get_irn_irg(n); tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); + c1 = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(proj, c1); return c1; } @@ -4508,23 +4632,24 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { */ c1 = get_Shl_right(left); if (is_Const(c1)) { - tarval *tv1 = get_Const_tarval(c1); - ir_mode *mode = get_irn_mode(left); - tarval *minus1 = get_mode_all_one(mode); - tarval *amask = tarval_shr(minus1, tv1); - tarval *cmask = tarval_shl(minus1, tv1); - ir_node *sl, *blk; + ir_graph *irg = get_irn_irg(c1); + ir_tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + ir_tarval *minus1 = get_mode_all_one(mode); + ir_tarval *amask = tarval_shr(minus1, tv1); + ir_tarval *cmask = tarval_shl(minus1, tv1); + ir_node *sl, *blk; if (tarval_and(tv, cmask) != tv) { /* condition not met */ tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); + c1 = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(proj, c1); return c1; } sl = get_Shl_left(left); blk = get_nodes_block(n); - left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode); + left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_r_Const(irg, amask), mode); tv = tarval_shr(tv, tv1); changed |= 2; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); @@ -4539,23 +4664,24 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { */ c1 = get_Shr_right(left); if (is_Const(c1)) { - tarval *tv1 = get_Const_tarval(c1); - ir_mode *mode = get_irn_mode(left); - tarval *minus1 = get_mode_all_one(mode); - tarval *amask = tarval_shl(minus1, tv1); - tarval *cmask = tarval_shr(minus1, tv1); - ir_node *sl, *blk; + ir_graph *irg = get_irn_irg(c1); + ir_tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + ir_tarval *minus1 = get_mode_all_one(mode); + ir_tarval *amask = tarval_shl(minus1, tv1); + ir_tarval *cmask = tarval_shr(minus1, tv1); + ir_node *sl, *blk; if (tarval_and(tv, cmask) != tv) { /* condition not met */ tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); + c1 = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(proj, c1); return c1; } sl = get_Shr_left(left); blk = get_nodes_block(n); - left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode); + left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_r_Const(irg, amask), mode); tv = tarval_shl(tv, tv1); changed |= 2; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); @@ -4570,11 +4696,12 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { */ c1 = get_Shrs_right(left); if (is_Const(c1)) { - tarval *tv1 = get_Const_tarval(c1); - ir_mode *mode = get_irn_mode(left); - tarval *minus1 = get_mode_all_one(mode); - tarval *amask = tarval_shl(minus1, tv1); - tarval *cond = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1)); + ir_graph *irg = get_irn_irg(c1); + ir_tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + ir_tarval *minus1 = get_mode_all_one(mode); + ir_tarval *amask = tarval_shl(minus1, tv1); + ir_tarval *cond = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1)); ir_node *sl, *blk; cond = tarval_sub(cond, tv1, NULL); @@ -4583,13 +4710,13 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { if (!tarval_is_all_one(cond) && !tarval_is_null(cond)) { /* condition not met */ tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); + c1 = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(proj, c1); return c1; } sl = get_Shrs_left(left); blk = get_nodes_block(n); - left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode); + left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_r_Const(irg, amask), mode); tv = tarval_shl(tv, tv1); changed |= 2; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); @@ -4600,8 +4727,10 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { } /* tarval != bad */ } - if (changed & 2) /* need a new Const */ - right = new_Const(tv); + if (changed & 2) { /* need a new Const */ + ir_graph *irg = get_irn_irg(n); + right = new_r_Const(irg, tv); + } if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_Const(right) && is_Const_null(right) && is_Proj(left)) { ir_node *op = get_Proj_pred(left); @@ -4611,16 +4740,17 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { ir_node *c = get_binop_right(op); if (is_Const(c)) { - tarval *tv = get_Const_tarval(c); + ir_tarval *tv = get_Const_tarval(c); if (tarval_is_single_bit(tv)) { /* special case: (x % 2^n) CMP 0 ==> x & (2^n-1) CMP 0 */ ir_node *v = get_binop_left(op); ir_node *blk = get_irn_n(op, -1); + ir_graph *irg = get_irn_irg(op); ir_mode *mode = get_irn_mode(v); tv = tarval_sub(tv, get_mode_one(mode), NULL); - left = new_rd_And(get_irn_dbg_info(op), blk, v, new_Const(tv), mode); + left = new_rd_And(get_irn_dbg_info(op), blk, v, new_r_Const(irg, tv), mode); changed |= 1; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_MOD_TO_AND); } @@ -4633,7 +4763,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { /* create a new compare */ n = new_rd_Cmp(get_irn_dbg_info(n), block, left, right); - proj = new_rd_Proj(get_irn_dbg_info(proj), block, n, get_irn_mode(proj), proj_nr); + proj = new_rd_Proj(get_irn_dbg_info(proj), n, get_irn_mode(proj), proj_nr); } return proj; @@ -4642,7 +4772,8 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { /** * Optimize CopyB(mem, x, x) into a Nop. */ -static ir_node *transform_node_Proj_CopyB(ir_node *proj) { +static ir_node *transform_node_Proj_CopyB(ir_node *proj) +{ ir_node *copyb = get_Proj_pred(proj); ir_node *a = get_CopyB_dst(copyb); ir_node *b = get_CopyB_src(copyb); @@ -4668,7 +4799,8 @@ static ir_node *transform_node_Proj_CopyB(ir_node *proj) { /** * Optimize Bounds(idx, idx, upper) into idx. */ -static ir_node *transform_node_Proj_Bound(ir_node *proj) { +static ir_node *transform_node_Proj_Bound(ir_node *proj) +{ ir_node *oldn = proj; ir_node *bound = get_Proj_pred(proj); ir_node *idx = get_Bound_index(bound); @@ -4679,14 +4811,13 @@ static ir_node *transform_node_Proj_Bound(ir_node *proj) { ret_tuple = 1; else if (is_Bound(pred)) { /* - * idx was Bounds checked in the same MacroBlock previously, - * it is still valid if lower <= pred_lower && pred_upper <= upper. + * idx was Bounds checked previously, it is still valid if + * lower <= pred_lower && pred_upper <= upper. */ ir_node *lower = get_Bound_lower(bound); ir_node *upper = get_Bound_upper(bound); if (get_Bound_lower(pred) == lower && - get_Bound_upper(pred) == upper && - get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) { + get_Bound_upper(pred) == upper) { /* * One could expect that we simply return the previous * Bound here. However, this would be wrong, as we could @@ -4726,7 +4857,8 @@ static ir_node *transform_node_Proj_Bound(ir_node *proj) { * Does all optimizations on nodes that must be done on it's Proj's * because of creating new nodes. */ -static ir_node *transform_node_Proj(ir_node *proj) { +static ir_node *transform_node_Proj(ir_node *proj) +{ ir_node *n = get_Proj_pred(proj); if (n->op->ops.transform_node_Proj) @@ -4737,7 +4869,8 @@ static ir_node *transform_node_Proj(ir_node *proj) { /** * Move Confirms down through Phi nodes. */ -static ir_node *transform_node_Phi(ir_node *phi) { +static ir_node *transform_node_Phi(ir_node *phi) +{ int i, n; ir_mode *mode = get_irn_mode(phi); @@ -4747,7 +4880,7 @@ static ir_node *transform_node_Phi(ir_node *phi) { /* Beware of Phi0 */ if (n > 0) { ir_node *pred = get_irn_n(phi, 0); - ir_node *bound, *new_Phi, *block, **in; + ir_node *bound, *new_phi, *block, **in; pn_Cmp pnc; if (! is_Confirm(pred)) @@ -4770,8 +4903,8 @@ static ir_node *transform_node_Phi(ir_node *phi) { } /* move the Confirm nodes "behind" the Phi */ block = get_irn_n(phi, -1); - new_Phi = new_r_Phi(block, n, in, get_irn_mode(phi)); - return new_r_Confirm(block, new_Phi, bound, pnc); + new_phi = new_r_Phi(block, n, in, get_irn_mode(phi)); + return new_r_Confirm(block, new_phi, bound, pnc); } } return phi; @@ -4781,7 +4914,8 @@ static ir_node *transform_node_Phi(ir_node *phi) { * Returns the operands of a commutative bin-op, if one operand is * a const, it is returned as the second one. */ -static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) { +static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) +{ ir_node *op_a = get_binop_left(binop); ir_node *op_b = get_binop_right(binop); @@ -4811,7 +4945,8 @@ static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) { * AND c1 ===> OR if (c1 | c2) == 0x111..11 * OR */ -static ir_node *transform_node_Or_bf_store(ir_node *or) { +static ir_node *transform_node_Or_bf_store(ir_node *or) +{ ir_node *and, *c1; ir_node *or_l, *c2; ir_node *and_l, *c3; @@ -4819,9 +4954,10 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) { ir_node *new_and, *new_const, *block; ir_mode *mode = get_irn_mode(or); - tarval *tv1, *tv2, *tv3, *tv4, *tv; + ir_tarval *tv1, *tv2, *tv3, *tv4, *tv; - while (1) { + for (;;) { + ir_graph *irg; get_comm_Binop_Ops(or, &and, &c1); if (!is_Const(c1) || !is_And(and)) return or; @@ -4880,10 +5016,11 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) { /* ok, all conditions met */ block = get_irn_n(or, -1); + irg = get_irn_irg(block); - new_and = new_r_And(block, value, new_Const(tarval_and(tv4, tv2)), mode); + new_and = new_r_And(block, value, new_r_Const(irg, tarval_and(tv4, tv2)), mode); - new_const = new_Const(tarval_or(tv3, tv1)); + new_const = new_r_Const(irg, tarval_or(tv3, tv1)); set_Or_left(or, new_and); set_Or_right(or, new_const); @@ -4895,11 +5032,16 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) { /** * Optimize an Or(shl(x, c), shr(x, bits - c)) into a Rotl */ -static ir_node *transform_node_Or_Rotl(ir_node *or) { +static ir_node *transform_node_Or_Rotl(ir_node *or) +{ ir_mode *mode = get_irn_mode(or); ir_node *shl, *shr, *block; - ir_node *irn, *x, *c1, *c2, *v, *sub, *n, *rotval; - tarval *tv1, *tv2; + ir_node *irn, *x, *c1, *c2, *n; + ir_tarval *tv1, *tv2; + + /* some backends can't handle rotl */ + if (!be_get_backend_param()->support_rotl) + return or; if (! mode_is_int(mode)) return or; @@ -4947,35 +5089,15 @@ static ir_node *transform_node_Or_Rotl(ir_node *or) { return n; } - if (is_Sub(c1)) { - v = c2; - sub = c1; - rotval = sub; /* a Rot right is not supported, so use a rot left */ - } else if (is_Sub(c2)) { - v = c1; - sub = c2; - rotval = v; - } else return or; - - if (get_Sub_right(sub) != v) - return or; - - c1 = get_Sub_left(sub); - if (!is_Const(c1)) - return or; - - tv1 = get_Const_tarval(c1); - if (! tarval_is_long(tv1)) - return or; - - if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode)) + /* Note: the obvious rot formulation (a << x) | (a >> (32-x)) gets + * transformed to (a << x) | (a >> -x) by transform_node_shift_modulo() */ + if (!is_negated_value(c1, c2)) { return or; + } /* yet, condition met */ block = get_nodes_block(or); - - n = new_r_Rotl(block, x, rotval, mode); - + n = new_r_Rotl(block, x, c1, mode); DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROTL); return n; } /* transform_node_Or_Rotl */ @@ -4983,7 +5105,8 @@ static ir_node *transform_node_Or_Rotl(ir_node *or) { /** * Transform an Or. */ -static ir_node *transform_node_Or(ir_node *n) { +static ir_node *transform_node_Or(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_Or_left(n); ir_node *b = get_Or_right(n); @@ -5008,13 +5131,12 @@ static ir_node *transform_node_Or(ir_node *n) { ir_node *pred_b = get_Proj_pred(b); if (pred_a == pred_b) { dbg_info *dbgi = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(pred_a); pn_Cmp pn_a = get_Proj_proj(a); pn_Cmp pn_b = get_Proj_proj(b); /* yes, we can simply calculate with pncs */ pn_Cmp new_pnc = pn_a | pn_b; - return new_rd_Proj(dbgi, block, pred_a, mode_b, new_pnc); + return new_rd_Proj(dbgi, pred_a, mode_b, new_pnc); } } @@ -5040,11 +5162,13 @@ static ir_node *transform_node(ir_node *n); * * Should be moved to reassociation? */ -static ir_node *transform_node_shift(ir_node *n) { +static ir_node *transform_node_shift(ir_node *n) +{ ir_node *left, *right; ir_mode *mode; - tarval *tv1, *tv2, *res; + ir_tarval *tv1, *tv2, *res; ir_node *in[2], *irn, *block; + ir_graph *irg; left = get_binop_left(n); @@ -5063,13 +5187,14 @@ static ir_node *transform_node_shift(ir_node *n) { res = tarval_add(tv1, tv2); mode = get_irn_mode(n); + irg = get_irn_irg(n); /* beware: a simple replacement works only, if res < modulo shift */ if (!is_Rotl(n)) { int modulo_shf = get_mode_modulo_shift(mode); if (modulo_shf > 0) { - tarval *modulo = new_tarval_from_long(modulo_shf, - get_tarval_mode(res)); + ir_tarval *modulo = new_tarval_from_long(modulo_shf, + get_tarval_mode(res)); assert(modulo_shf >= (int) get_mode_size_bits(mode)); @@ -5079,11 +5204,11 @@ static ir_node *transform_node_shift(ir_node *n) { ir_node *block = get_nodes_block(n); dbg_info *dbgi = get_irn_dbg_info(n); ir_mode *smode = get_irn_mode(right); - ir_node *cnst = new_Const_long(smode, get_mode_size_bits(mode) - 1); + ir_node *cnst = new_r_Const_long(irg, smode, get_mode_size_bits(mode) - 1); return new_rd_Shrs(dbgi, block, get_binop_left(left), cnst, mode); } - return new_Const(get_mode_null(mode)); + return new_r_Const(irg, get_mode_null(mode)); } } } else { @@ -5094,7 +5219,7 @@ static ir_node *transform_node_shift(ir_node *n) { block = get_nodes_block(n); in[0] = get_binop_left(left); - in[1] = new_Const(res); + in[1] = new_r_Const(irg, res); irn = new_ir_node(NULL, get_Block_irg(block), block, get_irn_op(n), mode, 2, in); @@ -5110,21 +5235,23 @@ static ir_node *transform_node_shift(ir_node *n) { * - Shl, Shr, Shrs, rotl instead of >> * (with a special case for Or/Xor + Shrs) */ -static ir_node *transform_node_bitop_shift(ir_node *n) { - ir_node *left; - ir_node *right = get_binop_right(n); - ir_mode *mode = get_irn_mode(n); - ir_node *bitop_left; - ir_node *bitop_right; - ir_op *op_left; - ir_node *block; - dbg_info *dbgi; - ir_node *new_shift; - ir_node *new_bitop; - ir_node *new_const; - tarval *tv1; - tarval *tv2; - tarval *tv_shift; +static ir_node *transform_node_bitop_shift(ir_node *n) +{ + ir_node *left; + ir_node *right = get_binop_right(n); + ir_mode *mode = get_irn_mode(n); + ir_node *bitop_left; + ir_node *bitop_right; + ir_op *op_left; + ir_node *block; + dbg_info *dbgi; + ir_graph *irg; + ir_node *new_shift; + ir_node *new_bitop; + ir_node *new_const; + ir_tarval *tv1; + ir_tarval *tv2; + ir_tarval *tv_shift; assert(is_Shrs(n) || is_Shr(n) || is_Shl(n) || is_Rotl(n)); @@ -5158,10 +5285,10 @@ static ir_node *transform_node_bitop_shift(ir_node *n) { if (is_Shl(n)) { new_shift = new_rd_Shl(dbgi, block, bitop_left, right, mode); tv_shift = tarval_shl(tv1, tv2); - } else if(is_Shr(n)) { + } else if (is_Shr(n)) { new_shift = new_rd_Shr(dbgi, block, bitop_left, right, mode); tv_shift = tarval_shr(tv1, tv2); - } else if(is_Shrs(n)) { + } else if (is_Shrs(n)) { new_shift = new_rd_Shrs(dbgi, block, bitop_left, right, mode); tv_shift = tarval_shrs(tv1, tv2); } else { @@ -5171,11 +5298,12 @@ static ir_node *transform_node_bitop_shift(ir_node *n) { } assert(get_tarval_mode(tv_shift) == mode); - new_const = new_Const(tv_shift); + irg = get_irn_irg(n); + new_const = new_r_Const(irg, tv_shift); if (op_left == op_And) { new_bitop = new_rd_And(dbgi, block, new_shift, new_const, mode); - } else if(op_left == op_Or) { + } else if (op_left == op_Or) { new_bitop = new_rd_Or(dbgi, block, new_shift, new_const, mode); } else { assert(op_left == op_Eor); @@ -5192,23 +5320,24 @@ static ir_node *transform_node_bitop_shift(ir_node *n) { * (x >> c1) << c2 <=> x OP (c2-c1) & ((-1 >> c1) << c2) * (also with x >>s c1 when c1>=c2) */ -static ir_node *transform_node_shl_shr(ir_node *n) { - ir_node *left; - ir_node *right = get_binop_right(n); - ir_node *x; - ir_graph *irg; - ir_node *block; - ir_mode *mode; - dbg_info *dbgi; - ir_node *new_const; - ir_node *new_shift; - ir_node *new_and; - tarval *tv_shl; - tarval *tv_shr; - tarval *tv_shift; - tarval *tv_mask; - pn_Cmp pnc; - int need_shrs = 0; +static ir_node *transform_node_shl_shr(ir_node *n) +{ + ir_node *left; + ir_node *right = get_binop_right(n); + ir_node *x; + ir_node *block; + ir_mode *mode; + dbg_info *dbgi; + ir_node *new_const; + ir_node *new_shift; + ir_node *new_and; + ir_tarval *tv_shl; + ir_tarval *tv_shr; + ir_tarval *tv_shift; + ir_tarval *tv_mask; + ir_graph *irg; + pn_Cmp pnc; + int need_shrs = 0; assert(is_Shl(n) || is_Shr(n) || is_Shrs(n)); @@ -5238,7 +5367,7 @@ static ir_node *transform_node_shl_shr(ir_node *n) { tv_mask = tarval_shr(get_mode_all_one(mode), tv_shr); } tv_mask = tarval_shl(tv_mask, tv_shl); - } else if(is_Shr(n) && is_Shl(left)) { + } else if (is_Shr(n) && is_Shl(left)) { ir_node *shl_right = get_Shl_right(left); if (!is_Const(shl_right)) @@ -5261,14 +5390,14 @@ static ir_node *transform_node_shl_shr(ir_node *n) { assert(tv_mask != tarval_bad); assert(get_tarval_mode(tv_mask) == mode); - irg = get_irn_irg(n); block = get_nodes_block(n); + irg = get_irn_irg(block); dbgi = get_irn_dbg_info(n); pnc = tarval_cmp(tv_shl, tv_shr); if (pnc == pn_Cmp_Lt || pnc == pn_Cmp_Eq) { tv_shift = tarval_sub(tv_shr, tv_shl, NULL); - new_const = new_Const(tv_shift); + new_const = new_r_Const(irg, tv_shift); if (need_shrs) { new_shift = new_rd_Shrs(dbgi, block, x, new_const, mode); } else { @@ -5277,20 +5406,106 @@ static ir_node *transform_node_shl_shr(ir_node *n) { } else { assert(pnc == pn_Cmp_Gt); tv_shift = tarval_sub(tv_shl, tv_shr, NULL); - new_const = new_Const(tv_shift); + new_const = new_r_Const(irg, tv_shift); new_shift = new_rd_Shl(dbgi, block, x, new_const, mode); } - new_const = new_Const(tv_mask); + new_const = new_r_Const(irg, tv_mask); new_and = new_rd_And(dbgi, block, new_shift, new_const, mode); return new_and; } +static ir_tarval *get_modulo_tv_value(ir_tarval *tv, int modulo_val) +{ + ir_mode *mode = get_tarval_mode(tv); + ir_tarval *modulo_tv = new_tarval_from_long(modulo_val, mode); + return tarval_mod(tv, modulo_tv); +} + +typedef ir_node*(*new_shift_func)(dbg_info *dbgi, ir_node *block, + ir_node *left, ir_node *right, ir_mode *mode); + +/** + * Normalisation: if we have a shl/shr with modulo_shift behaviour + * then we can use that to minimize the value of Add(x, const) or + * Sub(Const, x). In particular this often avoids 1 instruction in some + * backends for the Shift(x, Sub(Const, y)) case because it can be replaced + * by Shift(x, Minus(y)) which doesnt't need an explicit Const constructed. + */ +static ir_node *transform_node_shift_modulo(ir_node *n, + new_shift_func new_shift) +{ + ir_mode *mode = get_irn_mode(n); + int modulo = get_mode_modulo_shift(mode); + ir_node *newop = NULL; + ir_mode *mode_right; + ir_node *block; + ir_node *right; + ir_graph *irg; + + if (modulo == 0) + return n; + if (get_mode_arithmetic(mode) != irma_twos_complement) + return n; + if (!is_po2(modulo)) + return n; + + irg = get_irn_irg(n); + block = get_nodes_block(n); + right = get_binop_right(n); + mode_right = get_irn_mode(right); + if (is_Const(right)) { + ir_tarval *tv = get_Const_tarval(right); + ir_tarval *tv_mod = get_modulo_tv_value(tv, modulo); + + if (tv_mod == tv) + return n; + + newop = new_r_Const(irg, tv_mod); + } else if (is_Add(right)) { + ir_node *add_right = get_Add_right(right); + if (is_Const(add_right)) { + ir_tarval *tv = get_Const_tarval(add_right); + ir_tarval *tv_mod = get_modulo_tv_value(tv, modulo); + ir_node *newconst; + if (tv_mod == tv) + return n; + + newconst = new_r_Const(irg, tv_mod); + newop = new_r_Add(block, get_Add_left(right), newconst, + mode_right); + } + } else if (is_Sub(right)) { + ir_node *sub_left = get_Sub_left(right); + if (is_Const(sub_left)) { + ir_tarval *tv = get_Const_tarval(sub_left); + ir_tarval *tv_mod = get_modulo_tv_value(tv, modulo); + ir_node *newconst; + if (tv_mod == tv) + return n; + + newconst = new_r_Const(irg, tv_mod); + newop = new_r_Sub(block, newconst, get_Sub_right(right), + mode_right); + } + } else { + return n; + } + + if (newop != NULL) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *left = get_binop_left(n); + return new_shift(dbgi, block, left, newop, mode); + } + return n; +} + /** * Transform a Shr. */ -static ir_node *transform_node_Shr(ir_node *n) { +static ir_node *transform_node_Shr(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *left = get_Shr_left(n); ir_node *right = get_Shr_right(n); @@ -5299,6 +5514,8 @@ static ir_node *transform_node_Shr(ir_node *n) { HANDLE_BINOP_PHI((eval_func) tarval_shr, left, right, c, mode); n = transform_node_shift(n); + if (is_Shr(n)) + n = transform_node_shift_modulo(n, new_rd_Shr); if (is_Shr(n)) n = transform_node_shl_shr(n); if (is_Shr(n)) @@ -5310,7 +5527,8 @@ static ir_node *transform_node_Shr(ir_node *n) { /** * Transform a Shrs. */ -static ir_node *transform_node_Shrs(ir_node *n) { +static ir_node *transform_node_Shrs(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_Shrs_left(n); ir_node *b = get_Shrs_right(n); @@ -5319,6 +5537,8 @@ static ir_node *transform_node_Shrs(ir_node *n) { HANDLE_BINOP_PHI((eval_func) tarval_shrs, a, b, c, mode); n = transform_node_shift(n); + if (is_Shrs(n)) + n = transform_node_shift_modulo(n, new_rd_Shrs); if (is_Shrs(n)) n = transform_node_bitop_shift(n); @@ -5328,7 +5548,8 @@ static ir_node *transform_node_Shrs(ir_node *n) { /** * Transform a Shl. */ -static ir_node *transform_node_Shl(ir_node *n) { +static ir_node *transform_node_Shl(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_Shl_left(n); ir_node *b = get_Shl_right(n); @@ -5337,6 +5558,8 @@ static ir_node *transform_node_Shl(ir_node *n) { HANDLE_BINOP_PHI((eval_func) tarval_shl, a, b, c, mode); n = transform_node_shift(n); + if (is_Shl(n)) + n = transform_node_shift_modulo(n, new_rd_Shl); if (is_Shl(n)) n = transform_node_shl_shr(n); if (is_Shl(n)) @@ -5348,7 +5571,8 @@ static ir_node *transform_node_Shl(ir_node *n) { /** * Transform a Rotl. */ -static ir_node *transform_node_Rotl(ir_node *n) { +static ir_node *transform_node_Rotl(ir_node *n) +{ ir_node *c, *oldn = n; ir_node *a = get_Rotl_left(n); ir_node *b = get_Rotl_right(n); @@ -5366,7 +5590,8 @@ static ir_node *transform_node_Rotl(ir_node *n) { /** * Transform a Conv. */ -static ir_node *transform_node_Conv(ir_node *n) { +static ir_node *transform_node_Conv(ir_node *n) +{ ir_node *c, *oldn = n; ir_mode *mode = get_irn_mode(n); ir_node *a = get_Conv_op(n); @@ -5384,7 +5609,8 @@ static ir_node *transform_node_Conv(ir_node *n) { } if (is_Unknown(a)) { /* Conv_A(Unknown_B) -> Unknown_A */ - return new_r_Unknown(current_ir_graph, mode); + ir_graph *irg = get_irn_irg(n); + return new_r_Unknown(irg, mode); } if (mode_is_reference(mode) && @@ -5394,17 +5620,17 @@ static ir_node *transform_node_Conv(ir_node *n) { ir_node *r = get_Add_right(a); dbg_info *dbgi = get_irn_dbg_info(a); ir_node *block = get_nodes_block(n); - if(is_Conv(l)) { + if (is_Conv(l)) { ir_node *lop = get_Conv_op(l); - if(get_irn_mode(lop) == mode) { + if (get_irn_mode(lop) == mode) { /* ConvP(AddI(ConvI(P), x)) -> AddP(P, x) */ n = new_rd_Add(dbgi, block, lop, r, mode); return n; } } - if(is_Conv(r)) { + if (is_Conv(r)) { ir_node *rop = get_Conv_op(r); - if(get_irn_mode(rop) == mode) { + if (get_irn_mode(rop) == mode) { /* ConvP(AddI(x, ConvI(P))) -> AddP(x, P) */ n = new_rd_Add(dbgi, block, l, rop, mode); return n; @@ -5419,7 +5645,8 @@ static ir_node *transform_node_Conv(ir_node *n) { * Remove dead blocks and nodes in dead blocks * in keep alive list. We do not generate a new End node. */ -static ir_node *transform_node_End(ir_node *n) { +static ir_node *transform_node_End(ir_node *n) +{ int i, j, n_keepalives = get_End_n_keepalives(n); ir_node **in; @@ -5467,12 +5694,13 @@ bool is_negated_value(ir_node *a, ir_node *b) /** * Optimize a Mux into some simpler cases. */ -static ir_node *transform_node_Mux(ir_node *n) { +static ir_node *transform_node_Mux(ir_node *n) +{ ir_node *oldn = n, *sel = get_Mux_sel(n); ir_mode *mode = get_irn_mode(n); ir_node *t = get_Mux_true(n); ir_node *f = get_Mux_false(n); - ir_graph *irg = current_ir_graph; + ir_graph *irg = get_irn_irg(n); if (is_irg_state(irg, IR_GRAPH_STATE_KEEP_MUX)) return n; @@ -5531,23 +5759,22 @@ static ir_node *transform_node_Mux(ir_node *n) { } } - /* first normalization step: move a possible zero to the false case */ + /* first normalization step: try to move a constant to the false side, + * 0 preferred on false side too */ if (is_Proj(sel)) { ir_node *cmp = get_Proj_pred(sel); - if (is_Cmp(cmp)) { - if (is_Const(t) && is_Const_null(t)) { - ir_node *tmp; - - /* Mux(x, 0, y) => Mux(x, y, 0) */ - pn_Cmp pnc = get_Proj_proj(sel); - sel = new_r_Proj(get_nodes_block(cmp), cmp, mode_b, - get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp)))); - n = new_rd_Mux(get_irn_dbg_info(n), get_nodes_block(n), sel, t, f, mode); - tmp = t; - t = f; - f = tmp; - } + if (is_Cmp(cmp) && is_Const(t) && + (!is_Const(f) || (is_Const_null(t) && !is_Const_null(f)))) { + pn_Cmp pnc = get_Proj_proj(sel); + ir_node *tmp = t; + t = f; + f = tmp; + + /* Mux(x, a, b) => Mux(not(x), b, a) */ + sel = new_r_Proj(cmp, mode_b, + get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp)))); + n = new_rd_Mux(get_irn_dbg_info(n), get_nodes_block(n), sel, f, t, mode); } } @@ -5557,7 +5784,7 @@ static ir_node *transform_node_Mux(ir_node *n) { ir_node *block = get_nodes_block(n); if (is_Const(t)) { - tarval *tv_t = get_Const_tarval(t); + ir_tarval *tv_t = get_Const_tarval(t); if (tv_t == tarval_b_true) { if (is_Const(f)) { /* Muxb(sel, true, false) = sel */ @@ -5572,7 +5799,7 @@ static ir_node *transform_node_Mux(ir_node *n) { } } } else if (is_Const(f)) { - tarval *tv_f = get_Const_tarval(f); + ir_tarval *tv_f = get_Const_tarval(f); if (tv_f == tarval_b_true) { /* Muxb(sel, x, true) = Or(Not(sel), x) */ ir_node* not_sel = new_rd_Not(dbg, block, sel, mode_b); @@ -5589,11 +5816,11 @@ static ir_node *transform_node_Mux(ir_node *n) { } } - /* more normalization: try to normalize Mux(x, C1, C2) into Mux(x, +1/-1, 0) op C2 */ + /* more normalization: Mux(sel, 0, 1) is simply a conv from the mode_b + * value to integer. */ if (is_Const(t) && is_Const(f) && mode_is_int(mode)) { - tarval *a = get_Const_tarval(t); - tarval *b = get_Const_tarval(f); - tarval *diff, *min; + ir_tarval *a = get_Const_tarval(t); + ir_tarval *b = get_Const_tarval(f); if (tarval_is_one(a) && tarval_is_null(b)) { ir_node *block = get_nodes_block(n); @@ -5609,25 +5836,6 @@ static ir_node *transform_node_Mux(ir_node *n) { DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV); return n; } - /* TODO: it's not really clear if that helps in general or should be moved - * to backend, especially with the MUX->Conv transformation above */ - if (tarval_cmp(a, b) & pn_Cmp_Gt) { - diff = tarval_sub(a, b, NULL); - min = b; - } else { - diff = tarval_sub(b, a, NULL); - min = a; - } - - if (diff == get_tarval_one(mode)) { - dbg_info *dbg = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(n); - ir_node *t = new_Const(tarval_sub(a, min, NULL)); - ir_node *f = new_Const(tarval_sub(b, min, NULL)); - n = new_rd_Mux(dbg, block, sel, f, t, mode); - n = new_rd_Add(dbg, block, n, new_Const(min), mode); - return n; - } } if (is_Proj(sel)) { @@ -5637,11 +5845,6 @@ static ir_node *transform_node_Mux(ir_node *n) { /* * Note: normalization puts the constant on the right side, * so we check only one case. - * - * Note further that these optimization work even for floating point - * with NaN's because -NaN == NaN. - * However, if +0 and -0 is handled differently, we cannot use the Abs/-Abs - * transformations. */ if (is_Cmp(cmp)) { ir_node *cmp_r = get_Cmp_right(cmp); @@ -5649,30 +5852,6 @@ static ir_node *transform_node_Mux(ir_node *n) { ir_node *block = get_nodes_block(n); ir_node *cmp_l = get_Cmp_left(cmp); - if (!mode_honor_signed_zeros(mode) && is_negated_value(f, t)) { - /* f = -t */ - - /* NaN's work fine with abs, so it is ok to remove Uo */ - long pnc = pn & ~pn_Cmp_Uo; - - if ( (cmp_l == t && (pnc == pn_Cmp_Ge || pnc == pn_Cmp_Gt)) - || (cmp_l == f && (pnc == pn_Cmp_Le || pnc == pn_Cmp_Lt))) - { - /* Mux(a >/>= 0, a, -a) = Mux(a Abs(a) */ - n = new_rd_Abs(get_irn_dbg_info(n), block, cmp_l, mode); - DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS); - return n; - } else if ((cmp_l == t && (pnc == pn_Cmp_Le || pnc == pn_Cmp_Lt)) - || (cmp_l == f && (pnc == pn_Cmp_Ge || pnc == pn_Cmp_Gt))) - { - /* Mux(a />= 0, -a, a) ==> -Abs(a) */ - n = new_rd_Abs(get_irn_dbg_info(n), block, cmp_l, mode); - n = new_rd_Minus(get_irn_dbg_info(n), block, n, mode); - DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS); - return n; - } - } - if (mode_is_int(mode)) { /* integer only */ if ((pn == pn_Cmp_Lg || pn == pn_Cmp_Eq) && is_And(cmp_l)) { @@ -5745,7 +5924,8 @@ static ir_node *transform_node_Mux(ir_node *n) { * optimize Sync nodes that have other syncs as input we simply add the inputs * of the other sync to our own inputs */ -static ir_node *transform_node_Sync(ir_node *n) { +static ir_node *transform_node_Sync(ir_node *n) +{ int arity = get_Sync_n_preds(n); int i; @@ -5779,7 +5959,7 @@ static ir_node *transform_node_Sync(ir_node *n) { } /* rehash the sync node */ - add_identities(current_ir_graph->value_table, n); + add_identities(n); return n; } /* transform_node_Sync */ @@ -5787,10 +5967,12 @@ static ir_node *transform_node_Sync(ir_node *n) { /** * optimize a trampoline Call into a direct Call */ -static ir_node *transform_node_Call(ir_node *call) { +static ir_node *transform_node_Call(ir_node *call) +{ ir_node *callee = get_Call_ptr(call); ir_node *adr, *mem, *res, *bl, **in; ir_type *ctp, *mtp, *tp; + ir_graph *irg; type_dbg_info *tdb; dbg_info *db; int i, n_res, n_param; @@ -5825,7 +6007,8 @@ static ir_node *transform_node_Call(ir_node *call) { NEW_ARR_A(ir_node *, in, n_param + 1); /* FIXME: we don't need a new pointer type in every step */ - tp = get_irg_frame_type(current_ir_graph); + irg = get_irn_irg(call); + tp = get_irg_frame_type(irg); tp = new_type_pointer(tp); set_method_param_type(ctp, 0, tp); @@ -5860,7 +6043,8 @@ static ir_node *transform_node_Call(ir_node *call) { * transformations _do_ generate new nodes, and thus the old node must * not be freed even if the equivalent node isn't the old one. */ -static ir_node *transform_node(ir_node *n) { +static ir_node *transform_node(ir_node *n) +{ ir_node *oldn; /* @@ -5910,14 +6094,12 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops CASE_PROJ_EX(Mod); CASE_PROJ_EX(DivMod); CASE(Quot); - CASE(Abs); CASE_PROJ_EX(Cmp); CASE_PROJ_EX(Cond); CASE(And); CASE(Eor); CASE(Not); CASE(Minus); - CASE(Cast); CASE_PROJ(Load); CASE_PROJ(Store); CASE_PROJ(Bound); @@ -5953,92 +6135,86 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops #define N_IR_NODES 512 /** Compares the attributes of two Const nodes. */ -static int node_cmp_attr_Const(ir_node *a, ir_node *b) { - return (get_Const_tarval(a) != get_Const_tarval(b)) - || (get_Const_type(a) != get_Const_type(b)); -} /* node_cmp_attr_Const */ +static int node_cmp_attr_Const(ir_node *a, ir_node *b) +{ + return get_Const_tarval(a) != get_Const_tarval(b); +} /** Compares the attributes of two Proj nodes. */ -static int node_cmp_attr_Proj(ir_node *a, ir_node *b) { - return get_irn_proj_attr(a) != get_irn_proj_attr(b); +static int node_cmp_attr_Proj(ir_node *a, ir_node *b) +{ + return a->attr.proj != b->attr.proj; } /* node_cmp_attr_Proj */ -/** Compares the attributes of two Filter nodes. */ -static int node_cmp_attr_Filter(ir_node *a, ir_node *b) { - return get_Filter_proj(a) != get_Filter_proj(b); -} /* node_cmp_attr_Filter */ - /** Compares the attributes of two Alloc nodes. */ -static int node_cmp_attr_Alloc(ir_node *a, ir_node *b) { - const alloc_attr *pa = get_irn_alloc_attr(a); - const alloc_attr *pb = get_irn_alloc_attr(b); +static int node_cmp_attr_Alloc(ir_node *a, ir_node *b) +{ + const alloc_attr *pa = &a->attr.alloc; + const alloc_attr *pb = &b->attr.alloc; return (pa->where != pb->where) || (pa->type != pb->type); } /* node_cmp_attr_Alloc */ /** Compares the attributes of two Free nodes. */ -static int node_cmp_attr_Free(ir_node *a, ir_node *b) { - const free_attr *pa = get_irn_free_attr(a); - const free_attr *pb = get_irn_free_attr(b); +static int node_cmp_attr_Free(ir_node *a, ir_node *b) +{ + const free_attr *pa = &a->attr.free; + const free_attr *pb = &b->attr.free; return (pa->where != pb->where) || (pa->type != pb->type); } /* node_cmp_attr_Free */ /** Compares the attributes of two SymConst nodes. */ -static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) { - const symconst_attr *pa = get_irn_symconst_attr(a); - const symconst_attr *pb = get_irn_symconst_attr(b); +static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) +{ + const symconst_attr *pa = &a->attr.symc; + const symconst_attr *pb = &b->attr.symc; return (pa->kind != pb->kind) - || (pa->sym.type_p != pb->sym.type_p) - || (pa->tp != pb->tp); -} /* node_cmp_attr_SymConst */ + || (pa->sym.type_p != pb->sym.type_p); +} /** Compares the attributes of two Call nodes. */ -static int node_cmp_attr_Call(ir_node *a, ir_node *b) { - const call_attr *pa = get_irn_call_attr(a); - const call_attr *pb = get_irn_call_attr(b); +static int node_cmp_attr_Call(ir_node *a, ir_node *b) +{ + const call_attr *pa = &a->attr.call; + const call_attr *pb = &b->attr.call; return (pa->type != pb->type) || (pa->tail_call != pb->tail_call); } /* node_cmp_attr_Call */ /** Compares the attributes of two Sel nodes. */ -static int node_cmp_attr_Sel(ir_node *a, ir_node *b) { +static int node_cmp_attr_Sel(ir_node *a, ir_node *b) +{ const ir_entity *a_ent = get_Sel_entity(a); const ir_entity *b_ent = get_Sel_entity(b); -#if 0 - return - (a_ent->kind != b_ent->kind) || - (a_ent->name != b_ent->name) || - (a_ent->owner != b_ent->owner) || - (a_ent->ld_name != b_ent->ld_name) || - (a_ent->type != b_ent->type); -#endif - /* Matze: inlining of functions can produce 2 entities with same type, - * name, etc. */ return a_ent != b_ent; } /* node_cmp_attr_Sel */ /** Compares the attributes of two Phi nodes. */ -static int node_cmp_attr_Phi(ir_node *a, ir_node *b) { +static int node_cmp_attr_Phi(ir_node *a, ir_node *b) +{ /* we can only enter this function if both nodes have the same number of inputs, hence it is enough to check if one of them is a Phi0 */ if (is_Phi0(a)) { /* check the Phi0 pos attribute */ - return get_irn_phi_attr(a)->u.pos != get_irn_phi_attr(b)->u.pos; + return a->attr.phi.u.pos != b->attr.phi.u.pos; } return 0; } /* node_cmp_attr_Phi */ /** Compares the attributes of two Conv nodes. */ -static int node_cmp_attr_Conv(ir_node *a, ir_node *b) { +static int node_cmp_attr_Conv(ir_node *a, ir_node *b) +{ return get_Conv_strict(a) != get_Conv_strict(b); } /* node_cmp_attr_Conv */ /** Compares the attributes of two Cast nodes. */ -static int node_cmp_attr_Cast(ir_node *a, ir_node *b) { +static int node_cmp_attr_Cast(ir_node *a, ir_node *b) +{ return get_Cast_type(a) != get_Cast_type(b); } /* node_cmp_attr_Cast */ /** Compares the attributes of two Load nodes. */ -static int node_cmp_attr_Load(ir_node *a, ir_node *b) { +static int node_cmp_attr_Load(ir_node *a, ir_node *b) +{ if (get_Load_volatility(a) == volatility_is_volatile || get_Load_volatility(b) == volatility_is_volatile) /* NEVER do CSE on volatile Loads */ @@ -6051,7 +6227,8 @@ static int node_cmp_attr_Load(ir_node *a, ir_node *b) { } /* node_cmp_attr_Load */ /** Compares the attributes of two Store nodes. */ -static int node_cmp_attr_Store(ir_node *a, ir_node *b) { +static int node_cmp_attr_Store(ir_node *a, ir_node *b) +{ /* do not CSE Stores with different alignment. Be conservative. */ if (get_Store_align(a) != get_Store_align(b)) return 1; @@ -6062,9 +6239,10 @@ static int node_cmp_attr_Store(ir_node *a, ir_node *b) { } /* node_cmp_attr_Store */ /** Compares two exception attributes */ -static int node_cmp_exception(ir_node *a, ir_node *b) { - const except_attr *ea = get_irn_except_attr(a); - const except_attr *eb = get_irn_except_attr(b); +static int node_cmp_exception(ir_node *a, ir_node *b) +{ + const except_attr *ea = &a->attr.except; + const except_attr *eb = &b->attr.except; return ea->pin_state != eb->pin_state; } @@ -6072,55 +6250,53 @@ static int node_cmp_exception(ir_node *a, ir_node *b) { #define node_cmp_attr_Bound node_cmp_exception /** Compares the attributes of two Div nodes. */ -static int node_cmp_attr_Div(ir_node *a, ir_node *b) { - const divmod_attr *ma = get_irn_divmod_attr(a); - const divmod_attr *mb = get_irn_divmod_attr(b); +static int node_cmp_attr_Div(ir_node *a, ir_node *b) +{ + const divmod_attr *ma = &a->attr.divmod; + const divmod_attr *mb = &b->attr.divmod; return ma->exc.pin_state != mb->exc.pin_state || ma->resmode != mb->resmode || ma->no_remainder != mb->no_remainder; } /* node_cmp_attr_Div */ /** Compares the attributes of two DivMod nodes. */ -static int node_cmp_attr_DivMod(ir_node *a, ir_node *b) { - const divmod_attr *ma = get_irn_divmod_attr(a); - const divmod_attr *mb = get_irn_divmod_attr(b); +static int node_cmp_attr_DivMod(ir_node *a, ir_node *b) +{ + const divmod_attr *ma = &a->attr.divmod; + const divmod_attr *mb = &b->attr.divmod; return ma->exc.pin_state != mb->exc.pin_state || ma->resmode != mb->resmode; } /* node_cmp_attr_DivMod */ /** Compares the attributes of two Mod nodes. */ -static int node_cmp_attr_Mod(ir_node *a, ir_node *b) { - const divmod_attr *ma = get_irn_divmod_attr(a); - const divmod_attr *mb = get_irn_divmod_attr(b); - return ma->exc.pin_state != mb->exc.pin_state || - ma->resmode != mb->resmode; +static int node_cmp_attr_Mod(ir_node *a, ir_node *b) +{ + return node_cmp_attr_DivMod(a, b); } /* node_cmp_attr_Mod */ /** Compares the attributes of two Quot nodes. */ -static int node_cmp_attr_Quot(ir_node *a, ir_node *b) { - const divmod_attr *ma = get_irn_divmod_attr(a); - const divmod_attr *mb = get_irn_divmod_attr(b); - return ma->exc.pin_state != mb->exc.pin_state || - ma->resmode != mb->resmode; +static int node_cmp_attr_Quot(ir_node *a, ir_node *b) +{ + return node_cmp_attr_DivMod(a, b); } /* node_cmp_attr_Quot */ /** Compares the attributes of two Confirm nodes. */ -static int node_cmp_attr_Confirm(ir_node *a, ir_node *b) { +static int node_cmp_attr_Confirm(ir_node *a, ir_node *b) +{ /* no need to compare the bound, as this is a input */ return (get_Confirm_cmp(a) != get_Confirm_cmp(b)); } /* node_cmp_attr_Confirm */ /** Compares the attributes of two Builtin nodes. */ -static int node_cmp_attr_Builtin(ir_node *a, ir_node *b) { - const builtin_attr *ma = get_irn_builtin_attr(a); - const builtin_attr *mb = get_irn_builtin_attr(b); - +static int node_cmp_attr_Builtin(ir_node *a, ir_node *b) +{ /* no need to compare the type, equal kind means equal type */ - return ma->kind != mb->kind; + return get_Builtin_kind(a) != get_Builtin_kind(b); } /* node_cmp_attr_Builtin */ /** Compares the attributes of two ASM nodes. */ -static int node_cmp_attr_ASM(ir_node *a, ir_node *b) { +static int node_cmp_attr_ASM(ir_node *a, ir_node *b) +{ int i, n; const ir_asm_constraint *ca; const ir_asm_constraint *cb; @@ -6192,7 +6368,6 @@ static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops) switch (code) { CASE(Const); CASE(Proj); - CASE(Filter); CASE(Alloc); CASE(Free); CASE(SymConst); @@ -6214,7 +6389,8 @@ static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops) CASE(Dummy); /* FIXME CopyB */ default: - /* leave NULL */; + /* leave NULL */ + break; } return ops; @@ -6225,7 +6401,8 @@ static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops) * Compare function for two nodes in the value table. Gets two * nodes as parameters. Returns 0 if the nodes are a Common Sub Expression. */ -int identities_cmp(const void *elt, const void *key) { +int identities_cmp(const void *elt, const void *key) +{ ir_node *a = (ir_node *)elt; ir_node *b = (ir_node *)key; int i, irn_arity_a; @@ -6236,24 +6413,28 @@ int identities_cmp(const void *elt, const void *key) { (get_irn_mode(a) != get_irn_mode(b))) return 1; /* compare if a's in and b's in are of equal length */ - irn_arity_a = get_irn_intra_arity(a); - if (irn_arity_a != get_irn_intra_arity(b)) + irn_arity_a = get_irn_arity(a); + if (irn_arity_a != get_irn_arity(b)) + return 1; + + /* blocks are never the same */ + if (is_Block(a)) return 1; if (get_irn_pinned(a) == op_pin_state_pinned) { /* for pinned nodes, the block inputs must be equal */ - if (get_irn_intra_n(a, -1) != get_irn_intra_n(b, -1)) + if (get_irn_n(a, -1) != get_irn_n(b, -1)) return 1; } else if (! get_opt_global_cse()) { - /* for block-local CSE both nodes must be in the same MacroBlock */ - if (get_irn_MacroBlock(a) != get_irn_MacroBlock(b)) + /* for block-local CSE both nodes must be in the same Block */ + if (get_nodes_block(a) != get_nodes_block(b)) return 1; } /* compare a->in[0..ins] with b->in[0..ins] */ for (i = 0; i < irn_arity_a; ++i) { - ir_node *pred_a = get_irn_intra_n(a, i); - ir_node *pred_b = get_irn_intra_n(b, i); + ir_node *pred_a = get_irn_n(a, i); + ir_node *pred_b = get_irn_n(b, i); if (pred_a != pred_b) { /* if both predecessors are CSE neutral they might be different */ if (!is_irn_cse_neutral(pred_a) || !is_irn_cse_neutral(pred_b)) @@ -6276,22 +6457,29 @@ int identities_cmp(const void *elt, const void *key) { * * @param node The IR-node */ -unsigned ir_node_hash(const ir_node *node) { +unsigned ir_node_hash(const ir_node *node) +{ return node->op->ops.hash(node); } /* ir_node_hash */ -pset *new_identities(void) { - return new_pset(identities_cmp, N_IR_NODES); +void new_identities(ir_graph *irg) +{ + if (irg->value_table != NULL) + del_pset(irg->value_table); + irg->value_table = new_pset(identities_cmp, N_IR_NODES); } /* new_identities */ -void del_identities(pset *value_table) { - del_pset(value_table); +void del_identities(ir_graph *irg) +{ + if (irg->value_table != NULL) + del_pset(irg->value_table); } /* del_identities */ /* Normalize a node by putting constants (and operands with larger * node index) on the right (operator side). */ -void ir_normalize_node(ir_node *n) { +void ir_normalize_node(ir_node *n) +{ if (is_op_commutative(get_irn_op(n))) { ir_node *l = get_binop_left(n); ir_node *r = get_binop_right(n); @@ -6308,77 +6496,30 @@ void ir_normalize_node(ir_node *n) { } } /* ir_normalize_node */ -/** - * Update the nodes after a match in the value table. If both nodes have - * the same MacroBlock but different Blocks, we must ensure that the node - * with the dominating Block (the node that is near to the MacroBlock header - * is stored in the table. - * Because a MacroBlock has only one "non-exception" flow, we don't need - * dominance info here: We known, that one block must dominate the other and - * following the only block input will allow to find it. - */ -static void update_known_irn(ir_node *known_irn, const ir_node *new_ir_node) { - ir_node *known_blk, *new_block, *block, *mbh; - - if (get_opt_global_cse()) { - /* Block inputs are meaning less */ - return; - } - known_blk = get_irn_n(known_irn, -1); - new_block = get_irn_n(new_ir_node, -1); - if (known_blk == new_block) { - /* already in the same block */ - return; - } - /* - * We expect the typical case when we built the graph. In that case, the - * known_irn is already the upper one, so checking this should be faster. - */ - block = new_block; - mbh = get_Block_MacroBlock(new_block); - for (;;) { - if (block == known_blk) { - /* ok, we have found it: known_block dominates new_block as expected */ - return; - } - if (block == mbh) { - /* - * We have reached the MacroBlock header NOT founding - * the known_block. new_block must dominate known_block. - * Update known_irn. - */ - set_irn_n(known_irn, -1, new_block); - return; - } - assert(get_Block_n_cfgpreds(block) == 1); - block = get_Block_cfgpred_block(block, 0); - } -} /* update_value_table */ - /* * Return the canonical node computing the same value as n. * Looks up the node in a hash table, enters it in the table * if it isn't there yet. * - * @param value_table the HashSet containing all nodes in the - * current IR graph * @param n the node to look up * * @return a node that computes the same value as n or n if no such * node could be found */ -ir_node *identify_remember(pset *value_table, ir_node *n) { - ir_node *nn = NULL; +ir_node *identify_remember(ir_node *n) +{ + ir_graph *irg = get_irn_irg(n); + pset *value_table = irg->value_table; + ir_node *nn; - if (!value_table) return n; + if (value_table == NULL) + return n; ir_normalize_node(n); /* lookup or insert in hash table with given hash key. */ nn = pset_insert(value_table, n, ir_node_hash(n)); if (nn != n) { - update_known_irn(nn, n); - /* n is reachable again */ edges_node_revival(nn, get_irn_irg(nn)); } @@ -6387,36 +6528,45 @@ ir_node *identify_remember(pset *value_table, ir_node *n) { } /* identify_remember */ /** - * During construction we set the op_pin_state_pinned flag in the graph right when the - * optimization is performed. The flag turning on procedure global cse could - * be changed between two allocations. This way we are safe. + * During construction we set the op_pin_state_pinned flag in the graph right + * when the optimization is performed. The flag turning on procedure global + * cse could be changed between two allocations. This way we are safe. * - * @param value_table The value table * @param n The node to lookup */ -static inline ir_node *identify_cons(pset *value_table, ir_node *n) { +static inline ir_node *identify_cons(ir_node *n) +{ ir_node *old = n; - n = identify_remember(value_table, n); - if (n != old && get_irn_MacroBlock(old) != get_irn_MacroBlock(n)) - set_irg_pinned(current_ir_graph, op_pin_state_floats); + n = identify_remember(n); + if (n != old && get_nodes_block(old) != get_nodes_block(n)) { + ir_graph *irg = get_irn_irg(n); + set_irg_pinned(irg, op_pin_state_floats); + } return n; } /* identify_cons */ /* Add a node to the identities value table. */ -void add_identities(pset *value_table, ir_node *node) { - if (get_opt_cse() && is_no_Block(node)) - identify_remember(value_table, node); -} /* add_identities */ +void add_identities(ir_node *node) +{ + if (!get_opt_cse()) + return; + if (is_Block(node)) + return; + + identify_remember(node); +} /* Visit each node in the value table of a graph. */ -void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env) { - ir_node *node; +void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env) +{ + ir_node *node; ir_graph *rem = current_ir_graph; current_ir_graph = irg; - foreach_pset(irg->value_table, node) + foreach_pset(irg->value_table, node) { visit(node, env); + } current_ir_graph = rem; } /* visit_all_identities */ @@ -6424,14 +6574,16 @@ void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env) { * Garbage in, garbage out. If a node has a dead input, i.e., the * Bad node is input to the node, return the Bad node. */ -static ir_node *gigo(ir_node *node) { +static ir_node *gigo(ir_node *node) +{ int i, irn_arity; ir_op *op = get_irn_op(node); /* remove garbage blocks by looking at control flow that leaves the block and replacing the control flow by Bad. */ if (get_irn_mode(node) == mode_X) { - ir_node *block = get_nodes_block(skip_Proj(node)); + ir_node *block = get_nodes_block(skip_Proj(node)); + ir_graph *irg = get_irn_irg(block); /* Don't optimize nodes in immature blocks. */ if (!get_Block_matured(block)) @@ -6442,7 +6594,7 @@ static ir_node *gigo(ir_node *node) { if (is_Block(block)) { if (is_Block_dead(block)) { /* control flow from dead block is dead */ - return new_Bad(); + return new_r_Bad(irg); } for (i = get_irn_arity(block) - 1; i >= 0; --i) { @@ -6461,7 +6613,7 @@ static ir_node *gigo(ir_node *node) { * but can be found by irg_walk()! */ set_Block_dead(block); - return new_Bad(); + return new_r_Bad(irg); } } } @@ -6470,6 +6622,7 @@ static ir_node *gigo(ir_node *node) { /* Blocks, Phis and Tuples may have dead inputs, e.g., if one of the blocks predecessors is dead. */ if (op != op_Block && op != op_Phi && op != op_Tuple) { + ir_graph *irg = get_irn_irg(node); irn_arity = get_irn_arity(node); /* @@ -6477,13 +6630,13 @@ static ir_node *gigo(ir_node *node) { */ if (is_irn_pinned_in_irg(node) && is_Block_dead(get_nodes_block(skip_Proj(node)))) - return new_Bad(); + return new_r_Bad(irg); for (i = 0; i < irn_arity; i++) { ir_node *pred = get_irn_n(node, i); if (is_Bad(pred)) - return new_Bad(); + return new_r_Bad(irg); #if 0 /* Propagating Unknowns here seems to be a bad idea, because sometimes we need a node as a input and did not want that @@ -6491,7 +6644,7 @@ static ir_node *gigo(ir_node *node) { However, it might be useful to move this into a later phase (if you think that optimizing such code is useful). */ if (is_Unknown(pred) && mode_is_data(get_irn_mode(node))) - return new_Unknown(get_irn_mode(node)); + return new_r_Unknown(irg, get_irn_mode(node)); #endif } } @@ -6505,7 +6658,7 @@ static ir_node *gigo(ir_node *node) { for (i = 0; i < irn_arity; i++) { if (!is_Bad(get_irn_n(node, i))) break; } - if (i == irn_arity) node = new_Bad(); + if (i == irn_arity) node = new_r_Bad(irg); } #endif return node; @@ -6517,13 +6670,13 @@ static ir_node *gigo(ir_node *node) { * reference this one, i.e., right after construction of a node. * * @param n The node to optimize - * - * current_ir_graph must be set to the graph of the node! */ -ir_node *optimize_node(ir_node *n) { - tarval *tv; - ir_node *oldn = n; - ir_opcode iro = get_irn_opcode(n); +ir_node *optimize_node(ir_node *n) +{ + ir_node *oldn = n; + ir_graph *irg = get_irn_irg(n); + ir_opcode iro = get_irn_opcode(n); + ir_tarval *tv; /* Always optimize Phi nodes: part of the construction. */ if ((!get_opt_optimize()) && (iro != iro_Phi)) return n; @@ -6532,25 +6685,12 @@ ir_node *optimize_node(ir_node *n) { if (get_opt_constant_folding()) { /* neither constants nor Tuple values can be evaluated */ if (iro != iro_Const && (get_irn_mode(n) != mode_T)) { - unsigned fp_model = get_irg_fp_model(current_ir_graph); - int old_fp_mode = tarval_fp_ops_enabled(); - - tarval_enable_fp_ops(! (fp_model & fp_no_float_fold)); - /* try to evaluate */ tv = computed_value(n); if (tv != tarval_bad) { ir_node *nw; - ir_type *old_tp = get_irn_type(n); - int i, arity = get_irn_arity(n); int node_size; - /* - * Try to recover the type of the new expression. - */ - for (i = 0; i < arity && !old_tp; ++i) - old_tp = get_irn_type(get_irn_n(n, i)); - /* * we MUST copy the node here temporary, because it's still needed * for DBG_OPT_CSTEVAL @@ -6565,19 +6705,15 @@ ir_node *optimize_node(ir_node *n) { memcpy(oldn->in, n->in, ARR_LEN(n->in) * sizeof(n->in[0])); /* note the inplace edges module */ - edges_node_deleted(n, current_ir_graph); + edges_node_deleted(n, irg); /* evaluation was successful -- replace the node. */ - irg_kill_node(current_ir_graph, n); - nw = new_Const(tv); + irg_kill_node(irg, n); + nw = new_r_Const(irg, tv); - if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv)) - set_Const_type(nw, old_tp); DBG_OPT_CSTEVAL(oldn, nw); - tarval_enable_fp_ops(old_fp_mode); return nw; } - tarval_enable_fp_ops(old_fp_mode); } } @@ -6597,13 +6733,13 @@ ir_node *optimize_node(ir_node *n) { * subexpressions within a block. */ if (get_opt_cse()) - n = identify_cons(current_ir_graph->value_table, n); + n = identify_cons(n); if (n != oldn) { - edges_node_deleted(oldn, current_ir_graph); + edges_node_deleted(oldn, irg); /* We found an existing, better node, so we can deallocate the old node. */ - irg_kill_node(current_ir_graph, oldn); + irg_kill_node(irg, oldn); return n; } @@ -6622,7 +6758,7 @@ ir_node *optimize_node(ir_node *n) { /* Now we have a legal, useful node. Enter it in hash table for CSE */ if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) { ir_node *o = n; - n = identify_remember(current_ir_graph->value_table, o); + n = identify_remember(o); if (o != n) DBG_OPT_CSE(o, n); } @@ -6636,44 +6772,32 @@ ir_node *optimize_node(ir_node *n) { * nodes lying on the obstack. Remove these by a dead node elimination, * i.e., a copying garbage collection. */ -ir_node *optimize_in_place_2(ir_node *n) { - tarval *tv; - ir_node *oldn = n; - ir_opcode iro = get_irn_opcode(n); +ir_node *optimize_in_place_2(ir_node *n) +{ + ir_tarval *tv; + ir_node *oldn = n; + ir_opcode iro = get_irn_opcode(n); if (!get_opt_optimize() && !is_Phi(n)) return n; + if (iro == iro_Deleted) + return n; + /* constant expression evaluation / constant folding */ if (get_opt_constant_folding()) { /* neither constants nor Tuple values can be evaluated */ if (iro != iro_Const && get_irn_mode(n) != mode_T) { - unsigned fp_model = get_irg_fp_model(current_ir_graph); - int old_fp_mode = tarval_fp_ops_enabled(); - - tarval_enable_fp_ops((fp_model & fp_strict_algebraic) == 0); /* try to evaluate */ tv = computed_value(n); if (tv != tarval_bad) { /* evaluation was successful -- replace the node. */ - ir_type *old_tp = get_irn_type(n); - int i, arity = get_irn_arity(n); + ir_graph *irg = get_irn_irg(n); - /* - * Try to recover the type of the new expression. - */ - for (i = 0; i < arity && !old_tp; ++i) - old_tp = get_irn_type(get_irn_n(n, i)); - - n = new_Const(tv); - - if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv)) - set_Const_type(n, old_tp); + n = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(oldn, n); - tarval_enable_fp_ops(old_fp_mode); return n; } - tarval_enable_fp_ops(old_fp_mode); } } @@ -6692,7 +6816,7 @@ ir_node *optimize_in_place_2(ir_node *n) { subexpressions within a block. */ if (get_opt_cse()) { ir_node *o = n; - n = identify_remember(current_ir_graph->value_table, o); + n = identify_remember(o); if (o != n) DBG_OPT_CSE(o, n); } @@ -6709,14 +6833,14 @@ ir_node *optimize_in_place_2(ir_node *n) { n = gigo(n); /* Now we can verify the node, as it has no dead inputs any more. */ - irn_vrfy(n); + irn_verify(n); /* Now we have a legal, useful node. Enter it in hash table for cse. Blocks should be unique anyways. (Except the successor of start: is cse with the start block!) */ if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) { ir_node *o = n; - n = identify_remember(current_ir_graph->value_table, o); + n = identify_remember(o); if (o != n) DBG_OPT_CSE(o, n); } @@ -6727,29 +6851,32 @@ ir_node *optimize_in_place_2(ir_node *n) { /** * Wrapper for external use, set proper status bits after optimization. */ -ir_node *optimize_in_place(ir_node *n) { +ir_node *optimize_in_place(ir_node *n) +{ + ir_graph *irg = get_irn_irg(n); /* Handle graph state */ - assert(get_irg_phase_state(current_ir_graph) != phase_building); + assert(get_irg_phase_state(irg) != phase_building); if (get_opt_global_cse()) - set_irg_pinned(current_ir_graph, op_pin_state_floats); - if (get_irg_outs_state(current_ir_graph) == outs_consistent) - set_irg_outs_inconsistent(current_ir_graph); + set_irg_pinned(irg, op_pin_state_floats); + if (get_irg_outs_state(irg) == outs_consistent) + set_irg_outs_inconsistent(irg); /* FIXME: Maybe we could also test whether optimizing the node can change the control graph. */ - set_irg_doms_inconsistent(current_ir_graph); + set_irg_doms_inconsistent(irg); return optimize_in_place_2(n); } /* optimize_in_place */ /** * Calculate a hash value of a Const node. */ -static unsigned hash_Const(const ir_node *node) { +static unsigned hash_Const(const ir_node *node) +{ unsigned h; /* special value for const, as they only differ in their tarval. */ - h = HASH_PTR(node->attr.con.tv); + h = HASH_PTR(node->attr.con.tarval); return h; } /* hash_Const */ @@ -6757,7 +6884,8 @@ static unsigned hash_Const(const ir_node *node) { /** * Calculate a hash value of a SymConst node. */ -static unsigned hash_SymConst(const ir_node *node) { +static unsigned hash_SymConst(const ir_node *node) +{ unsigned h; /* all others are pointers */ @@ -6801,13 +6929,13 @@ static ir_op_ops *firm_set_default_hash(ir_opcode code, ir_op_ops *ops) /* * Sets the default operation for an ir_ops. */ -ir_op_ops *firm_set_default_operations(ir_opcode code, ir_op_ops *ops) { +ir_op_ops *firm_set_default_operations(ir_opcode code, ir_op_ops *ops) +{ ops = firm_set_default_hash(code, ops); ops = firm_set_default_computed_value(code, ops); ops = firm_set_default_equivalent_node(code, ops); ops = firm_set_default_transform_node(code, ops); ops = firm_set_default_node_cmp_attr(code, ops); - ops = firm_set_default_get_type(code, ops); ops = firm_set_default_get_type_attr(code, ops); ops = firm_set_default_get_entity_attr(code, ops);