X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=5e4b0517d77ac0cbf19aef3b039f45a411e43a4d;hb=2c6cb525849141ca24634f4bf3eab578fe6361d2;hp=12d5ac752f27a5ab645459ece1457839cc157475;hpb=2f35f68e309d03d6161312cf7acf688bddbec641;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 12d5ac752..5e4b0517d 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -29,9 +29,7 @@
  * - empty block elimination
  * - a simple dead node elimination (set inputs of unreachable nodes to BAD)
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -53,6 +51,7 @@
 #include "iredges_t.h"
 #include "irgraph_t.h"
 #include "irgopt.h"
+#include "irgmod.h"
 #include "irprintf_t.h"
 #include "irgwalk.h"
 
@@ -84,7 +83,6 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 						   const arch_register_class_t *cls,
 						   ir_node *pos)
 {
-	const arch_env_t *arch_env = birg->main_env->arch_env;
 	be_lv_t *lv     = birg->lv;
 	ir_node *bl     = is_Block(pos) ? pos : get_nodes_block(pos);
 	ir_graph *irg   = get_irn_irg(bl);
@@ -97,7 +95,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 	DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
 
 	ir_nodeset_init(&live);
-	be_liveness_nodes_live_at(lv, arch_env, cls, pos, &live);
+	be_liveness_nodes_live_at(lv, cls, pos, &live);
 
 	n = ir_nodeset_size(&live);
 	if(n == 0) {
@@ -105,7 +103,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 		return NULL;
 	}
 
-	nodes = xmalloc(n * sizeof(nodes[0]));
+	nodes = XMALLOCN(ir_node*, n);
 
 	DBG((dbg, LEVEL_1, "live:\n"));
 	i = 0;
@@ -123,12 +121,12 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 	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(arch_env, perm_op);
+		const arch_register_t *reg = arch_get_irn_register(perm_op);
 		be_ssa_construction_env_t senv;
 
 		ir_mode *mode = get_irn_mode(perm_op);
 		ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
-		arch_set_irn_register(arch_env, proj, reg);
+		arch_set_irn_register(proj, reg);
 
 		curr = proj;
 
@@ -160,10 +158,9 @@ static void remove_empty_block(ir_node *block)
 	ir_node *succ_block;
 	ir_node *jump = NULL;
 
-	if (irn_visited(block))
+	if (irn_visited_else_mark(block))
 		return;
 
-	mark_irn_visited(block);
 	if (get_Block_n_cfgpreds(block) != 1)
 		goto check_preds;
 
@@ -187,16 +184,29 @@ static void remove_empty_block(ir_node *block)
 
 		assert(succ_block == NULL);
 		succ_block = get_edge_src_irn(edge);
+		if (has_Block_label(succ_block) && has_Block_label(block)) {
+			/*
+			 * Currently we can add only one label for a block.
+			 * Therefore we cannot combine them if  both block already have one.
+			 */
+			goto check_preds;
+		}
 
 		set_irn_n(succ_block, pos, pred);
 	}
 
+	if (has_Block_label(block)) {
+		/* move the label to the successor block */
+		ir_label_t label = get_Block_label(block);
+		set_Block_label(succ_block, label);
+	}
+
 	/* there can be some non-scheduled Pin nodes left in the block, move them
-	 * to the succ block */
+	 * to the succ block (Pin) or pred block (Sync) */
 	foreach_out_edge_safe(block, edge, next) {
 		node = get_edge_src_irn(edge);
 
-		if(node == jump)
+		if (node == jump)
 			continue;
 		if (is_Block(node)) {
 			/* a Block->Block edge: This should be the MacroBlock
@@ -212,11 +222,16 @@ static void remove_empty_block(ir_node *block)
 			set_nodes_block(node, get_nodes_block(pred));
 			continue;
 		}
+		if (is_End(node)) { /* End-keep, reroute it to the successor */
+			int pos = get_edge_src_pos(edge);
+			set_irn_n(node, pos, succ_block);
+			continue;
+		}
 		panic("Unexpected node %+F in block %+F with empty schedule", node, block);
 	}
 
 	set_Block_cfgpred(block, 0, new_Bad());
-	be_kill_node(jump);
+	kill_node(jump);
 	blocks_removed = 1;
 
 	/* check predecessor */
@@ -239,18 +254,18 @@ int be_remove_empty_blocks(ir_graph *irg)
 
 	blocks_removed = 0;
 
-	set_using_irn_visited(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 	inc_irg_visited(irg);
 	remove_empty_block(get_irg_end_block(irg));
 	end   = get_irg_end(irg);
 	arity = get_irn_arity(end);
-	for(i = 0; i < arity; ++i) {
+	for (i = 0; i < arity; ++i) {
 		ir_node *pred = get_irn_n(end, i);
-		if(!is_Block(pred))
+		if (!is_Block(pred))
 			continue;
 		remove_empty_block(pred);
 	}
-	clear_using_irn_visited(irg);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
 	if (blocks_removed) {
 		/* invalidate analysis info */