X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_dw.c;h=0b9da801d10be9e8aafa2c643d10643191af2fd0;hb=dcff73b2cc34378750e2cc1979a4b120e19767a9;hp=c81d373a464c295e30c37e85f6ca71acd9123cc0;hpb=1e799c3b86bb5b1a6406c0137266b5dbe02bb9d9;p=libfirm diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c index c81d373a4..0b9da801d 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" @@ -142,7 +141,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 = (conv_tp_entry_t*)set_insert(conv_types, &key, sizeof(key), hash_ptr(imode) ^ hash_ptr(omode)); if (! entry->mtd) { int n_param = 1, n_res = 1; @@ -157,8 +156,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); @@ -169,8 +173,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); @@ -505,7 +514,7 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, 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)); + 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); @@ -1198,6 +1207,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); @@ -1228,6 +1254,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. */ @@ -1235,7 +1273,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; @@ -1250,15 +1287,6 @@ static void lower_Cond(ir_node *node, ir_mode *high_mode) (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; @@ -1491,8 +1519,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); } @@ -1530,8 +1563,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)); @@ -1629,12 +1667,8 @@ 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); ir_entity **parameter_entities; @@ -1708,6 +1742,9 @@ static ir_type *lower_mtp(ir_type *mtp) res = (ir_type*)pmap_get(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); @@ -1808,6 +1845,7 @@ static ir_type *lower_mtp(ir_type *mtp) set_higher_type(res, mtp); set_type_link(res, mtp); + mark_type_visited(res); pmap_insert(lowered_type, mtp, res); return res; } @@ -1903,7 +1941,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); @@ -2393,7 +2431,23 @@ static ir_type *lower_Builtin_type_high(ir_type *mtp) for (i = n_results = 0; i < n_results; ++i) { ir_type *tp = get_method_res_type(mtp, i); - set_method_res_type(res, i, tp); + 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 { + set_method_res_type(res, i, tp); + } + } else { + set_method_res_type(res, i, tp); + } } set_method_variadicity(res, get_method_variadicity(mtp)); @@ -2473,7 +2527,23 @@ static ir_type *lower_Builtin_type_low(ir_type *mtp) for (i = 0; i < n_results; ++i) { ir_type *tp = get_method_res_type(mtp, i); - set_method_res_type(res, i, tp); + 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 { + set_method_res_type(res, i, tp); + } + } else { + set_method_res_type(res, i, tp); + } } set_method_variadicity(res, get_method_variadicity(mtp)); @@ -2485,42 +2555,18 @@ static ir_type *lower_Builtin_type_low(ir_type *mtp) } /** - * Lower double word builtins. + * lowers a builtin which reduces a 64bit value to a simple summary value + * (popcount, ffs, ...) */ -static void lower_Builtin(ir_node *builtin, ir_mode *mode) +static void lower_reduce_builtin(ir_node *builtin, ir_mode *mode) { ir_builtin_kind kind = get_Builtin_kind(builtin); - ir_node *operand; - ir_mode *operand_mode; - - 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_bswap: - case ir_bk_inport: - case ir_bk_outport: - case ir_bk_inner_trampoline: - /* Nothing to do. */ - return; - case ir_bk_ffs: - case ir_bk_clz: - case ir_bk_ctz: - case ir_bk_popcount: - case ir_bk_parity: - break; - default: - panic("unknown builtin"); - } - - operand = get_Builtin_param(builtin, 0); - operand_mode = get_irn_mode(operand); - + 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); @@ -2528,8 +2574,14 @@ static void lower_Builtin(ir_node *builtin, ir_mode *mode) 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)); @@ -2537,84 +2589,70 @@ static void lower_Builtin(ir_node *builtin, ir_mode *mode) switch (kind) { case ir_bk_ffs: { - const lower64_entry_t *entry = get_node_entry(operand); - ir_node *in_high[1] = {entry->high_word}; - ir_node *in_low[1] = {entry->low_word}; - ir_node *number_of_bits = new_r_Const_long(irg, mode_Is, get_mode_size_bits(env->low_unsigned)); - ir_node *zero_signed = new_rd_Const(dbgi, irg, get_mode_null(mode_Is)); - ir_node *zero_unsigned = new_rd_Const(dbgi, irg, get_mode_null(mode_Iu)); + 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_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, mode_Is, pn_Builtin_max+1); - ir_node *high = new_rd_Add(dbgi, block, high_proj, number_of_bits, mode_Is); + 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, mode_Is, pn_Builtin_max+1); - ir_node *mux_high = new_rd_Mux(dbgi, block, cmp_high, high, zero_signed, mode_Is); + 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_signed)) + 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, mode_Is); + 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: { - const lower64_entry_t *entry = get_node_entry(operand); - ir_node *in_high[1] = {entry->high_word}; - ir_node *in_low[1] = {entry->low_word}; - ir_node *number_of_bits = new_r_Const_long(irg, mode_Is, get_mode_size_bits(mode)); - ir_node *zero_unsigned = new_rd_Const(dbgi, irg, get_mode_null(mode_Iu)); - ir_node *cmp_high = new_rd_Cmp(dbgi, block, entry->high_word, zero_unsigned, ir_relation_equal); + 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, mode_Is, pn_Builtin_max+1); + 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, mode_Is, pn_Builtin_max+1); - ir_node *low = new_rd_Add(dbgi, block, low_proj, number_of_bits, mode_Is); + 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, mode_Is); + 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: { - const lower64_entry_t *entry = get_node_entry(operand); - ir_node *in_high[1] = {entry->high_word}; - ir_node *in_low[1] = {entry->low_word}; - ir_node *number_of_bits = new_r_Const_long(irg, mode_Is, get_mode_size_bits(env->low_unsigned)); - ir_node *zero_unsigned = new_rd_Const(dbgi, irg, get_mode_null(mode_Iu)); + 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, mode_Is, pn_Builtin_max+1); - ir_node *high = new_rd_Add(dbgi, block, high_proj, number_of_bits, mode_Is); + 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, mode_Is, pn_Builtin_max+1); + ir_node *low = new_r_Proj(ffs_low, result_mode, pn_Builtin_max+1); - res = new_rd_Mux(dbgi, block, cmp_low, low, high, mode_Is); + 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: { - const lower64_entry_t *entry = get_node_entry(operand); - ir_node *in_high[1] = {entry->high_word}; - ir_node *in_low[1] = {entry->low_word}; 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, mode_Is, pn_Builtin_max+1); - ir_node *low = new_r_Proj(popcount_low, mode_Is, pn_Builtin_max+1); + 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, mode_Is); + res = new_rd_Add(dbgi, block, high, low, result_mode); break; } case ir_bk_parity: { - const lower64_entry_t *entry = get_node_entry(operand); - ir_node *in_high[1] = {entry->high_word}; - ir_node *in_low[1] = {entry->low_word}; ir_node *parity_high; ir_node *parity_low; ir_node *high; @@ -2623,10 +2661,10 @@ static void lower_Builtin(ir_node *builtin, ir_mode *mode) assert(arity == 2); parity_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high); - high = new_r_Proj(parity_high, mode_Is, pn_Builtin_max+1); + 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, mode_Is, pn_Builtin_max+1); - res = new_rd_Eor(dbgi, block, high, low, mode_Is); + low = new_r_Proj(parity_low, result_mode, pn_Builtin_max+1); + res = new_rd_Eor(dbgi, block, high, low, result_mode); break; } default: @@ -2636,6 +2674,99 @@ static void lower_Builtin(ir_node *builtin, ir_mode *mode) 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); + const ir_edge_t *edge; + const ir_edge_t *next; + 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, next) { + 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"); } /** @@ -2697,14 +2828,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) @@ -2875,7 +3006,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 */ @@ -2930,7 +3061,7 @@ 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); @@ -2950,6 +3081,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); @@ -2957,6 +3089,7 @@ 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); } @@ -3056,7 +3189,8 @@ void ir_lower_dw_ops(void) 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); @@ -3070,7 +3204,7 @@ void ir_lower_dw_ops(void) 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;