X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_mode_b.c;h=c541e1f1e74ed2245cfb08ccf4963b037267a33f;hb=2c8cc375a52fbfb9bdf15ebed6278a6d7b23a6ff;hp=d7e247c342e567205255c8b737583405f82d5ebd;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c index d7e247c34..c541e1f1e 100644 --- a/ir/lower/lower_mode_b.c +++ b/ir/lower/lower_mode_b.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -49,15 +49,19 @@ #include "irtools.h" #include "iredges.h" #include "iropt_t.h" +#include "irgmod.h" #include "tv.h" #include "error.h" #include "lowering.h" #include "pdeq.h" #include "irpass_t.h" +#include "util.h" +#include "array.h" -static lower_mode_b_config_t config; -static ir_type *lowered_type = NULL; -static pdeq *lowered_nodes = NULL; +static const lower_mode_b_config_t *config; +static ir_type *lowered_type; +static ir_node **lowered_nodes; +static ir_node **check_later; /** * Removes a node if its out-edge count has reached 0. @@ -77,21 +81,22 @@ static void maybe_kill_node(ir_node *node) arity = get_irn_arity(node); for (i = 0; i < arity; ++i) { - set_irn_n(node, i, new_Bad()); + set_irn_n(node, i, new_r_Bad(irg)); } - set_nodes_block(node, new_Bad()); + set_nodes_block(node, new_r_Bad(irg)); edges_node_deleted(node, irg); } static ir_node *create_not(dbg_info *dbgi, ir_node *node) { - ir_node *block = get_nodes_block(node); - ir_mode *mode = config.lowered_mode; - tarval *tv_one = get_tarval_one(mode); - ir_node *one = new_d_Const(dbgi, tv_one); + ir_node *block = get_nodes_block(node); + ir_mode *mode = config->lowered_mode; + ir_tarval *tv_one = get_mode_one(mode); + ir_graph *irg = get_irn_irg(node); + ir_node *one = new_rd_Const(dbgi, irg, tv_one); - return new_rd_Eor(dbgi, block, node, one, mode); + return new_rd_Eor(dbgi, block, node, one, mode); } static ir_node *create_convb(ir_node *node) @@ -105,38 +110,57 @@ static ir_node *create_convb(ir_node *node) static ir_type *create_lowered_type(void) { if (lowered_type == NULL) { - lowered_type = new_type_primitive(config.lowered_mode); + lowered_type = new_type_primitive(config->lowered_mode); } return lowered_type; } -/** - * creates a "set" node that produces a 0 or 1 based on a Cmp result - */ -static ir_node *create_set(ir_node *node) +ir_node *ir_create_mux_set(ir_node *cond, ir_mode *dest_mode) { - dbg_info *dbgi = get_irn_dbg_info(node); - ir_mode *mode = config.lowered_set_mode; - tarval *tv_one = get_tarval_one(mode); - ir_node *one = new_d_Const(dbgi, tv_one); - ir_node *block = get_nodes_block(node); - tarval *tv_zero = get_tarval_null(mode); - ir_node *zero = new_d_Const(dbgi, tv_zero); - - ir_node *set = new_rd_Mux(dbgi, block, node, zero, one, mode); - - if (mode != config.lowered_mode) { - set = new_r_Conv(block, set, config.lowered_mode); - } - + ir_graph *irg = get_irn_irg(cond); + ir_node *block = get_nodes_block(cond); + ir_tarval *tv_one = get_mode_one(dest_mode); + ir_node *one = new_r_Const(irg, tv_one); + ir_tarval *tv_zero = get_mode_null(dest_mode); + ir_node *zero = new_r_Const(irg, tv_zero); + ir_node *set = new_r_Mux(block, cond, zero, one, dest_mode); return set; } +ir_node *ir_create_cond_set(ir_node *cond_value, ir_mode *dest_mode) +{ + ir_node *lower_block = part_block_edges(cond_value); + ir_node *upper_block = get_nodes_block(cond_value); + ir_graph *irg = get_irn_irg(cond_value); + ir_node *cond = new_r_Cond(upper_block, cond_value); + ir_node *proj_true = new_r_Proj(cond, mode_X, pn_Cond_true); + ir_node *proj_false = new_r_Proj(cond, mode_X, pn_Cond_false); + ir_node *in_true[1] = { proj_true }; + ir_node *in_false[1] = { proj_false }; + ir_node *true_block = new_r_Block(irg, ARRAY_SIZE(in_true), in_true); + ir_node *false_block = new_r_Block(irg, ARRAY_SIZE(in_false),in_false); + ir_node *true_jmp = new_r_Jmp(true_block); + ir_node *false_jmp = new_r_Jmp(false_block); + ir_node *lower_in[2] = { true_jmp, false_jmp }; + ir_node *one = new_r_Const(irg, get_mode_one(dest_mode)); + ir_node *zero = new_r_Const(irg, get_mode_null(dest_mode)); + ir_node *phi_in[2] = { one, zero }; + ir_node *phi; + + set_irn_in(lower_block, ARRAY_SIZE(lower_in), lower_in); + phi = new_r_Phi(lower_block, ARRAY_SIZE(phi_in), phi_in, dest_mode); + + /* make sure we do visit the cond_value later... */ + ARR_APP1(ir_node*, check_later, cond_value); + + return phi; +} + static void adjust_method_type(ir_type *method_type) { - int i; - int n_params; - int n_res; + size_t i; + size_t n_params; + size_t n_res; n_params = get_method_n_params(method_type); for (i = 0; i < n_params; ++i) { @@ -159,34 +183,36 @@ static ir_node *lower_node(ir_node *node) { dbg_info *dbgi = get_irn_dbg_info(node); ir_node *block = get_nodes_block(node); - ir_mode *mode = config.lowered_mode; - ir_node *res; + ir_mode *mode = config->lowered_mode; + ir_node *res = (ir_node*)get_irn_link(node); + ir_graph *irg; - res = get_irn_link(node); if (res != NULL) return res; assert(get_irn_mode(node) == mode_b); + irg = get_irn_irg(node); switch (get_irn_opcode(node)) { case iro_Phi: { int i, arity; ir_node **in; - ir_node *unknown, *new_phi; + ir_node *dummy; + ir_node *new_phi; - arity = get_irn_arity(node); - in = ALLOCAN(ir_node*, arity); - unknown = new_Unknown(mode); + arity = get_irn_arity(node); + in = ALLOCAN(ir_node*, arity); + dummy = new_r_Dummy(irg, mode); for (i = 0; i < arity; ++i) { - in[i] = unknown; + in[i] = dummy; } new_phi = new_r_Phi(block, arity, in, mode); /* FIXME This does not correctly break cycles: The Phi might not be the - * first in the recursion, so the caller(s) are some yet un-lowered nodes - * and this Phi might have them (indirectly) as operands, so they would be - * replaced twice. */ + * first in the recursion, so the caller(s) are some yet un-lowered + * nodes and this Phi might have them (indirectly) as operands, so they + * would be replaced twice. */ set_irn_link(node, new_phi); - pdeq_putr(lowered_nodes, node); + ARR_APP1(ir_node*, lowered_nodes, node); for (i = 0; i < arity; ++i) { ir_node *in = get_irn_n(node, i); @@ -198,20 +224,22 @@ static ir_node *lower_node(ir_node *node) return new_phi; } - case iro_And: - case iro_Or: + case iro_And: { + ir_node *lowered_left = lower_node(get_And_left(node)); + ir_node *lowered_right = lower_node(get_And_right(node)); + res = new_rd_And(dbgi, block, lowered_left, lowered_right, mode); + break; + } + case iro_Or: { + ir_node *lowered_left = lower_node(get_Or_left(node)); + ir_node *lowered_right = lower_node(get_Or_right(node)); + res = new_rd_Or(dbgi, block, lowered_left, lowered_right, mode); + break; + } case iro_Eor: { - int i, arity; - - res = exact_copy(node); - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_n(node, i); - ir_node *low_in = lower_node(in); - - set_irn_n(res, i, low_in); - } - set_irn_mode(res, mode); + ir_node *lowered_left = lower_node(get_Eor_left(node)); + ir_node *lowered_right = lower_node(get_Eor_right(node)); + res = new_rd_Eor(dbgi, block, lowered_left, lowered_right, mode); break; } @@ -239,14 +267,14 @@ static ir_node *lower_node(ir_node *node) } case iro_Conv: { - ir_node *pred = get_Conv_op(node); - ir_mode *mode = get_irn_mode(pred); - tarval *tv_zeroc = get_tarval_null(mode); - ir_node *zero_cmp = new_d_Const(dbgi, tv_zeroc); + ir_node *pred = get_Conv_op(node); + ir_mode *mode = get_irn_mode(pred); + ir_tarval *tv_zeroc = get_mode_null(mode); + ir_node *zero_cmp = new_rd_Const(dbgi, irg, tv_zeroc); ir_node *cmp = new_rd_Cmp(dbgi, block, pred, zero_cmp); - ir_node *proj = new_rd_Proj(dbgi, block, cmp, mode_b, pn_Cmp_Lg); - res = create_set(proj); + ir_node *proj = new_rd_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg); + res = config->create_set(proj); break; } @@ -261,13 +289,13 @@ static ir_node *lower_node(ir_node *node) if ((mode_is_int(cmp_mode) || mode_is_reference(cmp_mode)) && (get_mode_size_bits(cmp_mode) < get_mode_size_bits(mode) || (mode_is_signed(cmp_mode) && is_Const(right) && is_Const_null(right)))) { - int pnc = get_Proj_proj(node); - int need_not = 0; - ir_node *a = NULL; - ir_node *b = NULL; - int bits; - tarval *tv; - ir_node *shift_cnt; + int pnc = get_Proj_proj(node); + int need_not = 0; + ir_node *a = NULL; + ir_node *b = NULL; + int bits; + ir_tarval *tv; + ir_node *shift_cnt; if (pnc == pn_Cmp_Lt) { /* a < b -> (a - b) >> 31 */ @@ -293,7 +321,7 @@ static ir_node *lower_node(ir_node *node) bits = get_mode_size_bits(mode); tv = new_tarval_from_long(bits-1, mode_Iu); - shift_cnt = new_d_Const(dbgi, tv); + shift_cnt = new_rd_Const(dbgi, irg, tv); if (cmp_mode != mode) { a = new_rd_Conv(dbgi, block, a, mode); @@ -308,16 +336,17 @@ static ir_node *lower_node(ir_node *node) } else { /* synthesize the 0/1 value */ synth_zero_one: - res = create_set(node); + res = config->create_set(node); } } else if (is_Proj(pred) && is_Call(get_Proj_pred(pred))) { - ir_type *type = get_Call_type(get_Proj_pred(pred)); + ir_type *type = get_Call_type(get_Proj_pred(pred)); adjust_method_type(type); set_irn_mode(node, mode); res = node; goto own_replacement; } else if (is_Proj(pred) && is_Start(get_Proj_pred(pred))) { - ir_entity *entity = get_irg_entity(current_ir_graph); + ir_graph *irg = get_irn_irg(node); + ir_entity *entity = get_irg_entity(irg); ir_type *type = get_entity_type(entity); adjust_method_type(type); set_irn_mode(node, mode); @@ -330,13 +359,13 @@ synth_zero_one: } case iro_Const: { - tarval *tv = get_Const_tarval(node); + ir_tarval *tv = get_Const_tarval(node); if (tv == get_tarval_b_true()) { - tarval *tv_one = get_tarval_one(mode); - res = new_d_Const(dbgi, tv_one); + ir_tarval *tv_one = get_mode_one(mode); + res = new_rd_Const(dbgi, irg, tv_one); } else if (tv == get_tarval_b_false()) { - tarval *tv_zero = get_tarval_null(mode); - res = new_d_Const(dbgi, tv_zero); + ir_tarval *tv_zero = get_mode_null(mode); + res = new_rd_Const(dbgi, irg, tv_zero); } else { panic("invalid boolean const %+F", node); } @@ -344,14 +373,14 @@ synth_zero_one: } case iro_Unknown: - res = new_Unknown(mode); + res = new_r_Unknown(irg, mode); break; default: panic("didn't expect %+F to have mode_b", node); } - pdeq_putr(lowered_nodes, node); + ARR_APP1(ir_node*, lowered_nodes, node); own_replacement: set_irn_link(node, res); return res; @@ -360,8 +389,7 @@ own_replacement: static void lower_mode_b_walker(ir_node *node, void *env) { int i, arity; - bool changed = 0; - (void) env; + bool changed = false; arity = get_irn_arity(node); for (i = 0; i < arity; ++i) { @@ -370,7 +398,7 @@ static void lower_mode_b_walker(ir_node *node, void *env) if (get_irn_mode(in) != mode_b) continue; - if (! config.lower_direct_cmp) { + if (! config->lower_direct_cmp) { /* Proj(Cmp) as input for Cond and Mux nodes needs no changes. (Mux with mode_b is an exception as it gets replaced by and/or anyway so we still lower the inputs then) */ @@ -396,61 +424,52 @@ static void lower_mode_b_walker(ir_node *node, void *env) changed = true; } if (changed) { - add_identities(current_ir_graph->value_table, node); + bool *global_changed = (bool*)env; + *global_changed = true; + add_identities(node); } } void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig) { - ir_entity *entity = get_irg_entity(irg); - ir_type *type = get_entity_type(entity); - - config = *nconfig; - lowered_nodes = new_pdeq(); + ir_entity *entity = get_irg_entity(irg); + ir_type *type = get_entity_type(entity); + bool changed = false; + size_t i; + size_t n; + + config = nconfig; + lowered_nodes = NEW_ARR_F(ir_node*, 0); + check_later = NEW_ARR_F(ir_node*, 0); lowered_type = NULL; + edges_assure(irg); + /* ensure no optimisation touches muxes anymore */ - set_irg_state(irg, IR_GRAPH_STATE_KEEP_MUX); + set_irg_state(irg, IR_GRAPH_STATE_KEEP_MUX | IR_GRAPH_STATE_BCONV_ALLOWED); ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); adjust_method_type(type); - set_opt_allow_conv_b(0); irg_walk_graph(irg, firm_clear_link, NULL, NULL); - irg_walk_graph(irg, lower_mode_b_walker, NULL, NULL); + irg_walk_graph(irg, lower_mode_b_walker, NULL, &changed); - while (!pdeq_empty(lowered_nodes)) { - ir_node *node = (ir_node*) pdeq_getr(lowered_nodes); + for (i = 0, n = ARR_LEN(check_later); i < n; ++i) { + ir_node *node = check_later[i]; + irg_walk_core(node, lower_mode_b_walker, NULL, &changed); + } + + for (i = 0, n = ARR_LEN(lowered_nodes); i < n; ++i) { + ir_node *node = lowered_nodes[i]; maybe_kill_node(node); } - del_pdeq(lowered_nodes); + DEL_ARR_F(check_later); + DEL_ARR_F(lowered_nodes); ir_free_resources(irg, IR_RESOURCE_IRN_LINK); -} - -struct pass_t { - ir_graph_pass_t pass; - const lower_mode_b_config_t *config; -}; - -/** - * Wrapper to run ir_lower_mode_b() as an ir_graph pass - */ -static int pass_wrapper(ir_graph *irg, void *context) -{ - struct pass_t *pass = context; - - ir_lower_mode_b(irg, pass->config); - return 0; -} -ir_graph_pass_t *ir_lower_mode_b_pass( - const char *name, const lower_mode_b_config_t *config) -{ - struct pass_t *pass = XMALLOCZ(struct pass_t); - - pass->config = config; - return def_graph_pass_constructor( - &pass->pass, name ? name : "lower_mode_b", pass_wrapper); + if (changed) { + set_irg_outs_inconsistent(irg); + } }