X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeflags.c;h=4d308620dc6552d7ef611a89ce56295e3836d1a6;hb=568a27341dd03831ca76a7fa3b83f7fdcfbb0859;hp=bb34a959b821d1bfdb14daac0970fccf25aeec9b;hpb=2e291eab8268af551488b1f4fb4d9ca61b625e33;p=libfirm

diff --git a/ir/be/beflags.c b/ir/be/beflags.c
index bb34a959b..4d308620d 100644
--- a/ir/be/beflags.c
+++ b/ir/be/beflags.c
@@ -35,9 +35,7 @@
  * 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 "irgwalk.h"
 #include "irnode_t.h"
@@ -48,12 +46,12 @@
 #include "error.h"
 
 #include "beflags.h"
-#include "bearch_t.h"
-#include "beirg_t.h"
-#include "besched_t.h"
-#include "benode_t.h"
+#include "bearch.h"
+#include "beirg.h"
+#include "besched.h"
+#include "benode.h"
+#include "belive.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;
@@ -62,7 +60,7 @@ 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);
@@ -75,7 +73,7 @@ static ir_node *default_remat(ir_node *node, ir_node *after)
 }
 
 /**
- * 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)
@@ -89,35 +87,35 @@ 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)) {
+		if (is_Proj(out)) {
 			const ir_edge_t *edge2;
 			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))
+				/* Phi or End represents a usage at block end. */
+				if (is_Phi(out2) || is_End(out2))
 					continue;
-				if(is_Sync(out2)) {
+				if (is_Sync(out2)) {
 					const ir_edge_t *edge3;
 					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)) {
+						if (sched_get_time_step(out3) <= sched_get_time_step(after)) {
 							return 0;
 						}
 					}
-				} else if(sched_get_time_step(out2) <= sched_get_time_step(after)) {
+				} else if (sched_get_time_step(out2) <= sched_get_time_step(after)) {
 					return 0;
 				}
 			}
 		} else {
 			/* 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)) {
+			if (sched_get_time_step(out) <= sched_get_time_step(after)) {
 				return 0;
 			}
 		}
@@ -133,7 +131,7 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 	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 +144,9 @@ 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);
 	} else {
 		value = copy;
 	}
@@ -159,16 +155,16 @@ 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);
+	} 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 */
@@ -176,25 +172,28 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 			get_nodes_block(node) != get_nodes_block(flags_needed)) {
 		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) {
+static int is_modify_flags(ir_node *node)
+{
 	int i, arity;
 
-	if(arch_irn_is(arch_env, node, modify_flags))
+	if (arch_irn_is(node, modify_flags))
 		return 1;
-	if(!be_is_Keep(node))
+	if (!be_is_Keep(node))
 		return 0;
 
 	arity = get_irn_arity(node);
-	for(i = 0; i < arity; ++i) {
+	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))
+		if (arch_irn_is(in, modify_flags))
 			return 1;
 	}
 
@@ -219,17 +218,17 @@ static void fix_flags_walker(ir_node *block, void *env)
 		int i, arity;
 		ir_node *new_flags_needed = NULL;
 
-		if(is_Phi(node))
+		if (is_Phi(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)) {
+		if (flags_needed != NULL && is_modify_flags(node)) {
 			/* rematerialize */
 			rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
 			flags_needed   = NULL;
@@ -238,22 +237,22 @@ static void fix_flags_walker(ir_node *block, void *env)
 
 		/* test whether the current node needs flags */
 		arity = get_irn_arity(node);
-		for(i = 0; i < arity; ++i) {
+		for (i = 0; i < arity; ++i) {
 			const arch_register_class_t *cls = arch_get_irn_reg_class(node, i);
-			if(cls == flag_class) {
+			if (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);
 				flags_needed   = NULL;
@@ -262,13 +261,13 @@ static void fix_flags_walker(ir_node *block, void *env)
 
 			flags_needed = new_flags_needed;
 			arch_set_irn_register(flags_needed, flags_reg);
-			if(is_Proj(flags_needed)) {
+			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);
@@ -276,7 +275,7 @@ 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);
 		flags_needed   = NULL;
@@ -292,19 +291,18 @@ void be_sched_fix_flags(be_irg_t *birg, const arch_register_class_t *flag_cls,
 {
 	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)
+	if (remat == NULL)
 		remat = &default_remat;
 
 	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
 	irg_block_walk_graph(irg, fix_flags_walker, NULL, birg->lv);
 	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 
-	if(changed) {
+	if (changed) {
 		be_remove_dead_nodes_from_schedule(birg);
 	}
 }