Made lpp stuff modular.

[libfirm] / ir / be / beutil.c

diff --git a/ir/be/beutil.c b/ir/be/beutil.c
index a50cb9d..4b75cdc 100644 (file)
--- a/ir/be/beutil.c
+++ b/ir/be/beutil.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
 
@@ -10,28 +13,37 @@
 
 #include "beutil.h"
 #include "besched_t.h"
-#include "bera_t.h"
+#include "bearch.h"
 
-static void dump_allocated_block(ir_node *block, void *env)
+struct dump_env {
+  FILE *f;
+  arch_env_t *env;
+};
+
+static void dump_allocated_block(ir_node *block, void *data)
 {
        int i, n;
        const ir_node *irn;
-       FILE *f = env;
+  struct dump_env *dump_env = data;
+       FILE *f = dump_env->f;
+  arch_env_t *env = dump_env->env;
 
        ir_fprintf(f, "node:{title:\"b%N\"\nlabel:\"%n\n", block, block);
        sched_foreach(block, irn) {
                const char *prefix = "";
+    const arch_register_t *reg = arch_get_irn_register(env, irn, 0);
 
                ir_fprintf(f, "\n");
-               if(is_color(get_irn_color(irn)))
-                       ir_fprintf(f, "r%d = ", get_irn_color(irn));
+    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)) {
-                                       ir_fprintf(f, "%sr%d", prefix, get_irn_color(op));
+        if(arch_is_register_operand(dump_env->env, op, arch_pos_make_out(0))) {
+                                       ir_fprintf(f, "%s%s", prefix,
+              arch_register_get_name(arch_get_irn_register(env, op, 0)));
                                        prefix = ", ";
                                }
                        }
@@ -49,18 +61,20 @@ static void dump_allocated_block(ir_node *block, void *env)
        }
 }
 
-void dump_allocated_irg(ir_graph *irg)
+void dump_allocated_irg(arch_env_t *arch_env, ir_graph *irg, char *suffix)
 {
        char buf[1024];
-       FILE *f;
+  struct dump_env env;
+
+  env.env = arch_env;
 
-       snprintf(buf, sizeof(buf), "%s-alloc.vcg", get_entity_name(get_irg_entity(irg)));
+       ir_snprintf(buf, sizeof(buf), "%F-alloc%s.vcg", irg, suffix);
 
-       if((f = fopen(buf, "wt")) != NULL) {
-               fprintf(f, "graph:{title:\"prg\"\n");
-               irg_block_walk_graph(irg, dump_allocated_block, NULL, f);
-               fprintf(f, "}\n");
-               fclose(f);
+       if((env.f = fopen(buf, "wt")) != NULL) {
+               fprintf(env.f, "graph:{title:\"prg\"\n");
+               irg_block_walk_graph(irg, dump_allocated_block, NULL, &env);
+               fprintf(env.f, "}\n");
+               fclose(env.f);
        }
 }
 
@@ -72,12 +86,19 @@ static void localize_const_walker(ir_node *irn, void *data)
                for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
                        ir_node *op = get_irn_n(irn, i);
                        if(get_irn_opcode(op) == iro_Const) {
+                               ir_node *tgt_block, *cnst;
+
+                               /* Special treatment for phi nodes, because phi-usage is different */
+                               tgt_block = get_nodes_block(irn);
+                               if(is_Phi(irn))
+                                       tgt_block = get_nodes_block(get_irn_n(tgt_block, i));
+
                                /*
                                 * We have to create the const node by ourselves, since the
                                 * firmcons implementation always places it in the start block.
                                 */
-                               ir_node *cnst = new_ir_node(NULL, get_irn_irg(irn),
-                                               get_nodes_block(irn), op_Const, get_irn_mode(op), 0, NULL);
+                               cnst = new_ir_node(NULL, get_irn_irg(irn),
+                                               tgt_block, op_Const, get_irn_mode(op), 0, NULL);
                                cnst->attr.con.tv = get_Const_tarval(op);
                                set_irn_n(irn, i, cnst);
                        }