X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeinfo.c;h=05f1b95b90b13c65f1abb90d8e6a4598c97d21ed;hb=884eb109498da4ec48fb64bd4a2d86f8d1001147;hp=51f4327b1fd5564c866b0789810a5493c464a94c;hpb=0a4048fbaae21a969b0f03b066dde30a06968814;p=libfirm

diff --git a/ir/be/beinfo.c b/ir/be/beinfo.c
index 51f4327b1..05f1b95b9 100644
--- a/ir/be/beinfo.c
+++ b/ir/be/beinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -20,13 +20,13 @@
 /**
  * @file
  * @author      Matthias Braun
- * @version     $Id$
  */
 #include "config.h"
 
 #include <stdbool.h>
 
 #include "beinfo.h"
+#include "beirg.h"
 #include "bearch.h"
 #include "benode.h"
 #include "besched.h"
@@ -35,32 +35,49 @@
 #include "irdump_t.h"
 #include "error.h"
 
-static copy_attr_func  old_phi_copy_attr;
+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;
 
-	/* 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
 	 */
-	if (get_irn_mode(node) != mode_T
-			&& get_irn_opcode(node) <= iro_Last) {
+	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;
 	}
 }
 
@@ -75,7 +92,7 @@ static void new_phi_copy_attr(ir_graph *irg, const ir_node *old_node,
 	old_phi_copy_attr(irg, old_node, new_node);
 }
 
-int be_nodes_equal(ir_node *node1, ir_node *node2)
+int be_nodes_equal(const ir_node *node1, const ir_node *node2)
 {
 	const backend_info_t *info1 = be_get_info(node1);
 	const backend_info_t *info2 = be_get_info(node2);
@@ -108,8 +125,9 @@ int be_nodes_equal(ir_node *node1, 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;
@@ -131,20 +149,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)) {
-		ir_node *prev = sched_prev(irn);
-		fprintf(F, "edge:{sourcename:\"");
-		PRINT_NODEID(irn);
-		fprintf(F, "\" targetname:\"");
-		PRINT_NODEID(prev);
-		fprintf(F, "\" color:magenta}\n");
+	if (sched_is_scheduled(irn) && !is_Block(irn)) {
+		ir_node *const prev = sched_prev(irn);
+		if (!sched_is_begin(prev)) {
+			fprintf(F, "edge:{sourcename: ");
+			print_nodeid(F, irn);
+			fprintf(F, " targetname: ");
+			print_nodeid(F, prev);
+			fprintf(F, " color:magenta}\n");
+		}
 	}
 }
 
@@ -158,7 +176,7 @@ void be_info_init_irg(ir_graph *irg)
 void be_info_free(void)
 {
 	if (!initialized)
-		panic("be_info_free called without prior init");
+		panic("called without prior init");
 
 	assert(op_Phi->ops.copy_attr == new_phi_copy_attr);
 	op_Phi->ops.copy_attr = old_phi_copy_attr;
@@ -167,9 +185,3 @@ void be_info_free(void)
 	assert(op_Phi->ops.dump_node == be_dump_phi_reg_reqs);
 	op_Phi->ops.dump_node = NULL;
 }
-
-int be_info_initialized(const ir_graph *irg)
-{
-	(void) irg;
-	return initialized;
-}