return new irn class

[libfirm] / ir / be / beutil.c

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index 09c88cb..97e1268 100644 (file)
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -6,6 +6,7 @@
 
 #include "irgraph.h"
 #include "irgwalk.h"
+#include "irdump_t.h"
 #include "ircons.h"
 #include "iropt.h"
 #include "irgopt.h"
@@ -13,7 +14,6 @@
 
 #include "beutil.h"
 #include "besched_t.h"
-#include "bera_t.h"
 #include "bearch.h"
 
 struct dump_env {
@@ -25,26 +25,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(is_allocatable_irn(op)) {
+                               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 +59,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);
                }
        }
 }
@@ -112,3 +114,49 @@ void localize_consts(ir_graph *irg)
        irg_walk_graph(irg, localize_const_walker, NULL, NULL);
        dead_node_elimination(irg);
 }
+
+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;
+}
+
+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);
+}