adapted (some parts) to abi changes

[libfirm] / ir / be / bechordal_draw.c

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 4163273..6e20f43 100644 (file)
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -20,7 +20,7 @@
 
 #include "irgwalk.h"
 #include "irprintf.h"
-#include "irouts.h"
+#include "iredges_t.h"
 
 #include "belive_t.h"
 #include "bechordal_t.h"
@@ -71,6 +71,16 @@ typedef struct {
   FILE *f;
 } ps_plotter_t;
 
+
+/*
+  ____  ____    ____  _       _   _
+ |  _ \/ ___|  |  _ \| | ___ | |_| |_ ___ _ __
+ | |_) \___ \  | |_) | |/ _ \| __| __/ _ \ '__|
+ |  __/ ___) | |  __/| | (_) | |_| ||  __/ |
+ |_|   |____/  |_|   |_|\___/ \__|\__\___|_|
+
+*/
+
 static void ps_begin(plotter_t *_self, const rect_t *vis)
 {
   FILE *f;
@@ -148,6 +158,63 @@ plotter_t *new_plotter_ps(const char *filename)
   return p;
 }
 
+/*
+   _____ _ _     _____  ____  _       _   _
+  |_   _(_) | __|__  / |  _ \| | ___ | |_| |_ ___ _ __
+    | | | | |/ /  / /  | |_) | |/ _ \| __| __/ _ \ '__|
+    | | | |   <  / /_  |  __/| | (_) | |_| ||  __/ |
+    |_| |_|_|\_\/____| |_|   |_|\___/ \__|\__\___|_|
+
+*/
+
+typedef struct {
+  base_plotter_t inh;
+  const char *filename;
+  FILE *f;
+} tikz_plotter_t;
+
+static void tikz_begin(plotter_t *_self, const rect_t *vis)
+{
+  FILE *f;
+  decl_self(tikz_plotter_t, _self);
+
+  f = self->f = fopen(self->filename, "wt");
+  fprintf(f, "\\begin{tikzpicture}\n");
+}
+
+static void tikz_setcolor(plotter_t *_self, const color_t *color)
+{
+  decl_self(tikz_plotter_t, _self);
+  set_color(_self, color);
+}
+
+static void tikz_line(plotter_t *_self, int x1, int y1, int x2, int y2)
+{
+  decl_self(tikz_plotter_t, _self);
+  fprintf(self->f, "\t\\draw (%d,%d) -- (%d,%d);\n", x1, y1, x2, y2);
+}
+
+static void tikz_box(plotter_t *_self, const rect_t *rect)
+{
+  decl_self(tikz_plotter_t, _self);
+
+  fprintf(self->f, "\t\\draw (%d,%d) rectangle (%d, %d)\n",
+         rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
+}
+
+void tikz_text(plotter_t *_self, int x, int y, const char *str)
+{
+  decl_self(tikz_plotter_t, _self);
+  fprintf(self->f, "\t\\draw (%d,%d) node {%s};\n", x, y, str);
+}
+
+static void tikz_finish(plotter_t *_self)
+{
+  decl_self(tikz_plotter_t, _self);
+  fclose(self->f);
+}
+
+
 extern void plotter_free(plotter_t *self)
 {
   self->vtab->free(self);
@@ -205,7 +272,7 @@ static void block_dims_walker(ir_node *block, void *data)
 
        list_for_each_entry_reverse(border_t, b, head, list) {
     ir_node *irn = b->irn;
-    const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn, 0);
+    const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
     int col = arch_register_get_index(reg);
 
     dims->max_step = max(dims->max_step, b->step);
@@ -277,10 +344,11 @@ static void set_y(const draw_chordal_env_t *env, ir_node *bl, int up)
 static color_t *reg_to_color(const draw_chordal_env_t *env,
     ir_node *rel_bl, ir_node *irn, color_t *color)
 {
-  int i, n, phi_arg = 0;
+  int phi_arg = 0;
+  const ir_edge_t *edge;
 
-  for(i = 0, n = get_irn_n_outs(irn); i < n && !phi_arg; ++i)
-    phi_arg |= is_Phi(get_irn_out(irn, i));
+  foreach_out_edge(irn, edge)
+    phi_arg |= is_Phi(edge->src);
 
 #if 1
   color->r = is_Phi(irn) ? 0.5 : 0.0;
@@ -326,7 +394,7 @@ static void draw_block(ir_node *bl, void *data)
 
        list_for_each_entry(border_t, b, head, list) {
     if(b->is_def) {
-      const arch_register_t *reg = arch_get_irn_register(env->arch_env, b->irn, 0);
+      const arch_register_t *reg = arch_get_irn_register(env->arch_env, b->irn);
       int col = arch_register_get_index(reg);
       int live_out = is_live_out(bl, b->irn);
       int x = (col + 1) * opts->h_inter_gap;
@@ -353,8 +421,8 @@ static void draw_block(ir_node *bl, void *data)
     struct block_dims *dom_dims = pmap_get(env->block_dims, dom);
 
     for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) {
-      if(arch_irn_has_reg_class(env->arch_env, irn, 0, env->cls)) {
-        const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn, 0);
+      if(arch_irn_has_reg_class(env->arch_env, irn, -1, env->cls)) {
+        const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
         int col = arch_register_get_index(reg);
         int x = (col + 1) * opts->h_inter_gap;
 
@@ -384,30 +452,28 @@ static void draw(draw_chordal_env_t *env, const rect_t *start_box)
   bbox.h = start_box->h + 2 * env->opts->y_margin;
 
   p->vtab->begin(p, &bbox);
-  irg_block_walk_graph(env->chordal_env->session_env->irg, draw_block, NULL, env);
+  irg_block_walk_graph(env->chordal_env->irg, draw_block, NULL, env);
   p->vtab->finish(p);
 }
 
 void draw_interval_tree(const draw_chordal_opts_t *opts,
-    const be_chordal_env_t *chordal_env,
-    plotter_t *plotter, const arch_env_t *arch_env,
-    const arch_register_class_t *cls)
+                                               const be_chordal_env_t *chordal_env,
+                                               plotter_t *plotter)
 {
   draw_chordal_env_t env;
   struct block_dims *start_dims;
-  ir_node *start_block = get_irg_start_block(chordal_env->session_env->irg);
+  ir_node *start_block = get_irg_start_block(chordal_env->irg);
 
-  env.arch_env = arch_env;
+  env.arch_env = chordal_env->birg->main_env->arch_env;
   env.opts = opts;
   env.block_dims = pmap_create();
   env.plotter = plotter;
-  env.chordal_env = chordal_env;
-  env.cls = cls;
+  env.cls = chordal_env->cls;
   env.max_color = 0;
   env.chordal_env = chordal_env;
   obstack_init(&env.obst);
 
-  irg_block_walk_graph(chordal_env->session_env->irg, block_dims_walker, NULL, &env);
+  irg_block_walk_graph(chordal_env->irg, block_dims_walker, NULL, &env);
   layout(&env, start_block, opts->x_margin);
   set_y(&env, start_block, opts->y_margin);
   start_dims = pmap_get(env.block_dims, start_block);