X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Flower%2Flower_intrinsics.c;h=6155c9f4b3c6b0c9224f60b10780648c93b75f10;hb=898744ef6b5b6701cd2a117dbf6a9a6d8ab9a785;hp=71b82ac2d39f170c67395c3d5a519498d7e7af61;hpb=4b734653b3f11a3182963369bb58980e4d5a62cb;p=libfirm

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index 71b82ac2d..6155c9f4b 100644
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -23,9 +23,10 @@
  * @author  Michael Beck
  * @version $Id$
  */
-
 #include "config.h"
 
+#include <stdbool.h>
+
 #include "lowering.h"
 #include "irop_t.h"
 #include "irprog_t.h"
@@ -39,6 +40,7 @@
 #include "irvrfy.h"
 #include "pmap.h"
 #include "array_t.h"
+#include "irpass_t.h"
 #include "iropt_dbg.h"
 #include "error.h"
 
@@ -158,6 +160,48 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) {
 	return nr_of_intrinsics;
 }  /* lower_intrinsics */
 
+struct pass_t {
+	ir_prog_pass_t pass;
+
+	int part_block_used;
+	int      length;
+	i_record list[1];
+};
+
+/**
+ * Wrapper for running lower_intrinsics() as an ir_prog pass.
+ */
+static int pass_wrapper(ir_prog *irp, void *context)
+{
+	struct pass_t *pass = context;
+	(void) irp; /* TODO: set current irp, or remove parameter */
+	lower_intrinsics(pass->list, pass->length, pass->part_block_used);
+	/* probably this pass should not run again */
+	return 0;
+}
+
+/**
+ * Creates an ir_prog pass for lower_intrinsics.
+ *
+ * @param name             the name of this pass or NULL
+ * @param list             an array of intrinsic map records
+ * @param length           the length of the array
+ * @param part_block_used  set to true if part_block() must be using during lowering
+ */
+ir_prog_pass_t *lower_intrinsics_pass(
+	const char *name,
+	i_record *list, int length, int part_block_used)
+{
+	struct pass_t *pass = xmalloc(sizeof(*pass) + (length-1) * sizeof(pass->list[0]));
+
+	memcpy(pass->list, list, sizeof(list[0]) * length);
+	pass->length          = length;
+	pass->part_block_used = part_block_used;
+
+	return def_prog_pass_constructor(
+		&pass->pass, name ? name : "lower_intrinsics", pass_wrapper);
+}  /* lower_intrinsics_pass*/
+
 /**
  * Helper function, replace the call by the given node.
  *
@@ -175,18 +219,17 @@ static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg
 		/* 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_r_Tuple(current_ir_graph, block, 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);
+	set_Tuple_pred(call, pn_Call_M, mem);
 	set_Tuple_pred(call, pn_Call_X_regular, reg_jmp);
 	set_Tuple_pred(call, pn_Call_X_except, exc_jmp);
 	set_Tuple_pred(call, pn_Call_T_result, irn);
-	set_Tuple_pred(call, pn_Call_M_except, mem);
 	set_Tuple_pred(call, pn_Call_P_value_res_base, new_Bad());
 }  /* replace_call */
 
@@ -199,12 +242,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);
@@ -220,14 +281,14 @@ int i_mapper_alloca(ir_node *call, void *ctx) {
 		if (mode == NULL) {
 			panic("Cannot find unsigned mode for %M", mode);
 		}
-		op = new_rd_Conv(dbg, current_ir_graph, block, op, mode);
+		op = new_rd_Conv(dbg, block, op, mode);
 	}
 
-	irn    = new_rd_Alloc(dbg, current_ir_graph, block, mem, op, firm_unknown_type, stack_alloc);
-	mem    = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_M, pn_Alloc_M);
-	no_exc = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_X, pn_Alloc_X_regular);
-	exc    = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_X, pn_Alloc_X_except);
-	irn    = new_rd_Proj(dbg, current_ir_graph, block, irn, get_modeP_data(), pn_Alloc_res);
+	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);
@@ -317,11 +378,11 @@ int i_mapper_pow(ir_node *call, void *ctx) {
 		ir_node *quot;
 
 		irn  = new_Const(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);
+		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);
@@ -399,7 +460,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);
@@ -505,6 +566,27 @@ static ir_entity *get_const_entity(ir_node *ptr) {
 	return NULL;
 }  /* get_const_entity */
 
