X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=1711aa07dbcf580419fa7648fbd31ea1e7cf1ca7;hb=87f7c13645e762f21991ad79985a7f3e6ef612cf;hp=aac8fe0eabcbb2193e364ed4ea4bc802ddf649e3;hpb=82fe4c79cd69aa57cf03a23b7f46200a3c3d001f;p=libfirm diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index aac8fe0ea..1711aa07d 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -6,7 +6,7 @@ * Modified by: Goetz Lindenmaier, Michael Beck * Created: * CVS-ID: $Id$ - * Copyright: (c) 1998-2005 Universität Karlsruhe + * Copyright: (c) 1998-2006 Universität Karlsruhe * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. */ @@ -42,34 +42,52 @@ #include "archop.h" #include "opt_polymorphy.h" #include "opt_confirms.h" +#include "irtools.h" /* Make types visible to allow most efficient access */ -# include "entity_t.h" +#include "entity_t.h" /** - * return the value of a Constant + * Return the value of a Constant. */ -static tarval *computed_value_Const(ir_node *n) -{ +static tarval *computed_value_Const(ir_node *n) { return get_Const_tarval(n); -} +} /* computed_value_Const */ /** - * return the value of a 'sizeof' SymConst + * Return the value of a 'sizeof' or 'alignof' SymConst. */ -static tarval *computed_value_SymConst(ir_node *n) -{ - if ((get_SymConst_kind(n) == symconst_size) && - (get_type_state(get_SymConst_type(n))) == layout_fixed) - return new_tarval_from_long(get_type_size_bytes(get_SymConst_type(n)), get_irn_mode(n)); +static tarval *computed_value_SymConst(ir_node *n) { + ir_type *type; + entity *ent; + + switch (get_SymConst_kind(n)) { + case symconst_type_size: + type = get_SymConst_type(n); + if (get_type_state(type) == layout_fixed) + return new_tarval_from_long(get_type_size_bytes(type), get_irn_mode(n)); + break; + case symconst_type_align: + type = get_SymConst_type(n); + if (get_type_state(type) == layout_fixed) + return new_tarval_from_long(get_type_alignment_bytes(type), get_irn_mode(n)); + break; + case symconst_ofs_ent: + ent = get_SymConst_entity(n); + type = get_entity_owner(ent); + if (get_type_state(type) == layout_fixed) + return new_tarval_from_long(get_entity_offset(ent), get_irn_mode(n)); + break; + default: + break; + } return tarval_bad; -} +} /* computed_value_SymConst */ /** - * return the value of an Add + * Return the value of an Add. */ -static tarval *computed_value_Add(ir_node *n) -{ +static tarval *computed_value_Add(ir_node *n) { ir_node *a = get_Add_left(n); ir_node *b = get_Add_right(n); @@ -80,14 +98,13 @@ static tarval *computed_value_Add(ir_node *n) return tarval_add(ta, tb); return tarval_bad; -} +} /* computed_value_Add */ /** - * return the value of a Sub + * Return the value of a Sub. * Special case: a - a */ -static tarval *computed_value_Sub(ir_node *n) -{ +static tarval *computed_value_Sub(ir_node *n) { ir_node *a = get_Sub_left(n); ir_node *b = get_Sub_right(n); tarval *ta; @@ -104,14 +121,13 @@ static tarval *computed_value_Sub(ir_node *n) return tarval_sub(ta, tb); return tarval_bad; -} +} /* computed_value_Sub */ /** - * return the value of a Carry + * Return the value of a Carry. * Special : a op 0, 0 op b */ -static tarval *computed_value_Carry(ir_node *n) -{ +static tarval *computed_value_Carry(ir_node *n) { ir_node *a = get_binop_left(n); ir_node *b = get_binop_right(n); ir_mode *m = get_irn_mode(n); @@ -128,14 +144,13 @@ static tarval *computed_value_Carry(ir_node *n) return get_mode_null(m); } return tarval_bad; -} +} /* computed_value_Carry */ /** - * return the value of a Borrow + * Return the value of a Borrow. * Special : a op 0 */ -static tarval *computed_value_Borrow(ir_node *n) -{ +static tarval *computed_value_Borrow(ir_node *n) { ir_node *a = get_binop_left(n); ir_node *b = get_binop_right(n); ir_mode *m = get_irn_mode(n); @@ -149,13 +164,12 @@ static tarval *computed_value_Borrow(ir_node *n) return get_mode_null(m); } return tarval_bad; -} +} /* computed_value_Borrow */ /** - * return the value of an unary Minus + * Return the value of an unary Minus. */ -static tarval *computed_value_Minus(ir_node *n) -{ +static tarval *computed_value_Minus(ir_node *n) { ir_node *a = get_Minus_op(n); tarval *ta = value_of(a); @@ -163,13 +177,12 @@ static tarval *computed_value_Minus(ir_node *n) return tarval_neg(ta); return tarval_bad; -} +} /* computed_value_Minus */ /** - * return the value of a Mul + * Return the value of a Mul. */ -static tarval *computed_value_Mul(ir_node *n) -{ +static tarval *computed_value_Mul(ir_node *n) { ir_node *a = get_Mul_left(n); ir_node *b = get_Mul_right(n); @@ -188,13 +201,12 @@ static tarval *computed_value_Mul(ir_node *n) return tb; } return tarval_bad; -} +} /* computed_value_Mul */ /** - * return the value of a floating point Quot + * Return the value of a floating point Quot. */ -static tarval *computed_value_Quot(ir_node *n) -{ +static tarval *computed_value_Quot(ir_node *n) { ir_node *a = get_Quot_left(n); ir_node *b = get_Quot_right(n); @@ -207,14 +219,13 @@ static tarval *computed_value_Quot(ir_node *n) return tarval_quo(ta, tb); } return tarval_bad; -} +} /* computed_value_Quot */ /** - * calculate the value of an integer Div of two nodes + * Calculate the value of an integer Div of two nodes. * Special case: 0 / b */ -static tarval *do_computed_value_Div(ir_node *a, ir_node *b) -{ +static tarval *do_computed_value_Div(ir_node *a, ir_node *b) { tarval *ta = value_of(a); tarval *tb = value_of(b); @@ -226,22 +237,20 @@ static tarval *do_computed_value_Div(ir_node *a, ir_node *b) return ta; } return tarval_bad; -} +} /* do_computed_value_Div */ /** - * return the value of an integer Div + * Return the value of an integer Div. */ -static tarval *computed_value_Div(ir_node *n) -{ +static tarval *computed_value_Div(ir_node *n) { return do_computed_value_Div(get_Div_left(n), get_Div_right(n)); -} +} /* computed_value_Div */ /** - * calculate the value of an integer Mod of two nodes + * Calculate the value of an integer Mod of two nodes. * Special case: a % 1 */ -static tarval *do_computed_value_Mod(ir_node *a, ir_node *b) -{ +static tarval *do_computed_value_Mod(ir_node *a, ir_node *b) { tarval *ta = value_of(a); tarval *tb = value_of(b); @@ -252,23 +261,20 @@ static tarval *do_computed_value_Mod(ir_node *a, ir_node *b) else if (tb == get_mode_one(get_tarval_mode(tb))) /* x mod 1 == 0 */ return get_mode_null(get_irn_mode(a)); } - return tarval_bad; -} +} /* do_computed_value_Mod */ /** - * return the value of an integer Mod + * Return the value of an integer Mod. */ -static tarval *computed_value_Mod(ir_node *n) -{ +static tarval *computed_value_Mod(ir_node *n) { return do_computed_value_Mod(get_Mod_left(n), get_Mod_right(n)); -} +} /* computed_value_Mod */ /** - * return the value of an Abs + * Return the value of an Abs. */ -static tarval *computed_value_Abs(ir_node *n) -{ +static tarval *computed_value_Abs(ir_node *n) { ir_node *a = get_Abs_op(n); tarval *ta = value_of(a); @@ -276,14 +282,13 @@ static tarval *computed_value_Abs(ir_node *n) return tarval_abs(ta); return tarval_bad; -} +} /* computed_value_Abs */ /** - * return the value of an And + * Return the value of an And. * Special case: a & 0, 0 & b */ -static tarval *computed_value_And(ir_node *n) -{ +static tarval *computed_value_And(ir_node *n) { ir_node *a = get_And_left(n); ir_node *b = get_And_right(n); @@ -301,14 +306,13 @@ static tarval *computed_value_And(ir_node *n) } } return tarval_bad; -} +} /* computed_value_And */ /** - * return the value of an Or + * Return the value of an Or. * Special case: a | 1...1, 1...1 | b */ -static tarval *computed_value_Or(ir_node *n) -{ +static tarval *computed_value_Or(ir_node *n) { ir_node *a = get_Or_left(n); ir_node *b = get_Or_right(n); @@ -325,13 +329,12 @@ static tarval *computed_value_Or(ir_node *n) } } return tarval_bad; -} +} /* computed_value_Or */ /** - * return the value of an Eor + * Return the value of an Eor. */ -static tarval *computed_value_Eor(ir_node *n) -{ +static tarval *computed_value_Eor(ir_node *n) { ir_node *a = get_Eor_left(n); ir_node *b = get_Eor_right(n); @@ -347,13 +350,12 @@ static tarval *computed_value_Eor(ir_node *n) return tarval_eor (ta, tb); } return tarval_bad; -} +} /* computed_value_Eor */ /** - * return the value of a Not + * Return the value of a Not. */ -static tarval *computed_value_Not(ir_node *n) -{ +static tarval *computed_value_Not(ir_node *n) { ir_node *a = get_Not_op(n); tarval *ta = value_of(a); @@ -361,13 +363,12 @@ static tarval *computed_value_Not(ir_node *n) return tarval_not(ta); return tarval_bad; -} +} /* computed_value_Not */ /** - * return the value of a Shl + * Return the value of a Shl. */ -static tarval *computed_value_Shl(ir_node *n) -{ +static tarval *computed_value_Shl(ir_node *n) { ir_node *a = get_Shl_left(n); ir_node *b = get_Shl_right(n); @@ -378,13 +379,12 @@ static tarval *computed_value_Shl(ir_node *n) return tarval_shl (ta, tb); } return tarval_bad; -} +} /* computed_value_Shl */ /** - * return the value of a Shr + * Return the value of a Shr. */ -static tarval *computed_value_Shr(ir_node *n) -{ +static tarval *computed_value_Shr(ir_node *n) { ir_node *a = get_Shr_left(n); ir_node *b = get_Shr_right(n); @@ -395,13 +395,12 @@ static tarval *computed_value_Shr(ir_node *n) return tarval_shr (ta, tb); } return tarval_bad; -} +} /* computed_value_Shr */ /** - * return the value of a Shrs + * Return the value of a Shrs. */ -static tarval *computed_value_Shrs(ir_node *n) -{ +static tarval *computed_value_Shrs(ir_node *n) { ir_node *a = get_Shrs_left(n); ir_node *b = get_Shrs_right(n); @@ -412,10 +411,10 @@ static tarval *computed_value_Shrs(ir_node *n) return tarval_shrs (ta, tb); } return tarval_bad; -} +} /* computed_value_Shrs */ /** - * return the value of a Rot + * Return the value of a Rot. */ static tarval *computed_value_Rot(ir_node *n) { @@ -429,10 +428,10 @@ static tarval *computed_value_Rot(ir_node *n) return tarval_rot (ta, tb); } return tarval_bad; -} +} /* computed_value_Rot */ /** - * return the value of a Conv + * Return the value of a Conv. */ static tarval *computed_value_Conv(ir_node *n) { @@ -443,10 +442,10 @@ static tarval *computed_value_Conv(ir_node *n) return tarval_convert_to(ta, get_irn_mode(n)); return tarval_bad; -} +} /* computed_value_Conv */ /** - * return the value of a Proj(Cmp) + * Return the value of a Proj(Cmp). * * This performs a first step of unreachable code elimination. * Proj can not be computed, but folding a Cmp above the Proj here is @@ -557,15 +556,14 @@ static tarval *computed_value_Proj_Cmp(ir_node *n) return new_tarval_from_long(proj_nr & pn_Cmp_Ne, mode_b); } } - return computed_value_Cmp_Confirm(a, aa, ab, proj_nr); -} +} /* computed_value_Proj_Cmp */ /** - * return the value of a Proj, handle Proj(Cmp), Proj(Div), Proj(Mod), Proj(DivMod) + * Return the value of a Proj, handle Proj(Cmp), Proj(Div), Proj(Mod), + * Proj(DivMod) and Proj(Quot). */ -static tarval *computed_value_Proj(ir_node *n) -{ +static tarval *computed_value_Proj(ir_node *n) { ir_node *a = get_Proj_pred(n); long proj_nr; @@ -592,18 +590,22 @@ static tarval *computed_value_Proj(ir_node *n) return computed_value(a); break; + case iro_Quot: + if (get_Proj_proj(n) == pn_Quot_res) + return computed_value(a); + break; + default: return tarval_bad; } return tarval_bad; -} +} /* computed_value_Proj */ /** - * calculate the value of a Mux: can be evaluated, if the - * sel and the right input are known + * Calculate the value of a Mux: can be evaluated, if the + * sel and the right input are known. */ -static tarval *computed_value_Mux(ir_node *n) -{ +static tarval *computed_value_Mux(ir_node *n) { ir_node *sel = get_Mux_sel(n); tarval *ts = value_of(sel); @@ -616,17 +618,27 @@ static tarval *computed_value_Mux(ir_node *n) return value_of(v); } return tarval_bad; -} +} /* computed_value_Mux */ + +/** + * Calculate the value of a Psi: can be evaluated, if a condition is true + * and all previous conditions are false. If all conditions are false + * we evaluate to the default one. + */ +static tarval *computed_value_Psi(ir_node *n) { + if (is_Mux(n)) + return computed_value_Mux(n); + return tarval_bad; +} /* computed_value_Psi */ /** - * calculate the value of a Confirm: can be evaluated, + * Calculate the value of a Confirm: can be evaluated, * if it has the form Confirm(x, '=', Const). */ -static tarval *computed_value_Confirm(ir_node *n) -{ +static tarval *computed_value_Confirm(ir_node *n) { return get_Confirm_cmp(n) == pn_Cmp_Eq ? value_of(get_Confirm_bound(n)) : tarval_bad; -} +} /* computed_value_Confirm */ /** * If the parameter n can be computed, return its value, else tarval_bad. @@ -634,15 +646,14 @@ static tarval *computed_value_Confirm(ir_node *n) * * @param n The node this should be evaluated */ -tarval *computed_value(ir_node *n) -{ +tarval *computed_value(ir_node *n) { if (n->op->ops.computed_value) return n->op->ops.computed_value(n); return tarval_bad; -} +} /* computed_value */ /** - * set the default computed_value evaluator in an ir_op_ops. + * Set the default computed_value evaluator in an ir_op_ops. * * @param code the opcode for the default operation * @param ops the operations initialized @@ -681,6 +692,7 @@ static ir_op_ops *firm_set_default_computed_value(opcode code, ir_op_ops *ops) CASE(Conv); CASE(Proj); CASE(Mux); + CASE(Psi); CASE(Confirm); default: /* leave NULL */; @@ -688,26 +700,7 @@ static ir_op_ops *firm_set_default_computed_value(opcode code, ir_op_ops *ops) return ops; #undef CASE -} - -#if 0 -/* returns 1 if the a and b are pointers to different locations. */ -static bool -different_identity (ir_node *a, ir_node *b) -{ - assert (mode_is_reference(get_irn_mode (a)) - && mode_is_reference(get_irn_mode (b))); - - if (get_irn_op (a) == op_Proj && get_irn_op(b) == op_Proj) { - ir_node *a1 = get_Proj_pred (a); - ir_node *b1 = get_Proj_pred (b); - if (a1 != b1 && get_irn_op (a1) == op_Alloc - && get_irn_op (b1) == op_Alloc) - return 1; - } - return 0; -} -#endif +} /* firm_set_default_computed_value */ /** * Returns a equivalent block for another block. @@ -781,8 +774,8 @@ static ir_node *equivalent_node_Block(ir_node *n) } } else if (get_opt_unreachable_code() && - (n != current_ir_graph->start_block) && - (n != current_ir_graph->end_block) ) { + (n != get_irg_start_block(current_ir_graph)) && + (n != get_irg_end_block(current_ir_graph)) ) { int i; /* If all inputs are dead, this block is dead too, except if it is @@ -809,22 +802,21 @@ static ir_node *equivalent_node_Block(ir_node *n) } return n; -} +} /* equivalent_node_Block */ /** * Returns a equivalent node for a Jmp, a Bad :-) - * Of course this only happens if the Block of the Jmp is 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) { /* unreachable code elimination */ if (is_Block_dead(get_nodes_block(n))) n = new_Bad(); return n; -} +} /* equivalent_node_Jmp */ -/* Same for op_Raise */ +/** Raise is handled in the same way as Jmp. */ #define equivalent_node_Raise equivalent_node_Jmp @@ -832,7 +824,7 @@ static ir_node *equivalent_node_Jmp(ir_node *n) See transform_node_Proj_Cond(). */ /** - * optimize operations that are commutative and have neutral 0, + * 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) @@ -870,8 +862,11 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n) } return n; -} +} /* equivalent_node_neutral_zero */ +/** + * Eor is commutative and has neutral 0. + */ #define equivalent_node_Eor equivalent_node_neutral_zero /* @@ -887,6 +882,11 @@ static ir_node *equivalent_node_Add(ir_node *n) { ir_node *oldn = n; ir_node *left, *right; + ir_mode *mode = get_irn_mode(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; n = equivalent_node_neutral_zero(n); if (n != oldn) @@ -900,7 +900,7 @@ static ir_node *equivalent_node_Add(ir_node *n) /* (a - x) + x */ n = get_Sub_left(left); - if (get_irn_mode(oldn) == get_irn_mode(n)) { + if (mode == get_irn_mode(n)) { DBG_OPT_ALGSIM1(oldn, left, right, n, FS_OPT_ADD_SUB); return n; } @@ -911,21 +911,20 @@ static ir_node *equivalent_node_Add(ir_node *n) /* x + (a - x) */ n = get_Sub_left(right); - if (get_irn_mode(oldn) == get_irn_mode(n)) { + if (mode == get_irn_mode(n)) { DBG_OPT_ALGSIM1(oldn, left, right, n, FS_OPT_ADD_SUB); return n; } } } return n; -} +} /* equivalent_node_Add */ /** * 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); @@ -936,9 +935,8 @@ static ir_node *equivalent_node_left_zero(ir_node *n) DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0); } - return n; -} +} /* equivalent_node_left_zero */ #define equivalent_node_Shl equivalent_node_left_zero #define equivalent_node_Shr equivalent_node_left_zero @@ -957,42 +955,45 @@ static ir_node *equivalent_node_left_zero(ir_node *n) static ir_node *equivalent_node_Sub(ir_node *n) { ir_node *oldn = n; + ir_node *a, *b; + ir_mode *mode = get_irn_mode(n); - ir_node *a = get_Sub_left(n); - ir_node *b = get_Sub_right(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; + + a = get_Sub_left(n); + b = get_Sub_right(n); /* Beware: modes might be different */ if (classify_tarval(value_of(b)) == TV_CLASSIFY_NULL) { - if (get_irn_mode(n) == get_irn_mode(a)) { + if (mode == get_irn_mode(a)) { n = a; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0); } } else if (get_irn_op(a) == op_Add) { - ir_mode *mode = get_irn_mode(n); - if (mode_wrap_around(mode)) { ir_node *left = get_Add_left(a); ir_node *right = get_Add_right(a); if (left == b) { - if (get_irn_mode(n) == get_irn_mode(right)) { + if (mode == get_irn_mode(right)) { n = right; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); } } else if (right == b) { - if (get_irn_mode(n) == get_irn_mode(left)) { + if (mode == get_irn_mode(left)) { n = left; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); } } } } - return n; -} +} /* equivalent_node_Sub */ /** @@ -1014,12 +1015,12 @@ static ir_node *equivalent_node_idempotent_unop(ir_node *n) DBG_OPT_ALGSIM2(oldn, pred, n); } return n; -} +} /* equivalent_node_idempotent_unop */ -/* Not(Not(x)) == x */ +/** Optimize Not(Not(x)) == x. */ #define equivalent_node_Not equivalent_node_idempotent_unop -/* --x == x */ /* ??? Is this possible or can --x raise an +/** --x == x ??? Is this possible or can --x raise an out of bounds exception if min =! max? */ #define equivalent_node_Minus equivalent_node_idempotent_unop @@ -1029,7 +1030,6 @@ static ir_node *equivalent_node_idempotent_unop(ir_node *n) static ir_node *equivalent_node_Mul(ir_node *n) { ir_node *oldn = n; - ir_node *a = get_Mul_left(n); ir_node *b = get_Mul_right(n); @@ -1042,13 +1042,12 @@ static ir_node *equivalent_node_Mul(ir_node *n) DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1); } return n; -} +} /* equivalent_node_Mul */ /** * Optimize a / 1 = a. */ -static ir_node *equivalent_node_Div(ir_node *n) -{ +static ir_node *equivalent_node_Div(ir_node *n) { ir_node *a = get_Div_left(n); ir_node *b = get_Div_right(n); @@ -1062,13 +1061,31 @@ static ir_node *equivalent_node_Div(ir_node *n) set_Tuple_pred(n, pn_Div_res, a); } return n; -} +} /* equivalent_node_Div */ + +/** + * Optimize a / 1.0 = a. + */ +static ir_node *equivalent_node_Quot(ir_node *n) { + ir_node *a = get_Quot_left(n); + ir_node *b = get_Quot_right(n); + + /* Div is not commutative. */ + if (classify_tarval(value_of(b)) == TV_CLASSIFY_ONE) { /* Quot(x, 1) == x */ + /* Turn Quot into a tuple (mem, bad, a) */ + ir_node *mem = get_Quot_mem(n); + turn_into_tuple(n, pn_Quot_max); + set_Tuple_pred(n, pn_Quot_M, mem); + set_Tuple_pred(n, pn_Quot_X_except, new_Bad()); /* no exception */ + set_Tuple_pred(n, pn_Quot_res, a); + } + return n; +} /* equivalent_node_Quot */ /** * Optimize a / 1 = a. */ -static ir_node *equivalent_node_DivMod(ir_node *n) -{ +static ir_node *equivalent_node_DivMod(ir_node *n) { ir_node *a = get_DivMod_left(n); ir_node *b = get_DivMod_right(n); @@ -1085,13 +1102,12 @@ static ir_node *equivalent_node_DivMod(ir_node *n) set_Tuple_pred(n, pn_DivMod_res_mod, new_Const(mode, get_mode_null(mode))); } return n; -} +} /* equivalent_node_DivMod */ /** * 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); @@ -1109,13 +1125,12 @@ static ir_node *equivalent_node_Or(ir_node *n) } return n; -} +} /* equivalent_node_Or */ /** * Optimize a & 0b1...1 = 0b1...1 & a = a & 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); @@ -1132,13 +1147,12 @@ static ir_node *equivalent_node_And(ir_node *n) DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND); } return n; -} +} /* equivalent_node_And */ /** * 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); ir_node *b; @@ -1147,6 +1161,9 @@ static ir_node *equivalent_node_Conv(ir_node *n) ir_mode *a_mode = get_irn_mode(a); if (n_mode == a_mode) { /* No Conv necessary */ + /* leave strict floating point Conv's */ + if (get_Conv_strict(n)) + return n; n = a; DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV); } else if (get_irn_op(a) == op_Conv) { /* Conv(Conv(b)) */ @@ -1170,7 +1187,7 @@ static ir_node *equivalent_node_Conv(ir_node *n) } } return n; -} +} /* equivalent_node_Conv */ /** * A Cast may be removed if the type of the previous node @@ -1185,14 +1202,14 @@ static ir_node *equivalent_node_Cast(ir_node *n) { DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CAST); } return n; -} +} /* equivalent_node_Cast */ /** - Several optimizations: - - no Phi in start block. - - remove Id operators that are inputs to Phi - - fold Phi-nodes, iff they have only one predecessor except - themselves. + * Several optimizations: + * - no Phi in start block. + * - remove Id operators that are inputs to Phi + * - fold Phi-nodes, iff they have only one predecessor except + * themselves. */ static ir_node *equivalent_node_Phi(ir_node *n) { @@ -1210,8 +1227,8 @@ static ir_node *equivalent_node_Phi(ir_node *n) /* @@@ fliegt 'raus, sollte aber doch immer wahr sein!!! assert(get_irn_arity(block) == n_preds && "phi in wrong block!"); */ if ((is_Block_dead(block)) || /* Control dead */ - (block == current_ir_graph->start_block)) /* There should be no Phi nodes */ - return new_Bad(); /* in the Start Block. */ + (block == get_irg_start_block(current_ir_graph))) /* There should be no Phi nodes */ + return new_Bad(); /* in the Start Block. */ if (n_preds == 0) return n; /* Phi of dead Region without predecessors. */ @@ -1257,14 +1274,13 @@ static ir_node *equivalent_node_Phi(ir_node *n) DBG_OPT_PHI(oldn, n); } return n; -} +} /* equivalent_node_Phi */ /** - Several optimizations: - - no Sync in start block. - - fold Sync-nodes, iff they have only one predecessor except - themselves. - @fixme: are there loop's in Sync's + * Several optimizations: + * - no Sync in start block. + * - fold Sync-nodes, iff they have only one predecessor except + * themselves. */ static ir_node *equivalent_node_Sync(ir_node *n) { @@ -1308,11 +1324,11 @@ static ir_node *equivalent_node_Sync(ir_node *n) DBG_OPT_SYNC(oldn, n); } return n; -} +} /* equivalent_node_Sync */ /** - * optimize Proj(Tuple) and gigo() for ProjX in Bad block, - * ProjX(Load) and ProjX(Store) + * Optimize Proj(Tuple) and gigo() for ProjX in Bad block, + * ProjX(Load) and ProjX(Store). */ static ir_node *equivalent_node_Proj(ir_node *n) { @@ -1341,9 +1357,13 @@ static ir_node *equivalent_node_Proj(ir_node *n) if (op == op_Load || op == op_Store) { /* get the load/store address */ ir_node *addr = get_irn_n(a, 1); - if (value_not_null(addr)) { - /* this node may float */ - set_irn_pinned(a, op_pin_state_floats); + ir_node *confirm; + + if (value_not_null(addr, &confirm)) { + if (confirm == NULL) { + /* this node may float if it did not depend on a Confirm */ + set_irn_pinned(a, op_pin_state_floats); + } DBG_OPT_EXC_REM(n); return new_Bad(); } @@ -1352,13 +1372,12 @@ static ir_node *equivalent_node_Proj(ir_node *n) } return n; -} +} /* equivalent_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 { @@ -1367,10 +1386,10 @@ static ir_node *equivalent_node_Id(ir_node *n) DBG_OPT_ID(oldn, n); return n; -} +} /* equivalent_node_Id */ /** - * optimize a Mux + * Optimize a Mux. */ static ir_node *equivalent_node_Mux(ir_node *n) { @@ -1439,7 +1458,18 @@ static ir_node *equivalent_node_Mux(ir_node *n) } } return n; -} +} /* equivalent_node_Mux */ + +/** + * Returns a equivalent node of a Psi: if a condition is true + * and all previous conditions are false we know its value. + * If all conditions are false its value is the default one. + */ +static ir_node *equivalent_node_Psi(ir_node *n) { + if (is_Mux(n)) + return equivalent_node_Mux(n); + return n; +} /* equivalent_node_Psi */ /** * Optimize -a CMP -b into b CMP a. @@ -1461,14 +1491,13 @@ static ir_node *equivalent_node_Cmp(ir_node *n) set_Cmp_right(n, left); } return n; -} +} /* equivalent_node_Cmp */ /** * 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); @@ -1495,10 +1524,9 @@ static ir_node *equivalent_node_Confirm(ir_node *n) } /** - * Optimize CopyB(mem, x, x) into a Nop + * Optimize CopyB(mem, x, x) into a Nop. */ -static ir_node *equivalent_node_CopyB(ir_node *n) -{ +static ir_node *equivalent_node_CopyB(ir_node *n) { ir_node *a = get_CopyB_dst(n); ir_node *b = get_CopyB_src(n); @@ -1508,16 +1536,15 @@ static ir_node *equivalent_node_CopyB(ir_node *n) turn_into_tuple(n, pn_CopyB_max); set_Tuple_pred(n, pn_CopyB_M, mem); set_Tuple_pred(n, pn_CopyB_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_Call_M_except, new_Bad()); + set_Tuple_pred(n, pn_CopyB_M_except, new_Bad()); } return n; -} +} /* equivalent_node_CopyB */ /** * Optimize Bounds(idx, idx, upper) into idx. */ -static ir_node *equivalent_node_Bound(ir_node *n) -{ +static ir_node *equivalent_node_Bound(ir_node *n) { ir_node *idx = get_Bound_index(n); ir_node *lower = get_Bound_lower(n); int ret_tuple = 0; @@ -1537,29 +1564,28 @@ static ir_node *equivalent_node_Bound(ir_node *n) * lower <= pred_lower && pred_upper <= upper. */ ir_node *upper = get_Bound_upper(n); - if (get_Bound_lower(pred) == lower && - get_Bound_upper(pred) == upper) { - /* - * One could expect that we simple return the previous - * Bound here. However, this would be wrong, as we could - * add an exception Proj to a new location than. - * So, we must turn in into a tuple - */ - ret_tuple = 1; - } + if (get_Bound_lower(pred) == lower && + get_Bound_upper(pred) == upper) { + /* + * One could expect that we simply return the previous + * Bound here. However, this would be wrong, as we could + * add an exception Proj to a new location than. + * So, we must turn in into a tuple + */ + ret_tuple = 1; + } } } if (ret_tuple) { /* Turn Bound into a tuple (mem, bad, idx) */ ir_node *mem = get_Bound_mem(n); turn_into_tuple(n, pn_Bound_max); - set_Tuple_pred(n, pn_Bound_M_regular, mem); - set_Tuple_pred(n, pn_Bound_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_Bound_res, idx); - set_Tuple_pred(n, pn_Bound_M_except, mem); + set_Tuple_pred(n, pn_Bound_M, mem); + set_Tuple_pred(n, pn_Bound_X_except, new_Bad()); /* no exception */ + set_Tuple_pred(n, pn_Bound_res, idx); } return n; -} +} /* equivalent_node_Bound */ /** * equivalent_node() returns a node equivalent to input n. It skips all nodes that @@ -1568,16 +1594,14 @@ static ir_node *equivalent_node_Bound(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; -} +} /* equivalent_node */ /** - * sets the default equivalent node operation for an ir_op_ops. + * Sets the default equivalent node operation for an ir_op_ops. * * @param code the opcode for the default operation * @param ops the operations initialized @@ -1608,6 +1632,7 @@ static ir_op_ops *firm_set_default_equivalent_node(opcode code, ir_op_ops *ops) CASE(Minus); CASE(Mul); CASE(Div); + CASE(Quot); CASE(DivMod); CASE(And); CASE(Conv); @@ -1617,6 +1642,7 @@ static ir_op_ops *firm_set_default_equivalent_node(opcode code, ir_op_ops *ops) CASE(Proj); CASE(Id); CASE(Mux); + CASE(Psi); CASE(Cmp); CASE(Confirm); CASE(CopyB); @@ -1627,13 +1653,12 @@ static ir_op_ops *firm_set_default_equivalent_node(opcode code, ir_op_ops *ops) return ops; #undef CASE -} +} /* firm_set_default_equivalent_node */ /** * Do node specific optimizations of nodes predecessors. */ -static void -optimize_preds(ir_node *n) { +static void optimize_preds(ir_node *n) { ir_node *a = NULL, *b = NULL; /* get the operands we will work on for simple cases. */ @@ -1660,7 +1685,115 @@ optimize_preds(ir_node *n) { default: break; } /* end switch */ -} +} /* optimize_preds */ + +/** + * Returns non-zero if a node is a Phi node + * with all predecessors constant. + */ +static int is_const_Phi(ir_node *n) { + int i; + + if (! is_Phi(n)) + return 0; + for (i = get_irn_arity(n) - 1; i >= 0; --i) + if (! is_Const(get_irn_n(n, i))) + return 0; + return 1; +} /* is_const_Phi */ + +/** + * Apply an evaluator on a binop with a constant operators (and one Phi). + * + * @param phi the Phi node + * @param other the other operand + * @param eval an evaluator function + * @param left if non-zero, other is the left operand, else the right + * + * @return a new Phi node if the conversion was successful, NULL else + */ +static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(tarval *, tarval *), int left) { + tarval *tv; + void **res; + ir_node *pred; + ir_mode *mode; + ir_graph *irg; + int i, n = get_irn_arity(phi); + + NEW_ARR_A(void *, res, n); + if (left) { + for (i = 0; i < n; ++i) { + pred = get_irn_n(phi, i); + tv = get_Const_tarval(pred); + tv = eval(other, tv); + + if (tv == tarval_bad) { + /* folding failed, bad */ + return NULL; + } + res[i] = tv; + } + } + else { + for (i = 0; i < n; ++i) { + pred = get_irn_n(phi, i); + tv = get_Const_tarval(pred); + tv = eval(tv, other); + + if (tv == tarval_bad) { + /* folding failed, bad */ + return 0; + } + res[i] = tv; + } + } + mode = get_irn_mode(phi); + irg = current_ir_graph; + for (i = 0; i < n; ++i) { + pred = get_irn_n(phi, i); + res[i] = new_r_Const_type(irg, get_irg_start_block(irg), + mode, res[i], get_Const_type(pred)); + } + return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode); +} /* apply_binop_on_phi */ + +/** + * Apply an evaluator on a unop with a constant operator (a Phi). + * + * @param phi the Phi node + * @param eval an evaluator function + * + * @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; + void **res; + ir_node *pred; + ir_mode *mode; + ir_graph *irg; + int i, n = get_irn_arity(phi); + + NEW_ARR_A(void *, res, n); + for (i = 0; i < n; ++i) { + pred = get_irn_n(phi, i); + tv = get_Const_tarval(pred); + tv = eval(tv); + + if (tv == tarval_bad) { + /* folding failed, bad */ + return 0; + } + res[i] = tv; + } + mode = get_irn_mode(phi); + irg = current_ir_graph; + for (i = 0; i < n; ++i) { + pred = get_irn_n(phi, i); + res[i] = new_r_Const_type(irg, get_irg_start_block(irg), + mode, res[i], get_Const_type(pred)); + } + return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode); +} /* apply_unop_on_phi */ /** * Transform AddP(P, ConvIs(Iu)), AddP(P, ConvIu(Is)) and @@ -1723,10 +1856,38 @@ static ir_node *transform_node_AddSub(ir_node *n) } } return n; -} +} /* transform_node_AddSub */ + +#define HANDLE_BINOP_PHI(op,a,b,c) \ + c = NULL; \ + if (is_Const(b) && is_const_Phi(a)) { \ + /* check for Op(Phi, Const) */ \ + c = apply_binop_on_phi(a, get_Const_tarval(b), op, 0); \ + } \ + else if (is_Const(a) && is_const_Phi(b)) { \ + /* check for Op(Const, Phi) */ \ + c = apply_binop_on_phi(b, get_Const_tarval(a), op, 1); \ + } \ + if (c) { \ + DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \ + return c; \ + } + +#define HANDLE_UNOP_PHI(op,a,c) \ + c = NULL; \ + if (is_const_Phi(a)) { \ + /* check for Op(Phi) */ \ + c = apply_unop_on_phi(a, op); \ + } \ + if (c) { \ + DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \ + return c; \ + } + /** * Do the AddSub optimization, then Transform + * Constant folding on Phi * Add(a,a) -> Mul(a, 2) * Add(Mul(a, x), a) -> Mul(a, x+1) * if the mode is integer or float. @@ -1736,15 +1897,22 @@ static ir_node *transform_node_AddSub(ir_node *n) static ir_node *transform_node_Add(ir_node *n) { ir_mode *mode; - ir_node *oldn = n; + ir_node *a, *b, *c, *oldn = n; n = transform_node_AddSub(n); + a = get_Add_left(n); + b = get_Add_right(n); + + HANDLE_BINOP_PHI(tarval_add, a,b,c); + mode = get_irn_mode(n); - if (mode_is_num(mode)) { - ir_node *a = get_Add_left(n); - ir_node *b = get_Add_right(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_num(mode)) { if (a == b) { ir_node *block = get_irn_n(n, -1); @@ -1843,25 +2011,36 @@ static ir_node *transform_node_Add(ir_node *n) } } return n; -} +} /* transform_node_Add */ /** * Do the AddSub optimization, then Transform + * Constant folding on Phi * Sub(0,a) -> Minus(a) * Sub(Mul(a, x), a) -> Mul(a, x-1) + * Sub(Sub(x, y), b) -> Sub(x, Add(y,b)) */ static ir_node *transform_node_Sub(ir_node *n) { ir_mode *mode; ir_node *oldn = n; - ir_node *a, *b; + ir_node *a, *b, *c; n = transform_node_AddSub(n); + a = get_Sub_left(n); + b = get_Sub_right(n); + + HANDLE_BINOP_PHI(tarval_sub, a,b,c); + mode = get_irn_mode(n); - a = get_Sub_left(n); - b = get_Sub_right(n); - if (mode_is_num(mode) && (classify_Const(a) == CNST_NULL)) { + + /* 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; + + /* Beware of Sub(P, P) which cannot be optimized into a simple Minus ... */ + if (mode_is_num(mode) && mode == get_irn_mode(a) && (classify_Const(a) == CNST_NULL)) { n = new_rd_Minus( get_irn_dbg_info(n), current_ir_graph, @@ -1906,22 +2085,57 @@ static ir_node *transform_node_Sub(ir_node *n) DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A); } } + else if (get_irn_op(a) == op_Sub) { + ir_node *x = get_Sub_left(a); + ir_node *y = get_Sub_right(a); + ir_node *blk = get_irn_n(n, -1); + ir_mode *m_b = get_irn_mode(b); + ir_mode *m_y = get_irn_mode(y); + ir_node *add; + + /* Determine the right mode for the Add. */ + if (m_b == m_y) + mode = m_b; + else if (mode_is_reference(m_b)) + mode = m_b; + else if (mode_is_reference(m_y)) + mode = m_y; + else { + /* + * Both modes are different but none is reference, + * happens for instance in SubP(SubP(P, Iu), Is). + * We have two possibilities here: Cast or ignore. + * Currently we ignore this case. + */ + return n; + } + + add = new_r_Add(current_ir_graph, blk, y, b, mode); + + set_Sub_left(n, x); + set_Sub_right(n, add); + DBG_OPT_ALGSIM0(n, n, FS_OPT_SUB_SUB_X_Y_Z); + } return n; -} +} /* transform_node_Sub */ /** * Transform Mul(a,-1) into -a. + * Do constant evaluation of Phi nodes. * Do architecture dependent optimizations on Mul nodes */ static ir_node *transform_node_Mul(ir_node *n) { - ir_node *oldn = n; - ir_mode *mode = get_irn_mode(n); + ir_node *c, *oldn = n; + ir_node *a = get_Mul_left(n); + ir_node *b = get_Mul_right(n); + ir_mode *mode; + HANDLE_BINOP_PHI(tarval_mul, a,b,c); + + mode = get_irn_mode(n); if (mode_is_signed(mode)) { ir_node *r = NULL; - ir_node *a = get_Mul_left(n); - ir_node *b = get_Mul_right(n); if (value_of(a) == get_mode_minus_one(mode)) r = b; @@ -1934,10 +2148,10 @@ static ir_node *transform_node_Mul(ir_node *n) { } } return arch_dep_replace_mul_with_shifts(n); -} +} /* transform_node_Mul */ /** - * transform a Div Node + * Transform a Div Node. */ static ir_node *transform_node_Div(ir_node *n) { @@ -1964,10 +2178,10 @@ static ir_node *transform_node_Div(ir_node *n) set_Tuple_pred(n, pn_Div_res, value); } return n; -} +} /* transform_node_Div */ /** - * transform a Mod node + * Transform a Mod node. */ static ir_node *transform_node_Mod(ir_node *n) { @@ -1994,10 +2208,10 @@ static ir_node *transform_node_Mod(ir_node *n) set_Tuple_pred(n, pn_Mod_res, value); } return n; -} +} /* transform_node_Mod */ /** - * transform a DivMod node + * Transform a DivMod node. */ static ir_node *transform_node_DivMod(ir_node *n) { @@ -2055,7 +2269,7 @@ static ir_node *transform_node_DivMod(ir_node *n) } return n; -} +} /* transform_node_DivMod */ /** * Optimize Abs(x) into x if x is Confirmed >= 0 @@ -2065,9 +2279,9 @@ static ir_node *transform_node_Abs(ir_node *n) { ir_node *oldn = n; ir_node *a = get_Abs_op(n); - value_classify sign = classify_value_sign(a); + value_classify_sign sign = classify_value_sign(a); - if (sign == VALUE_NEGATIVE) { + if (sign == value_classified_negative) { ir_mode *mode = get_irn_mode(n); /* @@ -2082,7 +2296,7 @@ static ir_node *transform_node_Abs(ir_node *n) DBG_OPT_CONFIRM(oldn, n); } - else if (sign == VALUE_POSITIVE) { + else if (sign == value_classified_positive) { /* n is positive, Abs is not needed */ n = a; @@ -2090,10 +2304,10 @@ static ir_node *transform_node_Abs(ir_node *n) } return n; -} +} /* transform_node_Abs */ /** - * transform a Cond node + * Transform a Cond node. */ static ir_node *transform_node_Cond(ir_node *n) { @@ -2125,18 +2339,33 @@ static ir_node *transform_node_Cond(ir_node *n) add_End_keepalive(get_irg_end(current_ir_graph), get_nodes_block(n)); } return n; -} +} /* transform_node_Cond */ + +/** + * Transform an And. + */ +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); + + HANDLE_BINOP_PHI(tarval_and, a,b,c); + return n; +} /* transform_node_And */ /** * Transform an Eor. */ static ir_node *transform_node_Eor(ir_node *n) { - ir_node *oldn = n; + ir_node *c, *oldn = n; ir_node *a = get_Eor_left(n); ir_node *b = get_Eor_right(n); ir_mode *mode = get_irn_mode(n); + HANDLE_BINOP_PHI(tarval_eor, a,b,c); + if (a == b) { /* a ^ a = 0 */ n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), @@ -2164,16 +2393,19 @@ static ir_node *transform_node_Eor(ir_node *n) } return n; -} +} /* transform_node_Eor */ /** - * Transform a boolean Not. + * Transform a Not. */ static ir_node *transform_node_Not(ir_node *n) { - ir_node *oldn = n; + ir_node *c, *oldn = n; ir_node *a = get_Not_op(n); + HANDLE_UNOP_PHI(tarval_not,a,c); + + /* check for a boolean Not */ if ( (get_irn_mode(n) == mode_b) && (get_irn_op(a) == op_Proj) && (get_irn_mode(a) == mode_b) @@ -2183,9 +2415,20 @@ static ir_node *transform_node_Not(ir_node *n) mode_b, get_negated_pnc(get_Proj_proj(a), mode_b)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP); } + return n; +} /* transform_node_Not */ +/** + * Transform a Minus. + */ +static ir_node *transform_node_Minus(ir_node *n) +{ + ir_node *c, *oldn = n; + ir_node *a = get_Minus_op(n); + + HANDLE_UNOP_PHI(tarval_neg,a,c); return n; -} +} /* transform_node_Minus */ /** * Transform a Cast_type(Const) into a new Const_type @@ -2206,7 +2449,7 @@ static ir_node *transform_node_Cast(ir_node *n) { } return n; -} +} /* transform_node_Cast */ /** * Transform a Proj(Div) with a non-zero value. @@ -2216,29 +2459,33 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) { ir_node *n = get_Proj_pred(proj); ir_node *b = get_Div_right(n); + ir_node *confirm; long proj_nr; - if (value_not_zero(b)) { + if (value_not_zero(b, &confirm)) { /* div(x, y) && y != 0 */ proj_nr = get_Proj_proj(proj); - - /* this node may float */ - set_irn_pinned(n, op_pin_state_floats); - if (proj_nr == pn_Div_X_except) { /* we found an exception handler, remove it */ DBG_OPT_EXC_REM(proj); return new_Bad(); - } else if (proj_nr == pn_Div_M) { - /* the memory Proj can be removed */ + } + else if (proj_nr == pn_Div_M) { ir_node *res = get_Div_mem(n); - set_Div_mem(n, get_irg_no_mem(current_ir_graph)); + ir_node *new_mem = get_irg_no_mem(current_ir_graph); + if (confirm) { + /* This node can only float up to the Confirm block */ + new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem); + } + set_irn_pinned(n, op_pin_state_floats); + /* this is a Div without exception, we can remove the memory edge */ + set_Div_mem(n, new_mem); return res; } } return proj; -} +} /* transform_node_Proj_Div */ /** * Transform a Proj(Mod) with a non-zero value. @@ -2248,24 +2495,28 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { ir_node *n = get_Proj_pred(proj); ir_node *b = get_Mod_right(n); + ir_node *confirm; long proj_nr; - if (value_not_zero(b)) { + if (value_not_zero(b, &confirm)) { /* mod(x, y) && y != 0 */ proj_nr = get_Proj_proj(proj); - /* this node may float */ - set_irn_pinned(n, op_pin_state_floats); - if (proj_nr == pn_Mod_X_except) { /* we found an exception handler, remove it */ DBG_OPT_EXC_REM(proj); return new_Bad(); } else if (proj_nr == pn_Mod_M) { - /* the memory Proj can be removed */ ir_node *res = get_Mod_mem(n); - set_Mod_mem(n, get_irg_no_mem(current_ir_graph)); + ir_node *new_mem = get_irg_no_mem(current_ir_graph); + if (confirm) { + /* This node can only float up to the Confirm block */ + new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem); + } + set_irn_pinned(n, op_pin_state_floats); + /* this is a Mod without exception, we can remove the memory edge */ + set_Mod_mem(n, get_irg_no_mem(current_ir_graph)); return res; } else if (proj_nr == pn_Mod_res && get_Mod_left(n) == b) { @@ -2278,7 +2529,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) } } return proj; -} +} /* transform_node_Proj_Mod */ /** * Transform a Proj(DivMod) with a non-zero value. @@ -2288,25 +2539,29 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) { ir_node *n = get_Proj_pred(proj); ir_node *b = get_DivMod_right(n); + ir_node *confirm; long proj_nr; - if (value_not_zero(b)) { + if (value_not_zero(b, &confirm)) { /* DivMod(x, y) && y != 0 */ proj_nr = get_Proj_proj(proj); - /* this node may float */ - set_irn_pinned(n, op_pin_state_floats); - if (proj_nr == pn_DivMod_X_except) { /* we found an exception handler, remove it */ DBG_OPT_EXC_REM(proj); return new_Bad(); } else if (proj_nr == pn_DivMod_M) { - /* the memory Proj can be removed */ ir_node *res = get_DivMod_mem(n); - set_DivMod_mem(n, get_irg_no_mem(current_ir_graph)); + ir_node *new_mem = get_irg_no_mem(current_ir_graph); + if (confirm) { + /* This node can only float up to the Confirm block */ + new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem); + } + set_irn_pinned(n, op_pin_state_floats); + /* this is a DivMod without exception, we can remove the memory edge */ + set_DivMod_mem(n, get_irg_no_mem(current_ir_graph)); return res; } else if (proj_nr == pn_DivMod_res_mod && get_DivMod_left(n) == b) { @@ -2319,7 +2574,7 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) } } return proj; -} +} /* transform_node_Proj_DivMod */ /** * Optimizes jump tables (CondIs or CondIu) by removing all impossible cases. @@ -2352,7 +2607,7 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) } } return proj; -} +} /* transform_node_Proj_Cond */ /** * Normalizes and optimizes Cmp nodes. @@ -2386,7 +2641,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) proj_nr = get_inversed_pnc(proj_nr); changed |= 1; } - else if (left > right) { + else if (get_irn_idx(left) > get_irn_idx(right)) { ir_node *t = left; left = right; @@ -2573,7 +2828,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) } } return proj; -} +} /* transform_node_Proj_Cmp */ /** * Does all optimizations on nodes that must be done on it's Proj's @@ -2607,10 +2862,53 @@ static ir_node *transform_node_Proj(ir_node *proj) /* do nothing */ return proj; } -} +} /* transform_node_Proj */ + +/** + * Move Confirms down through Phi nodes. + */ +static ir_node *transform_node_Phi(ir_node *phi) { + int i, n; + ir_mode *mode = get_irn_mode(phi); + + if (mode_is_reference(mode)) { + n = get_irn_arity(phi); + + /* Beware of Phi0 */ + if (n > 0) { + ir_node *pred = get_irn_n(phi, 0); + ir_node *bound, *new_Phi, *block, **in; + pn_Cmp pnc; + + if (! is_Confirm(pred)) + return phi; + + bound = get_Confirm_bound(pred); + pnc = get_Confirm_cmp(pred); + + NEW_ARR_A(ir_node *, in, n); + in[0] = get_Confirm_value(pred); + + for (i = 1; i < n; ++i) { + pred = get_irn_n(phi, i); + + if (! is_Confirm(pred) || + get_Confirm_bound(pred) != bound || + get_Confirm_cmp(pred) != pnc) + return phi; + in[i] = get_Confirm_value(pred); + } + /* move the Confirm nodes "behind" the Phi */ + block = get_irn_n(phi, -1); + new_Phi = new_r_Phi(current_ir_graph, block, n, in, get_irn_mode(phi)); + return new_r_Confirm(current_ir_graph, block, new_Phi, bound, pnc); + } + } + return phi; +} /* transform_node_Phi */ /** - * returns the operands of a commutative bin-op, if one operand is + * 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) @@ -2628,7 +2926,7 @@ static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) *a = op_a; *c = op_b; } -} +} /* get_comm_Binop_Ops */ /** * Optimize a Or(And(Or(And(v,c4),c3),c2),c1) pattern if possible. @@ -2708,7 +3006,7 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) /* check for more */ return transform_node_Or_bf_store(or); -} +} /* transform_node_Or_bf_store */ /** * Optimize an Or(shl(x, c), shr(x, bits - c)) into a Rot @@ -2819,18 +3117,25 @@ static ir_node *transform_node_Or_Rot(ir_node *or) } return or; -} +} /* transform_node_Or_Rot */ /** - * Optimize an Or + * Transform an Or. */ -static ir_node *transform_node_Or(ir_node *or) +static ir_node *transform_node_Or(ir_node *n) { - or = transform_node_Or_bf_store(or); - or = transform_node_Or_Rot(or); + ir_node *c, *oldn = n; + ir_node *a = get_Or_left(n); + ir_node *b = get_Or_right(n); + + HANDLE_BINOP_PHI(tarval_or, a,b,c); + + n = transform_node_Or_bf_store(n); + n = transform_node_Or_Rot(n); + + return n; +} /* transform_node_Or */ - return or; -} /* forward */ static ir_node *transform_node(ir_node *n); @@ -2893,11 +3198,46 @@ static ir_node *transform_node_shift(ir_node *n) return transform_node(irn); } return n; -} +} /* transform_node_shift */ + +/** + * Transform a Shr. + */ +static ir_node *transform_node_Shr(ir_node *n) +{ + ir_node *c, *oldn = n; + ir_node *a = get_Shr_left(n); + ir_node *b = get_Shr_right(n); + + HANDLE_BINOP_PHI(tarval_shr, a, b, c); + return transform_node_shift(n); +} /* transform_node_Shr */ + +/** + * Transform a Shrs. + */ +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); + + HANDLE_BINOP_PHI(tarval_shrs, a, b, c); + return transform_node_shift(n); +} /* transform_node_Shrs */ + +/** + * Transform a Shl. + */ +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); -#define transform_node_Shr transform_node_shift -#define transform_node_Shrs transform_node_shift -#define transform_node_Shl transform_node_shift + HANDLE_BINOP_PHI(tarval_shl, a, b, c); + return transform_node_shift(n); +} /* transform_node_Shl */ /** * Remove dead blocks and nodes in dead blocks @@ -2917,7 +3257,7 @@ static ir_node *transform_node_End(ir_node *n) { set_End_keepalive(n, i, new_Bad()); } return n; -} +} /* transform_node_End */ /** * Optimize a Mux into some simpler cases. @@ -3051,7 +3391,17 @@ static ir_node *transform_node_Mux(ir_node *n) } } return arch_transform_node_Mux(n); -} +} /* transform_node_Mux */ + +/** + * Optimize a Psi into some simpler cases. + */ +static ir_node *transform_node_Psi(ir_node *n) { + if (is_Mux(n)) + return transform_node_Mux(n); + + return n; +} /* transform_node_Psi */ /** * Tries several [inplace] [optimizing] transformations and returns an @@ -3064,7 +3414,7 @@ static ir_node *transform_node(ir_node *n) if (n->op->ops.transform_node) n = n->op->ops.transform_node(n); return n; -} +} /* transform_node */ /** * sSets the default transform node operation for an ir_op_ops. @@ -3091,24 +3441,28 @@ static ir_op_ops *firm_set_default_transform_node(opcode code, ir_op_ops *ops) CASE(DivMod); CASE(Abs); CASE(Cond); + CASE(And); + CASE(Or); CASE(Eor); + CASE(Minus); CASE(Not); CASE(Cast); CASE(Proj); + CASE(Phi); CASE(Sel); - CASE(Or); CASE(Shr); CASE(Shrs); CASE(Shl); CASE(End); CASE(Mux); + CASE(Psi); default: /* leave NULL */; } return ops; #undef CASE -} +} /* firm_set_default_transform_node */ /* **************** Common Subexpression Elimination **************** */ @@ -3118,98 +3472,90 @@ static ir_op_ops *firm_set_default_transform_node(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) -{ +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 */ /** Compares the attributes of two Proj nodes. */ -static int node_cmp_attr_Proj(ir_node *a, ir_node *b) -{ +static int node_cmp_attr_Proj(ir_node *a, ir_node *b) { return get_irn_proj_attr (a) != get_irn_proj_attr (b); -} +} /* node_cmp_attr_Proj */ /** Compares the attributes of two Filter nodes. */ -static int node_cmp_attr_Filter(ir_node *a, ir_node *b) -{ +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) -{ +static int node_cmp_attr_Alloc(ir_node *a, ir_node *b) { return (get_irn_alloc_attr(a).where != get_irn_alloc_attr(b).where) || (get_irn_alloc_attr(a).type != get_irn_alloc_attr(b).type); -} +} /* node_cmp_attr_Alloc */ /** Compares the attributes of two Free nodes. */ -static int node_cmp_attr_Free(ir_node *a, ir_node *b) -{ +static int node_cmp_attr_Free(ir_node *a, ir_node *b) { return (get_irn_free_attr(a).where != get_irn_free_attr(b).where) || (get_irn_free_attr(a).type != get_irn_free_attr(b).type); -} +} /* node_cmp_attr_Free */ /** Compares the attributes of two SymConst nodes. */ -static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) -{ +static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) { return (get_irn_symconst_attr(a).num != get_irn_symconst_attr(b).num) || (get_irn_symconst_attr(a).sym.type_p != get_irn_symconst_attr(b).sym.type_p) || (get_irn_symconst_attr(a).tp != get_irn_symconst_attr(b).tp); -} +} /* node_cmp_attr_SymConst */ /** Compares the attributes of two Call nodes. */ -static int node_cmp_attr_Call(ir_node *a, ir_node *b) -{ +static int node_cmp_attr_Call(ir_node *a, ir_node *b) { return (get_irn_call_attr(a) != get_irn_call_attr(b)); -} +} /* 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) { return (get_irn_sel_attr(a).ent->kind != get_irn_sel_attr(b).ent->kind) || (get_irn_sel_attr(a).ent->name != get_irn_sel_attr(b).ent->name) || (get_irn_sel_attr(a).ent->owner != get_irn_sel_attr(b).ent->owner) || (get_irn_sel_attr(a).ent->ld_name != get_irn_sel_attr(b).ent->ld_name) || (get_irn_sel_attr(a).ent->type != get_irn_sel_attr(b).ent->type); -} +} /* 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) { return get_irn_phi_attr (a) != get_irn_phi_attr (b); -} +} /* node_cmp_attr_Phi */ + +/** Compares the attributes of two Conv nodes. */ +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 */ return 1; return get_Load_mode(a) != get_Load_mode(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) { /* NEVER do CSE on volatile Stores */ return (get_Store_volatility(a) == volatility_is_volatile || get_Store_volatility(b) == volatility_is_volatile); -} +} /* node_cmp_attr_Store */ /** 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) { return (get_Confirm_cmp(a) != get_Confirm_cmp(b)); -} +} /* node_cmp_attr_Confirm */ /** * Set the default node attribute compare operation for an ir_op_ops. @@ -3237,6 +3583,7 @@ static ir_op_ops *firm_set_default_node_cmp_attr(opcode code, ir_op_ops *ops) CASE(Call); CASE(Sel); CASE(Phi); + CASE(Conv); CASE(Cast); CASE(Load); CASE(Store); @@ -3247,7 +3594,7 @@ static ir_op_ops *firm_set_default_node_cmp_attr(opcode code, ir_op_ops *ops) return ops; #undef CASE -} +} /* firm_set_default_node_cmp_attr */ /* * Compare function for two nodes in the hash table. Gets two @@ -3290,13 +3637,12 @@ int identities_cmp(const void *elt, const void *key) return a->op->ops.node_cmp_attr(a, b); return 0; -} +} /* identities_cmp */ /* * Calculate a hash value of a node. */ -unsigned -ir_node_hash (ir_node *node) +unsigned ir_node_hash(ir_node *node) { unsigned h; int i, irn_arity; @@ -3307,7 +3653,7 @@ ir_node_hash (ir_node *node) h = 9*h + HASH_PTR(get_irn_mode(node)); } else if (node->op == op_SymConst) { /* special value for const, as they only differ in their symbol. */ - h = HASH_PTR(node->attr.i.sym.type_p); + h = HASH_PTR(node->attr.symc.sym.type_p); h = 9*h + HASH_PTR(get_irn_mode(node)); } else { @@ -3315,7 +3661,7 @@ ir_node_hash (ir_node *node) h = irn_arity = get_irn_intra_arity(node); /* consider all in nodes... except the block if not a control flow. */ - for (i = is_cfop(node) ? -1 : 0; i < irn_arity; i++) { + for (i = is_cfop(node) ? -1 : 0; i < irn_arity; i++) { h = 9*h + HASH_PTR(get_irn_intra_n(node, i)); } @@ -3326,28 +3672,29 @@ ir_node_hash (ir_node *node) } return h; -} +} /* ir_node_hash */ -pset * -new_identities(void) { +pset *new_identities(void) { return new_pset(identities_cmp, N_IR_NODES); -} +} /* new_identities */ -void -del_identities(pset *value_table) { +void del_identities(pset *value_table) { del_pset(value_table); -} +} /* del_identities */ /** * Return the canonical node computing the same value as n. + * + * @param value_table The value table + * @param n The node to lookup + * * Looks up the node in a hash table. * * For Const nodes this is performed in the constructor, too. Const * nodes are extremely time critical because of their frequent use in * constant string arrays. */ -static INLINE ir_node * -identify (pset *value_table, ir_node *n) +static INLINE ir_node *identify(pset *value_table, ir_node *n) { ir_node *o = NULL; @@ -3359,43 +3706,41 @@ identify (pset *value_table, ir_node *n) ir_node *r = get_binop_right(n); /* for commutative operators perform a OP b == b OP a */ - if (l > r) { + if (get_irn_idx(l) > get_irn_idx(r)) { set_binop_left(n, r); set_binop_right(n, l); } } } - o = pset_find (value_table, n, ir_node_hash (n)); + o = pset_find(value_table, n, ir_node_hash(n)); if (!o) return n; DBG_OPT_CSE(n, o); return o; -} +} /* identify */ /** * 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. */ -static INLINE ir_node * -identify_cons (pset *value_table, ir_node *n) { +static INLINE ir_node *identify_cons(pset *value_table, ir_node *n) { ir_node *old = n; n = identify(value_table, n); if (get_irn_n(old, -1) != get_irn_n(n, -1)) set_irg_pinned(current_ir_graph, op_pin_state_floats); return n; -} +} /* identify_cons */ /* * 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. */ -ir_node * -identify_remember (pset *value_table, ir_node *n) +ir_node *identify_remember(pset *value_table, ir_node *n) { ir_node *o = NULL; @@ -3422,20 +3767,30 @@ identify_remember (pset *value_table, ir_node *n) } return o; -} +} /* identify_remember */ -void -add_identities (pset *value_table, ir_node *node) { - if (get_opt_cse() && (get_irn_opcode(node) != iro_Block)) - identify_remember (value_table, node); -} +/* 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 */ + +/* 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; + ir_graph *rem = current_ir_graph; + + current_ir_graph = irg; + foreach_pset(irg->value_table, node) + visit(node, env); + current_ir_graph = rem; +} /* visit_all_identities */ /** - * garbage in, garbage out. If a node has a dead input, i.e., the + * 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 INLINE ir_node * -gigo (ir_node *node) +static INLINE ir_node *gigo(ir_node *node) { int i, irn_arity; ir_op *op = get_irn_op(node); @@ -3462,7 +3817,7 @@ 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) { + if (op != op_Block && op != op_Phi && op != op_Tuple) { irn_arity = get_irn_arity(node); /* @@ -3477,8 +3832,15 @@ gigo (ir_node *node) if (is_Bad(pred)) return new_Bad(); +#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 + it kills it's user. + 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)); +#endif } } #if 0 @@ -3495,18 +3857,18 @@ gigo (ir_node *node) } #endif return node; -} - +} /* gigo */ /** * These optimizations deallocate nodes from the obstack. * It can only be called if it is guaranteed that no other nodes * 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) +ir_node *optimize_node(ir_node *n) { tarval *tv; ir_node *oldn = n; @@ -3550,7 +3912,7 @@ optimize_node(ir_node *n) edges_node_deleted(n, current_ir_graph); /* evaluation was successful -- replace the node. */ - obstack_free(current_ir_graph->obst, n); + irg_kill_node(current_ir_graph, n); nw = new_Const(get_tarval_mode (tv), tv); if (old_tp && get_type_mode(old_tp) == get_tarval_mode (tv)) @@ -3567,7 +3929,7 @@ optimize_node(ir_node *n) (iro == iro_Id) || (iro == iro_Proj) || (iro == iro_Block) ) /* Flags tested local. */ - n = equivalent_node (n); + n = equivalent_node(n); optimize_preds(n); /* do node specific optimizations of nodes predecessors. */ @@ -3579,14 +3941,13 @@ 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(current_ir_graph->value_table, n); if (n != oldn) { edges_node_deleted(oldn, current_ir_graph); /* We found an existing, better node, so we can deallocate the old node. */ - obstack_free (current_ir_graph->obst, oldn); - + irg_kill_node(current_ir_graph, oldn); return n; } @@ -3595,9 +3956,8 @@ optimize_node(ir_node *n) iro = get_irn_opcode(n); if (get_opt_constant_folding() || (iro == iro_Cond) || - (iro == iro_Proj) || - (iro == iro_Sel)) /* Flags tested local. */ - n = transform_node (n); + (iro == iro_Proj)) /* Flags tested local. */ + n = transform_node(n); /* Remove nodes with dead (Bad) input. Run always for transformation induced Bads. */ @@ -3605,11 +3965,11 @@ 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)) { - n = identify_remember (current_ir_graph->value_table, n); + n = identify_remember(current_ir_graph->value_table, n); } return n; -} +} /* optimize_node */ /** @@ -3617,8 +3977,7 @@ 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) +ir_node *optimize_in_place_2(ir_node *n) { tarval *tv; ir_node *oldn = n; @@ -3677,8 +4036,7 @@ optimize_in_place_2 (ir_node *n) iro = get_irn_opcode(n); if (get_opt_constant_folding() || (iro == iro_Cond) || - (iro == iro_Proj) || - (iro == iro_Sel)) /* Flags tested local. */ + (iro == iro_Proj)) /* Flags tested local. */ n = transform_node(n); /* Remove nodes with dead (Bad) input. @@ -3695,14 +4053,12 @@ optimize_in_place_2 (ir_node *n) n = identify_remember(current_ir_graph->value_table, n); return n; -} +} /* optimize_in_place_2 */ /** * 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) { /* Handle graph state */ assert(get_irg_phase_state(current_ir_graph) != phase_building); @@ -3715,13 +4071,12 @@ optimize_in_place (ir_node *n) change the control graph. */ set_irg_doms_inconsistent(current_ir_graph); return optimize_in_place_2 (n); -} +} /* optimize_in_place */ /* * Sets the default operation for an ir_ops. */ -ir_op_ops *firm_set_default_operations(opcode code, ir_op_ops *ops) -{ +ir_op_ops *firm_set_default_operations(opcode code, ir_op_ops *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); @@ -3731,4 +4086,4 @@ ir_op_ops *firm_set_default_operations(opcode code, ir_op_ops *ops) ops = firm_set_default_get_entity_attr(code, ops); return ops; -} +} /* firm_set_default_operations */