X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabihelper.c;h=75ca7e893b6b5f7f75cad84ad0edad6bae180c2a;hb=1b4cac3471b02b63e9656cd8c876f067766fe482;hp=df0c96397c3a162e6f93c1edada59222fc4226dc;hpb=9a78c10bb1c78b0513f31e8b2a0222e3c497c454;p=libfirm

diff --git a/ir/be/beabihelper.c b/ir/be/beabihelper.c
index df0c96397..75ca7e893 100644
--- a/ir/be/beabihelper.c
+++ b/ir/be/beabihelper.c
@@ -22,18 +22,19 @@
  * @brief       Helper functions for handling ABI constraints in the code
  *              selection phase.
  * @author      Matthias Braun
- * @version     $Id$
  */
 #include "config.h"
 
 #include "beabihelper.h"
 #include "bearch.h"
+#include "beirg.h"
 #include "benode.h"
 #include "besched.h"
 #include "ircons.h"
 #include "iredges.h"
 #include "irgwalk.h"
-#include "irphase_t.h"
+#include "irnodemap.h"
+#include "irtools.h"
 #include "heights.h"
 
 /**
@@ -65,7 +66,6 @@ struct beabi_helper_env_t {
 	ir_graph                 *irg;         /**< the graph we operate on */
 	register_state_mapping_t  prolog;      /**< the register state map for the prolog */
 	register_state_mapping_t  epilog;      /**< the register state map for the epilog */
