X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeirgmod.c;h=5c69c2f9a5790f54a7a20cdc1564c0d80372d57f;hb=418806b20f02139f4506528f7d33390fadc61909;hp=472d8410b7d7c4d1308ffbe06e84ba128087760c;hpb=d4bbab11371a9c68aa2a716eaa7589b82a28691e;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 472d8410b..5c69c2f9a 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>
 
@@ -59,14 +57,14 @@
 
 #include "be_t.h"
 #include "bechordal_t.h"
-#include "bearch_t.h"
-#include "besched_t.h"
+#include "bearch.h"
+#include "besched.h"
 #include "belive_t.h"
-#include "benode_t.h"
+#include "benode.h"
 #include "beutil.h"
 #include "beinsn_t.h"
 #include "bessaconstr.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "beirgmod.h"
 #include "bemodule.h"
 
@@ -85,10 +83,8 @@ 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);
 	ir_nodeset_t          live;
 	ir_nodeset_iterator_t iter;
 
@@ -98,7 +94,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) {
@@ -117,7 +113,7 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 	}
 	ir_nodeset_destroy(&live);
 
-	perm = be_new_Perm(cls, irg, bl, n, nodes);
+	perm = be_new_Perm(cls, bl, n, nodes);
 	sched_add_after(pos, perm);
 	free(nodes);
 
@@ -128,8 +124,8 @@ ir_node *insert_Perm_after(be_irg_t *birg,
 		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);
+		ir_node *proj = new_r_Proj(bl, perm, mode, i);
+		arch_set_irn_register(proj, reg);
 
 		curr = proj;
 
@@ -168,7 +164,8 @@ static void remove_empty_block(ir_node *block)
 		goto check_preds;
 
 	sched_foreach(block, node) {
-		if (! is_Jmp(node))
+		if (! is_Jmp(node)
+				&& !(arch_irn_get_flags(node) & arch_irn_flags_simple_jump))
 			goto check_preds;
 		if (jump != NULL) {
 			/* we should never have 2 jumps in a block */
@@ -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_entity(succ_block) && has_Block_entity(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_entity(block)) {
+		/* move the label to the successor block */
+		ir_entity *entity = get_Block_entity(block);
+		set_Block_entity(succ_block, entity);
+	}
+
 	/* there can be some non-scheduled Pin nodes left in the block, move them
 	 * 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
@@ -204,8 +214,11 @@ static void remove_empty_block(ir_node *block)
 			assert(get_Block_MacroBlock(node) == block && "Wrong Block->Block edge");
 			continue;
 		}
+		/* we simply kill Pins, because there are some strange interactions
+		 * between jump threading, which produce PhiMs with Pins, we simply
+		 * kill the pins here, everything is scheduled anyway */
 		if (is_Pin(node)) {
-			set_nodes_block(node, succ_block);
+			exchange(node, get_Pin_op(node));
 			continue;
 		}
 		if (is_Sync(node)) {
@@ -249,9 +262,9 @@ int be_remove_empty_blocks(ir_graph *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);
 	}