X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeinfo.c;h=95cceb4198125282b1e7de5be8fcd2eef6a20e9c;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=4ae071e45ec377232fcbce5baa48087dfdf48396;hpb=52abe23f2fa0d4bd16ec0f2d707f99b201dc9fc2;p=libfirm

diff --git a/ir/be/beinfo.c b/ir/be/beinfo.c
index 4ae071e45..95cceb419 100644
--- a/ir/be/beinfo.c
+++ b/ir/be/beinfo.c
@@ -20,7 +20,6 @@
 /**
  * @file
  * @author      Matthias Braun
- * @version     $Id$
  */
 #include "config.h"
 
@@ -37,48 +36,47 @@
 
 static copy_attr_func old_phi_copy_attr;
 
-void be_info_new_node(ir_node *node)
+void be_info_new_node(ir_graph *irg, ir_node *node)
 {
 	struct obstack *obst;
 	backend_info_t *info;
-	unsigned        opcode;
 
-	/* Projs need no be info, their tuple holds all information */
+	/* Projs need no be info, all info is fetched from their predecessor */
 	if (is_Proj(node))
 		return;
 
-	obst = be_get_be_obst(current_ir_graph);
+	obst = be_get_be_obst(irg);
 	info = OALLOCZ(obst, backend_info_t);
 
 	assert(node->backend_info == NULL);
 	node->backend_info = info;
 
-	/* Hack! We still have middle end nodes in the backend (which was probably
-	   a bad decision back then), which have no register constraints.
-	   Set some none_requirements here.
+	/*
+	 * Set backend info for some middleend nodes which still appear in
+	 * backend graphs
 	 */
-	opcode = get_irn_opcode(node);
-	if (opcode <= iro_Last) {
-		ir_mode *mode = get_irn_mode(node);
-		if (mode != mode_T) {
-			info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
-			memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
-			info->out_infos[0].req = arch_no_register_req;
-		}
-
-		switch (opcode) {
-		case iro_Anchor:
-		case iro_Bad:
-		case iro_Block:
-		case iro_Dummy:
-		case iro_End:
-		case iro_NoMem:
-		case iro_Pin:
-		case iro_Sync:
-		case iro_Unknown:
-			info->flags |= arch_irn_flags_not_scheduled;
-			break;
-		}
+	switch (get_irn_opcode(node)) {
+	case iro_Block:
+	case iro_Dummy:
+	case iro_NoMem:
+	case iro_Anchor:
+	case iro_Pin:
+	case iro_Sync:
+	case iro_Bad:
+	case iro_End:
+	case iro_Unknown:
+		info->flags |= arch_irn_flags_not_scheduled;
+		info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
+		memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
+		info->out_infos[0].req = arch_no_register_req;
+		break;
+	case iro_Phi:
+		info->out_infos = NEW_ARR_D(reg_out_info_t, obst, 1);
+		memset(info->out_infos, 0, 1 * sizeof(info->out_infos[0]));
+		info->out_infos[0].req = arch_no_register_req;
+		break;
+	default:
+		break;
 	}
 }
 
@@ -126,8 +124,9 @@ int be_nodes_equal(const ir_node *node1, const ir_node *node2)
 
 static void init_walker(ir_node *node, void *data)
 {
+	ir_graph *irg = get_irn_irg(node);
 	(void) data;
-	be_info_new_node(node);
+	be_info_new_node(irg, node);
 }
 
 static bool initialized = false;
@@ -149,20 +148,20 @@ void be_info_init(void)
 /**
  * Edge hook to dump the schedule edges.
  */
-static void sched_edge_hook(FILE *F, ir_node *irn)
+static void sched_edge_hook(FILE *F, const ir_node *irn)
 {
 	if (is_Proj(irn))
 		return;
 	if (get_irn_irg(irn)->be_data == NULL)
 		return;
 
-	if (sched_is_scheduled(irn) && sched_has_prev(irn)) {
+	if (sched_is_scheduled(irn) && sched_has_prev(irn) && !is_Block(irn)) {
 		ir_node *prev = sched_prev(irn);
-		fprintf(F, "edge:{sourcename:\"");
-		PRINT_NODEID(irn);
-		fprintf(F, "\" targetname:\"");
-		PRINT_NODEID(prev);
-		fprintf(F, "\" color:magenta}\n");
+		fprintf(F, "edge:{sourcename: ");
+		print_nodeid(F, irn);
+		fprintf(F, " targetname: ");
+		print_nodeid(F, prev);
+		fprintf(F, " color:magenta}\n");
 	}
 }