-	ir_phase                 *stack_order; /**< a phase to handle stack dependencies. */
 };
 
 /**
@@ -275,12 +275,12 @@ ir_node *be_prolog_create_start(beabi_helper_env_t *env, dbg_info *dbgi,
 		const arch_register_t *reg     = regflag->reg;
 		ir_node               *proj;
 		if (reg == NULL) {
-			arch_set_out_register_req(start, o, arch_no_register_req);
+			arch_set_irn_register_req_out(start, o, arch_no_register_req);
 			proj = new_r_Proj(start, mode_M, o);
 		} else {
 			be_set_constr_single_reg_out(start, o, regflag->reg,
 			                             regflag->flags);
-			arch_irn_set_register(start, o, regflag->reg);
+			arch_set_irn_register_out(start, o, regflag->reg);
 			proj = new_r_Proj(start, reg->reg_class->mode, o);
 		}
 		env->prolog.value_map[o] = proj;
@@ -384,7 +384,6 @@ ir_node *be_epilog_create_return(beabi_helper_env_t *env, dbg_info *dbgi,
  */
 static bool has_real_user(const ir_node *node)
 {
-	const ir_edge_t *edge;
 	foreach_out_edge(node, edge) {
 		ir_node *user = get_edge_src_irn(edge);
 		if (!is_End(user) && !is_Anchor(user))
@@ -412,18 +411,15 @@ static ir_node *add_to_keep(ir_node *last_keep,
 	return last_keep;
 }
 
-static void add_missing_keep_walker(ir_node *node, void *data)
+void be_add_missing_keeps_node(ir_node *node)
 {
-	int              n_outs, i;
-	unsigned        *found_projs;
-	const ir_edge_t *edge;
-	ir_mode         *mode = get_irn_mode(node);
-	ir_node         *last_keep;
-	ir_node        **existing_projs;
-	(void) data;
+	int       n_outs, i;
+	ir_mode  *mode = get_irn_mode(node);
+	ir_node  *last_keep;
+
 	if (mode != mode_T) {
 		if (!has_real_user(node)) {
-			const arch_register_req_t   *req = arch_get_register_req_out(node);
+			const arch_register_req_t   *req = arch_get_irn_register_req(node);
 			const arch_register_class_t *cls = req->cls;
 			if (cls == NULL
 					|| (cls->flags & arch_register_class_flag_manual_ra)) {
@@ -435,12 +431,12 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 		return;
 	}
 
-	n_outs = arch_irn_get_n_outs(node);
+	n_outs = arch_get_irn_n_outs(node);
 	if (n_outs <= 0)
 		return;
 
-	rbitset_alloca(found_projs, n_outs);
-	existing_projs = ALLOCANZ(ir_node*, n_outs);
+	unsigned *const found_projs    = rbitset_alloca(n_outs);
+	ir_node **const existing_projs = ALLOCANZ(ir_node*, n_outs);
 	foreach_out_edge(node, edge) {
 		ir_node *succ = get_edge_src_irn(edge);
 		ir_mode *mode = get_irn_mode(succ);
@@ -471,7 +467,7 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 			continue;
 		}
 
-		req = arch_get_out_register_req(node, i);
+		req = arch_get_irn_register_req_out(node, i);
 		cls = req->cls;
 		if (cls == NULL || (cls->flags & arch_register_class_flag_manual_ra)) {
 			continue;
@@ -484,6 +480,12 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 	}
 }
 
+static void add_missing_keep_walker(ir_node *node, void *data)
+{
+	(void)data;
+	be_add_missing_keeps_node(node);
+}
+
 void be_add_missing_keeps(ir_graph *irg)
 {
 	irg_walk_graph(irg, add_missing_keep_walker, NULL, NULL);
@@ -567,6 +569,7 @@ static int cmp_call_dependency(const void *c1, const void *c2)
 {
 	const ir_node *n1 = *(const ir_node **) c1;
 	const ir_node *n2 = *(const ir_node **) c2;
+	unsigned h1, h2;
 
 	if (dependent_on(n1, n2))
 		return 1;
@@ -575,7 +578,16 @@ static int cmp_call_dependency(const void *c1, const void *c2)
 		return -1;
 
 	/* The nodes have no depth order, but we need a total order because qsort()
-	 * is not stable. */
+	 * is not stable.
+	 *
+	 * Additionally, we need to respect transitive dependencies. Consider a
+	 * Call a depending on Call b and an independent Call c.
+	 * We MUST NOT order c > a and b > c. */
+	h1 = get_irn_height(heights, n1);
+	h2 = get_irn_height(heights, n2);
+	if (h1 < h2) return  1;
+	if (h1 > h2) return -1;
+	/* Same height, so use a random (but stable) order */
 	return get_irn_idx(n2) - get_irn_idx(n1);
 }
 
@@ -584,11 +596,11 @@ static int cmp_call_dependency(const void *c1, const void *c2)
  */
 static void process_ops_in_block(ir_node *block, void *data)
 {
-	ir_phase *phase = (ir_phase*)data;
-	unsigned  n;
-	unsigned  n_nodes;
-	ir_node  *node;
-	ir_node **nodes;
+	ir_nodemap *map = (ir_nodemap*)data;
+	unsigned    n;
+	unsigned    n_nodes;
+	ir_node    *node;
+	ir_node   **nodes;
 
 	n_nodes = 0;
 	for (node = (ir_node*)get_irn_link(block); node != NULL;
@@ -615,37 +627,53 @@ static void process_ops_in_block(ir_node *block, void *data)
 		ir_node *node = nodes[n];
 		ir_node *pred = nodes[n-1];
 
-		phase_set_irn_data(phase, node, pred);
+		ir_nodemap_insert(map, node, pred);
 	}
 	xfree(nodes);
 }
 
-void be_collect_stacknodes(beabi_helper_env_t *env)
+
+
+struct be_stackorder_t {
+	ir_nodemap stack_order; /**< a phase to handle stack dependencies. */
+};
+
+be_stackorder_t *be_collect_stacknodes(ir_graph *irg)
 {
-	ir_graph *irg = env->irg;
+	be_stackorder_t *env = XMALLOCZ(be_stackorder_t);
+
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
 
 	/* collect all potential^stack accessing nodes */
 	irg_walk_graph(irg, firm_clear_link, link_ops_in_block_walker, NULL);
 
-	assert(env->stack_order == NULL);
-	env->stack_order = new_phase(irg, phase_irn_init_default);
+	ir_nodemap_init(&env->stack_order, irg);
 
 	/* use heights to create a total order for those nodes: this order is stored
 	 * in the created phase */
 	heights = heights_new(irg);
-	irg_block_walk_graph(irg, NULL, process_ops_in_block, env->stack_order);
+	irg_block_walk_graph(irg, NULL, process_ops_in_block, &env->stack_order);
 	heights_free(heights);
+
+	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+
+	return env;
 }
 
-ir_node *be_get_stack_pred(const beabi_helper_env_t *env, const ir_node *node)
+ir_node *be_get_stack_pred(const be_stackorder_t *env, const ir_node *node)
 {
-	return (ir_node*)phase_get_irn_data(env->stack_order, node);
+	return ir_nodemap_get(ir_node, &env->stack_order, node);
 }
 
-void be_add_parameter_entity_stores(ir_graph *irg)
+void be_free_stackorder(be_stackorder_t *env)
 {
-	ir_type *frame_type  = get_irg_frame_type(irg);
-	size_t   n           = get_compound_n_members(frame_type);
+	ir_nodemap_destroy(&env->stack_order);
+	free(env);
+}
+
+static void create_stores_for_type(ir_graph *irg, ir_type *type)
+{
+	size_t   n           = get_compound_n_members(type);
 	ir_node *frame       = get_irg_frame(irg);
 	ir_node *initial_mem = get_irg_initial_mem(irg);
 	ir_node *mem         = initial_mem;
@@ -657,13 +685,16 @@ void be_add_parameter_entity_stores(ir_graph *irg)
 	/* all parameter entities left in the frame type require stores.
 	 * (The ones passed on the stack have been moved to the arg type) */
 	for (i = 0; i < n; ++i) {
-		ir_entity *entity = get_compound_member(frame_type, i);
+		ir_entity *entity = get_compound_member(type, i);
 		ir_node   *addr;
 		size_t     arg;
 		if (!is_parameter_entity(entity))
 			continue;
 
-		arg  = get_entity_parameter_number(entity);
+		arg = get_entity_parameter_number(entity);
+		if (arg == IR_VA_START_PARAMETER_NUMBER)
+			continue;
+
 		addr = new_r_Sel(start_block, mem, frame, 0, NULL, entity);
 		if (entity->attr.parameter.doubleword_low_mode != NULL) {
 			ir_mode *mode      = entity->attr.parameter.doubleword_low_mode;
@@ -683,7 +714,7 @@ void be_add_parameter_entity_stores(ir_graph *irg)
 				first_store = store0;
 		} else {
 			ir_type *tp    = get_entity_type(entity);
-			ir_mode *mode  = get_type_mode(tp);
+			ir_mode *mode  = is_compound_type(tp) ? mode_P : get_type_mode(tp);
 			ir_node *val   = new_r_Proj(args, mode, arg);
 			ir_node *store = new_r_Store(start_block, mem, addr, val, cons_none);
 			mem = new_r_Proj(store, mode_M, pn_Store_M);
@@ -692,8 +723,18 @@ void be_add_parameter_entity_stores(ir_graph *irg)
 		}
 	}
 
-	if (mem != initial_mem) {
-		edges_reroute(initial_mem, mem);
-		set_Store_mem(first_store, initial_mem);
+	if (mem != initial_mem)
+		edges_reroute_except(initial_mem, mem, first_store);
+}
+
+void be_add_parameter_entity_stores(ir_graph *irg)
+{
+	ir_type           *frame_type   = get_irg_frame_type(irg);
+	be_stack_layout_t *layout       = be_get_irg_stack_layout(irg);
+	ir_type           *between_type = layout->between_type;
+
+	create_stores_for_type(irg, frame_type);
+	if (between_type != NULL) {
+		create_stores_for_type(irg, between_type);
 	}
 }