X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeflags.c;h=1adde1a7246f0b534ba163e2d6a76bbd5fa7c30f;hb=89dc24503c04139bb05504059b291d6d89f99661;hp=ccc1e18b623cae201ca436d61a1b54bb68383373;hpb=799bf12e39cba79400b15ecd87415c6a357e662f;p=libfirm

diff --git a/ir/be/beflags.c b/ir/be/beflags.c
index ccc1e18b6..1adde1a72 100644
--- a/ir/be/beflags.c
+++ b/ir/be/beflags.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -57,6 +57,7 @@ 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;
+static int                          changed;
 
 static ir_node *default_remat(ir_node *node, ir_node *after)
 {
@@ -141,7 +142,8 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
 		return;
 	}
 
-	copy = remat(flags_needed, node);
+	changed = 1;
+	copy    = remat(flags_needed, node);
 
 	if(get_irn_mode(copy) == mode_T) {
 		ir_node *block = get_nodes_block(copy);
@@ -199,7 +201,7 @@ 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;
+	int      pn = -1;
 	(void) env;
 
 	sched_foreach_reverse(block, node) {
@@ -215,7 +217,7 @@ static void fix_flags_walker(ir_node *block, void *env)
 			flag_consumers = NULL;
 		}
 
-		/* test wether node destroys the flags */
+		/* test whether node destroys the flags */
 		if(flags_needed != NULL && is_modify_flags(node)) {
 			/* rematerialize */
 			rematerialize_or_move(flags_needed, node, flag_consumers, pn);
@@ -223,10 +225,9 @@ static void fix_flags_walker(ir_node *block, void *env)
 			flag_consumers = NULL;
 		}
 
-		/* test wether the current node needs flags */
+		/* test whether the current node needs flags */
 		arity = get_irn_arity(node);
 		for(i = 0; i < arity; ++i) {
-			//ir_node *in = get_irn_n(node, i);
 			const arch_register_class_t *cls
 				= arch_get_irn_reg_class(arch_env, node, i);
 			if(cls == flag_class) {
@@ -240,7 +241,8 @@ static void fix_flags_walker(ir_node *block, void *env)
 
 		/* spiller can't (correctly) remat flag consumers at the moment */
 		assert(!arch_irn_is(arch_env, node, rematerializable));
-		if(new_flags_needed != flags_needed) {
+
+		if(skip_Proj(new_flags_needed) != flags_needed) {
 			if(flags_needed != NULL) {
 				/* rematerialize node */
 				rematerialize_or_move(flags_needed, node, flag_consumers, pn);
@@ -249,7 +251,7 @@ static void fix_flags_walker(ir_node *block, void *env)
 			}
 
 			flags_needed = new_flags_needed;
-					arch_set_irn_register(arch_env, flags_needed, flags_reg);
+			arch_set_irn_register(arch_env, flags_needed, flags_reg);
 			if(is_Proj(flags_needed)) {
 				pn           = get_Proj_proj(flags_needed);
 				flags_needed = get_Proj_pred(flags_needed);
@@ -284,10 +286,15 @@ void be_sched_fix_flags(be_irg_t *birg, const arch_register_class_t *flag_cls,
 	flag_class = flag_cls;
 	flags_reg  = & flag_class->regs[0];
 	remat      = remat_func;
+	changed    = 0;
 	if(remat == NULL)
 		remat = &default_remat;
 
 	set_using_irn_link(irg);
 	irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL);
 	clear_using_irn_link(irg);
+
+	if(changed) {
+		be_remove_dead_nodes_from_schedule(birg);
+	}
 }