X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Flower%2Flower_mode_b.c;h=d248a873daeabd5928f48df43093501dd33684e8;hb=384e2aaec53d5d2f7571e819f5ba96e9edab6d88;hp=a711fb9f9278829fdb870e2d2e64e7b8d64dd23d;hpb=1adbf5a888bc38944df7db0c201b2a68ccb265e1;p=libfirm diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c index a711fb9f9..d248a873d 100644 --- a/ir/lower/lower_mode_b.c +++ b/ir/lower/lower_mode_b.c @@ -26,14 +26,13 @@ * @author Matthias Braun, Christoph Mallon * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include "irnode_t.h" #include "ircons_t.h" +#include "irflag.h" #include "irgwalk.h" #include "irtools.h" #include "iredges.h" @@ -74,20 +73,18 @@ static void maybe_kill_node(ir_node *node) static ir_node *create_not(dbg_info *dbgi, ir_node *node) { - ir_graph *irg = current_ir_graph; 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, mode, tv_one); + ir_node *one = new_d_Const(dbgi, tv_one); - return new_rd_Eor(dbgi, irg, block, node, one, mode); + return new_rd_Eor(dbgi, block, node, one, mode); } static ir_node *create_convb(ir_node *node) { - ir_graph *irg = current_ir_graph; ir_node *block = get_nodes_block(node); - ir_node *conv = new_rd_Conv(NULL, irg, block, node, mode_b); + ir_node *conv = new_rd_Conv(NULL, block, node, mode_b); return conv; } @@ -106,19 +103,18 @@ static ir_type *create_lowered_type(void) */ static ir_node *create_set(ir_node *node) { - ir_graph *irg = current_ir_graph; 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, mode, tv_one); + 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, mode, tv_zero); + ir_node *zero = new_d_Const(dbgi, tv_zero); - ir_node *set = new_rd_Mux(dbgi, irg, block, node, zero, one, mode); + ir_node *set = new_rd_Mux(dbgi, block, node, zero, one, mode); if (mode != config.lowered_mode) { - set = new_r_Conv(irg, block, set, config.lowered_mode); + set = new_r_Conv(block, set, config.lowered_mode); } return set; @@ -149,7 +145,6 @@ static void adjust_method_type(ir_type *method_type) static ir_node *lower_node(ir_node *node) { - ir_graph *irg = current_ir_graph; dbg_info *dbgi = get_irn_dbg_info(node); ir_node *block = get_nodes_block(node); ir_mode *mode = config.lowered_mode; @@ -168,13 +163,13 @@ static ir_node *lower_node(ir_node *node) ir_node **in; ir_node *unknown, *new_phi; - arity = get_irn_arity(node); - in = alloca(arity * sizeof(in[0])); + arity = get_irn_arity(node); + in = ALLOCAN(ir_node*, arity); unknown = new_Unknown(config.lowered_mode); for(i = 0; i < arity; ++i) { in[i] = unknown; } - new_phi = new_r_Phi(irg, block, arity, in, config.lowered_mode); + new_phi = new_r_Phi(block, arity, in, config.lowered_mode); set_irn_link(node, new_phi); pdeq_putr(lowered_nodes, node); @@ -224,10 +219,10 @@ static ir_node *lower_node(ir_node *node) ir_node *v_false = get_Mux_false(node); ir_node *low_v_false = lower_node(v_false); - ir_node *and0 = new_rd_And(dbgi, irg, block, low_cond, low_v_true, mode); + ir_node *and0 = new_rd_And(dbgi, block, low_cond, low_v_true, mode); ir_node *not_cond = create_not(dbgi, low_cond); - ir_node *and1 = new_rd_And(dbgi, irg, block, not_cond, low_v_false, mode); - ir_node *or = new_rd_Or(dbgi, irg, block, and0, and1, mode); + ir_node *and1 = new_rd_And(dbgi, block, not_cond, low_v_false, mode); + ir_node *or = new_rd_Or(dbgi, block, and0, and1, mode); set_irn_link(node, or); pdeq_putr(lowered_nodes, node); @@ -237,12 +232,11 @@ static ir_node *lower_node(ir_node *node) 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, mode, tv_zeroc); + ir_node *zero_cmp = new_d_Const(dbgi, tv_zeroc); ir_node *set; - ir_node *cmp = new_rd_Cmp(dbgi, irg, block, pred, zero_cmp); - ir_node *proj = new_rd_Proj(dbgi, irg, block, cmp, mode_b, - pn_Cmp_Lg); + 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); set = create_set(proj); set_irn_link(node, set); @@ -290,18 +284,18 @@ static ir_node *lower_node(ir_node *node) if(a != NULL) { int bits = get_mode_size_bits(mode); tarval *tv = new_tarval_from_long(bits-1, mode_Iu); - ir_node *shift_cnt = new_d_Const(dbgi, mode_Iu, tv); + ir_node *shift_cnt = new_d_Const(dbgi, tv); if(cmp_mode != mode) { - a = new_rd_Conv(dbgi, irg, block, a, mode); - b = new_rd_Conv(dbgi, irg, block, b, mode); + a = new_rd_Conv(dbgi, block, a, mode); + b = new_rd_Conv(dbgi, block, b, mode); } - res = new_rd_Sub(dbgi, irg, block, a, b, mode); + res = new_rd_Sub(dbgi, block, a, b, mode); if(need_not) { - res = new_rd_Not(dbgi, irg, block, res, mode); + res = new_rd_Not(dbgi, block, res, mode); } - res = new_rd_Shr(dbgi, irg, block, res, shift_cnt, mode); + res = new_rd_Shr(dbgi, block, res, shift_cnt, mode); set_irn_link(node, res); pdeq_putr(lowered_nodes, node); @@ -320,7 +314,7 @@ static ir_node *lower_node(ir_node *node) set_irn_mode(node, mode); return node; } else if(is_Proj(pred) && is_Start(get_Proj_pred(pred))) { - ir_entity *entity = get_irg_entity(irg); + ir_entity *entity = get_irg_entity(current_ir_graph); ir_type *type = get_entity_type(entity); adjust_method_type(type); set_irn_mode(node, mode); @@ -333,10 +327,10 @@ static ir_node *lower_node(ir_node *node) tarval *tv = get_Const_tarval(node); if(tv == get_tarval_b_true()) { tarval *tv_one = get_tarval_one(mode); - res = new_d_Const(dbgi, mode, tv_one); + res = new_d_Const(dbgi, tv_one); } else if(tv == get_tarval_b_false()) { tarval *tv_zero = get_tarval_null(mode); - res = new_d_Const(dbgi, mode, tv_zero); + res = new_d_Const(dbgi, tv_zero); } else { panic("invalid boolean const %+F", node); } @@ -405,8 +399,13 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig) { config = *nconfig; lowered_nodes = new_pdeq(); - set_using_irn_link(irg); + /* ensure no optimisation touches muxes anymore */ + set_irg_state(irg, IR_GRAPH_STATE_KEEP_MUX); + + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); + + set_opt_allow_conv_b(0); irg_walk_graph(irg, clear_links, NULL, NULL); irg_walk_graph(irg, lower_mode_b_walker, NULL, NULL); @@ -416,5 +415,5 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig) } del_pdeq(lowered_nodes); - clear_using_irn_link(irg); + ir_free_resources(irg, IR_RESOURCE_IRN_LINK); }