X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=0547a0cf5558c2053c7d6769021dc394354692da;hb=9d20c61722e987065708bfb75669e92c28cab78c;hp=a0b935de7d97bda9da8824e5bb8ada5d061ef926;hpb=e4b61083553236f2a83c88807a8d11621956bbbc;p=libfirm

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index a0b935de7..0547a0cf5 100644
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -725,14 +725,20 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 
 	/* Make additional projs for the caller save registers
 	   and the Keep node which keeps them alive. */
-	if (pset_count(caller_save) + n_reg_results > 0) {
+	if (1 || pset_count(caller_save) + n_reg_results > 0) {
 		const arch_register_t *reg;
 		ir_node               **in, *keep;
-		int                   i, n;
+		int                   i;
+		int                   n = 0;
 		int                   curr_res_proj
 			= pn_be_Call_first_res + n_reg_results;
 
-		for (reg = pset_first(caller_save), n = 0; reg; reg = pset_next(caller_save), ++n) {
+		/* also keep the stack pointer */
+		++n;
+		set_irn_link(curr_sp, (void*) sp);
+		obstack_ptr_grow(obst, curr_sp);
+
+		for (reg = pset_first(caller_save); reg; reg = pset_next(caller_save), ++n) {
 			ir_node *proj = new_r_Proj(irg, bl, low_call, reg->reg_class->mode,
 			                           curr_res_proj);
 
@@ -782,7 +788,7 @@ static ir_node *adjust_call(be_abi_irg_t *env, ir_node *irn, ir_node *curr_sp)
 		}
 
 		if (! mem_proj) {
-			mem_proj = new_r_Proj(irg, bl, low_call, mode_M, pn_Call_M);
+			mem_proj = new_r_Proj(irg, bl, low_call, mode_M, pn_be_Call_M_regular);
 			keep_alive(mem_proj);
 		}
 
@@ -1142,8 +1148,10 @@ static void process_calls_in_block(ir_node *bl, void *data)
 
 		obstack_free(&env->obst, nodes);
 
-		/* Keep the last stack state in the block by tying it to Keep node */
-		if(curr_sp != env->init_sp) {
+		/* Keep the last stack state in the block by tying it to Keep node,
+		 * the proj from calls is already kept */
+		if(curr_sp != env->init_sp
+				&& !(is_Proj(curr_sp) && be_is_Call(get_Proj_pred(curr_sp)))) {
 			nodes[0] = curr_sp;
 			keep     = be_new_Keep(env->isa->sp->reg_class, get_irn_irg(bl),
 			                       bl, 1, nodes);