X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeutil.c;h=1d209b3247d80a42ee0184390a95995bb8264a47;hb=1b8713c0eca7389d9db2a74302e206d718edc902;hp=53c868c45ec4c8b7619c787ae51e0c5aa9e57e46;hpb=9b24fe0ec0f4412c790ee4a7c6fc022fd28064a1;p=libfirm

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index 53c868c45..1d209b324 100644
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -4,9 +4,12 @@
 
 #include <stdio.h>
 
+#include "pset.h"
+
 #include "irgraph.h"
 #include "irgwalk.h"
 #include "irdump_t.h"
+#include "irdom_t.h"
 #include "ircons.h"
 #include "iropt.h"
 #include "irgopt.h"
@@ -16,6 +19,16 @@
 #include "besched_t.h"
 #include "bearch.h"
 
+pset *be_empty_set(void)
+{
+	static pset *empty_set = NULL;
+
+	if(!empty_set)
+		empty_set = pset_new_ptr_default();
+
+	return empty_set;
+}
+
 struct dump_env {
   FILE *f;
   arch_env_t *env;
@@ -25,26 +38,28 @@ static void dump_allocated_block(ir_node *block, void *data)
 {
 	int i, n;
 	const ir_node *irn;
-  struct dump_env *dump_env = data;
+	struct dump_env *dump_env = data;
 	FILE *f = dump_env->f;
-  arch_env_t *env = dump_env->env;
+	arch_env_t *env = dump_env->env;
 
-	ir_fprintf(f, "node:{title:\"b%N\"\nlabel:\"%n\n", block, block);
+	ir_fprintf(f, "node:{title:\"b%N\"\nlabel:\"", block);
 	sched_foreach(block, irn) {
 		const char *prefix = "";
-    const arch_register_t *reg = arch_get_irn_register(env, irn, 0);
+
+		const arch_register_t *reg = arch_get_irn_register(env, irn);
 
 		ir_fprintf(f, "\n");
-    if(reg)
-      ir_fprintf(f, "%s = ", arch_register_get_name(reg));
+		if(reg)
+			ir_fprintf(f, "%s = ", arch_register_get_name(reg));
+
 		ir_fprintf(f, "%n(", irn);
 
 		if(block != get_irg_start_block(get_irn_irg(block))) {
 			for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
 				ir_node *op = get_irn_n(irn, i);
-        if(arch_is_register_operand(dump_env->env, op, arch_pos_make_out(0))) {
+				if(arch_is_register_operand(dump_env->env, op, -1)) {
 					ir_fprintf(f, "%s%s", prefix,
-              arch_register_get_name(arch_get_irn_register(env, op, 0)));
+						arch_register_get_name(arch_get_irn_register(env, op)));
 					prefix = ", ";
 				}
 			}
@@ -57,7 +72,7 @@ static void dump_allocated_block(ir_node *block, void *data)
 	if(get_irg_start_block(get_irn_irg(block)) != block) {
 		for(i = 0, n = get_irn_arity(block); i < n; ++i) {
 			ir_node *pred_bl = get_nodes_block(get_irn_n(block, i));
-			ir_fprintf(f, "edge:{sourcename:\"b%N\" targetname:\"b%N\"}\n", pred_bl, block);
+			ir_fprintf(f, "edge:{sourcename:\"b%N\" targetname:\"b%N\"}\n", block, pred_bl);
 		}
 	}
 }
@@ -129,7 +144,49 @@ static int sched_edge_hook(FILE *F, ir_node *irn)
 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);
     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);
+}
+
+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 be_clear_links(ir_graph *irg)
+{
+	irg_walk_graph(irg, clear_link, NULL, NULL);
+}
+
+void be_collect_phis(ir_graph *irg)
+{
+	irg_walk_graph(irg, collect_phis, NULL, NULL);
+}
+
+
+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;
+
+	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 */
+}