+static bool initializer_val_is_null(ir_initializer_t *init)
+{
+	tarval *tv;
+
+	if (get_initializer_kind(init) == IR_INITIALIZER_NULL)
+		return true;
+
+	if (get_initializer_kind(init) == IR_INITIALIZER_TARVAL) {
+		tv = get_initializer_tarval_value(init);
+	} else if (get_initializer_kind(init) == IR_INITIALIZER_CONST) {
+		ir_node *irn = get_initializer_const_value(init);
+		if (!is_Const(irn))
+			return false;
+		tv = get_Const_tarval(irn);
+	} else {
+		return false;
+	}
+
+	return tarval_is_null(tv);
+}
+
 /**
  * Calculate the value of strlen if possible.
  *
@@ -517,7 +599,9 @@ static ir_entity *get_const_entity(ir_node *ptr) {
 static ir_node *eval_strlen(ir_entity *ent, ir_type *res_tp) {
 	ir_type *tp = get_entity_type(ent);
 	ir_mode *mode;
-	int     i, n, len = -1;
+	ir_initializer_t *initializer;
+	unsigned          size;
+	unsigned          i;
 
 	if (! is_Array_type(tp))
 		return NULL;
@@ -530,23 +614,44 @@ static ir_node *eval_strlen(ir_entity *ent, ir_type *res_tp) {
 	if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
 		return NULL;
 
-	n = get_compound_ent_n_values(ent);
-	for (i = 0; i < n; ++i) {
-		ir_node *irn = get_compound_ent_value(ent, i);
+	if (!has_entity_initializer(ent)) {
+		int len;
+		int n;
+		int i = -1;
 
-		if (! is_Const(irn))
-			return NULL;
+		n = get_compound_ent_n_values(ent);
+		for (i = 0; i < n; ++i) {
+			ir_node *irn = get_compound_ent_value(ent, i);
 
-		if (is_Const_null(irn)) {
-			/* found the length */
-			len = i;
-			break;
+			if (! is_Const(irn))
+				return NULL;
+
+			if (is_Const_null(irn)) {
+				/* found the length */
+				len = i;
+				break;
+			}
 		}
+		if (len >= 0) {
+			tarval *tv = new_tarval_from_long(len, get_type_mode(res_tp));
+			return new_Const_type(tv, res_tp);
+		}
+		return NULL;
 	}
-	if (len >= 0) {
-		tarval *tv = new_tarval_from_long(len, get_type_mode(res_tp));
-		return new_Const_type(tv, res_tp);
+
+	initializer = get_entity_initializer(ent);
+	if (get_initializer_kind(initializer) != IR_INITIALIZER_COMPOUND)
+		return NULL;
+
+	size = get_initializer_compound_n_entries(initializer);
+	for (i = 0; i < size; ++i) {
+		ir_initializer_t *val = get_initializer_compound_value(initializer, i);
+		if (initializer_val_is_null(val)) {
+			tarval *tv = new_tarval_from_long(i, get_type_mode(res_tp));
+			return new_Const_type(tv, res_tp);
+		}
 	}
+
 	return NULL;
 }  /* eval_strlen */
 
@@ -615,46 +720,54 @@ static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp)
 	if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
 		return NULL;
 
