X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=cf752ab550899a366add8ba690437ff37792a823;hb=b9d45e08e23bcf058fa8f2d9e18dd78e8cccd044;hp=8c43799e8f6d6ec201706d7a4806cc93508b9cc7;hpb=4c66ebcce62ceffb68a891142dd309429e03351a;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 8c43799e8..cf752ab55 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);
@@ -307,7 +375,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 = put_live_in(bl, pset_new_ptr_default());
+  pset *live_in = be_lv_pset_put_in(env->chordal_env->lv, bl, pset_new_ptr_default());
   ir_node *irn;
   border_t *b;
 	struct list_head *head = get_block_border_head(env->chordal_env, bl);
@@ -329,7 +397,7 @@ static void draw_block(ir_node *bl, void *data)
     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 = is_live_out(bl, b->irn);
+      int live_out = be_is_live_out(env->chordal_env->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)
@@ -354,7 +422,7 @@ 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)) {
+      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;
@@ -390,20 +458,18 @@ static void draw(draw_chordal_env_t *env, const rect_t *start_box)
 }
 
 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->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);