X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=30aef630d8dbfac82c6b2913f4475ea192c9b03a;hb=3dc38f8f23569593c030b85e83ecd9174a95bc73;hp=3448520c026f83ca9e6cdc6fd584cbf3fd0c22aa;hpb=5316c6fdb1dec69a9082218cbe67b6ec43dc4e39;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 3448520c0..30aef630d 100644
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -71,6 +71,16 @@ typedef struct {
   FILE *f;
 } ps_plotter_t;
 
+
+/*
+  ____  ____    ____  _       _   _
+ |  _ \/ ___|  |  _ \| | ___ | |_| |_ ___ _ __
+ | |_) \___ \  | |_) | |/ _ \| __| __/ _ \ '__|
+ |  __/ ___) | |  __/| | (_) | |_| ||  __/ |
+ |_|   |____/  |_|   |_|\___/ \__|\__\___|_|
+
+*/
+
 static void ps_begin(plotter_t *_self, const rect_t *vis)
 {
   FILE *f;
@@ -140,7 +150,7 @@ const plotter_if_t ps_plotter_vtab = {
 
 plotter_t *new_plotter_ps(const char *filename)
 {
-  ps_plotter_t *ps_plotter = malloc(sizeof(*ps_plotter));
+  ps_plotter_t *ps_plotter = xmalloc(sizeof(*ps_plotter));
   plotter_t *p = (plotter_t *) ps_plotter;
 
   ps_plotter->filename = filename;
@@ -148,6 +158,64 @@ plotter_t *new_plotter_ps(const char *filename)
   return p;
 }
 
+/*
+   _____ _ _     _____  ____  _       _   _
+  |_   _(_) | __|__  / |  _ \| | ___ | |_| |_ ___ _ __
+    | | | | |/ /  / /  | |_) | |/ _ \| __| __/ _ \ '__|
+    | | | |   <  / /_  |  __/| | (_) | |_| ||  __/ |
+    |_| |_|_|\_\/____| |_|   |_|\___/ \__|\__\___|_|
+
+*/
+
+#if 0
+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)
+{
+  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);
+}
+#endif
+
+
 extern void plotter_free(plotter_t *self)
 {
   self->vtab->free(self);
@@ -205,7 +273,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,7 +345,7 @@ 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;
 
   foreach_out_edge(irn, edge)
@@ -304,72 +372,73 @@ static color_t *reg_to_color(const draw_chordal_env_t *env,
 
 static void draw_block(ir_node *bl, void *data)
 {
-  static const color_t black = { 0, 0, 0 };
+	static const color_t black = { 0, 0, 0 };
 
-  const draw_chordal_env_t *env = data;
-  pset *live_in = put_live_in(bl, pset_new_ptr_default());
-  ir_node *irn;
-  border_t *b;
+	const draw_chordal_env_t *env = data;
+	const be_lv_t *lv = be_get_birg_liveness(env->chordal_env->birg);
+	pset *live_in = be_lv_pset_put_in(lv, bl, pset_new_ptr_default());
+	ir_node *irn;
+	border_t *b;
 	struct list_head *head = get_block_border_head(env->chordal_env, bl);
-  ir_node *dom = get_Block_idom(bl);
-  const draw_chordal_opts_t *opts = env->opts;
-  struct block_dims *dims = pmap_get(env->block_dims, bl);
-  char buf[64];
+	ir_node *dom = get_Block_idom(bl);
+	const draw_chordal_opts_t *opts = env->opts;
+	struct block_dims *dims = pmap_get(env->block_dims, bl);
+	char buf[64];
 
-  ir_snprintf(buf, sizeof(buf), "%F", bl);
+	ir_snprintf(buf, sizeof(buf), "%F", bl);
 
-  env->plotter->vtab->set_color(env->plotter, &black);
-  env->plotter->vtab->box(env->plotter, &dims->box);
+	env->plotter->vtab->set_color(env->plotter, &black);
+	env->plotter->vtab->box(env->plotter, &dims->box);
 
 #if 0
   env->plotter->vtab->text(env->plotter, dims->box.x, dims->box.y, buf);
 #endif
 
-	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);
-      int col = arch_register_get_index(reg);
-      int live_out = is_live_out(bl, b->irn);
-      int x = (col + 1) * opts->h_inter_gap;
-      int ystart = (b->step) * opts->v_inter_gap;
-      int ystop = (b->other_end->step)
-        * opts->v_inter_gap + (live_out ? 0 : opts->v_inter_gap / 2);
-
-      color_t color;
-      reg_to_color(env, bl, b->irn, &color);
-
-      x += dims->box.x;
-      ystart += dims->box.y;
-      ystop += dims->box.y;
-
-      env->plotter->vtab->set_color(env->plotter, &color);
-      env->plotter->vtab->line(env->plotter, x, ystart, x, ystop);
-
-      env->plotter->vtab->line(env->plotter, x - 2, ystart, x + 2, ystart);
-      env->plotter->vtab->line(env->plotter, x - 2, ystop, x + 2, ystop);
-    }
+  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);
+		  int col = arch_register_get_index(reg);
+		  int live_out = be_is_live_out(lv, bl, b->irn);
+		  int x = (col + 1) * opts->h_inter_gap;
+		  int ystart = (b->step) * opts->v_inter_gap;
+		  int ystop = (b->other_end->step)
+			  * opts->v_inter_gap + (live_out ? 0 : opts->v_inter_gap / 2);
+
+		  color_t color;
+		  reg_to_color(env, bl, b->irn, &color);
+
+		  x += dims->box.x;
+		  ystart += dims->box.y;
+		  ystop += dims->box.y;
+
+		  env->plotter->vtab->set_color(env->plotter, &color);
+		  env->plotter->vtab->line(env->plotter, x, ystart, x, ystop);
+
+		  env->plotter->vtab->line(env->plotter, x - 2, ystart, x + 2, ystart);
+		  env->plotter->vtab->line(env->plotter, x - 2, ystop, x + 2, ystop);
+	  }
   }
 
   if(dom) {
-    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);
-        int col = arch_register_get_index(reg);
-        int x = (col + 1) * opts->h_inter_gap;
-
-        color_t color;
-        reg_to_color(env, bl, irn, &color);
-
-        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);
-      }
-    }
+	  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, -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;
+
+			  color_t color;
+			  reg_to_color(env, bl, irn, &color);
+
+			  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);
+		  }
+	  }
   }
 
   del_pset(live_in);
@@ -384,31 +453,31 @@ static void draw(draw_chordal_env_t *env, const rect_t *start_box)
   bbox.w = start_box->w + 2 * env->opts->x_margin;
   bbox.h = start_box->h + 2 * env->opts->y_margin;
 
+  be_assure_liveness(env->chordal_env->birg);
+
   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);