X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_finish.c;h=ac8fc9e73ba1eb3080ee771edb0069f62d5153b5;hb=df2faee01a5832057bb3ca0ba5f67e979c916e19;hp=139dfdbf74121d238701d8ce3b4ba16abeef9533;hpb=6004627aa720d7d6588782c5aaf6c73d35e37235;p=libfirm

diff --git a/ir/be/sparc/sparc_finish.c b/ir/be/sparc/sparc_finish.c
index 139dfdbf7..ac8fc9e73 100644
--- a/ir/be/sparc/sparc_finish.c
+++ b/ir/be/sparc/sparc_finish.c
@@ -80,29 +80,26 @@ static void kill_unused_stacknodes(ir_node *node)
 
 static void introduce_epilog(ir_node *ret)
 {
-	const arch_register_t *sp_reg     = &sparc_registers[REG_SP];
-	ir_graph              *irg        = get_irn_irg(ret);
-	be_stack_layout_t     *layout     = be_get_irg_stack_layout(irg);
-	ir_node               *block      = get_nodes_block(ret);
-	ir_type               *frame_type = get_irg_frame_type(irg);
-	unsigned               frame_size = get_type_size_bytes(frame_type);
-
+	arch_register_t const *const sp_reg = &sparc_registers[REG_SP];
 	assert(arch_get_irn_register_req_in(ret, n_sparc_Return_sp) == sp_reg->single_req);
-	ir_node *const sp = get_irn_n(ret, n_sparc_Return_sp);
 
+	ir_node           *const sp     = get_irn_n(ret, n_sparc_Return_sp);
+	ir_node           *const block  = get_nodes_block(ret);
+	ir_graph          *const irg    = get_irn_irg(ret);
+	be_stack_layout_t *const layout = be_get_irg_stack_layout(irg);
 	if (!layout->sp_relative) {
-		const arch_register_t *fp_reg = &sparc_registers[REG_FRAME_POINTER];
-		const arch_register_t *sp_reg = &sparc_registers[REG_SP];
-		ir_node *fp      = be_get_initial_reg_value(irg, fp_reg);
-		ir_node *sp      = be_get_initial_reg_value(irg, sp_reg);
-		ir_node *restore = new_bd_sparc_RestoreZero(NULL, block, sp, fp);
+		arch_register_t const *const fp_reg  = &sparc_registers[REG_FRAME_POINTER];
+		ir_node               *const fp      = be_get_initial_reg_value(irg, fp_reg);
+		ir_node               *const new_sp  = be_get_initial_reg_value(irg, sp_reg);
+		ir_node               *const restore = new_bd_sparc_RestoreZero(NULL, block, new_sp, fp);
 		sched_add_before(ret, restore);
 		arch_set_irn_register(restore, sp_reg);
 		set_irn_n(ret, n_sparc_Return_sp, restore);
-
 		kill_unused_stacknodes(sp);
 	} else {
-		ir_node *incsp  = be_new_IncSP(sp_reg, block, sp, -frame_size, 0);
+		ir_type *const frame_type = get_irg_frame_type(irg);
+		unsigned const frame_size = get_type_size_bytes(frame_type);
+		ir_node *const incsp      = be_new_IncSP(sp_reg, block, sp, -frame_size, 0);
 		set_irn_n(ret, n_sparc_Return_sp, incsp);
 		sched_add_before(ret, incsp);
 	}
@@ -580,25 +577,13 @@ static void peephole_sparc_RestoreZero(ir_node *node)
 
 static void finish_sparc_Return(ir_node *node)
 {
-	ir_node *schedpoint = node;
-	ir_node *restore;
-	/* see that there is no code between Return and restore, if there is move
-	 * it in front of the restore */
-	while (true) {
-		schedpoint = sched_prev(schedpoint);
-		if (sched_is_begin(schedpoint))
-			return;
-		if (is_sparc_Restore(schedpoint) || is_sparc_RestoreZero(schedpoint))
+	/* Ensure that the restore is directly before the return. */
+	sched_foreach_reverse_from(sched_prev(node), restore) {
+		if (is_sparc_Restore(restore) || is_sparc_RestoreZero(restore)) {
+			sched_remove(restore);
+			sched_add_before(node, restore);
 			break;
-	}
-	restore = schedpoint;
-	schedpoint = sched_prev(node);
-	/* move all code between return and restore up */
-	while (schedpoint != restore) {
-		ir_node *next_schedpoint = sched_prev(schedpoint);
-		sched_remove(schedpoint);
-		sched_add_before(restore, schedpoint);
-		schedpoint = next_schedpoint;
+		}
 	}
 }