X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeutil.c;h=d800315e1eb7b71f3e295dd5b0f1588d95306fe9;hb=fbcf2e712da1f1824bfe3f6698d794658521a7e5;hp=ee4506ce8a926851c4f5c5d7a218506959d215d5;hpb=d1de7107f847963fbce099597e6c42c2371b053c;p=libfirm

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index ee4506ce8..d800315e1 100644
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -128,7 +128,9 @@ void dump_allocated_irg(arch_env_t *arch_env, ir_graph *irg, char *suffix)
  */
 static int sched_edge_hook(FILE *F, ir_node *irn)
 {
-	if(sched_is_scheduled(irn) && sched_has_prev(irn)) {
+	if (is_Proj(irn))
+		return 1;
+	if (sched_is_scheduled(irn) && sched_has_prev(irn)) {
 		ir_node *prev = sched_prev(irn);
 		fprintf(F, "edge:{sourcename:\"");
 		PRINT_NODEID(irn);
@@ -143,7 +145,8 @@ void dump_ir_block_graph_sched(ir_graph *irg, const char *suffix) {
 	DUMP_NODE_EDGE_FUNC old = get_dump_node_edge_hook();
 
 	dump_consts_local(0);
-	set_dump_node_edge_hook(sched_edge_hook);
+	if (have_sched_info(irg))
+		set_dump_node_edge_hook(sched_edge_hook);
 	dump_ir_block_graph(irg, suffix);
 	set_dump_node_edge_hook(old);
 }
@@ -152,7 +155,8 @@ void dump_ir_extblock_graph_sched(ir_graph *irg, const char *suffix) {
 	DUMP_NODE_EDGE_FUNC old = get_dump_node_edge_hook();
 
 	dump_consts_local(0);
-	set_dump_node_edge_hook(sched_edge_hook);
+	if (have_sched_info(irg))
+		set_dump_node_edge_hook(sched_edge_hook);
 	dump_ir_extblock_graph(irg, suffix);
 	set_dump_node_edge_hook(old);
 }
@@ -182,16 +186,19 @@ void be_dump(ir_graph *irg, const char *suffix, void (*dumper)(ir_graph *, const
 
 static void collect_phis(ir_node *irn, void *data)
 {
-  if(is_Phi(irn)) {
-    ir_node *bl = get_nodes_block(irn);
-    set_irn_link(irn, get_irn_link(bl));
-    set_irn_link(bl, irn);
-  }
+	(void) data;
+	if(is_Phi(irn)) {
+		ir_node *bl = get_nodes_block(irn);
+		set_irn_link(irn, get_irn_link(bl));
+		set_irn_link(bl, irn);
+	}
 }
 
 void be_clear_links(ir_graph *irg)
 {
+	set_using_irn_link(irg);
 	irg_walk_graph(irg, firm_clear_link, NULL, NULL);
+	clear_using_irn_link(irg);
 }
 
 void be_collect_phis(ir_graph *irg)
@@ -199,9 +206,11 @@ void be_collect_phis(ir_graph *irg)
 	irg_walk_graph(irg, collect_phis, NULL, NULL);
 }
 
-static void count_num_reachable_nodes(ir_node *irn, void *env) {
+static void count_num_reachable_nodes(ir_node *irn, void *env)
+{
 	int *num = env;
 	(*num)++;
+	(void) irn;
 }
 
 unsigned get_num_reachable_nodes(ir_graph *irg) {
@@ -210,48 +219,6 @@ unsigned get_num_reachable_nodes(ir_graph *irg) {
 	return num;
 }
 
-/**
- * Sets all node inputs to BAD node.
- */
-void be_kill_node(ir_node *irn) {
-	ir_graph *irg = get_irn_irg(irn);
-
-	assert(!is_Bad(irn));
-
-#ifdef DEBUG_libfirm
-	{
-	int i, first;
-	first = 0 - ! is_Block(irn);
-
-	for (i = get_irn_arity(irn) - 1; i >= first; --i) {
-		set_irn_n(irn, i, get_irg_bad(irg));
-	}
-	}
-#endif
-
-	edges_node_deleted(irn, irg);
-}
-
-/* FIXME: not used. can be deleted? */
-ir_node *dom_up_search(pset *accept, ir_node *start_point_exclusive) {
-	ir_node *irn, *idom;
-
-	/* search the current block */
-	for (irn=sched_prev(start_point_exclusive); irn; irn=sched_prev(irn))
-		if (pset_find_ptr(accept, irn))
-			return irn;
-
-	/* FIXME: This is obviously buggy: after the first recursive call idom is a block
-	   and get_nodes_block will fail.
-		 Moreover, why not a simple iteration instead of recursion */
-	idom = get_Block_idom(get_nodes_block(start_point_exclusive));
-
-	if (idom)
-		return dom_up_search(accept, idom); /* continue search in idom-block */
-	else
-		return NULL; /* this was the start block and we did not find an acceptable irn */
-}
-
 /**
  * Gets the Proj with number pn from irn.
  */