X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeutil.c;h=18effda0f3ed7aafd89e5e03c74344df88fa7420;hb=712cea35fe399ae20e3a33eb9bf81360b5000cf3;hp=935612ef57ffa9e68ec9a5a08abfc693073ff2dc;hpb=5e1f95efc1491481487ba22482422b6d6f42bcdb;p=libfirm

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index 935612ef5..18effda0f 100644
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -13,19 +13,22 @@
 #include "ircons.h"
 #include "iropt.h"
 #include "irgopt.h"
+#include "irtools.h"
 #include "irprintf.h"
 
 #include "beutil.h"
 #include "besched_t.h"
 #include "bearch.h"
 
+/* Get an always empty set. */
 pset *be_empty_set(void)
 {
 	static pset *empty_set = NULL;
 
 	if(!empty_set)
-		empty_set = pset_new_ptr_default();
+		empty_set = pset_new_ptr(1);
 
+	assert(pset_count(empty_set) == 0);
 	return empty_set;
 }
 
@@ -128,33 +131,62 @@ void localize_consts(ir_graph *irg)
 	dead_node_elimination(irg);
 }
 
+/**
+ * Edge hook to dump the schedule edges.
+ */
 static int sched_edge_hook(FILE *F, ir_node *irn)
 {
-    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");
-    }
-    return 1;
+	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");
+	}
+	return 1;
 }
 
 void dump_ir_block_graph_sched(ir_graph *irg, const char *suffix) {
-    DUMP_NODE_EDGE_FUNC old = get_dump_node_edge_hook();
+	DUMP_NODE_EDGE_FUNC old = get_dump_node_edge_hook();
 
 	dump_consts_local(0);
-    set_dump_node_edge_hook(sched_edge_hook);
-    dump_ir_block_graph(irg, suffix);
-    set_dump_node_edge_hook(old);
+	set_dump_node_edge_hook(sched_edge_hook);
+	dump_ir_block_graph(irg, suffix);
+	set_dump_node_edge_hook(old);
 }
 
-static void clear_link(ir_node *irn, void *data)
-{
-  set_irn_link(irn, NULL);
+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);
+	dump_ir_extblock_graph(irg, suffix);
+	set_dump_node_edge_hook(old);
 }
 
+/**
+ * Dumps a graph and numbers all dumps.
+ * @param irg    The graph
+ * @param suffix A suffix to its file name.
+ * @param dumper The dump function
+ */
+void be_dump(ir_graph *irg, const char *suffix, void (*dumper)(ir_graph *, const char *)) {
+	static ir_graph *last_irg = NULL;
+	static int       nr       = 0;
+	char             buf[128];
+
+	if (irg != last_irg) {
+		last_irg = irg;
+		nr       = 0;
+	}
+
+	snprintf(buf, sizeof(buf), "-%02d%s", nr++, suffix);
+	dumper(irg, buf);
+}
+
+
+
 static void collect_phis(ir_node *irn, void *data)
 {
   if(is_Phi(irn)) {
@@ -166,7 +198,7 @@ static void collect_phis(ir_node *irn, void *data)
 
 void be_clear_links(ir_graph *irg)
 {
-	irg_walk_graph(irg, clear_link, NULL, NULL);
+	irg_walk_graph(irg, firm_clear_link, NULL, NULL);
 }
 
 void be_collect_phis(ir_graph *irg)
@@ -174,7 +206,7 @@ void be_collect_phis(ir_graph *irg)
 	irg_walk_graph(irg, collect_phis, NULL, NULL);
 }
 
-
+/* FIXME: not used. can be deleted? */
 ir_node *dom_up_search(pset *accept, ir_node *start_point_exclusive) {
 	ir_node *irn, *idom;
 
@@ -183,6 +215,9 @@ ir_node *dom_up_search(pset *accept, ir_node *start_point_exclusive) {
 		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)