X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=8f3df483f766a68cd0e43888297ba9f1d80a7643;hb=ab885c915d20539feaf6098531e706bcf2d3c779;hp=e3b9d8449a16b7f08cd939052a3850ba7c7de37a;hpb=3663d1cfe641a78f9d7bc1f4df7f875757cbde9f;p=libfirm diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index e3b9d8449..8f3df483f 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -1,12 +1,14 @@ -/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe -** All rights reserved. -** -** Authors: Christian Schaefer, Goetz Lindenmaier -** -** iropt --- optimizations intertwined with IR construction. -*/ - -/* $Id$ */ +/* + * Project: libFIRM + * File name: ir/ir/iropt.c + * Purpose: iropt --- optimizations intertwined with IR construction. + * Author: Christian Schaefer + * Modified by: Goetz Lindenmaier + * Created: + * CVS-ID: $Id$ + * Copyright: (c) 1998-2003 Universität Karlsruhe + * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. + */ #ifdef HAVE_CONFIG_H # include @@ -19,9 +21,8 @@ # include "irgmod.h" # include "irvrfy.h" # include "tv.h" -# include "tune.h" # include "dbginfo_t.h" -# include "iropt_dbg.c" +# include "iropt_dbg.h" /* Make types visible to allow most efficient access */ # include "entity_t.h" @@ -39,12 +40,12 @@ static INLINE tarval * value_of (ir_node *n) { if ((n != NULL) && (get_irn_op(n) == op_Const)) - return get_Const_tarval(n); + return get_Const_tarval(n); /* might return tarval_bad */ else - return NULL; + return tarval_bad; } -/* if n can be computed, return the value, else NULL. Performs +/* if n can be computed, return the value, else tarval_bad. Performs constant folding. GL: Only if n is arithmetic operator? */ tarval * computed_value (ir_node *n) @@ -52,9 +53,10 @@ computed_value (ir_node *n) tarval *res; ir_node *a = NULL, *b = NULL; /* initialized to shut up gcc */ - tarval *ta = NULL, *tb = NULL; /* initialized to shut up gcc */ + /* initialized to uniformly filter invalid constants */ + tarval *ta = tarval_bad, *tb = tarval_bad; - res = NULL; + res = tarval_bad; /* get the operands we will work on for simple cases. */ if (is_binop(n)) { @@ -77,79 +79,83 @@ computed_value (ir_node *n) case iro_SymConst: if ((get_SymConst_kind(n) == size) && (get_type_state(get_SymConst_type(n))) == layout_fixed) - res = tarval_from_long (mode_i, get_type_size(get_SymConst_type(n))); + res = new_tarval_from_long (get_type_size(get_SymConst_type(n)), mode_Is); break; case iro_Add: - if (ta && tb && (get_irn_mode(a) == get_irn_mode(b)) - && (get_irn_mode(a) != mode_p)) { + if ((ta != tarval_bad) && (tb != tarval_bad) + && (get_irn_mode(a) == get_irn_mode(b)) + && !(get_mode_sort(get_irn_mode(a)) == irms_reference)) { res = tarval_add (ta, tb); } break; case iro_Sub: - if (ta && tb && (get_irn_mode(a) == get_irn_mode(b)) - && (get_irn_mode(a) != mode_p)) { + if ((ta != tarval_bad) && (tb != tarval_bad) + && (get_irn_mode(a) == get_irn_mode(b)) + && !(get_mode_sort(get_irn_mode(a)) == irms_reference)) { res = tarval_sub (ta, tb); - } else if (a == b) { - res = tarval_mode_null [get_irn_modecode (n)]; } break; case iro_Minus: - if (ta && mode_is_float(get_irn_mode(a))) + if ((ta != tarval_bad) && mode_is_signed(get_irn_mode(a))) res = tarval_neg (ta); break; case iro_Mul: - if (ta && tb) /* tarval_mul tests for equivalent modes itself */ { + if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) { res = tarval_mul (ta, tb); } else { /* a*0 = 0 or 0*b = 0: calls computed_value recursive and returns the 0 with proper mode. */ tarval *v; - if ( (tarval_classify ((v = computed_value (a))) == 0) - || (tarval_classify ((v = computed_value (b))) == 0)) { + if ( ( ((v = computed_value (a)) != tarval_bad) + && (v == get_mode_null(get_tarval_mode(v))) ) + || ( ((v = computed_value (b)) != tarval_bad) + && (v == get_mode_null(get_tarval_mode(v))) )) { res = v; } } break; case iro_Quot: /* This was missing in original implementation. Why? */ - if (ta && tb && (get_irn_mode(a) == get_irn_mode(b))) { - if (tarval_classify(tb) == 0) {res = NULL; break;} + if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) { + if (tb == get_mode_null(get_tarval_mode(tb))) break; /* div by zero: return tarval_bad */ res = tarval_quo(ta, tb); } break; case iro_Div: /* This was missing in original implementation. Why? */ - if (ta && tb && (get_irn_mode(a) == get_irn_mode(b))) { - if (tarval_classify(tb) == 0) {res = NULL; break;} + if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) { + if (tb == get_mode_null(get_tarval_mode(tb))) break; /* div by zero: return tarval_bad */ res = tarval_div(ta, tb); } break; case iro_Mod: /* This was missing in original implementation. Why? */ - if (ta && tb && (get_irn_mode(a) == get_irn_mode(b))) { - if (tarval_classify(tb) == 0) {res = NULL; break;} + if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) { + if (tb == get_mode_null(get_tarval_mode(tb))) break; /* div by zero: return tarval_bad */ res = tarval_mod(ta, tb); } break; /* for iro_DivMod see iro_Proj */ case iro_Abs: - if (ta) + if (ta != tarval_bad) res = tarval_abs (ta); break; case iro_And: - if (ta && tb) { + if ((ta != tarval_bad) && (tb != tarval_bad)) { res = tarval_and (ta, tb); } else { tarval *v; - if ( (tarval_classify ((v = computed_value (a))) == 0) - || (tarval_classify ((v = computed_value (b))) == 0)) { + if ( ( ((v = computed_value (a)) != tarval_bad) + && (v == get_mode_null(get_tarval_mode(v))) ) + || ( ((v = computed_value (b)) != tarval_bad) + && (v == get_mode_null(get_tarval_mode(v))) )) { res = v; } } break; case iro_Or: - if (ta && tb) { + if ((ta != tarval_bad) && (tb != tarval_bad)) { res = tarval_or (ta, tb); } else { tarval *v; @@ -159,14 +165,40 @@ computed_value (ir_node *n) } } break; - case iro_Eor: if (ta && tb) { res = tarval_eor (ta, tb); } break; - case iro_Not: if (ta) { res = tarval_neg (ta); } break; - case iro_Shl: if (ta && tb) { res = tarval_shl (ta, tb); } break; - /* tarval_shr is faulty !! */ - case iro_Shr: if (ta && tb) { res = tarval_shr (ta, tb); } break; - case iro_Shrs:if (ta && tb) { /*res = tarval_shrs (ta, tb)*/; } break; - case iro_Rot: if (ta && tb) { /*res = tarval_rot (ta, tb)*/; } break; - case iro_Conv:if (ta) { res = tarval_convert_to (ta, get_irn_mode (n)); } + case iro_Eor: + if ((ta != tarval_bad) && (tb != tarval_bad)) { + res = tarval_eor (ta, tb); + } + break; + case iro_Not: + if ((ta != tarval_bad)) { + res = tarval_not (ta); + } + break; + case iro_Shl: + if ((ta != tarval_bad) && (tb != tarval_bad)) { + res = tarval_shl (ta, tb); + } + break; + case iro_Shr: + if ((ta != tarval_bad) && (tb != tarval_bad)) { + res = tarval_shr (ta, tb); + } + break; + case iro_Shrs: + if ((ta != tarval_bad) && (tb != tarval_bad)) { + res = tarval_shrs (ta, tb); + } + break; + case iro_Rot: + if ((ta != tarval_bad) && (tb != tarval_bad)) { + /*res = tarval_rot (ta, tb)*/; + } + break; + case iro_Conv: + if (ta != tarval_bad) { + res = tarval_convert_to (ta, get_irn_mode (n)); + } break; case iro_Proj: /* iro_Cmp */ { @@ -180,8 +212,8 @@ computed_value (ir_node *n) only 1 is used. There are several case where we can evaluate a Cmp node: 1. The nodes compared are both the same. If we compare for - equal, this will return true, else it will return false. - This step relies on cse. + equal, greater equal, ... this will return true, else it + will return false. This step relies on cse. 2. The predecessors of Cmp are target values. We can evaluate the Cmp. 3. The predecessors are Allocs or void* constants. Allocs never @@ -193,49 +225,49 @@ computed_value (ir_node *n) if (aa == ab) { /* 1.: */ /* This is a tric with the bits used for encoding the Cmp Proj numbers, the following statement is not the same: - res = tarval_from_long (mode_b, (get_Proj_proj(n) == Eq)): */ - res = tarval_from_long (mode_b, (get_Proj_proj(n) & irpn_Eq)); + res = new_tarval_from_long ((get_Proj_proj(n) == Eq), mode_b) */ + res = new_tarval_from_long ((get_Proj_proj(n) & Eq), mode_b); } else { tarval *taa = computed_value (aa); tarval *tab = computed_value (ab); - if (taa && tab) { /* 2.: */ + if ((taa != tarval_bad) && (tab != tarval_bad)) { /* 2.: */ /* strange checks... */ - ir_pncmp flags = tarval_comp (taa, tab); - if (flags != irpn_False) { - res = tarval_from_long (mode_b, get_Proj_proj(n) & flags); + pnc_number flags = tarval_cmp (taa, tab); + if (flags != False) { + res = new_tarval_from_long (get_Proj_proj(n) & flags, mode_b); } } else { /* check for 3.: */ ir_node *aaa = skip_nop(skip_Proj(aa)); ir_node *aba = skip_nop(skip_Proj(ab)); if ( ( (/* aa is ProjP and aaa is Alloc */ (get_irn_op(aa) == op_Proj) - && (get_irn_mode(aa) == mode_p) + && (mode_is_reference(get_irn_mode(aa))) && (get_irn_op(aaa) == op_Alloc)) && ( (/* ab is constant void */ (get_irn_op(ab) == op_Const) - && (get_irn_mode(ab) == mode_p) - && (get_Const_tarval(ab) == tarval_p_void)) + && (mode_is_reference(get_irn_mode(ab))) + && (get_Const_tarval(ab) == get_mode_null(get_irn_mode(ab)))) || (/* ab is other Alloc */ (get_irn_op(ab) == op_Proj) - && (get_irn_mode(ab) == mode_p) + && (mode_is_reference(get_irn_mode(ab))) && (get_irn_op(aba) == op_Alloc) && (aaa != aba)))) || (/* aa is void and aba is Alloc */ (get_irn_op(aa) == op_Const) - && (get_irn_mode(aa) == mode_p) - && (get_Const_tarval(aa) == tarval_p_void) + && (mode_is_reference(get_irn_mode(aa))) + && (get_Const_tarval(aa) == get_mode_null(get_irn_mode(aa))) && (get_irn_op(ab) == op_Proj) - && (get_irn_mode(ab) == mode_p) + && (mode_is_reference(get_irn_mode(ab))) && (get_irn_op(aba) == op_Alloc))) /* 3.: */ - res = tarval_from_long (mode_b, get_Proj_proj(n) & irpn_Ne); + res = new_tarval_from_long (get_Proj_proj(n) & Ne, mode_b); } } } else if (get_irn_op(a) == op_DivMod) { ta = value_of(get_DivMod_left(a)); tb = value_of(get_DivMod_right(a)); - if (ta && tb && (get_irn_mode(a) == get_irn_mode(b))) { - if (tarval_classify(tb) == 0) {res = NULL; break;} + if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) { + if (tb == get_mode_null(get_tarval_mode(tb))) break; /* div by zero: return tarval_bad */ if (get_Proj_proj(n)== 0) /* Div */ res = tarval_div(ta, tb); else /* Mod */ @@ -251,13 +283,13 @@ computed_value (ir_node *n) } /* compute node */ - +#if 0 /* returns 1 if the a and b are pointers to different locations. */ -bool +static bool different_identity (ir_node *a, ir_node *b) { - assert (get_irn_mode (a) == mode_p - && get_irn_mode (b) == mode_p); + 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); @@ -268,7 +300,7 @@ different_identity (ir_node *a, ir_node *b) } return 0; } - +#endif /* equivalent_node returns a node equivalent to N. It skips all nodes that perform no actual computation, as, e.g., the Id nodes. It does not create @@ -310,10 +342,11 @@ equivalent_node (ir_node *n) Remaining Phi nodes are just Ids. */ if ((get_Block_n_cfgpreds(n) == 1) && (get_irn_op(get_Block_cfgpred(n, 0)) == op_Jmp) && - (get_opt_control_flow())) { + (get_opt_control_flow_straightening())) { n = get_nodes_Block(get_Block_cfgpred(n, 0)); DBG_OPT_STG; + } else if ((get_Block_n_cfgpreds(n) == 2) && - (get_opt_control_flow())) { + (get_opt_control_flow_weak_simplification())) { /* Test whether Cond jumps twice to this block @@@ we could do this also with two loops finding two preds from several ones. */ a = get_Block_cfgpred(n, 0); @@ -321,7 +354,8 @@ equivalent_node (ir_node *n) if ((get_irn_op(a) == op_Proj) && (get_irn_op(b) == op_Proj) && (get_Proj_pred(a) == get_Proj_pred(b)) && - (get_irn_op(get_Proj_pred(a)) == op_Cond)) { + (get_irn_op(get_Proj_pred(a)) == op_Cond) && + (get_irn_mode(get_Cond_selector(get_Proj_pred(a))) == mode_b)) { /* Also a single entry Block following a single exit Block. Phis have twice the same operand and will be optimized away. */ n = get_nodes_Block(a); DBG_OPT_IFSIM; @@ -356,9 +390,9 @@ equivalent_node (ir_node *n) ir_node *on; /* After running compute_node there is only one constant predecessor. Find this predecessors value and remember the other node: */ - if ((tv = computed_value (a))) { + if ((tv = computed_value (a)) != tarval_bad) { on = b; - } else if ((tv = computed_value (b))) { + } else if ((tv = computed_value (b)) != tarval_bad) { on = a; } else break; @@ -384,15 +418,15 @@ equivalent_node (ir_node *n) case iro_Minus: /* --x == x */ /* ??? Is this possible or can --x raise an out of bounds exception if min =! max? */ if (get_irn_op(get_unop_op(n)) == get_irn_op(n)) { - n = get_unop_op(get_unop_op(n)); DBG_OPT_ALGSIM2 + n = get_unop_op(get_unop_op(n)); DBG_OPT_ALGSIM2; } break; case iro_Mul: /* Mul is commutative and has again an other neutral element. */ if (tarval_classify (computed_value (a)) == 1) { - n = b; DBG_OPT_ALGSIM1 + n = b; DBG_OPT_ALGSIM1; } else if (tarval_classify (computed_value (b)) == 1) { - n = a; DBG_OPT_ALGSIM1 + n = a; DBG_OPT_ALGSIM1; } break; case iro_Div: @@ -406,10 +440,11 @@ equivalent_node (ir_node *n) set_Tuple_pred(n, 2, a); } break; - /* GL: Why are they skipped? DivMod allocates new nodes --> it's - treated in transform node. - case iro_Mod, Quot, DivMod - */ + /* + case iro_Mod, Quot, DivMod + DivMod allocates new nodes --> it's treated in transform node. + What about Quot, DivMod? + */ case iro_And: if (a == b) { n = a; /* And has it's own neutral element */ @@ -445,9 +480,13 @@ equivalent_node (ir_node *n) ir_node *first_val = NULL; /* to shutup gcc */ ir_node *scnd_val = NULL; /* to shutup gcc */ + if (!get_opt_normalize()) return n; + n_preds = get_Phi_n_preds(n); block = get_nodes_Block(n); + /* @@@ fliegt 'raus, sollte aber doch immer wahr sein!!! + assert(get_irn_arity(block) == n_preds && "phi in wrong block!"); */ if ((is_Bad(block)) || /* Control dead */ (block == current_ir_graph->start_block)) /* There should be no Phi nodes */ return new_Bad(); /* in the Start Block. */ @@ -573,7 +612,7 @@ equivalent_node (ir_node *n) } } else if (get_irn_mode(n) == mode_X && is_Bad(get_nodes_Block(n))) { - /* Remove dead control flow. */ + /* Remove dead control flow -- early gigo. */ n = new_Bad(); } } @@ -589,39 +628,68 @@ equivalent_node (ir_node *n) return n; } /* end equivalent_node() */ +/* do node specific optimizations of nodes predecessors. */ +static void +optimize_preds(ir_node *n) { + ir_node *a = NULL, *b = NULL; + + /* get the operands we will work on for simple cases. */ + if (is_binop(n)) { + a = get_binop_left(n); + b = get_binop_right(n); + } else if (is_unop(n)) { + a = get_unop_op(n); + } + + switch (get_irn_opcode(n)) { + + case iro_Cmp: + /* We don't want Cast as input to Cmp. */ + if (get_irn_op(a) == op_Cast) { + a = get_Cast_op(a); + set_Cmp_left(n, a); + } + if (get_irn_op(b) == op_Cast) { + b = get_Cast_op(b); + set_Cmp_right(n, b); + } + break; + + default: break; + } /* end switch */ +} + /* tries several [inplace] [optimizing] transformations and returns an equivalent node. The difference to equivalent_node is that these 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) -{ - +transform_node (ir_node *n) { ir_node *a = NULL, *b; tarval *ta, *tb; switch (get_irn_opcode(n)) { case iro_Div: { ta = computed_value(n); - if (ta) { + if (ta != tarval_bad) { /* Turn Div into a tuple (mem, bad, value) */ ir_node *mem = get_Div_mem(n); turn_into_tuple(n, 3); set_Tuple_pred(n, 0, mem); set_Tuple_pred(n, 1, new_Bad()); - set_Tuple_pred(n, 2, new_Const(get_tv_mode(ta), ta)); + set_Tuple_pred(n, 2, new_Const(get_tarval_mode(ta), ta)); } } break; case iro_Mod: { ta = computed_value(n); - if (ta) { - /* Turn Div into a tuple (mem, bad, value) */ + if (ta != tarval_bad) { + /* Turn Mod into a tuple (mem, bad, value) */ ir_node *mem = get_Mod_mem(n); turn_into_tuple(n, 3); set_Tuple_pred(n, 0, mem); set_Tuple_pred(n, 1, new_Bad()); - set_Tuple_pred(n, 2, new_Const(get_tv_mode(ta), ta)); + set_Tuple_pred(n, 2, new_Const(get_tarval_mode(ta), ta)); } } break; case iro_DivMod: { @@ -638,29 +706,29 @@ transform_node (ir_node *n) break; if (a == b) { - a = new_Const (mode, tarval_from_long (mode, 1)); - b = new_Const (mode, tarval_from_long (mode, 0)); + a = new_Const (mode, get_mode_one(mode)); + b = new_Const (mode, get_mode_null(mode)); evaluated = 1; } else { ta = value_of(a); tb = value_of(b); - if (tb) { - if (tarval_classify(tb) == 1) { - b = new_Const (mode, tarval_from_long (mode, 0)); + if (tb != tarval_bad) { + if (tb == get_mode_one(get_tarval_mode(tb))) { + b = new_Const (mode, get_mode_null(mode)); evaluated = 1; - } else if (ta) { + } else if (ta != tarval_bad) { tarval *resa, *resb; resa = tarval_div (ta, tb); - if (!resa) break; /* Causes exception!!! Model by replacing through - Jmp for X result!? */ + if (resa == tarval_bad) break; /* Causes exception!!! Model by replacing through + Jmp for X result!? */ resb = tarval_mod (ta, tb); - if (!resb) break; /* Causes exception! */ + if (resb == tarval_bad) break; /* Causes exception! */ a = new_Const (mode, resa); b = new_Const (mode, resb); evaluated = 1; } - } else if (tarval_classify (ta) == 0) { + } else if (ta == get_mode_null(get_tarval_mode(ta))) { b = a; evaluated = 1; } @@ -684,24 +752,24 @@ transform_node (ir_node *n) a = get_Cond_selector(n); ta = value_of(a); - if (ta && + if ((ta != tarval_bad) && (get_irn_mode(a) == mode_b) && (get_opt_unreachable_code())) { /* It's a boolean Cond, branching on a boolean constant. Replace it by a tuple (Bad, Jmp) or (Jmp, Bad) */ jmp = new_r_Jmp(current_ir_graph, get_nodes_Block(n)); turn_into_tuple(n, 2); - if (tv_val_b(ta) == 1) /* GL: I hope this returns 1 if true */ { - set_Tuple_pred(n, 0, new_Bad()); - set_Tuple_pred(n, 1, jmp); + if (ta == tarval_b_true) { + set_Tuple_pred(n, 0, new_Bad()); + set_Tuple_pred(n, 1, jmp); } else { - set_Tuple_pred(n, 0, jmp); - set_Tuple_pred(n, 1, new_Bad()); + set_Tuple_pred(n, 0, jmp); + set_Tuple_pred(n, 1, new_Bad()); } /* We might generate an endless loop, so keep it alive. */ add_End_keepalive(get_irg_end(current_ir_graph), get_nodes_Block(n)); - } else if (ta && - (get_irn_mode(a) == mode_I) && + } else if ((ta != tarval_bad) && + (get_irn_mode(a) == mode_Iu) && (get_Cond_kind(n) == dense) && (get_opt_unreachable_code())) { /* I don't want to allow Tuples smaller than the biggest Proj. @@ -747,12 +815,12 @@ transform_node (ir_node *n) else set_Proj_proj(n, 0); } else if ((get_irn_op(a) == op_Cond) - && (get_irn_mode(get_Cond_selector(a)) == mode_I) + && (get_irn_mode(get_Cond_selector(a)) == mode_Iu) && value_of(a) && (get_Cond_kind(a) == dense) && (get_opt_unreachable_code())) { /* The Cond is a Switch on a Constant */ - if (get_Proj_proj(n) == tv_val_CHIL(value_of(a))) { + if (get_Proj_proj(n) == tarval_to_long(value_of(a))) { /* The always taken branch, reuse the existing Jmp. */ if (!get_irn_link(a)) /* well, if it exists ;-> */ set_irn_link(a, new_r_Jmp(current_ir_graph, get_nodes_Block(n))); @@ -806,6 +874,10 @@ transform_node (ir_node *n) /* **************** Common Subexpression Elimination **************** */ +/** The size of the hash table used, should estimate the number of nodes + in a graph. */ +#define N_IR_NODES 512 + /* Compare function for two nodes in the hash table. Gets two */ /* nodes as parameters. Returns 0 if the nodes are a cse. */ static int @@ -839,7 +911,8 @@ vt_cmp (const void *elt, const void *key) switch (get_irn_opcode(a)) { case iro_Const: - return get_irn_const_attr (a) != get_irn_const_attr (b); + return (get_Const_tarval(a) != get_Const_tarval(b)) + || (get_Const_type(a) != get_Const_type(b)); case iro_Proj: return get_irn_proj_attr (a) != get_irn_proj_attr (b); case iro_Filter: @@ -862,6 +935,8 @@ vt_cmp (const void *elt, const void *key) || (get_irn_sel_attr(a).ent->type != get_irn_sel_attr(b).ent->type); case iro_Phi: return get_irn_phi_attr (a) != get_irn_phi_attr (b); + case iro_Cast: + return get_Cast_type(a) != get_Cast_type(b); default: ; } @@ -893,7 +968,7 @@ ir_node_hash (ir_node *node) pset * new_identities (void) { - return new_pset (vt_cmp, TUNE_NIR_NODES); + return new_pset (vt_cmp, N_IR_NODES); } void @@ -980,6 +1055,20 @@ gigo (ir_node *node) int i; ir_op* op = get_irn_op(node); +#if 1 + /* 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(node); + if (get_irn_op(block) == op_Block && get_Block_matured(block)) { + for (i = 0; i < get_irn_arity(block); i++) { + if (!is_Bad(get_irn_n(block, i))) break; + } + if (i == get_irn_arity(block)) return new_Bad(); + } + } +#endif + /* 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) { @@ -990,13 +1079,15 @@ gigo (ir_node *node) } } #if 0 + /* With this code we violate the agreement that local_optimize + only leaves Bads in Block, Phi and Tuple nodes. */ /* If Block has only Bads as predecessors it's garbage. */ /* If Phi has only Bads as predecessors it's garbage. */ - if (op == op_Block || op == op_Phi) { + if ((op == op_Block && get_Block_matured(node)) || op == op_Phi) { for (i = 0; i < get_irn_arity(node); i++) { if (!is_Bad(get_irn_n(node, i))) break; } - if (i = get_irn_arity(node)) node = new_Bad(); + if (i == get_irn_arity(node)) node = new_Bad(); } #endif return node; @@ -1007,7 +1098,7 @@ gigo (ir_node *node) It can only be called if it is guaranteed that no other nodes reference this one, i.e., right after construction of a node. */ ir_node * -optimize (ir_node *n) +optimize_node (ir_node *n) { tarval *tv; ir_node *old_n = n; @@ -1021,10 +1112,10 @@ optimize (ir_node *n) if (get_irn_op(n) != op_Const) { /* try to evaluate */ tv = computed_value (n); - if ((get_irn_mode(n) != mode_T) && (tv != NULL)) { + if ((get_irn_mode(n) != mode_T) && (tv != tarval_bad)) { /* evaluation was succesful -- replace the node. */ obstack_free (current_ir_graph->obst, n); - return new_Const (get_tv_mode (tv), tv); + return new_Const (get_tarval_mode (tv), tv); } } } @@ -1037,6 +1128,8 @@ optimize (ir_node *n) (get_irn_op(n) == op_Block) ) /* Flags tested local. */ n = equivalent_node (n); + optimize_preds(n); /* do node specific optimizations of nodes predecessors. */ + /** common subexpression elimination **/ /* Checks whether n is already available. */ /* The block input is used to distinguish different subexpressions. Right @@ -1098,9 +1191,9 @@ optimize_in_place_2 (ir_node *n) if (get_irn_op(n) != op_Const) { /* try to evaluate */ tv = computed_value (n); - if ((get_irn_mode(n) != mode_T) && (tv != NULL)) { + if ((get_irn_mode(n) != mode_T) && (tv != tarval_bad)) { /* evaluation was succesful -- replace the node. */ - n = new_Const (get_tv_mode (tv), tv); + n = new_Const (get_tarval_mode (tv), tv); __dbg_info_merge_pair(n, old_n, dbg_const_eval); return n; } @@ -1116,6 +1209,8 @@ optimize_in_place_2 (ir_node *n) (get_irn_op(n) == op_Block) ) /* Flags tested local. */ n = equivalent_node (n); + optimize_preds(n); /* do node specific optimizations of nodes predecessors. */ + /** common subexpression elimination **/ /* Checks whether n is already available. */ /* The block input is used to distinguish different subexpressions. Right