X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_intrinsics.c;h=aa44a8b9f974a518c7b64938ec5f76b0068a60d1;hb=f2c2e45eb4e677fef5bf6a8e418b2a22441172d5;hp=4288bee8df672e4b23acfe35638d0bb6b70887ff;hpb=91953f5a2e107ebb5fd2d8a301bc67a3caebb5ef;p=libfirm diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c index 4288bee8d..aa44a8b9f 100644 --- a/ir/lower/lower_intrinsics.c +++ b/ir/lower/lower_intrinsics.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. * @@ -24,9 +24,7 @@ * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "lowering.h" #include "irop_t.h" @@ -38,11 +36,13 @@ #include "irgmod.h" #include "irgopt.h" #include "trouts.h" +#include "irvrfy.h" #include "pmap.h" -#include "xmalloc.h" +#include "array_t.h" #include "iropt_dbg.h" +#include "error.h" -/** Walker environment */ +/** Walker environment. */ typedef struct _walker_env { pmap *c_map; /**< The intrinsic call map. */ unsigned nr_of_intrinsics; /**< statistics */ @@ -63,11 +63,10 @@ static void call_mapper(ir_node *node, void *env) { ir_entity *ent; symconst = get_Call_ptr(node); - if (get_irn_op(symconst) != op_SymConst || - get_SymConst_kind(symconst) != symconst_addr_ent) + if (! is_Global(symconst)) return; - ent = get_SymConst_entity(symconst); + ent = get_Global_entity(symconst); p = pmap_find(wenv->c_map, ent); if (p) { @@ -121,27 +120,35 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) { for (i = get_irp_n_irgs() - 1; i >= 0; --i) { irg = get_irp_irg(i); - if (part_block_used) + if (part_block_used) { + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST); collect_phiprojs(irg); + } wenv.nr_of_intrinsics = 0; irg_walk_graph(irg, NULL, call_mapper, &wenv); - if (wenv.nr_of_intrinsics) { - /* changes detected */ + if (part_block_used) + ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST); + + if (wenv.nr_of_intrinsics > 0) { + /* Changes detected: we might have added/removed nodes. */ set_irg_outs_inconsistent(irg); set_irg_callee_info_state(irg, irg_callee_info_inconsistent); - /* exception control flow might have changed */ + /* Exception control flow might have changed / new block might have added. */ set_irg_doms_inconsistent(irg); set_irg_extblk_inconsistent(irg); set_irg_loopinfo_inconsistent(irg); - /* calls might be removed/added */ + /* Calls might be removed/added. */ set_trouts_inconsistent(); - /* optimize it, tuple might be created */ - local_optimize_graph(irg); + /* verify here */ + irg_verify(irg, VRFY_NORMAL); + + /* Optimize it, tuple might be created. */ + optimize_graph_df(irg); nr_of_intrinsics += wenv.nr_of_intrinsics; } @@ -161,17 +168,18 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) { * @param exc_jmp new exception control flow, if reg_jmp == NULL, a Bad will be used */ static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg_jmp, ir_node *exc_jmp) { + ir_node *block = get_nodes_block(call); + if (reg_jmp == NULL) { - ir_node *block = get_nodes_block(call); /* Beware: do we need here a protection against CSE? Better we do it. */ int old_cse = get_opt_cse(); set_opt_cse(0); - reg_jmp = new_r_Jmp(current_ir_graph, block); + reg_jmp = new_r_Jmp(block); set_opt_cse(old_cse); exc_jmp = new_Bad(); } - irn = new_Tuple(1, &irn); + irn = new_r_Tuple(block, 1, &irn); turn_into_tuple(call, pn_Call_max); set_Tuple_pred(call, pn_Call_M_regular, mem); @@ -191,12 +199,30 @@ int i_mapper_abs(ir_node *call, void *ctx) { dbg_info *dbg = get_irn_dbg_info(call); (void) ctx; - irn = new_rd_Abs(dbg, current_ir_graph, block, op, get_irn_mode(op)); + irn = new_rd_Abs(dbg, block, op, get_irn_mode(op)); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ABS); replace_call(irn, call, mem, NULL, NULL); return 1; } /* i_mapper_abs */ +/* A mapper for the integer bswap. */ +int i_mapper_bswap(ir_node *call, void *ctx) { + ir_node *mem = get_Call_mem(call); + ir_node *block = get_nodes_block(call); + ir_node *op = get_Call_param(call, 0); + ir_type *tp = get_Call_type(call); + dbg_info *dbg = get_irn_dbg_info(call); + ir_node *irn; + (void) ctx; + + irn = new_rd_Builtin(dbg, block, get_irg_no_mem(current_ir_graph), 1, &op, ir_bk_bswap, tp); + set_irn_pinned(irn, op_pin_state_floats); + DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ABS); + irn = new_r_Proj(block, irn, get_irn_mode(op), pn_Builtin_1_result); + replace_call(irn, call, mem, NULL, NULL); + return 1; +} /* i_mapper_bswap */ + /* A mapper for the alloca() function. */ int i_mapper_alloca(ir_node *call, void *ctx) { ir_node *mem = get_Call_mem(call); @@ -206,11 +232,20 @@ int i_mapper_alloca(ir_node *call, void *ctx) { dbg_info *dbg = get_irn_dbg_info(call); (void) ctx; - irn = new_rd_Alloc(dbg, current_ir_graph, block, mem, op, firm_unknown_type, stack_alloc); - mem = new_Proj(irn, mode_M, pn_Alloc_M); - no_exc = new_Proj(irn, mode_X, pn_Alloc_X_regular); - exc = new_Proj(irn, mode_X, pn_Alloc_X_except); - irn = new_Proj(irn, get_modeP_data(), pn_Alloc_res); + if (mode_is_signed(get_irn_mode(op))) { + ir_mode *mode = get_irn_mode(op); + mode = find_unsigned_mode(mode); + if (mode == NULL) { + panic("Cannot find unsigned mode for %M", mode); + } + op = new_rd_Conv(dbg, block, op, mode); + } + + irn = new_rd_Alloc(dbg, block, mem, op, firm_unknown_type, stack_alloc); + mem = new_rd_Proj(dbg, block, irn, mode_M, pn_Alloc_M); + no_exc = new_rd_Proj(dbg, block, irn, mode_X, pn_Alloc_X_regular); + exc = new_rd_Proj(dbg, block, irn, mode_X, pn_Alloc_X_except); + irn = new_rd_Proj(dbg, block, irn, get_modeP_data(), pn_Alloc_res); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ALLOCA); replace_call(irn, call, mem, no_exc, exc); @@ -279,7 +314,7 @@ int i_mapper_pow(ir_node *call, void *ctx) { if (tarval_is_null(tv)) { /* pow(x, 0.0) = 1.0 */ ir_mode *mode = get_tarval_mode(tv); - irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode)); + irn = new_Const(get_mode_one(mode)); } else if (tarval_is_one(tv)) { /* pow(x, 1.0) = x */ irn = left; @@ -299,12 +334,12 @@ int i_mapper_pow(ir_node *call, void *ctx) { ir_mode *mode = get_irn_mode(left); ir_node *quot; - irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode)); - quot = new_rd_Quot(dbg, current_ir_graph, block, mem, irn, left, mode, op_pin_state_pinned); - mem = new_r_Proj(current_ir_graph, block, quot, mode_M, pn_Quot_M); - irn = new_r_Proj(current_ir_graph, block, quot, mode, pn_Quot_res); - reg_jmp = new_r_Proj(current_ir_graph, block, quot, mode_X, pn_Quot_X_regular); - exc_jmp = new_r_Proj(current_ir_graph, block, quot, mode_X, pn_Quot_X_except); + irn = new_Const(get_mode_one(mode)); + quot = new_rd_Quot(dbg, block, mem, irn, left, mode, op_pin_state_pinned); + mem = new_r_Proj(block, quot, mode_M, pn_Quot_M); + irn = new_r_Proj(block, quot, mode, pn_Quot_res); + reg_jmp = new_r_Proj(block, quot, mode_X, pn_Quot_X_regular); + exc_jmp = new_r_Proj(block, quot, mode_X, pn_Quot_X_except); } DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_POW); replace_call(irn, call, mem, reg_jmp, exc_jmp); @@ -318,9 +353,8 @@ int i_mapper_exp(ir_node *call, void *ctx) { if (is_Const(val) && is_Const_null(val)) { /* exp(0.0) = 1.0 */ - ir_node *block = get_nodes_block(call); ir_mode *mode = get_irn_mode(val); - ir_node *irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode)); + ir_node *irn = new_Const(get_mode_one(mode)); ir_node *mem = get_Call_mem(call); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_EXP); replace_call(irn, call, mem, NULL, NULL); @@ -355,9 +389,8 @@ static int i_mapper_one_to_zero(ir_node *call, void *ctx, int reason) { if (is_Const(val) && is_Const_one(val)) { /* acos(1.0) = 0.0 */ - ir_node *block = get_nodes_block(call); ir_mode *mode = get_irn_mode(val); - ir_node *irn = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode)); + ir_node *irn = new_Const(get_mode_null(mode)); ir_node *mem = get_Call_mem(call); DBG_OPT_ALGSIM0(call, irn, reason); replace_call(irn, call, mem, NULL, NULL); @@ -384,7 +417,7 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason) dbg_info *dbg = get_irn_dbg_info(val); op = get_Minus_op(op); - val = new_rd_Conv(dbg, current_ir_graph, block, op, mode); + val = new_rd_Conv(dbg, block, op, mode); if (is_Conv(val)) { /* still a Conv ? */ set_Conv_strict(val, 1); @@ -401,9 +434,8 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason) if (is_Const(val) && is_Const_null(val)) { /* f(0.0) = 1.0 */ - ir_node *block = get_nodes_block(call); ir_mode *mode = get_irn_mode(val); - ir_node *irn = new_r_Const(current_ir_graph, block, mode, get_mode_one(mode)); + ir_node *irn = new_Const(get_mode_one(mode)); ir_node *mem = get_Call_mem(call); DBG_OPT_ALGSIM0(call, irn, reason); replace_call(irn, call, mem, NULL, NULL); @@ -480,8 +512,8 @@ int i_mapper_tanh(ir_node *call, void *ctx) { */ static ir_entity *get_const_entity(ir_node *ptr) { /* FIXME: this cannot handle constant strings inside struct initializers yet */ - if (is_SymConst(ptr) && get_SymConst_kind(ptr) == symconst_addr_ent) { - ir_entity *ent = get_SymConst_entity(ptr); + if (is_Global(ptr)) { + ir_entity *ent = get_Global_entity(ptr); if (get_entity_variability(ent) == variability_constant) { /* a constant entity */ @@ -513,7 +545,7 @@ static ir_node *eval_strlen(ir_entity *ent, ir_type *res_tp) { mode = get_type_mode(tp); /* FIXME: This is too restrict, as the type char might be more the 8bits */ - if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs)) + if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return NULL; n = get_compound_ent_n_values(ent); @@ -541,6 +573,8 @@ int i_mapper_strlen(ir_node *call, void *ctx) { ir_node *s = get_Call_param(call, 0); ir_entity *ent = get_const_entity(s); + (void) ctx; + /* FIXME: this cannot handle constant strings inside struct initializers yet */ if (ent != NULL) { /* a constant entity */ @@ -584,7 +618,7 @@ static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp) mode = get_type_mode(tp); /* FIXME: This is too restrict, as the type char might be more the 8bits */ - if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs)) + if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return NULL; tp = get_entity_type(right); @@ -596,7 +630,7 @@ static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp) mode = get_type_mode(tp); /* FIXME: This is too restrict, as the type char might be more the 8bits */ - if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs)) + if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return NULL; n = get_compound_ent_n_values(left); @@ -663,7 +697,7 @@ static int is_empty_string(ir_entity *ent) { mode = get_type_mode(tp); /* FIXME: This is too restrict, as the type char might be more the 8bits */ - if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs)) + if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) return 0; n = get_compound_ent_n_values(ent); @@ -681,9 +715,7 @@ int i_mapper_strcmp(ir_node *call, void *ctx) { ir_node *irn = NULL; ir_node *exc = NULL; ir_node *reg = NULL; - ir_node *adr = get_Call_ptr(call); - ir_entity *ent = get_SymConst_entity(adr); - ir_type *call_tp = get_entity_type(ent); + ir_type *call_tp = get_Call_type(call); ir_type *res_tp = get_method_res_type(call_tp, 0); ir_entity *ent_l, *ent_r; ir_type *char_tp; @@ -705,9 +737,8 @@ int i_mapper_strcmp(ir_node *call, void *ctx) { /* a strcmp(s, s) ==> 0 */ ir_node *mem = get_Call_mem(call); ir_mode *mode = get_type_mode(res_tp); - ir_node *block = get_nodes_block(call); - irn = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode)); + irn = new_Const(get_mode_null(mode)); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRCMP); replace_call(irn, call, mem, NULL, NULL); return 1; @@ -739,19 +770,19 @@ replace_by_call: mode = get_type_mode(char_tp); /* replace the strcmp by (*x) */ - irn = new_rd_Load(dbg, current_ir_graph, block, mem, v, mode); - mem = new_r_Proj(current_ir_graph, block, irn, mode_M, pn_Load_M); - exc = new_r_Proj(current_ir_graph, block, irn, mode_X, pn_Load_X_except); - reg = new_r_Proj(current_ir_graph, block, irn, mode_X, pn_Load_X_regular); - irn = new_r_Proj(current_ir_graph, block, irn, mode, pn_Load_res); + irn = new_rd_Load(dbg, block, mem, v, mode, 0); + mem = new_r_Proj(block, irn, mode_M, pn_Load_M); + exc = new_r_Proj(block, irn, mode_X, pn_Load_X_except); + reg = new_r_Proj(block, irn, mode_X, pn_Load_X_regular); + irn = new_r_Proj(block, irn, mode, pn_Load_res); /* conv to the result mode */ mode = get_type_mode(res_tp); - irn = new_rd_Conv(dbg, current_ir_graph, block, irn, mode); + irn = new_rd_Conv(dbg, block, irn, mode); if (v == right) { /* negate in the ("", s) case */ - irn = new_rd_Minus(dbg, current_ir_graph, block, irn, mode); + irn = new_rd_Minus(dbg, block, irn, mode); } } } @@ -783,9 +814,8 @@ int i_mapper_strncmp(ir_node *call, void *ctx) { ir_type *call_tp = get_entity_type(ent); ir_type *res_tp = get_method_res_type(call_tp, 0); ir_mode *mode = get_type_mode(res_tp); - ir_node *block = get_nodes_block(call); - irn = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode)); + irn = new_Const(get_mode_null(mode)); DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRNCMP); replace_call(irn, call, mem, NULL, NULL); return 1; @@ -793,15 +823,35 @@ int i_mapper_strncmp(ir_node *call, void *ctx) { return 0; } /* i_mapper_strncmp */ +/* A mapper for strcpy */ +int i_mapper_strcpy(ir_node *call, void *ctx) { + ir_node *dst = get_Call_param(call, 0); + ir_node *src = get_Call_param(call, 1); + (void) ctx; + + if (dst == src) { + /* a strcpy(d, s) ==> d */ + ir_node *mem = get_Call_mem(call); + ir_node *dst = get_Call_param(call, 0); + + DBG_OPT_ALGSIM0(call, dst, FS_OPT_RTS_STRCPY); + replace_call(dst, call, mem, NULL, NULL); + return 1; + } + return 0; +} /* i_mapper_strcpy */ + /* A mapper for memcpy */ int i_mapper_memcpy(ir_node *call, void *ctx) { + ir_node *dst = get_Call_param(call, 0); + ir_node *src = get_Call_param(call, 1); ir_node *len = get_Call_param(call, 2); (void) ctx; - if (is_Const(len) && is_Const_null(len)) { - /* a memcpy(d, s, 0) ==> d */ + if (dst == src || (is_Const(len) && is_Const_null(len))) { + /* a memcpy(d, d, len) ==> d OR + a memcpy(d, s, 0) ==> d */ ir_node *mem = get_Call_mem(call); - ir_node *dst = get_Call_param(call, 0); DBG_OPT_ALGSIM0(call, dst, FS_OPT_RTS_MEMCPY); replace_call(dst, call, mem, NULL, NULL); @@ -810,6 +860,48 @@ int i_mapper_memcpy(ir_node *call, void *ctx) { return 0; } /* i_mapper_memcpy */ +/* A mapper for mempcpy */ +int i_mapper_mempcpy(ir_node *call, void *ctx) { + ir_node *dst = get_Call_param(call, 0); + ir_node *src = get_Call_param(call, 1); + ir_node *len = get_Call_param(call, 2); + (void) ctx; + + if (dst == src || (is_Const(len) && is_Const_null(len))) { + /* a memcpy(d, d, len) ==> d + len OR + a memcpy(d, s, 0) ==> d + 0 */ + dbg_info *dbg = get_irn_dbg_info(call); + ir_node *mem = get_Call_mem(call); + ir_node *blk = get_nodes_block(call); + ir_mode *mode = get_irn_mode(dst); + ir_node *res = new_rd_Add(dbg, blk, dst, len, mode); + + DBG_OPT_ALGSIM0(call, res, FS_OPT_RTS_MEMPCPY); + replace_call(res, call, mem, NULL, NULL); + return 1; + } + return 0; +} /* i_mapper_mempcpy */ + +/* A mapper for memmove */ +int i_mapper_memmove(ir_node *call, void *ctx) { + ir_node *dst = get_Call_param(call, 0); + ir_node *src = get_Call_param(call, 1); + ir_node *len = get_Call_param(call, 2); + (void) ctx; + + if (dst == src || (is_Const(len) && is_Const_null(len))) { + /* a memmove(d, d, len) ==> d OR + a memmove(d, s, 0) ==> d */ + ir_node *mem = get_Call_mem(call); + + DBG_OPT_ALGSIM0(call, dst, FS_OPT_RTS_MEMMOVE); + replace_call(dst, call, mem, NULL, NULL); + return 1; + } + return 0; +} /* i_mapper_memmove */ + /* A mapper for memset */ int i_mapper_memset(ir_node *call, void *ctx) { ir_node *len = get_Call_param(call, 2); @@ -827,6 +919,32 @@ int i_mapper_memset(ir_node *call, void *ctx) { return 0; } /* i_mapper_memset */ +/* A mapper for memcmp */ +int i_mapper_memcmp(ir_node *call, void *ctx) { + ir_node *left = get_Call_param(call, 0); + ir_node *right = get_Call_param(call, 1); + ir_node *len = get_Call_param(call, 2); + ir_node *irn; + (void) ctx; + + if (left == right || (is_Const(len) && is_Const_null(len))) { + /* a memcmp(s, s, len) ==> 0 OR + a memcmp(a, b, 0) ==> 0 */ + ir_node *mem = get_Call_mem(call); + ir_node *adr = get_Call_ptr(call); + ir_entity *ent = get_SymConst_entity(adr); + ir_type *call_tp = get_entity_type(ent); + ir_type *res_tp = get_method_res_type(call_tp, 0); + ir_mode *mode = get_type_mode(res_tp); + + irn = new_Const(get_mode_null(mode)); + DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRNCMP); + replace_call(irn, call, mem, NULL, NULL); + return 1; + } + return 0; +} /* i_mapper_memcmp */ + /** * Returns the result mode of a node. */ @@ -922,12 +1040,12 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) { /* step 1: create the call */ sym.entity_p = rt->ent; - addr = new_r_SymConst(irg, bl, sym, symconst_addr_ent); - call = new_rd_Call(get_irn_dbg_info(node), irg, bl, mem, addr, n_param, in, mtp); + addr = new_r_SymConst(irg, mode_P_code, sym, symconst_addr_ent); + call = new_rd_Call(get_irn_dbg_info(node), bl, mem, addr, n_param, in, mtp); set_irn_pinned(call, get_irn_pinned(node)); if (n_res > 0) - res_proj = new_r_Proj(irg, bl, call, mode_T, pn_Call_T_result); + res_proj = new_r_Proj(bl, call, mode_T, pn_Call_T_result); else res_proj = NULL; @@ -940,29 +1058,29 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) { for (i = 0; i < n_proj; ++i) set_Tuple_pred(node, i, new_r_Bad(irg)); if (rt->mem_proj_nr >= 0) - set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_regular)); - if (get_irn_op(mem) != op_NoMem) { + set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(bl, call, mode_M, pn_Call_M_regular)); + if (!is_NoMem(mem)) { /* Exceptions can only be handled with real memory */ if (rt->regular_proj_nr >= 0) - set_Tuple_pred(node, rt->regular_proj_nr, new_r_Proj(irg, bl, call, mode_X, pn_Call_X_regular)); + set_Tuple_pred(node, rt->regular_proj_nr, new_r_Proj(bl, call, mode_X, pn_Call_X_regular)); if (rt->exc_proj_nr >= 0) - set_Tuple_pred(node, rt->exc_proj_nr, new_r_Proj(irg, bl, call, mode_X, pn_Call_X_except)); + set_Tuple_pred(node, rt->exc_proj_nr, new_r_Proj(bl, call, mode_X, pn_Call_X_except)); if (rt->exc_mem_proj_nr >= 0) - set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_except)); + set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(bl, call, mode_M, pn_Call_M_except)); } if (rt->res_proj_nr >= 0) for (i = 0; i < n_res; ++i) set_Tuple_pred(node, rt->res_proj_nr + i, - new_r_Proj(irg, bl, res_proj, get_type_mode(get_method_res_type(mtp, i)), i)); + new_r_Proj(bl, res_proj, get_type_mode(get_method_res_type(mtp, i)), i)); return 1; } else { /* only one return value supported */ if (n_res > 0) { ir_mode *mode = get_type_mode(get_method_res_type(mtp, 0)); - res_proj = new_r_Proj(irg, bl, call, mode_T, pn_Call_T_result); - res_proj = new_r_Proj(irg, bl, res_proj, mode, 0); + res_proj = new_r_Proj(bl, call, mode_T, pn_Call_T_result); + res_proj = new_r_Proj(bl, res_proj, mode, 0); exchange(node, res_proj); return 1;