X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_mode_b.c;h=87ea56393a05bbda58cc560f76be45e3583807a4;hb=cf33c97013ef2e2a2a9e6f0dcc9226af9bb81e42;hp=5f8e137a069a54870b98c0d17f2cc8ab712f1cda;hpb=b96863be44f8a472aa1b15e834afc76dbb313751;p=libfirm diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c index 5f8e137a0..87ea56393 100644 --- a/ir/lower/lower_mode_b.c +++ b/ir/lower/lower_mode_b.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -19,17 +19,20 @@ /** * @file + * @brief lowers operations with mode_b. The result is a graph which + * might still contains some convs from/to mode_b, but no + * operations are performed on them anymore, they are just there + * so modes match. A backend can safely skip all mode_b convs. * @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" @@ -38,6 +41,7 @@ #include "error.h" #include "lowering.h" #include "pdeq.h" +#include "irpass_t.h" static lower_mode_b_config_t config; static ir_type *lowered_type = NULL; @@ -70,20 +74,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; } @@ -102,20 +104,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 *vals[2] = { one, zero }; - ir_node *set = new_rd_Psi(dbgi, irg, block, 1, &node, vals, 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); + if (mode != config.lowered_mode) { + set = new_r_Conv(block, set, config.lowered_mode); } return set; @@ -146,9 +146,7 @@ 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_op *op = get_irn_op(node); ir_node *block = get_nodes_block(node); ir_mode *mode = config.lowered_mode; ir_node *res; @@ -160,18 +158,19 @@ static ir_node *lower_node(ir_node *node) return res; /* TODO: be robust against phi-loops... */ - if(op == op_Phi) { + switch (get_irn_opcode(node)) { + case iro_Phi: { int i, arity; 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); @@ -185,7 +184,9 @@ static ir_node *lower_node(ir_node *node) return new_phi; } - if(op == op_And || op == op_Or || op == op_Eor) { + case iro_And: + case iro_Or: + case iro_Eor: { int i, arity; ir_node *copy = exact_copy(node); @@ -202,7 +203,7 @@ static ir_node *lower_node(ir_node *node) pdeq_putr(lowered_nodes, node); return copy; } - if(op == op_Not) { + case iro_Not: { ir_node *op = get_Not_op(node); ir_node *low_op = lower_node(op); @@ -211,46 +212,39 @@ static ir_node *lower_node(ir_node *node) pdeq_putr(lowered_nodes, node); return res; } - if(op == op_Psi) { - ir_node *cond = get_Psi_cond(node, 0); + case iro_Mux: { + ir_node *cond = get_Mux_sel(node); ir_node *low_cond = lower_node(cond); - ir_node *v_true = get_Psi_val(node, 0); + ir_node *v_true = get_Mux_true(node); ir_node *low_v_true = lower_node(v_true); - ir_node *v_false = get_Psi_default(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); return or; } - if(op == op_Conv) { + 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, 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); pdeq_putr(lowered_nodes, node); return set; } - if(op == op_Proj) { + case iro_Proj: { ir_node *pred = get_Proj_pred(node); if(is_Cmp(pred)) { @@ -291,18 +285,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); @@ -321,7 +315,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); @@ -330,14 +324,14 @@ static ir_node *lower_node(ir_node *node) panic("unexpected projb: %+F (pred: %+F)", node, pred); } - if(op == op_Const) { + case iro_Const: { 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); } @@ -345,11 +339,11 @@ static ir_node *lower_node(ir_node *node) pdeq_putr(lowered_nodes, node); return res; } - if (op == op_Unknown) { + case iro_Unknown: return new_Unknown(config.lowered_mode); + default: + panic("didn't expect %+F to have mode_b", node); } - - panic("didn't expect %+F to have mode_b", node); } static void lower_mode_b_walker(ir_node *node, void *env) @@ -366,8 +360,8 @@ static void lower_mode_b_walker(ir_node *node, void *env) continue; if(! config.lower_direct_cmp) { - if(is_Cond(node) - || (is_Psi(node) && get_irn_mode(node) != mode_b)) { + if (is_Cond(node) || + (is_Mux(node) && get_irn_mode(node) != mode_b)) { if(is_Proj(in)) { ir_node *pred = get_Proj_pred(in); if(is_Cmp(pred)) @@ -406,8 +400,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); @@ -417,5 +416,29 @@ 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); +} + +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); }