X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabi.c;h=ef81cd98665c0943a04b47cfdee0357c7c090d14;hb=4ed245f5007168dab7850942a7ee6b6b29a19817;hp=e2005cdfbd6479036e40302dc3c3da216664ffc9;hpb=3a5f96eb2a12ff342c96c1b9db8d16d382b15d28;p=libfirm

diff --git a/ir/be/beabi.c b/ir/be/beabi.c
index e2005cdfb..ef81cd986 100644
--- a/ir/be/beabi.c
+++ b/ir/be/beabi.c
@@ -716,6 +716,8 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
 
 		const ir_edge_t *edge;
 		ir_node *new_alloc;
+		ir_node *addr;
+		ir_node *copy;
 
 		foreach_out_edge(alloc, edge) {
 			ir_node *irn = get_edge_src_irn(edge);
@@ -746,7 +748,7 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
 		env->call->flags.bits.try_omit_fp = 0;
 		new_alloc = be_new_AddSP(env->isa->sp, irg, bl, curr_sp, get_Alloc_size(alloc));
 
-		exchange(alloc, env->isa->stack_dir < 0 ? new_alloc : curr_sp);
+		exchange(alloc, new_alloc);
 
 		if(alloc_mem != NULL)
 			set_Proj_proj(alloc_mem, pn_be_AddSP_M);
@@ -754,6 +756,18 @@ static ir_node *adjust_alloc(be_abi_irg_t *env, ir_node *alloc, ir_node *curr_sp
 		/* fix projnum of alloca res */
 		set_Proj_proj(alloc_res, pn_be_AddSP_res);
 
+		addr = env->isa->stack_dir < 0 ? alloc_res : curr_sp;
+
+		/* copy the address away, since it could be used after further stack pointer modifictions. */
+		/* Let it point curr_sp just for the moment, I'll reroute it in a second. */
+		copy = be_new_Copy(env->isa->sp->reg_class, irg, bl, curr_sp);
+
+		/* Let all users of the Alloc() result now point to the copy. */
+		edges_reroute(alloc_res, copy, irg);
+
+		/* Rewire the copy appropriately. */
+		set_irn_n(copy, be_pos_Copy_op, addr);
+
 		curr_sp = alloc_res;
 	}
 
@@ -1704,14 +1718,18 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg)
 	restore_optimization_state(&state);
 	FIRM_DBG_REGISTER(env->dbg, "firm.be.abi");
 
-	env->cb = env->call->cb->init(env->call, birg->main_env->arch_env, irg);
-
 	memcpy(&env->irn_handler, &abi_irn_handler, sizeof(abi_irn_handler));
 	env->irn_ops.impl = &abi_irn_ops;
 
 	/* Lower all call nodes in the IRG. */
 	process_calls(env);
 
+	/*
+		Beware: init backend abi call object after processing calls,
+		otherwise some information might be not yet available.
+	*/
+	env->cb = env->call->cb->init(env->call, birg->main_env->arch_env, irg);
+
 	/* Process the IRG */
 	modify_irg(env);
 
@@ -1775,8 +1793,14 @@ struct fix_stack_walker_info {
 static void collect_stack_nodes_walker(ir_node *irn, void *data)
 {
 	struct fix_stack_walker_info *info = data;
+	ir_mode *mode;
+
+	if (is_Block(irn))
+		return;
+
+	mode = get_irn_mode(irn);
 
-	if(arch_irn_is(info->aenv, irn, modify_sp))
+	if (arch_irn_is(info->aenv, irn, modify_sp) && mode != mode_T && mode != mode_M)
 		pset_insert_ptr(info->nodes, irn);
 }
 
@@ -1978,6 +2002,10 @@ static entity *abi_get_frame_entity(const void *_self, const ir_node *irn)
 	return NULL;
 }
 
+static void abi_set_frame_entity(const void *_self, ir_node *irn, entity *ent)
+{
+}
+
 static void abi_set_stack_bias(const void *_self, ir_node *irn, int bias)
 {
 }
@@ -1989,7 +2017,12 @@ static const arch_irn_ops_if_t abi_irn_ops = {
 	abi_classify,
 	abi_get_flags,
 	abi_get_frame_entity,
-	abi_set_stack_bias
+	abi_set_frame_entity,
+	abi_set_stack_bias,
+	NULL,    /* get_inverse             */
+	NULL,    /* get_op_estimated_cost   */
+	NULL,    /* possible_memory_operand */
+	NULL,    /* perform_memory_operand  */
 };
 
 static const arch_irn_handler_t abi_irn_handler = {