X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fsparc%2Fsparc_stackframe.c;h=fdadc757b6bc9e224f43acca329b1dddb05e5f00;hb=b009bb03a362a0a9584a1928d7b8b1aded6d6232;hp=816dc297731db32136d65c152a75180403564a89;hpb=93d82d09d2a6e2e56be9781d7021492838642f2f;p=libfirm

diff --git a/ir/be/sparc/sparc_stackframe.c b/ir/be/sparc/sparc_stackframe.c
index 816dc2977..fdadc757b 100644
--- a/ir/be/sparc/sparc_stackframe.c
+++ b/ir/be/sparc/sparc_stackframe.c
@@ -24,6 +24,8 @@
  */
 #include "config.h"
 
+#include "beirg.h"
+#include "error.h"
 #include "firm_types.h"
 #include "irnode_t.h"
 #include "bearch_sparc_t.h"
@@ -50,9 +52,6 @@ static void set_irn_sp_bias(ir_node *node, int new_bias)
 static void process_bias(ir_node *block, bool sp_relative, int bias,
                          int free_bytes)
 {
-	const ir_edge_t *edge;
-	ir_node         *irn;
-
 	mark_Block_block_visited(block);
 
 	/* process schedule */
@@ -68,6 +67,14 @@ static void process_bias(ir_node *block, bool sp_relative, int bias,
 			arch_set_frame_offset(irn, offset);
 		}
 
+		/* The additional alignment bytes cannot be used
+		 * anymore after alloca. */
+		if (is_sparc_SubSP(irn)) {
+			free_bytes = 0;
+		} else if (is_sparc_AddSP(irn)) {
+			assert(free_bytes == 0);
+		}
+
 		irn_bias = arch_get_sp_bias(irn);
 		if (irn_bias == 0) {
 			/* do nothing */
@@ -280,7 +287,7 @@ void sparc_create_stacklayout(ir_graph *irg, calling_convention_t *cconv)
 /* Assign entity offsets, to all stack-related entities.
  * The offsets are relative to the begin of the stack frame.
  */
-static void process_frame_types(ir_graph *irg)
+void sparc_adjust_stack_entity_offsets(ir_graph *irg)
 {
 	be_stack_layout_t *layout = be_get_irg_stack_layout(irg);
 
@@ -321,9 +328,10 @@ static void process_frame_types(ir_graph *irg)
 	if (!layout->sp_relative) {
 		frame_size = (frame_size + frame_align-1) & ~(frame_align-1);
 	} else {
-		unsigned misalign = SPARC_MIN_STACKSIZE % frame_align;
+		unsigned misalign = (SPARC_MIN_STACKSIZE+frame_size) % frame_align;
 		frame_size += misalign;
 	}
+	set_type_size_bytes(frame_type, frame_size);
 
 	ir_type *arg_type = layout->arg_type;
 
@@ -338,8 +346,6 @@ void sparc_fix_stack_bias(ir_graph *irg)
 
 	ir_node *start_block = get_irg_start_block(irg);
 
-	process_frame_types(irg);
-
 	ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED);
 	inc_irg_block_visited(irg);
 	process_bias(start_block, sp_relative, 0, 0);