X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeabihelper.c;h=0aec1415257573832747341a99cc06f999d434db;hb=27e53d81fb378dfbe76f68b981236ffa25a117f9;hp=2bba9b993cb3bc31a1d2c19a5faa31c556f84b44;hpb=56f6da026890baa73b2fa0869958cd0d5bf3dd32;p=libfirm

diff --git a/ir/be/beabihelper.c b/ir/be/beabihelper.c
index 2bba9b993..0aec14152 100644
--- a/ir/be/beabihelper.c
+++ b/ir/be/beabihelper.c
@@ -165,9 +165,9 @@ static void rsm_clear_regs(register_state_mapping_t *rsm,
  * Add a register and its constraint flags to a register state map
  * and return its index inside the map.
  */
-static int rsm_add_reg(register_state_mapping_t *rsm,
-                       const arch_register_t *reg,
-                       arch_register_req_type_t flags)
+static size_t rsm_add_reg(register_state_mapping_t *rsm,
+                          const arch_register_t *reg,
+                           arch_register_req_type_t flags)
 {
 	size_t     input_idx = ARR_LEN(rsm->regs);
 	int        cls_idx   = reg->reg_class->index;
@@ -267,8 +267,6 @@ ir_node *be_prolog_create_start(beabi_helper_env_t *env, dbg_info *dbgi,
 	ir_node *start        = be_new_Start(dbgi, block, n_start_outs);
 	int      o;
 
-	arch_irn_add_flags(start, arch_irn_flags_prolog);
-
 	assert(env->prolog.value_map == NULL);
 	env->prolog.value_map = NEW_ARR_F(ir_node*, n_start_outs);
 
@@ -326,7 +324,7 @@ void be_epilog_begin(beabi_helper_env_t *env)
 void be_epilog_add_reg(beabi_helper_env_t *env, const arch_register_t *reg,
                        arch_register_req_type_t flags, ir_node *value)
 {
-	int index = rsm_add_reg(&env->epilog, reg, flags);
+	size_t index = rsm_add_reg(&env->epilog, reg, flags);
 	rsm_set_value(&env->epilog, index, value);
 }
 
@@ -366,7 +364,6 @@ ir_node *be_epilog_create_return(beabi_helper_env_t *env, dbg_info *dbgi,
 
 	ret = be_new_Return(dbgi, get_irn_irg(block), block, n_res, pop,
 	                    n_return_in, in);
-	arch_irn_add_flags(ret, arch_irn_flags_epilog);
 	for (i = 0; i < n_return_in; ++i) {
 		const reg_flag_t      *regflag = &env->epilog.regs[i];
 		const arch_register_t *reg     = regflag->reg;
@@ -381,6 +378,42 @@ ir_node *be_epilog_create_return(beabi_helper_env_t *env, dbg_info *dbgi,
 	return ret;
 }
 
+/**
+ * Tests whether a node has a real user and is not just kept by the End or
+ * Anchor node
+ */
+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))
+			return true;
+	}
+	return false;
+}
+
+static ir_node *add_to_keep(ir_node *last_keep,
+                            const arch_register_class_t *cls, ir_node *node)
+{
+	const ir_node *op;
+	if (last_keep != NULL) {
+		be_Keep_add_node(last_keep, cls, node);
+	} else {
+		ir_node *in[1] = { node };
+		ir_node *block = get_nodes_block(node);
+		ir_node *schedpoint;
+		last_keep = be_new_Keep(block, 1, in);
+
+		schedpoint = skip_Proj(node);
+		if (sched_is_scheduled(schedpoint)) {
+			sched_add_after(schedpoint, last_keep);
+		}
+	}
+	op = skip_Proj_const(node);
+	return last_keep;
+}
+
 static void add_missing_keep_walker(ir_node *node, void *data)
 {
 	int              n_outs, i;
@@ -388,15 +421,28 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 	const ir_edge_t *edge;
 	ir_mode         *mode = get_irn_mode(node);
 	ir_node         *last_keep;
+	ir_node        **existing_projs;
 	(void) data;
-	if (mode != mode_T)
+	if (mode != mode_T) {
+		if (!has_real_user(node)) {
+			const arch_register_req_t   *req = arch_get_register_req_out(node);
+			const arch_register_class_t *cls = req->cls;
+			if (cls == NULL
+					|| (cls->flags & arch_register_class_flag_manual_ra)) {
+				return;
+			}
+
+			add_to_keep(NULL, cls, node);
+		}
 		return;
+	}
 
 	n_outs = arch_irn_get_n_outs(node);
 	if (n_outs <= 0)
 		return;
 
 	rbitset_alloca(found_projs, n_outs);
+	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);
@@ -405,21 +451,21 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 		/* The node could be kept */
 		if (is_End(succ) || is_Anchor(succ))
 			continue;
-
 		if (mode == mode_M || mode == mode_X)
 			continue;
+		pn                 = get_Proj_proj(succ);
+		existing_projs[pn] = succ;
+		if (!has_real_user(succ))
+			continue;
 
-		pn = get_Proj_proj(succ);
 		assert(pn < n_outs);
 		rbitset_set(found_projs, pn);
 	}
 
-
 	/* are keeps missing? */
 	last_keep = NULL;
 	for (i = 0; i < n_outs; ++i) {
-		ir_node                     *block;
-		ir_node                     *in[1];
+		ir_node                     *value;
 		const arch_register_req_t   *req;
 		const arch_register_class_t *cls;
 
@@ -433,16 +479,10 @@ static void add_missing_keep_walker(ir_node *node, void *data)
 			continue;
 		}
 
-		block = get_nodes_block(node);
-		in[0] = new_r_Proj(node, arch_register_class_mode(cls), i);
-		if (last_keep != NULL) {
-			be_Keep_add_node(last_keep, cls, in[0]);
-		} else {
-			last_keep = be_new_Keep(block, 1, in);
-			if (sched_is_scheduled(node)) {
-				sched_add_after(node, last_keep);
-			}
-		}
+		value = existing_projs[i];
+		if (value == NULL)
+			value = new_r_Proj(node, arch_register_class_mode(cls), i);
+		last_keep = add_to_keep(last_keep, cls, value);
 	}
 }