X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeflags.c;h=3ffae62d26c5880e63b3541bc604d1f12068a2c9;hb=1b4cac3471b02b63e9656cd8c876f067766fe482;hp=97905da5d10c3e1bc3c8af3888dd173b5013d825;hpb=e30e5834fd8c1c3a7d28fc66e99b91a84993bde8;p=libfirm

diff --git a/ir/be/beflags.c b/ir/be/beflags.c
index 97905da5d..3ffae62d2 100644
--- a/ir/be/beflags.c
+++ b/ir/be/beflags.c
@@ -21,7 +21,6 @@
  * @file
  * @brief       modifies schedule so flags dependencies are respected.
  * @author      Matthias Braun, Christoph Mallon
- * @version     $Id: besched.h 14693 2007-06-21 15:35:49Z beck $
  *
  * Fixup schedule to respect flag constraints by moving and rematerialisation of
  * nodes.
@@ -35,9 +34,9 @@
  * spilled. So in some situations (for example 2 adc-nodes that use the flags of
  * a single add node on x86) operations have to be repeated to work correctly.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <stdbool.h>
 
 #include "irgwalk.h"
 #include "irnode_t.h"
@@ -48,21 +47,24 @@
 #include "error.h"
 
 #include "beflags.h"
-#include "bearch_t.h"
-#include "beirg_t.h"
-#include "besched_t.h"
-#include "benode_t.h"
-
-static const arch_env_t            *arch_env   = NULL;
-static const arch_register_class_t *flag_class = NULL;
-static const arch_register_t       *flags_reg  = NULL;
-static func_rematerialize           remat      = NULL;
+#include "bearch.h"
+#include "beirg.h"
+#include "beirgmod.h"
+#include "besched.h"
+#include "benode.h"
+#include "belive.h"
+#include "beabihelper.h"
+
+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)
 {
 	ir_node *block, *copy;
-	if(is_Block(after))
+	if (is_Block(after))
 		block = after;
 	else
 		block = get_nodes_block(after);
@@ -74,14 +76,19 @@ 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 wether we can legally move node node after node after
+ * 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);
@@ -89,51 +96,53 @@ static int can_move(ir_node *node, ir_node *after)
 	/** all users have to be after the after node */
 	foreach_out_edge(node, edge) {
 		ir_node *out = get_edge_src_irn(edge);
-		if(is_Proj(out)) {
-			const ir_edge_t *edge2;
+		if (is_Proj(out)) {
 			assert(get_irn_n_edges_kind(out, EDGE_KIND_DEP) == 0);
 			foreach_out_edge(out, edge2) {
 				ir_node *out2 = get_edge_src_irn(edge2);
-				/* phi represents a usage at block end */
-				if(is_Phi(out2))
+				if (get_nodes_block(out2) != node_block)
 					continue;
-				if(is_Sync(out2)) {
-					const ir_edge_t *edge3;
+				/* Phi or End represents a usage at block end. */
+				if (is_Phi(out2) || is_End(out2))
+					continue;
+				if (is_Sync(out2)) {
 					foreach_out_edge(out2, edge3) {
 						ir_node *out3 = get_edge_src_irn(edge3);
-						/* phi represents a usage at block end */
-						if(is_Phi(out3))
+						/* Phi or End represents a usage at block end. */
+						if (is_Phi(out3) || is_End(out3))
 							continue;
 						assert(!is_Sync(out3));
-						if(sched_get_time_step(out3) <= sched_get_time_step(after)) {
-							return 0;
+						if (sched_get_time_step(out3) <= sched_get_time_step(after)) {
+							return false;
 						}
 					}
-				} else if(sched_get_time_step(out2) <= sched_get_time_step(after)) {
-					return 0;
+				} else if (sched_get_time_step(out2) <= sched_get_time_step(after)) {
+					return false;
 				}
 			}
 		} else {
+			if (get_nodes_block(out) != node_block)
+				continue;
 			/* phi represents a usage at block end */
-			if(is_Phi(out))
+			if (is_Phi(out))
 				continue;
-			if(sched_get_time_step(out) <= sched_get_time_step(after)) {
-				return 0;
+			if (sched_get_time_step(out) <= sched_get_time_step(after)) {
+				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;
 	ir_node *value;
 
-	if(!is_Block(node) &&
+	if (!is_Block(node) &&
 			get_nodes_block(flags_needed) == get_nodes_block(node) &&
 			can_move(flags_needed, node)) {
 		/* move it */
@@ -146,11 +155,10 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 	changed = 1;
 	copy    = remat(flags_needed, node);
 
-	if(get_irn_mode(copy) == mode_T) {
-		ir_node *block = get_nodes_block(copy);
-		ir_mode *mode  = flag_class->mode;
-		value = new_rd_Proj(NULL, current_ir_graph, block,
-							copy, mode, pn);
+	if (get_irn_mode(copy) == mode_T) {
+		ir_mode *mode = flag_class->mode;
+		value = new_rd_Proj(NULL, copy, mode, pn);
+		be_add_missing_keeps_node(copy);
 	} else {
 		value = copy;
 	}
@@ -159,48 +167,33 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 	do {
 		int i;
 		int arity = get_irn_arity(n);
-		for(i = 0; i < arity; ++i) {
+		for (i = 0; i < arity; ++i) {
 			ir_node *in = get_irn_n(n, i);
 			in = skip_Proj(in);
-			if(in == flags_needed) {
+			if (in == flags_needed) {
 				set_irn_n(n, i, value);
 				break;
 			}
 		}
-		n = get_irn_link(n);
-	} while(n != NULL);
+		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;
 
-		for (i = get_irn_arity(copy) - 1; i >= 0; --i) {
-			be_liveness_update(lv, get_irn_n(copy, i));
+		if (lv != NULL) {
+			for (i = get_irn_arity(copy) - 1; i >= 0; --i) {
+				be_liveness_update(lv, get_irn_n(copy, i));
+			}
 		}
 	}
 }
 
-static int is_modify_flags(ir_node *node) {
-	int i, arity;
-
-	if(arch_irn_is(arch_env, 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(arch_env, 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
@@ -210,66 +203,74 @@ static int is_modify_flags(ir_node *node) {
  */
 static void fix_flags_walker(ir_node *block, void *env)
 {
-	ir_node *node;
 	ir_node *flags_needed   = NULL;
 	ir_node *flag_consumers = NULL;
 	int      pn = -1;
+	(void) env;
 
+	ir_node *place = block;
 	sched_foreach_reverse(block, node) {
 		int i, arity;
 		ir_node *new_flags_needed = NULL;
+		ir_node *test;
 
-		if(is_Phi(node))
+		if (is_Phi(node)) {
+			place = node;
 			break;
+		}
 
-		if(node == flags_needed) {
+		if (node == flags_needed) {
 			/* all ok */
 			flags_needed   = NULL;
 			flag_consumers = NULL;
 		}
 
 		/* 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;
 		}
 
 		/* test whether the current node needs flags */
 		arity = get_irn_arity(node);
-		for(i = 0; i < arity; ++i) {
-			const arch_register_class_t *cls
-				= arch_get_irn_reg_class(arch_env, node, i);
-			if(cls == flag_class) {
+		for (i = 0; i < arity; ++i) {
+			const arch_register_req_t *req
+				= arch_get_irn_register_req_in(node, i);
+			if (req->cls == flag_class) {
 				assert(new_flags_needed == NULL);
 				new_flags_needed = get_irn_n(node, i);
 			}
 		}
 
-		if(new_flags_needed == NULL)
+		if (new_flags_needed == NULL)
 			continue;
 
 		/* spiller can't (correctly) remat flag consumers at the moment */
-		assert(!arch_irn_is(arch_env, node, rematerializable));
+		assert(!arch_irn_is(node, rematerializable));
 
-		if(skip_Proj(new_flags_needed) != flags_needed) {
-			if(flags_needed != NULL) {
+		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;
 			}
 
 			flags_needed = new_flags_needed;
-			arch_set_irn_register(arch_env, flags_needed, flags_reg);
-			if(is_Proj(flags_needed)) {
+			arch_set_irn_register(flags_needed, flags_reg);
+			if (is_Proj(flags_needed)) {
 				pn           = get_Proj_proj(flags_needed);
 				flags_needed = get_Proj_pred(flags_needed);
 			}
 			flag_consumers = node;
 			set_irn_link(flag_consumers, NULL);
-			assert(arch_irn_is(arch_env, flags_needed, rematerializable));
+			assert(arch_irn_is(flags_needed, rematerializable));
 		} else {
 			/* link all consumers in a list */
 			set_irn_link(node, flag_consumers);
@@ -277,9 +278,9 @@ static void fix_flags_walker(ir_node *block, void *env)
 		}
 	}
 
-	if(flags_needed != NULL) {
+	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, place, flag_consumers, pn);
 		flags_needed   = NULL;
 		flag_consumers = NULL;
 	}
@@ -288,24 +289,25 @@ static void fix_flags_walker(ir_node *block, void *env)
 	assert(flag_consumers == NULL);
 }
 
-void be_sched_fix_flags(be_irg_t *birg, const arch_register_class_t *flag_cls,
-                        func_rematerialize remat_func)
+void be_sched_fix_flags(ir_graph *irg, const arch_register_class_t *flag_cls,
+                        func_rematerialize remat_func,
+                        check_modifies_flags check_modifies_flags_func)
 {
-	ir_graph *irg = be_get_birg_irg(birg);
-
-	arch_env   = be_get_birg_arch_env(birg);
-	flag_class = flag_cls;
-	flags_reg  = & flag_class->regs[0];
-	remat      = remat_func;
-	changed    = 0;
-	if(remat == NULL)
+	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, birg->lv);
+	irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL);
 	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 
-	if(changed) {
-		be_remove_dead_nodes_from_schedule(birg);
+	if (changed) {
+		be_remove_dead_nodes_from_schedule(irg);
 	}
 }