-	n   = get_compound_ent_n_values(left);
-	n_r = get_compound_ent_n_values(right);
-	if (n_r < n)
-		n = n_r;
-	for (i = 0; i < n; ++i) {
-		ir_node *irn;
-		long v_l, v_r;
-		tarval *tv;
-
-		irn = get_compound_ent_value(left, i);
-		if (! is_Const(irn))
-			return NULL;
-		tv = get_Const_tarval(irn);
-		v_l = get_tarval_long(tv);
-
-		irn = get_compound_ent_value(right, i);
-		if (! is_Const(irn))
-			return NULL;
-		tv = get_Const_tarval(irn);
-		v_r = get_tarval_long(tv);
+	if (!has_entity_initializer(left) && !has_entity_initializer(right)) {
+		/* code that uses deprecated compound_graph_path stuff */
+
+		n   = get_compound_ent_n_values(left);
+		n_r = get_compound_ent_n_values(right);
+		if (n_r < n)
+			n = n_r;
+		for (i = 0; i < n; ++i) {
+			ir_node *irn;
+			long v_l, v_r;
+			tarval *tv;
+
+			irn = get_compound_ent_value(left, i);
+			if (! is_Const(irn))
+				return NULL;
+			tv = get_Const_tarval(irn);
+			v_l = get_tarval_long(tv);
+
+			irn = get_compound_ent_value(right, i);
+			if (! is_Const(irn))
+				return NULL;
+			tv = get_Const_tarval(irn);
+			v_r = get_tarval_long(tv);
+
+			if (v_l < v_r) {
+				res = -1;
+				break;
+			}
+			if (v_l > v_r) {
+				res = +1;
+				break;
+			}
 
-		if (v_l < v_r) {
-			res = -1;
-			break;
-		}
-		if (v_l > v_r) {
-			res = +1;
-			break;
+			if (v_l == 0) {
+				res = 0;
+				break;
+			}
 		}
-
-		if (v_l == 0) {
-			res = 0;
-			break;
+		if (i < n) {
+			/* we found an end */
+			tarval *tv = new_tarval_from_long(res, get_type_mode(res_tp));
+			return new_Const_type(tv, res_tp);
 		}
+		return NULL;
 	}
-	if (i < n) {
-		/* we found an end */
-		tarval *tv = new_tarval_from_long(res, get_type_mode(res_tp));
-		return new_Const_type(tv, res_tp);
-	}
+
+	/* TODO */
+
 	return NULL;
 }  /* eval_strcmp */
 
@@ -666,10 +779,11 @@ static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp)
  * @return non-zero if ent represents the empty string
  */
 static int is_empty_string(ir_entity *ent) {
-	ir_type *tp = get_entity_type(ent);
-	ir_mode *mode;
-	int     n;
-	ir_node *irn;
+	ir_type          *tp = get_entity_type(ent);
+	ir_mode          *mode;
+	ir_node          *irn;
+	ir_initializer_t *initializer;
+	ir_initializer_t *init0;
 
 	if (! is_Array_type(tp))
 		return 0;
@@ -682,12 +796,25 @@ static int is_empty_string(ir_entity *ent) {
 	if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
 		return 0;
 
-	n = get_compound_ent_n_values(ent);
-	if (n < 1)
+	if (!has_entity_initializer(ent)) {
+		/* code for deprecated compound_graph_path stuff */
+		int n = get_compound_ent_n_values(ent);
+		if (n < 1)
+			return 0;
+		irn = get_compound_ent_value(ent, 0);
+
+		return is_Const(irn) && is_Const_null(irn);
+	}
+
+	initializer = get_entity_initializer(ent);
+	if (get_initializer_kind(initializer) != IR_INITIALIZER_COMPOUND)
+		return 0;
+
+	if (get_initializer_compound_n_entries(initializer) < 1)
 		return 0;
-	irn = get_compound_ent_value(ent, 0);
 
-	return is_Const(irn) && is_Const_null(irn);
+	init0 = get_initializer_compound_value(initializer, 0);
+	return initializer_val_is_null(init0);
 }  /* is_empty_string */
 
 /* A mapper for strcmp */
@@ -752,19 +879,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);
 			}
 		}
 	}
@@ -805,15 +932,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);
@@ -822,6 +969,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);
@@ -839,6 +1028,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.
  */
@@ -934,12 +1149,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, mode_P_code, 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;
 
@@ -952,29 +1167,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));
+			set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(bl, call, mode_M, pn_Call_M));
 		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));
 		}
 
 		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;