X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeflags.c;h=1a08275b02da4f481435be3293f5254122577cb6;hb=12203fc84a7620ce57d6cfdf2d56eb6b0a3ce076;hp=4601c7673454661561affa69d9480b2091415e35;hpb=65a52a96e8ab7ed601d7f98c516d37c46b674b4a;p=libfirm

diff --git a/ir/be/beflags.c b/ir/be/beflags.c
index 4601c7673..1a08275b0 100644
--- a/ir/be/beflags.c
+++ b/ir/be/beflags.c
@@ -37,6 +37,8 @@
  */
 #include "config.h"
 
+#include <stdbool.h>
+
 #include "irgwalk.h"
 #include "irnode_t.h"
 #include "irtools.h"
@@ -52,9 +54,10 @@
 #include "benode.h"
 #include "belive.h"
 
-static const arch_register_class_t *flag_class = NULL;
-static const arch_register_t       *flags_reg  = NULL;
-static func_rematerialize           remat      = NULL;
+static const arch_register_class_t *flag_class;
+static const arch_register_t       *flags_reg;
+static func_rematerialize           remat;
+static check_modifies_flags         check_modify;
 static int                          changed;
 
 static ir_node *default_remat(ir_node *node, ir_node *after)
@@ -72,14 +75,20 @@ static ir_node *default_remat(ir_node *node, ir_node *after)
 	return copy;
 }
 
+static bool default_check_modifies(const ir_node *node)
+{
+	return arch_irn_is(node, modify_flags);
+}
+
 /**
  * tests whether we can legally move node node after node after
  * (only works for nodes in same block)
  */
-static int can_move(ir_node *node, ir_node *after)
+static bool can_move(ir_node *node, ir_node *after)
 {
 	const ir_edge_t *edge;
-	assert(get_nodes_block(node) == get_nodes_block(after));
+	ir_node *node_block = get_nodes_block(node);
+	assert(node_block == get_nodes_block(after));
 
 	/* TODO respect dep edges */
 	assert(get_irn_n_edges_kind(node, EDGE_KIND_DEP) == 0);
@@ -92,6 +101,8 @@ static int can_move(ir_node *node, ir_node *after)
 			assert(get_irn_n_edges_kind(out, EDGE_KIND_DEP) == 0);
 			foreach_out_edge(out, edge2) {
 				ir_node *out2 = get_edge_src_irn(edge2);
+				if (get_nodes_block(out2) != node_block)
+					continue;
 				/* Phi or End represents a usage at block end. */
 				if (is_Phi(out2) || is_End(out2))
 					continue;
@@ -104,28 +115,30 @@ static int can_move(ir_node *node, ir_node *after)
 							continue;
 						assert(!is_Sync(out3));
 						if (sched_get_time_step(out3) <= sched_get_time_step(after)) {
-							return 0;
+							return false;
 						}
 					}
 				} else if (sched_get_time_step(out2) <= sched_get_time_step(after)) {
-					return 0;
+					return false;
 				}
 			}
 		} else {
+			if (get_nodes_block(out) != node_block)
+				continue;
 			/* phi represents a usage at block end */
 			if (is_Phi(out))
 				continue;
 			if (sched_get_time_step(out) <= sched_get_time_step(after)) {
-				return 0;
+				return false;
 			}
 		}
 	}
 
-	return 1;
+	return true;
 }
 
 static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
-                                  ir_node *flag_consumers, int pn, be_lv_t *lv)
+                                  ir_node *flag_consumers, int pn)
 {
 	ir_node *n;
 	ir_node *copy;
@@ -163,14 +176,16 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 				break;
 			}
 		}
