X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_dw.c;h=5c0050897d3aeeba4210c922b2c6616b0cca90a2;hb=15b2fcf1f10bdf2c54a8e600a6f5fe2e17b56834;hp=c92c2afc97b32f19478dd747defd3db9f18f58dc;hpb=a76b189218289d8074d8e72931dffd26747ed1ad;p=libfirm diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c index c92c2afc9..5c0050897 100644 --- a/ir/lower/lower_dw.c +++ b/ir/lower/lower_dw.c @@ -22,7 +22,6 @@ * @brief Lower double word operations, i.e. 64bit -> 32bit, 32bit -> 16bit etc. * @date 8.10.2004 * @author Michael Beck - * @version $Id$ */ #include "config.h" @@ -31,9 +30,11 @@ #include #include +#include "be.h" #include "error.h" #include "lowering.h" #include "irnode_t.h" +#include "irnodeset.h" #include "irgraph_t.h" #include "irmode_t.h" #include "iropt_t.h" @@ -46,6 +47,7 @@ #include "irgwalk.h" #include "ircons.h" #include "irflag.h" +#include "iroptimize.h" #include "irtools.h" #include "debug.h" #include "set.h" @@ -65,9 +67,15 @@ static set *conv_types; /** A map from a method type to its lowered type. */ static pmap *lowered_type; +/** A map from a builtin type to its lower and higher type. */ +static pmap *lowered_builtin_type_high; +static pmap *lowered_builtin_type_low; + /** The types for the binop and unop intrinsics. */ static ir_type *binop_tp_u, *binop_tp_s, *unop_tp_u, *unop_tp_s, *tp_s, *tp_u; +static ir_nodeset_t created_mux_nodes; + /** the debug handle */ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) @@ -103,7 +111,6 @@ typedef struct lower_dw_env_t { ir_graph *irg; struct obstack obst; /**< an obstack holding the temporary data */ ir_tarval *tv_mode_bytes; /**< a tarval containing the number of bytes in the lowered modes */ - ir_tarval *tv_mode_bits; /**< a tarval containing the number of bits in the lowered modes */ pdeq *waitq; /**< a wait queue of all nodes that must be handled later */ ir_node **lowered_phis; /**< list of lowered phis */ ir_mode *high_signed; /**< doubleword signed type */ @@ -133,7 +140,7 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode) key.omode = omode; key.mtd = NULL; - entry = (conv_tp_entry_t*)set_insert(conv_types, &key, sizeof(key), HASH_PTR(imode) ^ HASH_PTR(omode)); + entry = set_insert(conv_tp_entry_t, conv_types, &key, sizeof(key), hash_ptr(imode) ^ hash_ptr(omode)); if (! entry->mtd) { int n_param = 1, n_res = 1; @@ -148,8 +155,13 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode) /* set param types and result types */ n_param = 0; if (imode == env->high_signed) { - set_method_param_type(mtd, n_param++, tp_u); - set_method_param_type(mtd, n_param++, tp_s); + if (env->params->little_endian) { + set_method_param_type(mtd, n_param++, tp_u); + set_method_param_type(mtd, n_param++, tp_s); + } else { + set_method_param_type(mtd, n_param++, tp_s); + set_method_param_type(mtd, n_param++, tp_u); + } } else if (imode == env->high_unsigned) { set_method_param_type(mtd, n_param++, tp_u); set_method_param_type(mtd, n_param++, tp_u); @@ -160,8 +172,13 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode) n_res = 0; if (omode == env->high_signed) { - set_method_res_type(mtd, n_res++, tp_u); - set_method_res_type(mtd, n_res++, tp_s); + if (env->params->little_endian) { + set_method_res_type(mtd, n_res++, tp_u); + set_method_res_type(mtd, n_res++, tp_s); + } else { + set_method_res_type(mtd, n_res++, tp_s); + set_method_res_type(mtd, n_res++, tp_u); + } } else if (omode == env->high_unsigned) { set_method_res_type(mtd, n_res++, tp_u); set_method_res_type(mtd, n_res++, tp_u); @@ -183,15 +200,14 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode) */ static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf) { - int i, arity = get_irn_arity(block); + int i, arity = get_Block_n_cfgpreds(block); ir_node **in; - const ir_edge_t *edge; assert(nr < arity); NEW_ARR_A(ir_node *, in, arity + 1); for (i = 0; i < arity; ++i) - in[i] = get_irn_n(block, i); + in[i] = get_Block_cfgpred(block, i); in[i] = cf; set_irn_in(block, i + 1, in); @@ -215,11 +231,11 @@ static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf) */ static void add_block_cf_input(ir_node *block, ir_node *tmpl, ir_node *cf) { - int i, arity = get_irn_arity(block); + int i, arity = get_Block_n_cfgpreds(block); int nr = 0; for (i = 0; i < arity; ++i) { - if (get_irn_n(block, i) == tmpl) { + if (get_Block_cfgpred(block, i) == tmpl) { nr = i; break; } @@ -284,6 +300,27 @@ static void prepare_links(ir_node *node) env->flags |= MUST_BE_LOWERED; } return; + } else if (is_Call(node)) { + /* Special case: If the result of the Call is never used, we won't + * find a Proj with a mode that potentially triggers MUST_BE_LOWERED + * to be set. Thus, if we see a call, we check its result types and + * decide whether MUST_BE_LOWERED has to be set. + */ + ir_type *tp = get_Call_type(node); + size_t n_res, i; + + n_res = get_method_n_ress(tp); + for (i = 0; i < n_res; ++i) { + ir_type *rtp = get_method_res_type(tp, i); + + if (is_Primitive_type(rtp)) { + ir_mode *rmode = get_type_mode(rtp); + + if (rmode == env->high_signed || rmode == env->high_unsigned) { + env->flags |= MUST_BE_LOWERED; + } + } + } } } @@ -317,7 +354,7 @@ static void lower_Const(ir_node *node, ir_mode *mode) ir_tarval *tv = get_Const_tarval(node); ir_tarval *tv_l = tarval_convert_to(tv, low_mode); ir_node *res_low = new_rd_Const(dbg, irg, tv_l); - ir_tarval *tv_shrs = tarval_shrs(tv, env->tv_mode_bits); + ir_tarval *tv_shrs = tarval_shrs_unsigned(tv, get_mode_size_bits(low_mode)); ir_tarval *tv_h = tarval_convert_to(tv_shrs, mode); ir_node *res_high = new_rd_Const(dbg, irg, tv_h); @@ -340,8 +377,6 @@ static void lower_Load(ir_node *node, ir_mode *mode) ir_node *block = get_nodes_block(node); ir_cons_flags volatility = get_Load_volatility(node) == volatility_is_volatile ? cons_volatile : cons_none; - const ir_edge_t *edge; - const ir_edge_t *next; if (env->params->little_endian) { low = adr; @@ -357,7 +392,7 @@ static void lower_Load(ir_node *node, ir_mode *mode) proj_m = new_r_Proj(low, mode_M, pn_Load_M); high = new_rd_Load(dbg, block, proj_m, high, mode, volatility); - foreach_out_edge_safe(node, edge, next) { + foreach_out_edge_safe(node, edge) { ir_node *proj = get_edge_src_irn(edge); if (!is_Proj(proj)) continue; @@ -399,8 +434,6 @@ static void lower_Store(ir_node *node, ir_mode *mode) const lower64_entry_t *entry = get_node_entry(value); ir_cons_flags volatility = get_Store_volatility(node) == volatility_is_volatile ? cons_volatile : cons_none; - const ir_edge_t *edge; - const ir_edge_t *next; (void) mode; assert(entry); @@ -430,7 +463,7 @@ static void lower_Store(ir_node *node, ir_mode *mode) proj_m = new_r_Proj(low, mode_M, pn_Store_M); high = new_rd_Store(dbg, block, proj_m, high, entry->high_word, volatility); - foreach_out_edge_safe(node, edge, next) { + foreach_out_edge_safe(node, edge) { ir_node *proj = get_edge_src_irn(edge); if (!is_Proj(proj)) continue; @@ -474,8 +507,8 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, key.omode = omode; key.ent = NULL; - entry = (op_mode_entry_t*)set_insert(intrinsic_fkt, &key, sizeof(key), - HASH_PTR(op) ^ HASH_PTR(imode) ^ (HASH_PTR(omode) << 8)); + entry = set_insert(op_mode_entry_t, intrinsic_fkt, &key, sizeof(key), + hash_ptr(op) ^ hash_ptr(imode) ^ (hash_ptr(omode) << 8)); if (! entry->ent) { /* create a new one */ ent = env->params->create_intrinsic(method, op, imode, omode, env->params->ctx); @@ -496,19 +529,16 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, */ static void lower_Div(ir_node *node, ir_mode *mode) { - ir_node *left = get_Div_left(node); - ir_node *right = get_Div_right(node); - ir_node *block = get_nodes_block(node); - dbg_info *dbgi = get_irn_dbg_info(node); - ir_type *mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; - ir_mode *opmode = get_irn_op_mode(node); - ir_node *addr - = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode); - ir_node *in[4]; - ir_node *call; - ir_node *resproj; - const ir_edge_t *edge; - const ir_edge_t *next; + ir_node *left = get_Div_left(node); + ir_node *right = get_Div_right(node); + ir_node *block = get_nodes_block(node); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_type *mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; + ir_mode *opmode = get_irn_op_mode(node); + ir_node *addr = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode); + ir_node *in[4]; + ir_node *call; + ir_node *resproj; if (env->params->little_endian) { in[0] = get_lowered_low(left); @@ -525,7 +555,7 @@ static void lower_Div(ir_node *node, ir_mode *mode) resproj = new_r_Proj(call, mode_T, pn_Call_T_result); set_irn_pinned(call, get_irn_pinned(node)); - foreach_out_edge_safe(node, edge, next) { + foreach_out_edge_safe(node, edge) { ir_node *proj = get_edge_src_irn(edge); if (!is_Proj(proj)) continue; @@ -571,19 +601,16 @@ static void lower_Div(ir_node *node, ir_mode *mode) */ static void lower_Mod(ir_node *node, ir_mode *mode) { - ir_node *left = get_Mod_left(node); - ir_node *right = get_Mod_right(node); - dbg_info *dbgi = get_irn_dbg_info(node); - ir_node *block = get_nodes_block(node); - ir_type *mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; - ir_mode *opmode = get_irn_op_mode(node); - ir_node *addr - = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode); - ir_node *in[4]; - ir_node *call; - ir_node *resproj; - const ir_edge_t *edge; - const ir_edge_t *next; + ir_node *left = get_Mod_left(node); + ir_node *right = get_Mod_right(node); + dbg_info *dbgi = get_irn_dbg_info(node); + ir_node *block = get_nodes_block(node); + ir_type *mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u; + ir_mode *opmode = get_irn_op_mode(node); + ir_node *addr = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode); + ir_node *in[4]; + ir_node *call; + ir_node *resproj; if (env->params->little_endian) { in[0] = get_lowered_low(left); @@ -600,7 +627,7 @@ static void lower_Mod(ir_node *node, ir_mode *mode) resproj = new_r_Proj(call, mode_T, pn_Call_T_result); set_irn_pinned(call, get_irn_pinned(node)); - foreach_out_edge_safe(node, edge, next) { + foreach_out_edge_safe(node, edge) { ir_node *proj = get_edge_src_irn(edge); if (!is_Proj(proj)) continue; @@ -703,7 +730,6 @@ static void move(ir_node *node, ir_node *from_bl, ir_node *to_bl) /* move its Projs */ if (get_irn_mode(node) == mode_T) { - const ir_edge_t *edge; foreach_out_edge(node, edge) { ir_node *proj = get_edge_src_irn(edge); if (!is_Proj(proj)) @@ -751,8 +777,6 @@ static ir_node *part_block_dw(ir_node *node) int n_cfgpreds = get_Block_n_cfgpreds(old_block); ir_node **cfgpreds = get_Block_cfgpred_arr(old_block); ir_node *new_block = new_r_Block(irg, n_cfgpreds, cfgpreds); - const ir_edge_t *edge; - const ir_edge_t *next; /* old_block has no predecessors anymore for now */ set_irn_in(old_block, 0, NULL); @@ -761,7 +785,7 @@ static ir_node *part_block_dw(ir_node *node) move(node, old_block, new_block); /* move Phi nodes to new_block */ - foreach_out_edge_safe(old_block, edge, next) { + foreach_out_edge_safe(old_block, edge) { ir_node *phi = get_edge_src_irn(edge); if (!is_Phi(phi)) continue; @@ -790,7 +814,7 @@ static void lower_shr_helper(ir_node *node, ir_mode *mode, ir_node *lower_block; ir_node *block; ir_node *cnst; - ir_node *and; + ir_node *andn; ir_node *cmp; ir_node *cond; ir_node *proj_true; @@ -834,9 +858,9 @@ static void lower_shr_helper(ir_node *node, ir_mode *mode, /* add a Cmp to test if highest bit is set <=> whether we shift more * than half the word width */ cnst = new_r_Const_long(irg, low_unsigned, modulo_shift2); - and = new_r_And(block, right, cnst, low_unsigned); + andn = new_r_And(block, right, cnst, low_unsigned); cnst = new_r_Const(irg, get_mode_null(low_unsigned)); - cmp = new_rd_Cmp(dbgi, block, and, cnst, ir_relation_equal); + cmp = new_rd_Cmp(dbgi, block, andn, cnst, ir_relation_equal); cond = new_rd_Cond(dbgi, block, cmp); proj_true = new_r_Proj(cond, mode_X, pn_Cond_true); proj_false = new_r_Proj(cond, mode_X, pn_Cond_false); @@ -925,7 +949,7 @@ static void lower_Shl(ir_node *node, ir_mode *mode) ir_node *lower_block = get_nodes_block(node); ir_node *block; ir_node *cnst; - ir_node *and; + ir_node *andn; ir_node *cmp; ir_node *cond; ir_node *proj_true; @@ -940,14 +964,14 @@ static void lower_Shl(ir_node *node, ir_mode *mode) * (and can't handle anything else) */ if (modulo_shift != get_mode_size_bits(shr_mode) || modulo_shift2<<1 != modulo_shift) { - panic("Shr lowering only implemented for modulo shift shr operations"); + panic("Shl lowering only implemented for modulo shift shl operations"); } if (!is_po2(modulo_shift) || !is_po2(modulo_shift2)) { - panic("Shr lowering only implemented for power-of-2 modes"); + panic("Shl lowering only implemented for power-of-2 modes"); } /* without 2-complement the -x instead of (bit_width-x) trick won't work */ if (get_mode_arithmetic(shr_mode) != irma_twos_complement) { - panic("Shr lowering only implemented for two-complement modes"); + panic("Shl lowering only implemented for two-complement modes"); } /* if the right operand is a 64bit value, we're only interested in the @@ -967,9 +991,9 @@ static void lower_Shl(ir_node *node, ir_mode *mode) /* add a Cmp to test if highest bit is set <=> whether we shift more * than half the word width */ cnst = new_r_Const_long(irg, low_unsigned, modulo_shift2); - and = new_r_And(block, right, cnst, low_unsigned); + andn = new_r_And(block, right, cnst, low_unsigned); cnst = new_r_Const(irg, get_mode_null(low_unsigned)); - cmp = new_rd_Cmp(dbgi, block, and, cnst, ir_relation_equal); + cmp = new_rd_Cmp(dbgi, block, andn, cnst, ir_relation_equal); cond = new_rd_Cond(dbgi, block, cmp); proj_true = new_r_Proj(cond, mode_X, pn_Cond_true); proj_false = new_r_Proj(cond, mode_X, pn_Cond_false); @@ -1168,6 +1192,23 @@ static void lower_Not(ir_node *node, ir_mode *mode) ir_set_dw_lowered(node, res_low, res_high); } +static void lower_Proj(ir_node *node, ir_mode *op_mode) +{ + ir_mode *mode = get_irn_mode(node); + ir_node *pred; + (void)op_mode; + if (mode != env->high_signed && mode != env->high_unsigned) + return; + /* skip tuples */ + pred = get_Proj_pred(node); + if (is_Tuple(pred)) { + long pn = get_Proj_proj(node); + ir_node *op = get_irn_n(pred, pn); + const lower64_entry_t *entry = get_node_entry(op); + ir_set_dw_lowered(node, entry->low_word, entry->high_word); + } +} + static bool is_equality_cmp(const ir_node *node) { ir_relation relation = get_Cmp_relation(node); @@ -1198,6 +1239,18 @@ static ir_node *get_cfop_destination(const ir_node *cfop) return get_edge_src_irn(first); } +static void lower_Switch(ir_node *node, ir_mode *high_mode) +{ + ir_node *selector = get_Switch_selector(node); + ir_mode *mode = get_irn_mode(selector); + (void)high_mode; + if (mode == env->high_signed || mode == env->high_unsigned) { + /* we can't really handle Switch with 64bit offsets */ + panic("Switch with 64bit jumptable not supported"); + } + lower_node(selector); +} + /** * Translate a Cond. */ @@ -1205,7 +1258,6 @@ static void lower_Cond(ir_node *node, ir_mode *high_mode) { ir_node *left, *right, *block; ir_node *sel = get_Cond_selector(node); - ir_mode *m = get_irn_mode(sel); ir_mode *cmp_mode; const lower64_entry_t *lentry, *rentry; ir_node *projT = NULL, *projF = NULL; @@ -1215,20 +1267,9 @@ static void lower_Cond(ir_node *node, ir_mode *high_mode) ir_relation relation; ir_graph *irg; dbg_info *dbg; - const ir_edge_t *edge; - const ir_edge_t *next; (void) high_mode; - if (m != mode_b) { - if (m == env->high_signed || m == env->high_unsigned) { - /* bad we can't really handle Switch with 64bit offsets */ - panic("Cond with 64bit jumptable not supported"); - } - lower_node(sel); - return; - } - if (!is_Cmp(sel)) { lower_node(sel); return; @@ -1248,7 +1289,7 @@ static void lower_Cond(ir_node *node, ir_mode *high_mode) rentry = get_node_entry(right); /* all right, build the code */ - foreach_out_edge_safe(node, edge, next) { + foreach_out_edge_safe(node, edge) { ir_node *proj = get_edge_src_irn(edge); long proj_nr; if (!is_Proj(proj)) @@ -1461,8 +1502,13 @@ static void lower_Conv_to_Ll(ir_node *node) set_irn_pinned(call, get_irn_pinned(node)); irn = new_r_Proj(call, mode_T, pn_Call_T_result); - res_low = new_r_Proj(irn, low_unsigned, 0); - res_high = new_r_Proj(irn, low_signed, 1); + if (env->params->little_endian) { + res_low = new_r_Proj(irn, low_unsigned, 0); + res_high = new_r_Proj(irn, low_signed, 1); + } else { + res_low = new_r_Proj(irn, low_unsigned, 1); + res_high = new_r_Proj(irn, low_signed, 0); + } } ir_set_dw_lowered(node, res_low, res_high); } @@ -1500,8 +1546,13 @@ static void lower_Conv_from_Ll(ir_node *node) ir_node *res; irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode); - in[0] = entry->low_word; - in[1] = entry->high_word; + if (env->params->little_endian) { + in[0] = entry->low_word; + in[1] = entry->high_word; + } else { + in[0] = entry->high_word; + in[1] = entry->low_word; + } call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 2, in, mtp); set_irn_pinned(call, get_irn_pinned(node)); @@ -1599,22 +1650,12 @@ static void lower_Conv(ir_node *node, ir_mode *mode) } } -static void fix_parameter_entities(ir_graph *irg) +static void fix_parameter_entities(ir_graph *irg, ir_type *orig_mtp) { - ir_entity *entity = get_irg_entity(irg); - ir_type *mtp = get_entity_type(entity); - ir_type *orig_mtp = get_type_link(mtp); - size_t orig_n_params = get_method_n_params(orig_mtp); - size_t orig_n_real_params = orig_n_params; ir_entity **parameter_entities; - /* Allow selecting one past the last parameter to get the variadic - * parameters. */ - if (get_method_variadicity(orig_mtp) == variadicity_variadic) - ++orig_n_real_params; - - parameter_entities = ALLOCANZ(ir_entity*, orig_n_real_params); + parameter_entities = ALLOCANZ(ir_entity*, orig_n_params); ir_type *frame_type = get_irg_frame_type(irg); size_t n = get_compound_n_members(frame_type); @@ -1628,23 +1669,22 @@ static void fix_parameter_entities(ir_graph *irg) if (!is_parameter_entity(entity)) continue; p = get_entity_parameter_number(entity); - assert(p < orig_n_real_params); + if (p == IR_VA_START_PARAMETER_NUMBER) + continue; + assert(p < orig_n_params); assert(parameter_entities[p] == NULL); parameter_entities[p] = entity; } /* adjust indices */ n_param = 0; - for (i = 0; i < orig_n_real_params; ++i, ++n_param) { + for (i = 0; i < orig_n_params; ++i, ++n_param) { ir_entity *entity = parameter_entities[i]; ir_type *tp; if (entity != NULL) set_entity_parameter_number(entity, n_param); - if (i == orig_n_params) - break; - tp = get_method_param_type(orig_mtp, i); if (is_Primitive_type(tp)) { ir_mode *mode = get_type_mode(tp); @@ -1682,9 +1722,12 @@ static ir_type *lower_mtp(ir_type *mtp) size_t n_res; bool must_be_lowered; - res = (ir_type*)pmap_get(lowered_type, mtp); + res = pmap_get(ir_type, lowered_type, mtp); if (res != NULL) return res; + if (type_visited(mtp)) + return mtp; + mark_type_visited(mtp); orig_n_params = get_method_n_params(mtp); orig_n_res = get_method_n_ress(mtp); @@ -1782,9 +1825,10 @@ static ir_type *lower_mtp(ir_type *mtp) set_method_calling_convention(res, get_method_calling_convention(mtp)); set_method_additional_properties(res, get_method_additional_properties(mtp)); - set_lowered_type(mtp, res); + set_higher_type(res, mtp); set_type_link(res, mtp); + mark_type_visited(res); pmap_insert(lowered_type, mtp, res); return res; } @@ -1794,9 +1838,6 @@ static ir_type *lower_mtp(ir_type *mtp) */ static void lower_Return(ir_node *node, ir_mode *mode) { - ir_graph *irg = get_irn_irg(node); - ir_entity *ent = get_irg_entity(irg); - ir_type *mtp = get_entity_type(ent); ir_node **in; size_t i, j, n; int need_conv = 0; @@ -1813,8 +1854,9 @@ static void lower_Return(ir_node *node, ir_mode *mode) if (! need_conv) return; - ent = get_irg_entity(irg); - mtp = get_entity_type(ent); + ir_graph *irg = get_irn_irg(node); + ir_entity *ent = get_irg_entity(irg); + ir_type *mtp = get_entity_type(ent); /* create a new in array */ NEW_ARR_A(ir_node *, in, get_method_n_ress(mtp) + 1); @@ -1851,12 +1893,10 @@ static void lower_Start(ir_node *node, ir_mode *high_mode) ir_graph *irg = get_irn_irg(node); ir_entity *ent = get_irg_entity(irg); ir_type *mtp = get_entity_type(ent); - ir_type *orig_mtp = get_type_link(mtp); + ir_type *orig_mtp = (ir_type*)get_type_link(mtp); ir_node *args; long *new_projs; size_t i, j, n_params; - const ir_edge_t *edge; - const ir_edge_t *next; (void) high_mode; /* if type link is NULL then the type was not lowered, hence no changes @@ -1880,7 +1920,7 @@ static void lower_Start(ir_node *node, ir_mode *high_mode) } } - /* lower method type */ + /* find args Proj */ args = NULL; foreach_out_edge(node, edge) { ir_node *proj = get_edge_src_irn(edge); @@ -1895,7 +1935,7 @@ static void lower_Start(ir_node *node, ir_mode *high_mode) return; /* fix all Proj's and create new ones */ - foreach_out_edge_safe(args, edge, next) { + foreach_out_edge_safe(args, edge) { ir_node *proj = get_edge_src_irn(edge); ir_mode *mode = get_irn_mode(proj); ir_mode *mode_l = env->low_unsigned; @@ -1904,6 +1944,7 @@ static void lower_Start(ir_node *node, ir_mode *high_mode) ir_mode *mode_h; ir_node *res_low; ir_node *res_high; + int old_cse; dbg_info *dbg; if (!is_Proj(proj)) @@ -1921,6 +1962,9 @@ static void lower_Start(ir_node *node, ir_mode *high_mode) continue; } + /* Switch off CSE or we might get an already existing Proj. */ + old_cse = get_opt_cse(); + set_opt_cse(0); dbg = get_irn_dbg_info(proj); if (env->params->little_endian) { res_low = new_rd_Proj(dbg, pred, mode_l, new_projs[proj_nr]); @@ -1929,6 +1973,7 @@ static void lower_Start(ir_node *node, ir_mode *high_mode) res_high = new_rd_Proj(dbg, pred, mode_h, new_projs[proj_nr]); res_low = new_rd_Proj(dbg, pred, mode_l, new_projs[proj_nr] + 1); } + set_opt_cse(old_cse); ir_set_dw_lowered(proj, res_low, res_high); } } @@ -1946,8 +1991,6 @@ static void lower_Call(ir_node *node, ir_mode *mode) size_t p; long *res_numbers = NULL; ir_node *resproj; - const ir_edge_t *edge; - const ir_edge_t *next; (void) mode; n_params = get_method_n_params(tp); @@ -2027,7 +2070,7 @@ static void lower_Call(ir_node *node, ir_mode *mode) return; /* fix the results */ - foreach_out_edge_safe(resproj, edge, next) { + foreach_out_edge_safe(resproj, edge) { ir_node *proj = get_edge_src_irn(edge); ir_mode *proj_mode = get_irn_mode(proj); ir_mode *mode_l = env->low_unsigned; @@ -2197,11 +2240,10 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode) ir_asm_constraint *output_constraints = get_ASM_output_constraints(asmn); ir_asm_constraint *input_constraints = get_ASM_input_constraints(asmn); unsigned n_64bit_outs = 0; - int i; (void)mode; - for (i = get_irn_arity(asmn) - 1; i >= 0; --i) { + for (int i = get_irn_arity(asmn) - 1; i >= 0; --i) { ir_node *op = get_irn_n(asmn, i); ir_mode *op_mode = get_irn_mode(op); if (op_mode == high_signed || op_mode == high_unsigned) { @@ -2209,8 +2251,8 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode) } } - for (i = 0; i < n_outs; ++i) { - const ir_asm_constraint *constraint = &output_constraints[i]; + for (int o = 0; o < n_outs; ++o) { + const ir_asm_constraint *constraint = &output_constraints[o]; if (constraint->mode == high_signed || constraint->mode == high_unsigned) { const char *constr = get_id_str(constraint->constraint); ++n_64bit_outs; @@ -2225,75 +2267,480 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode) if (n_64bit_outs == 0) return; - { - dbg_info *dbgi = get_irn_dbg_info(asmn); - ir_node *block = get_nodes_block(asmn); - int arity = get_irn_arity(asmn); - ir_node **in = get_irn_in(asmn) + 1; - int new_n_outs = 0; - int n_clobber = get_ASM_n_clobbers(asmn); - long *proj_map = ALLOCAN(long, n_outs); - ident **clobbers = get_ASM_clobbers(asmn); - ident *asm_text = get_ASM_text(asmn); - ir_asm_constraint *new_outputs - = ALLOCAN(ir_asm_constraint, n_outs+n_64bit_outs); - ir_node *new_asm; - const ir_edge_t *edge; - const ir_edge_t *next; - - for (i = 0; i < n_outs; ++i) { - const ir_asm_constraint *constraint = &output_constraints[i]; - if (constraint->mode == high_signed || constraint->mode == high_unsigned) { - new_outputs[new_n_outs].pos = constraint->pos; - new_outputs[new_n_outs].constraint = new_id_from_str("=a"); - new_outputs[new_n_outs].mode = env->low_unsigned; - proj_map[i] = new_n_outs; - ++new_n_outs; - new_outputs[new_n_outs].pos = constraint->pos; - new_outputs[new_n_outs].constraint = new_id_from_str("=d"); - if (constraint->mode == high_signed) - new_outputs[new_n_outs].mode = env->low_signed; - else - new_outputs[new_n_outs].mode = env->low_unsigned; - ++new_n_outs; + dbg_info *dbgi = get_irn_dbg_info(asmn); + ir_node *block = get_nodes_block(asmn); + ir_node *mem = get_ASM_mem(asmn); + int new_n_outs = 0; + int n_clobber = get_ASM_n_clobbers(asmn); + long *proj_map = ALLOCAN(long, n_outs); + ident **clobbers = get_ASM_clobbers(asmn); + ident *asm_text = get_ASM_text(asmn); + ir_asm_constraint *new_outputs + = ALLOCAN(ir_asm_constraint, n_outs+n_64bit_outs); + ir_node *new_asm; + + for (int o = 0; o < n_outs; ++o) { + const ir_asm_constraint *constraint = &output_constraints[o]; + if (constraint->mode == high_signed || constraint->mode == high_unsigned) { + new_outputs[new_n_outs].pos = constraint->pos; + new_outputs[new_n_outs].constraint = new_id_from_str("=a"); + new_outputs[new_n_outs].mode = env->low_unsigned; + proj_map[o] = new_n_outs; + ++new_n_outs; + new_outputs[new_n_outs].pos = constraint->pos; + new_outputs[new_n_outs].constraint = new_id_from_str("=d"); + if (constraint->mode == high_signed) + new_outputs[new_n_outs].mode = env->low_signed; + else + new_outputs[new_n_outs].mode = env->low_unsigned; + ++new_n_outs; + } else { + new_outputs[new_n_outs] = *constraint; + proj_map[o] = new_n_outs; + ++new_n_outs; + } + } + assert(new_n_outs == n_outs+(int)n_64bit_outs); + + int n_inputs = get_ASM_n_inputs(asmn); + ir_node **new_ins = ALLOCAN(ir_node*, n_inputs); + for (int i = 0; i < n_inputs; ++i) + new_ins[i] = get_ASM_input(asmn, i); + + new_asm = new_rd_ASM(dbgi, block, mem, n_inputs, new_ins, input_constraints, + new_n_outs, new_outputs, n_clobber, clobbers, + asm_text); + + foreach_out_edge_safe(asmn, edge) { + ir_node *proj = get_edge_src_irn(edge); + ir_mode *proj_mode = get_irn_mode(proj); + long pn; + + if (!is_Proj(proj)) + continue; + pn = get_Proj_proj(proj); + + if (pn < n_outs) + pn = proj_map[pn]; + else + pn = new_n_outs + pn - n_outs; + + if (proj_mode == high_signed || proj_mode == high_unsigned) { + ir_mode *high_mode + = proj_mode == high_signed ? env->low_signed : env->low_unsigned; + ir_node *np_low = new_r_Proj(new_asm, env->low_unsigned, pn); + ir_node *np_high = new_r_Proj(new_asm, high_mode, pn+1); + ir_set_dw_lowered(proj, np_low, np_high); + } else { + ir_node *np = new_r_Proj(new_asm, proj_mode, pn); + exchange(proj, np); + } + } +} + +/** + * Lower the builtin type to its higher part. + * + * @param mtp the builtin type to lower + * + * @return the lowered type + */ +static ir_type *lower_Builtin_type_high(ir_type *mtp) +{ + ir_type *res; + size_t i; + size_t n_params; + size_t n_results; + bool must_be_lowered; + + res = pmap_get(ir_type, lowered_builtin_type_high, mtp); + if (res != NULL) + return res; + + n_params = get_method_n_params(mtp); + n_results = get_method_n_ress(mtp); + must_be_lowered = false; + + /* check for double word parameter */ + for (i = n_params; i > 0;) { + ir_type *tp = get_method_param_type(mtp, --i); + + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->high_signed || mode == env->high_unsigned) { + must_be_lowered = true; + break; + } + } + } + + if (!must_be_lowered) { + set_type_link(mtp, NULL); + return mtp; + } + + res = new_d_type_method(n_params, n_results, get_type_dbg_info(mtp)); + + /* set param types and result types */ + for (i = 0; i < n_params; ++i) { + ir_type *tp = get_method_param_type(mtp, i); + + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->high_signed) { + if (env->params->little_endian) { + set_method_param_type(res, i, tp_u); + } else { + set_method_param_type(res, i, tp_s); + } + } else if (mode == env->high_unsigned) { + set_method_param_type(res, i, tp_u); + } else { + set_method_param_type(res, i, tp); + } + } else { + set_method_param_type(res, i, tp); + } + } + for (i = n_results = 0; i < n_results; ++i) { + ir_type *tp = get_method_res_type(mtp, i); + + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->high_signed) { + if (env->params->little_endian) { + set_method_res_type(res, i, tp_u); + } else { + set_method_res_type(res, i, tp_s); + } + } else if (mode == env->high_unsigned) { + set_method_res_type(res, i, tp_u); } else { - new_outputs[new_n_outs] = *constraint; - proj_map[i] = new_n_outs; - ++new_n_outs; + set_method_res_type(res, i, tp); } + } else { + set_method_res_type(res, i, tp); } - assert(new_n_outs == n_outs+(int)n_64bit_outs); + } - new_asm = new_rd_ASM(dbgi, block, arity, in, input_constraints, - new_n_outs, new_outputs, n_clobber, clobbers, - asm_text); + set_method_variadicity(res, get_method_variadicity(mtp)); + set_method_calling_convention(res, get_method_calling_convention(mtp)); + set_method_additional_properties(res, get_method_additional_properties(mtp)); - foreach_out_edge_safe(asmn, edge, next) { - ir_node *proj = get_edge_src_irn(edge); - ir_mode *proj_mode = get_irn_mode(proj); - long pn; + pmap_insert(lowered_builtin_type_high, mtp, res); + return res; +} - if (!is_Proj(proj)) - continue; - pn = get_Proj_proj(proj); +/** + * Lower the builtin type to its lower part. + * + * @param mtp the builtin type to lower + * + * @return the lowered type + */ +static ir_type *lower_Builtin_type_low(ir_type *mtp) +{ + ir_type *res; + size_t i; + size_t n_params; + size_t n_results; + bool must_be_lowered; - if (pn < n_outs) - pn = proj_map[pn]; - else - pn = new_n_outs + pn - n_outs; - - if (proj_mode == high_signed || proj_mode == high_unsigned) { - ir_mode *high_mode - = proj_mode == high_signed ? env->low_signed : env->low_unsigned; - ir_node *np_low = new_r_Proj(new_asm, env->low_unsigned, pn); - ir_node *np_high = new_r_Proj(new_asm, high_mode, pn+1); - ir_set_dw_lowered(proj, np_low, np_high); + res = pmap_get(ir_type, lowered_builtin_type_low, mtp); + if (res != NULL) + return res; + + n_params = get_method_n_params(mtp); + n_results = get_method_n_ress(mtp); + must_be_lowered = false; + + /* check for double word parameter */ + for (i = n_params; i > 0;) { + ir_type *tp = get_method_param_type(mtp, --i); + + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->high_signed || mode == env->high_unsigned) { + must_be_lowered = true; + break; + } + } + } + + if (!must_be_lowered) { + set_type_link(mtp, NULL); + return mtp; + } + + res = new_d_type_method(n_params, n_results, get_type_dbg_info(mtp)); + + /* set param types and result types */ + for (i = 0; i < n_params; ++i) { + ir_type *tp = get_method_param_type(mtp, i); + + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->high_signed) { + if (env->params->little_endian) { + set_method_param_type(res, i, tp_s); + } else { + set_method_param_type(res, i, tp_u); + } + } else if (mode == env->high_unsigned) { + set_method_param_type(res, i, tp_u); + } else { + set_method_param_type(res, i, tp); + } + } else { + set_method_param_type(res, i, tp); + } + } + for (i = 0; i < n_results; ++i) { + ir_type *tp = get_method_res_type(mtp, i); + + if (is_Primitive_type(tp)) { + ir_mode *mode = get_type_mode(tp); + + if (mode == env->high_signed) { + if (env->params->little_endian) { + set_method_res_type(res, i, tp_s); + } else { + set_method_res_type(res, i, tp_u); + } + } else if (mode == env->high_unsigned) { + set_method_res_type(res, i, tp_u); } else { - ir_node *np = new_r_Proj(new_asm, proj_mode, pn); - exchange(proj, np); + set_method_res_type(res, i, tp); } + } else { + set_method_res_type(res, i, tp); } } + + set_method_variadicity(res, get_method_variadicity(mtp)); + set_method_calling_convention(res, get_method_calling_convention(mtp)); + set_method_additional_properties(res, get_method_additional_properties(mtp)); + + pmap_insert(lowered_builtin_type_low, mtp, res); + return res; +} + +/** + * lowers a builtin which reduces a 64bit value to a simple summary value + * (popcount, ffs, ...) + */ +static void lower_reduce_builtin(ir_node *builtin, ir_mode *mode) +{ + ir_builtin_kind kind = get_Builtin_kind(builtin); + ir_node *operand = get_Builtin_param(builtin, 0); + ir_mode *operand_mode = get_irn_mode(operand); + if (operand_mode != env->high_signed && operand_mode != env->high_unsigned) + return; + + { + arch_allow_ifconv_func allow_ifconv = be_get_backend_param()->allow_ifconv; + int arity = get_irn_arity(builtin); + dbg_info *dbgi = get_irn_dbg_info(builtin); + ir_graph *irg = get_irn_irg(builtin); + ir_type *type = get_Builtin_type(builtin); + ir_type *lowered_type_high = lower_Builtin_type_high(type); + ir_type *lowered_type_low = lower_Builtin_type_low(type); + ir_type *result_type = get_method_res_type(lowered_type_low, 0); + ir_mode *result_mode = get_type_mode(result_type); + ir_node *block = get_nodes_block(builtin); + ir_node *mem = get_Builtin_mem(builtin); + const lower64_entry_t *entry = get_node_entry(operand); + ir_mode *high_mode = get_irn_mode(entry->high_word); + ir_node *in_high[1] = {entry->high_word}; + ir_node *in_low[1] = {entry->low_word}; + ir_node *res; + + assert(is_NoMem(mem)); + assert(arity == 2); + + switch (kind) { + case ir_bk_ffs: { + ir_node *number_of_bits = new_r_Const_long(irg, result_mode, get_mode_size_bits(env->low_unsigned)); + ir_node *zero_high = new_rd_Const(dbgi, irg, get_mode_null(high_mode)); + ir_node *zero_unsigned = new_rd_Const(dbgi, irg, get_mode_null(env->low_unsigned)); + ir_node *zero_result = new_rd_Const(dbgi, irg, get_mode_null(result_mode)); + ir_node *cmp_low = new_rd_Cmp(dbgi, block, entry->low_word, zero_unsigned, ir_relation_equal); + ir_node *cmp_high = new_rd_Cmp(dbgi, block, entry->high_word, zero_high, ir_relation_equal); + ir_node *ffs_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high); + ir_node *high_proj = new_r_Proj(ffs_high, result_mode, pn_Builtin_max+1); + ir_node *high = new_rd_Add(dbgi, block, high_proj, number_of_bits, result_mode); + ir_node *ffs_low = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low); + ir_node *low = new_r_Proj(ffs_low, result_mode, pn_Builtin_max+1); + ir_node *mux_high = new_rd_Mux(dbgi, block, cmp_high, high, zero_result, result_mode); + + if (! allow_ifconv(cmp_high, high, zero_result)) + ir_nodeset_insert(&created_mux_nodes, mux_high); + + res = new_rd_Mux(dbgi, block, cmp_low, low, mux_high, result_mode); + + if (! allow_ifconv(cmp_low, low, mux_high)) + ir_nodeset_insert(&created_mux_nodes, res); + break; + } + case ir_bk_clz: { + ir_node *zero = new_rd_Const(dbgi, irg, get_mode_null(high_mode)); + ir_node *cmp_high = new_rd_Cmp(dbgi, block, entry->high_word, zero, ir_relation_equal); + ir_node *clz_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high); + ir_node *high = new_r_Proj(clz_high, result_mode, pn_Builtin_max+1); + ir_node *clz_low = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low); + ir_node *low_proj = new_r_Proj(clz_low, result_mode, pn_Builtin_max+1); + ir_node *number_of_bits = new_r_Const_long(irg, result_mode, get_mode_size_bits(mode)); + ir_node *low = new_rd_Add(dbgi, block, low_proj, number_of_bits, result_mode); + + res = new_rd_Mux(dbgi, block, cmp_high, high, low, result_mode); + + if (! allow_ifconv(cmp_high, high, low)) + ir_nodeset_insert(&created_mux_nodes, res); + break; + } + case ir_bk_ctz: { + ir_node *zero_unsigned = new_rd_Const(dbgi, irg, get_mode_null(env->low_unsigned)); + ir_node *cmp_low = new_rd_Cmp(dbgi, block, entry->low_word, zero_unsigned, ir_relation_equal); + ir_node *ffs_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high); + ir_node *high_proj = new_r_Proj(ffs_high, result_mode, pn_Builtin_max+1); + ir_node *number_of_bits = new_r_Const_long(irg, result_mode, get_mode_size_bits(env->low_unsigned)); + ir_node *high = new_rd_Add(dbgi, block, high_proj, number_of_bits, result_mode); + ir_node *ffs_low = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low); + ir_node *low = new_r_Proj(ffs_low, result_mode, pn_Builtin_max+1); + + res = new_rd_Mux(dbgi, block, cmp_low, low, high, result_mode); + + if (! allow_ifconv(cmp_low, low, high)) + ir_nodeset_insert(&created_mux_nodes, res); + break; + } + case ir_bk_popcount: { + ir_node *popcount_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high); + ir_node *popcount_low = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low); + ir_node *high = new_r_Proj(popcount_high, result_mode, pn_Builtin_max+1); + ir_node *low = new_r_Proj(popcount_low, result_mode, pn_Builtin_max+1); + + res = new_rd_Add(dbgi, block, high, low, result_mode); + break; + } + case ir_bk_parity: { + ir_node *parity_high; + ir_node *parity_low; + ir_node *high; + ir_node *low; + + assert(arity == 2); + + parity_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high); + high = new_r_Proj(parity_high, result_mode, pn_Builtin_max+1); + parity_low = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low); + low = new_r_Proj(parity_low, result_mode, pn_Builtin_max+1); + res = new_rd_Eor(dbgi, block, high, low, result_mode); + break; + } + default: + panic("unexpected builtin"); + } + + turn_into_tuple(builtin, 2); + set_irn_n(builtin, pn_Builtin_M, mem); + set_irn_n(builtin, pn_Builtin_max+1, res); + } +} + +/** + * lowers builtins performing arithmetic (bswap) + */ +static void lower_arithmetic_builtin(ir_node *builtin, ir_mode *mode) +{ + ir_builtin_kind kind = get_Builtin_kind(builtin); + ir_node *operand = get_Builtin_param(builtin, 0); + ir_mode *operand_mode = get_irn_mode(operand); + (void) mode; + if (operand_mode != env->high_signed && operand_mode != env->high_unsigned) + return; + + { + dbg_info *dbgi = get_irn_dbg_info(builtin); + ir_type *type = get_Builtin_type(builtin); + ir_type *lowered_type_high = lower_Builtin_type_high(type); + ir_type *lowered_type_low = lower_Builtin_type_low(type); + ir_node *block = get_nodes_block(builtin); + ir_node *mem = get_Builtin_mem(builtin); + const lower64_entry_t *entry = get_node_entry(operand); + ir_mode *mode_high = get_irn_mode(entry->high_word); + ir_node *res_high; + ir_node *res_low; + + switch (kind) { + case ir_bk_bswap: { + ir_node *in_high[1] = { entry->high_word }; + ir_node *in_low[1] = { entry->low_word }; + ir_node *swap_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high); + ir_node *swap_low = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low); + ir_node *high = new_r_Proj(swap_high, mode_high, pn_Builtin_max+1); + ir_node *low = new_r_Proj(swap_low, env->low_unsigned, pn_Builtin_max+1); + if (mode_high == env->low_signed) { + res_high = new_rd_Conv(dbgi, block, low, env->low_signed); + res_low = new_rd_Conv(dbgi, block, high, env->low_unsigned); + } else { + res_high = low; + res_low = high; + } + break; + } + default: + panic("unexpected builtin"); + } + + /* search result Proj */ + foreach_out_edge_safe(builtin, edge) { + ir_node *proj = get_edge_src_irn(edge); + if (!is_Proj(proj)) + continue; + + if (get_Proj_proj(proj) == pn_Builtin_max+1) { + ir_set_dw_lowered(proj, res_low, res_high); + } + } + } +} + +/** + * Lower double word builtins. + */ +static void lower_Builtin(ir_node *builtin, ir_mode *mode) +{ + ir_builtin_kind kind = get_Builtin_kind(builtin); + + switch (kind) { + case ir_bk_trap: + case ir_bk_debugbreak: + case ir_bk_return_address: + case ir_bk_frame_address: + case ir_bk_prefetch: + case ir_bk_inport: + case ir_bk_outport: + case ir_bk_inner_trampoline: + /* Nothing to do. */ + return; + case ir_bk_bswap: + lower_arithmetic_builtin(builtin, mode); + return; + case ir_bk_ffs: + case ir_bk_clz: + case ir_bk_ctz: + case ir_bk_popcount: + case ir_bk_parity: + lower_reduce_builtin(builtin, mode); + return; + } + panic("unknown builtin"); } /** @@ -2303,11 +2750,13 @@ static bool always_lower(unsigned code) { switch (code) { case iro_ASM: + case iro_Builtin: case iro_Proj: case iro_Start: case iro_Call: case iro_Return: case iro_Cond: + case iro_Switch: case iro_Conv: case iro_Sel: return true; @@ -2354,14 +2803,14 @@ static void setup_modes(void) unsigned size_bits = env->params->doubleword_size; ir_mode *doubleword_signed = NULL; ir_mode *doubleword_unsigned = NULL; - size_t n_modes = get_irp_n_modes(); + size_t n_modes = ir_get_n_modes(); ir_mode_arithmetic arithmetic; unsigned modulo_shift; size_t i; /* search for doubleword modes... */ for (i = 0; i < n_modes; ++i) { - ir_mode *mode = get_irp_mode(i); + ir_mode *mode = ir_get_mode(i); if (!mode_is_int(mode)) continue; if (get_mode_size_bits(mode) != size_bits) @@ -2415,10 +2864,10 @@ static void setup_modes(void) /* produce lowered modes */ env->high_signed = doubleword_signed; env->high_unsigned = doubleword_unsigned; - env->low_signed = new_ir_mode("WS", irms_int_number, size_bits, 1, - arithmetic, modulo_shift); - env->low_unsigned = new_ir_mode("WU", irms_int_number, size_bits, 0, - arithmetic, modulo_shift); + env->low_signed = new_int_mode("WS", arithmetic, size_bits, 1, + modulo_shift); + env->low_unsigned = new_int_mode("WU", arithmetic, size_bits, 0, + modulo_shift); } static void enqueue_preds(ir_node *node) @@ -2513,7 +2962,7 @@ static void lower_irg(ir_graph *irg) /* just here for debugging */ current_ir_graph = irg; - edges_assure(irg); + assure_edges(irg); n_idx = get_irg_last_idx(irg); n_idx = n_idx + (n_idx >> 2); /* add 25% */ @@ -2532,7 +2981,7 @@ static void lower_irg(ir_graph *irg) set_entity_type(ent, lowered_mtp); env->flags |= MUST_BE_LOWERED; - fix_parameter_entities(irg); + fix_parameter_entities(irg, mtp); } /* first step: link all nodes and allocate data */ @@ -2566,8 +3015,7 @@ static void lower_irg(ir_graph *irg) if (env->flags & CF_CHANGED) { /* control flow changed, dominance info is invalid */ - set_irg_doms_inconsistent(irg); - set_irg_extblk_inconsistent(irg); + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE); } edges_deactivate(irg); } @@ -2587,11 +3035,12 @@ void ir_prepare_dw_lowering(const lwrdw_param_t *new_param) param = new_param; - clear_irp_opcodes_generic_func(); + ir_clear_opcodes_generic_func(); ir_register_dw_lower_function(op_ASM, lower_ASM); ir_register_dw_lower_function(op_Add, lower_binop); ir_register_dw_lower_function(op_And, lower_And); ir_register_dw_lower_function(op_Bad, lower_Bad); + ir_register_dw_lower_function(op_Builtin, lower_Builtin); ir_register_dw_lower_function(op_Call, lower_Call); ir_register_dw_lower_function(op_Cmp, lower_Cmp); ir_register_dw_lower_function(op_Cond, lower_Cond); @@ -2606,6 +3055,7 @@ void ir_prepare_dw_lowering(const lwrdw_param_t *new_param) ir_register_dw_lower_function(op_Mux, lower_Mux); ir_register_dw_lower_function(op_Not, lower_Not); ir_register_dw_lower_function(op_Or, lower_Or); + ir_register_dw_lower_function(op_Proj, lower_Proj); ir_register_dw_lower_function(op_Return, lower_Return); ir_register_dw_lower_function(op_Shl, lower_Shl); ir_register_dw_lower_function(op_Shr, lower_Shr); @@ -2613,9 +3063,18 @@ void ir_prepare_dw_lowering(const lwrdw_param_t *new_param) ir_register_dw_lower_function(op_Start, lower_Start); ir_register_dw_lower_function(op_Store, lower_Store); ir_register_dw_lower_function(op_Sub, lower_binop); + ir_register_dw_lower_function(op_Switch, lower_Switch); ir_register_dw_lower_function(op_Unknown, lower_Unknown); } +/** + * Callback to lower only the Mux nodes we created. + */ +static int lower_mux_cb(ir_node *mux) +{ + return ir_nodeset_contains(&created_mux_nodes, mux); +} + /* * Do the lowering. */ @@ -2637,6 +3096,10 @@ void ir_lower_dw_ops(void) conv_types = new_set(cmp_conv_tp, 16); if (! lowered_type) lowered_type = pmap_create(); + if (! lowered_builtin_type_low) + lowered_builtin_type_low = pmap_create(); + if (! lowered_builtin_type_high) + lowered_builtin_type_high = pmap_create(); /* create a primitive unsigned and signed type */ if (! tp_u) @@ -2695,18 +3158,26 @@ void ir_lower_dw_ops(void) } lenv.tv_mode_bytes = new_tarval_from_long(param->doubleword_size/(2*8), lenv.low_unsigned); - lenv.tv_mode_bits = new_tarval_from_long(param->doubleword_size/2, lenv.low_unsigned); lenv.waitq = new_pdeq(); lenv.first_id = new_id_from_chars(param->little_endian ? ".l" : ".h", 2); lenv.next_id = new_id_from_chars(param->little_endian ? ".h" : ".l", 2); - irp_reserve_resources(irp, IRP_RESOURCE_TYPE_LINK); + irp_reserve_resources(irp, IRP_RESOURCE_TYPE_LINK | IRP_RESOURCE_TYPE_VISITED); + inc_master_type_visited(); /* transform all graphs */ for (i = 0, n = get_irp_n_irgs(); i < n; ++i) { ir_graph *irg = get_irp_irg(i); + + ir_nodeset_init(&created_mux_nodes); + lower_irg(irg); + + if (ir_nodeset_size(&created_mux_nodes) > 0) + lower_mux(irg, lower_mux_cb); + + ir_nodeset_destroy(&created_mux_nodes); } - irp_free_resources(irp, IRP_RESOURCE_TYPE_LINK); + irp_free_resources(irp, IRP_RESOURCE_TYPE_LINK | IRP_RESOURCE_TYPE_VISITED); del_pdeq(lenv.waitq); env = NULL;