Moved to new lpp library

[libfirm] / ir / be / bechordal_draw.c

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 1835228..1b31a56 100644 (file)
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -9,10 +9,14 @@
  * Copyright (C) 2005 Universitaet Karlsruhe
  * Released under the GPL
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <limits.h>
 
 #include "pmap.h"
+#include "pset.h"
 
 #include "irgwalk.h"
 #include "irprintf.h"
@@ -151,7 +155,7 @@ extern void plotter_free(plotter_t *self)
 }
 
 const draw_chordal_opts_t draw_chordal_def_opts = {
-  10, 10, 30, 8
+  10, 10, 30, 8, 10, 10
 };
 
 typedef struct _draw_chordal_env_t {
@@ -174,11 +178,13 @@ struct block_dims {
   rect_t subtree_box;
 };
 
+#undef min
 static INLINE int min(int a, int b)
 {
   return a < b ? a : b;
 }
 
+#undef max
 static INLINE int max(int a, int b)
 {
   return a > b ? a : b;
@@ -225,7 +231,7 @@ static void layout(const draw_chordal_env_t *env, ir_node *bl, int x)
   struct block_dims *dims = pmap_get(env->block_dims, bl);
   ir_node *sub;
   rect_t *rect = &dims->subtree_box;
-  int h_space = 0;
+  int h_space = 0, v_space = 0;
 
   memset(rect, 0, sizeof(*rect));
   rect->x = x;
@@ -239,14 +245,15 @@ static void layout(const draw_chordal_env_t *env, ir_node *bl, int x)
     rect->h = max(rect->h, bl_dim->subtree_box.h);
 
     h_space = opts->h_gap;
+    v_space = opts->v_gap;
   }
 
   rect->w = max(rect->w, dims->box.w + opts->h_gap);
 
   dims->box.x = x + doz(rect->w, dims->box.w) / 2;
-  dims->box.y = rect->h + opts->v_gap;
+  dims->box.y = rect->h + v_space;
 
-  rect->h += dims->box.h + opts->v_gap;
+  rect->h += dims->box.h + v_space;
 }
 
 static void set_y(const draw_chordal_env_t *env, ir_node *bl, int up)
@@ -299,7 +306,7 @@ static void draw_block(ir_node *bl, void *data)
   static const color_t black = { 0, 0, 0 };
 
   const draw_chordal_env_t *env = data;
-  pset *live_in = get_live_in(bl);
+  pset *live_in = put_live_in(bl, pset_new_ptr_default());
   ir_node *irn;
   border_t *b;
        struct list_head *head = get_block_border_head(env->chordal_env, bl);
@@ -357,32 +364,27 @@ static void draw_block(ir_node *bl, void *data)
 
         env->plotter->vtab->set_color(env->plotter, &color);
         env->plotter->vtab->line(env->plotter,
-            dims->box.x + x, dims->box.y + dims->box.h,
-            dom_dims->box.x + x, dom_dims->box.y);
+            dims->box.x + x,
+            dims->box.y + dims->box.h,
+            dom_dims->box.x + x,
+            dom_dims->box.y);
       }
     }
   }
 
-#if 0
-  if(dom) {
-  struct block_dims *dom_dims = pmap_get(env->block_dims, dom);
-    rect_t line;
-
-    line.x = dims->box.x;
-    line.y = dims->box.y;
-    line.w = dom_dims->box.x;
-    line.h = dom_dims->box.y;
-
-    env->plotter->vtab->line(env->plotter, &line);
-  }
-#endif
+  del_pset(live_in);
 }
 
-static void draw(draw_chordal_env_t *env, const rect_t *bbox)
+static void draw(draw_chordal_env_t *env, const rect_t *start_box)
 {
   plotter_t *p = env->plotter;
+  rect_t bbox;
+
+  bbox.x = bbox.y = 0;
+  bbox.w = start_box->w + 2 * env->opts->x_margin;
+  bbox.h = start_box->h + 2 * env->opts->y_margin;
 
-  p->vtab->begin(p, bbox);
+  p->vtab->begin(p, &bbox);
   irg_block_walk_graph(env->chordal_env->irg, draw_block, NULL, env);
   p->vtab->finish(p);
 }
@@ -407,8 +409,8 @@ void draw_interval_tree(const draw_chordal_opts_t *opts,
   obstack_init(&env.obst);
 
   irg_block_walk_graph(chordal_env->irg, block_dims_walker, NULL, &env);
-  layout(&env, start_block, 0);
-  set_y(&env, start_block, 0);
+  layout(&env, start_block, opts->x_margin);
+  set_y(&env, start_block, opts->y_margin);
   start_dims = pmap_get(env.block_dims, start_block);
   draw(&env, &start_dims->subtree_box);