X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=87bdea31670141bb1586098dd558a5ec5e348c81;hb=f804d333c7b5459c3c1a6bfc188ecdc54346be73;hp=6529194de0875a6e6a14ad1cc32d609e8d2bb435;hpb=9f63c0a173a6a270f7bcf103ce765efc8e2d7923;p=libfirm

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 6529194de..87bdea316 100644
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -189,7 +189,7 @@ static perm_cycle_t *get_perm_cycle(perm_cycle_t *cycle, reg_pair_t *pairs, int
 	}
 
 	/* assume worst case: all remaining pairs build a cycle or chain */
-	cycle->elems    = calloc((n - n_pairs_done) * 2, sizeof(cycle->elems[0]));
+	cycle->elems    = xcalloc((n - n_pairs_done) * 2, sizeof(cycle->elems[0]));
 	cycle->n_elems  = 2;  /* initial number of elements is 2 */
 	cycle->elems[0] = pairs[start].in_reg;
 	cycle->elems[1] = pairs[start].out_reg;
@@ -330,7 +330,7 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
 
 		/* go to the first not-checked pair */
 		while (pairs[i].checked) i++;
-		cycle = calloc(1, sizeof(*cycle));
+		cycle = xcalloc(1, sizeof(*cycle));
 		cycle = get_perm_cycle(cycle, pairs, n, i);
 
 		DB((mod, LEVEL_1, "%+F: following %s created:\n  ", irn, cycle->type == PERM_CHAIN ? "chain" : "cycle"));
@@ -430,12 +430,15 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
  * @param walk_env The walker environment
  */
 static void lower_call_node(ir_node *call, const void *walk_env) {
-	const arch_env_t            *arch_env = walk_env;
+	const arch_env_t            *arch_env   = walk_env;
+	int                          bitset_idx = 0;
+	int                          set_size   = 0;
+	arch_isa_t                  *isa        = arch_env_get_isa(arch_env);
+	const ir_node               *proj_T     = NULL;
+	ir_node                     *block      = get_nodes_block(call);
 	const arch_register_class_t *reg_class;
-	int                          i, j, set_size = 0, pn, keep_arity;
-	arch_isa_t                  *isa      = arch_env_get_isa(arch_env);
-	const ir_node               *proj_T   = NULL;
-	ir_node                     **in_keep, *block = get_nodes_block(call);
+	int                          i, j, pn, keep_arity;
+	ir_node                     **in_keep;
 	bitset_t                    *proj_set;
 	const ir_edge_t             *edge;
 	const arch_register_t       *reg;
@@ -446,7 +449,7 @@ static void lower_call_node(ir_node *call, const void *walk_env) {
 		set_size  += arch_register_class_n_regs(reg_class);
 	}
 
-	in_keep = malloc(set_size * sizeof(ir_node *));
+	in_keep = xmalloc(set_size * sizeof(ir_node *));
 
 	proj_set = bitset_malloc(set_size);
 	bitset_clear_all(proj_set);
@@ -463,7 +466,8 @@ static void lower_call_node(ir_node *call, const void *walk_env) {
 			ir_node *proj = get_edge_src_irn(edge);
 
 			assert(is_Proj(proj));
-			bitset_set(proj_set, get_Proj_proj(proj));
+			pn = isa->impl->handle_call_proj(isa, proj, 0);
+			bitset_set(proj_set, pn);
 		}
 	}
 	else {
@@ -484,12 +488,16 @@ static void lower_call_node(ir_node *call, const void *walk_env) {
 
 			/* only check caller save registers */
 			if (arch_register_type_is(reg, caller_saved)) {
-				pn = isa->impl->get_projnum_for_register(isa, reg);
-				if (!bitset_is_set(proj_set, pn)) {
-					ir_node *proj = new_r_Proj(current_ir_graph, block, (ir_node *)proj_T, mode_Is, pn);
 
+				/* Only create new proj, iff not already present */
+				if (!bitset_is_set(proj_set, bitset_idx)) {
+					ir_node *proj = new_r_Proj(current_ir_graph, block, (ir_node *)proj_T, mode_Is, bitset_idx);
+
+					pn = isa->impl->handle_call_proj(isa, proj, 1);
 					in_keep[keep_arity++] = proj;
 				}
+
+				bitset_idx++;
 			}
 		}