X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=0cfb3f46cea75c03af69a64223d2f7206c7ee362;hb=bd019d8cd785c1a433c19dee44bf3f9e82397286;hp=64f517ebd5ce98956e18d0501a9a0fa35ef54fb3;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 64f517ebd..0cfb3f46c 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -22,7 +22,6 @@
  * @brief       Backend IRG modification routines.
  * @author      Sebastian Hack, Daniel Grund, Matthias Braun, Christian Wuerdig
  * @date        04.05.2005
- * @version     $Id$
  *
  * This file contains the following IRG modifications for be routines:
  * - insertion of Perm nodes
@@ -87,7 +86,7 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
 	ir_nodeset_t          live;
 	ir_nodeset_iterator_t iter;
 
-	ir_node *curr, *irn, *perm, **nodes;
+	ir_node *irn, *perm, **nodes;
 	size_t i, n;
 
 	DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
@@ -116,7 +115,6 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
 	sched_add_after(pos, perm);
 	free(nodes);
 
-	curr = perm;
 	for (i = 0; i < n; ++i) {
 		ir_node *perm_op = get_irn_n(perm, i);
 		const arch_register_t *reg = arch_get_irn_register(perm_op);
@@ -126,8 +124,6 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
 		ir_node *proj = new_r_Proj(perm, mode, i);
 		arch_set_irn_register(proj, reg);
 
-		curr = proj;
-
 		be_ssa_construction_init(&senv, irg);
 		be_ssa_construction_add_copy(&senv, perm_op);
 		be_ssa_construction_add_copy(&senv, proj);
@@ -165,7 +161,7 @@ static void remove_empty_block(ir_node *block)
 
 	sched_foreach(block, node) {
 		if (! is_Jmp(node)
-				&& !(arch_irn_get_flags(node) & arch_irn_flags_simple_jump))
+				&& !(arch_get_irn_flags(node) & arch_irn_flags_simple_jump))
 			goto check_preds;
 		if (jump != NULL) {
 			/* we should never have 2 jumps in a block */
@@ -184,7 +180,8 @@ static void remove_empty_block(ir_node *block)
 
 		assert(succ_block == NULL);
 		succ_block = get_edge_src_irn(edge);
-		if (has_Block_entity(succ_block) && has_Block_entity(block)) {
+		if (get_Block_entity(succ_block) != NULL
+		    && get_Block_entity(block) != NULL) {
 			/*
 			 * Currently we can add only one label for a block.
 			 * Therefore we cannot combine them if  both block already have one.
@@ -195,7 +192,7 @@ static void remove_empty_block(ir_node *block)
 		set_irn_n(succ_block, pos, pred);
 	}
 
-	if (has_Block_entity(block)) {
+	if (get_Block_entity(block) != NULL) {
 		/* move the label to the successor block */
 		ir_entity *entity = get_Block_entity(block);
 		set_Block_entity(succ_block, entity);
@@ -227,7 +224,7 @@ static void remove_empty_block(ir_node *block)
 		panic("Unexpected node %+F in block %+F with empty schedule", node, block);
 	}
 
-	set_Block_cfgpred(block, 0, new_r_Bad(irg));
+	set_Block_cfgpred(block, 0, new_r_Bad(irg, mode_X));
 	kill_node(jump);
 	blocks_removed = 1;
 
@@ -266,10 +263,8 @@ int be_remove_empty_blocks(ir_graph *irg)
 
 	if (blocks_removed) {
 		/* invalidate analysis info */
-		set_irg_doms_inconsistent(irg);
-		set_irg_extblk_inconsistent(irg);
-		set_irg_outs_inconsistent(irg);
-		set_irg_loopinfo_inconsistent(irg);
+		clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE
+		                   | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS);
 	}
 	return blocks_removed;
 }
@@ -307,9 +302,23 @@ static void remove_dead_nodes_walker(ir_node *block, void *data)
 		if (bitset_is_set(env->reachable, get_irn_idx(node)))
 			continue;
 
-		if (env->lv)
+		if (env->lv != NULL)
 			be_liveness_remove(env->lv, node);
 		sched_remove(node);
+
+		/* kill projs */
+		if (get_irn_mode(node) == mode_T) {
+			const ir_edge_t *edge;
+			const ir_edge_t *next_edge;
+			foreach_out_edge_safe(node, edge, next_edge) {
+				ir_node *proj = get_edge_src_irn(edge);
+				if (!is_Proj(proj))
+					continue;
+				if (env->lv != NULL)
+					be_liveness_remove(env->lv, proj);
+				kill_node(proj);
+			}
+		}
 		kill_node(node);
 	}
 }
@@ -328,7 +337,7 @@ void be_remove_dead_nodes_from_schedule(ir_graph *irg)
 	irg_block_walk_graph(irg, remove_dead_nodes_walker, NULL, &env);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_irgmod);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_irgmod)
 void be_init_irgmod(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.irgmod");