-		n = get_irn_link(n);
+		n = (ir_node*)get_irn_link(n);
 	} while (n != NULL);
 
 	/* No need to introduce the copy, because it only lives in this block, but
 	 * we have to update the liveness of all operands */
 	if (is_Block(node) ||
 			get_nodes_block(node) != get_nodes_block(flags_needed)) {
-		int i;
+		ir_graph *irg = get_irn_irg(node);
+		be_lv_t  *lv  = be_get_irg_liveness(irg);
+		int       i;
 
 		if (lv != NULL) {
 			for (i = get_irn_arity(copy) - 1; i >= 0; --i) {
@@ -180,26 +195,6 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 	}
 }
 
-static int is_modify_flags(ir_node *node)
-{
-	int i, arity;
-
-	if (arch_irn_is(node, modify_flags))
-		return 1;
-	if (!be_is_Keep(node))
-		return 0;
-
-	arity = get_irn_arity(node);
-	for (i = 0; i < arity; ++i) {
-		ir_node *in = get_irn_n(node, i);
-		in = skip_Proj(in);
-		if (arch_irn_is(in, modify_flags))
-			return 1;
-	}
-
-	return 0;
-}
-
 /**
  * walks up the schedule and makes sure there are no flag-destroying nodes
  * between a flag-consumer -> flag-producer chain. Fixes problematic situations
@@ -213,10 +208,12 @@ static void fix_flags_walker(ir_node *block, void *env)
 	ir_node *flags_needed   = NULL;
 	ir_node *flag_consumers = NULL;
 	int      pn = -1;
+	(void) env;
 
 	sched_foreach_reverse(block, node) {
 		int i, arity;
 		ir_node *new_flags_needed = NULL;
+		ir_node *test;
 
 		if (is_Phi(node))
 			break;
@@ -228,9 +225,13 @@ static void fix_flags_walker(ir_node *block, void *env)
 		}
 
 		/* test whether node destroys the flags */
-		if (flags_needed != NULL && is_modify_flags(node)) {
+		test = node;
+		if (be_is_Keep(test))
+			test = sched_prev(test);
+
+		if (flags_needed != NULL && check_modify(test)) {
 			/* rematerialize */
-			rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
+			rematerialize_or_move(flags_needed, node, flag_consumers, pn);
 			flags_needed   = NULL;
 			flag_consumers = NULL;
 		}
@@ -254,7 +255,7 @@ static void fix_flags_walker(ir_node *block, void *env)
 		if (skip_Proj(new_flags_needed) != flags_needed) {
 			if (flags_needed != NULL) {
 				/* rematerialize node */
-				rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
+				rematerialize_or_move(flags_needed, node, flag_consumers, pn);
 				flags_needed   = NULL;
 				flag_consumers = NULL;
 			}
@@ -277,7 +278,7 @@ static void fix_flags_walker(ir_node *block, void *env)
 
 	if (flags_needed != NULL) {
 		assert(get_nodes_block(flags_needed) != block);
-		rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
+		rematerialize_or_move(flags_needed, node, flag_consumers, pn);
 		flags_needed   = NULL;
 		flag_consumers = NULL;
 	}
@@ -287,17 +288,21 @@ static void fix_flags_walker(ir_node *block, void *env)
 }
 
 void be_sched_fix_flags(ir_graph *irg, const arch_register_class_t *flag_cls,
-                        func_rematerialize remat_func)
+                        func_rematerialize remat_func,
+                        check_modifies_flags check_modifies_flags_func)
 {
-	flag_class = flag_cls;
-	flags_reg  = & flag_class->regs[0];
-	remat      = remat_func;
-	changed    = 0;
+	flag_class   = flag_cls;
+	flags_reg    = & flag_class->regs[0];
+	remat        = remat_func;
+	check_modify = check_modifies_flags_func;
+	changed      = 0;
 	if (remat == NULL)
 		remat = &default_remat;
+	if (check_modify == NULL)
+		check_modify = &default_check_modifies;
 
 	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
-	irg_block_walk_graph(irg, fix_flags_walker, NULL, be_get_irg_liveness(irg));
+	irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL);
 	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 
 	if (changed) {