X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Farm%2Fbearch_arm.c;h=c3942f05378c887ccc79c2b041f994aeabf9c964;hb=ea40997bb109173b1ba75d01a958a3cf05a771c3;hp=ce71c03d57c44e2d82d0c5678cedabfa04222a4a;hpb=2413c90193696a4d31ea883954386dc32c0ae550;p=libfirm

diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index ce71c03d5..c3942f053 100644
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -56,6 +56,7 @@
 #include "../begnuas.h"
 #include "../belistsched.h"
 #include "../beflags.h"
+#include "../bestack.h"
 
 #include "bearch_arm_t.h"
 
@@ -144,18 +145,48 @@ static void arm_prepare_graph(ir_graph *irg)
 	place_code(irg);
 }
 
-/**
- * Called immediately before emit phase.
- */
-static void arm_finish_irg(ir_graph *irg)
+static void arm_collect_frame_entity_nodes(ir_node *node, void *data)
 {
-	/* do peephole optimizations and fix stack offsets */
-	arm_peephole_optimization(irg);
+	be_fec_env_t  *env = (be_fec_env_t*)data;
+	const ir_mode *mode;
+	int            align;
+	ir_entity     *entity;
+	const arm_load_store_attr_t *attr;
+
+	if (be_is_Reload(node) && be_get_frame_entity(node) == NULL) {
+		mode  = get_irn_mode(node);
+		align = get_mode_size_bytes(mode);
+		be_node_needs_frame_entity(env, node, mode, align);
+		return;
+	}
+
+	switch (get_arm_irn_opcode(node)) {
+	case iro_arm_Ldf:
+	case iro_arm_Ldr:
+		break;
+	default:
+		return;
+	}
+
+	attr   = get_arm_load_store_attr_const(node);
+	entity = attr->entity;
+	mode   = attr->load_store_mode;
+	align  = get_mode_size_bytes(mode);
+	if (entity != NULL)
+		return;
+	if (!attr->is_frame_entity)
+		return;
+	be_node_needs_frame_entity(env, node, mode, align);
 }
 
-static void arm_before_ra(ir_graph *irg)
+static void arm_set_frame_entity(ir_node *node, ir_entity *entity)
 {
-	be_sched_fix_flags(irg, &arm_reg_classes[CLASS_arm_flags], NULL, NULL);
+	if (is_be_node(node)) {
+		be_node_set_frame_entity(node, entity);
+	} else {
+		arm_load_store_attr_t *attr = get_arm_load_store_attr(node);
+		attr->entity = entity;
+	}
 }
 
 static void transform_Reload(ir_node *node)
@@ -223,51 +254,10 @@ static void arm_after_ra_walker(ir_node *block, void *data)
 	}
 }
 
-static void arm_collect_frame_entity_nodes(ir_node *node, void *data)
-{
-	be_fec_env_t  *env = (be_fec_env_t*)data;
-	const ir_mode *mode;
-	int            align;
-	ir_entity     *entity;
-	const arm_load_store_attr_t *attr;
-
-	if (be_is_Reload(node) && be_get_frame_entity(node) == NULL) {
-		mode  = get_irn_mode(node);
-		align = get_mode_size_bytes(mode);
-		be_node_needs_frame_entity(env, node, mode, align);
-		return;
-	}
-
-	switch (get_arm_irn_opcode(node)) {
-	case iro_arm_Ldf:
-	case iro_arm_Ldr:
-		break;
-	default:
-		return;
-	}
-
-	attr   = get_arm_load_store_attr_const(node);
-	entity = attr->entity;
-	mode   = attr->load_store_mode;
-	align  = get_mode_size_bytes(mode);
-	if (entity != NULL)
-		return;
-	if (!attr->is_frame_entity)
-		return;
-	be_node_needs_frame_entity(env, node, mode, align);
-}
-
-static void arm_set_frame_entity(ir_node *node, ir_entity *entity)
-{
-	if (is_be_node(node)) {
-		be_node_set_frame_entity(node, entity);
-	} else {
-		arm_load_store_attr_t *attr = get_arm_load_store_attr(node);
-		attr->entity = entity;
-	}
-}
-
-static void arm_after_ra(ir_graph *irg)
+/**
+ * Called immediately before emit phase.
+ */
+static void arm_finish_irg(ir_graph *irg)
 {
 	be_stack_layout_t *stack_layout = be_get_irg_stack_layout(irg);
 	bool               at_begin     = stack_layout->sp_relative ? true : false;
@@ -278,6 +268,18 @@ static void arm_after_ra(ir_graph *irg)
 	be_free_frame_entity_coalescer(fec_env);
 
 	irg_block_walk_graph(irg, NULL, arm_after_ra_walker, NULL);
+
+	/* fix stack entity offsets */
+	be_abi_fix_stack_nodes(irg);
+	be_abi_fix_stack_bias(irg);
+
+	/* do peephole optimizations and fix stack offsets */
+	arm_peephole_optimization(irg);
+}
+
+static void arm_before_ra(ir_graph *irg)
+{
+	be_sched_fix_flags(irg, &arm_reg_classes[CLASS_arm_flags], NULL, NULL);
 }
 
 /**
@@ -616,7 +618,6 @@ const arch_isa_if_t arm_isa_if = {
 	NULL,  /* before_abi */
 	arm_prepare_graph,
 	arm_before_ra,
-	arm_after_ra,
 	arm_finish_irg,
 	arm_gen_routine,
 	NULL, /* register_saved_by */