X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeutil.c;h=d1d53c49aa8687c7da177f4a34b5f7736e0cfb62;hb=d6b7eed0bb726ee331416c677aa10a80861bfe19;hp=aa950cd1e610052b77cf1df2a016c9e47fe4f10c;hpb=72b961b5b05ac239435b379ef340154c64134e25;p=libfirm

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index aa950cd1e..d1d53c49a 100644
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -7,6 +7,7 @@
 #include "irgraph.h"
 #include "irgwalk.h"
 #include "irdump_t.h"
+#include "irdom_t.h"
 #include "ircons.h"
 #include "iropt.h"
 #include "irgopt.h"
@@ -25,27 +26,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 = ", ";
 				}
 			}
@@ -58,7 +60,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);
 		}
 	}
 }
@@ -130,6 +132,7 @@ 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);
@@ -158,3 +161,20 @@ 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 */
+}