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

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index a0195f934..cf752ab55 100644
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -150,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;
@@ -167,6 +167,7 @@ plotter_t *new_plotter_ps(const char *filename)
 
 */
 
+#if 0
 typedef struct {
   base_plotter_t inh;
   const char *filename;
@@ -184,7 +185,6 @@ static void tikz_begin(plotter_t *_self, const rect_t *vis)
 
 static void tikz_setcolor(plotter_t *_self, const color_t *color)
 {
-  decl_self(tikz_plotter_t, _self);
   set_color(_self, color);
 }
 
@@ -213,6 +213,7 @@ static void tikz_finish(plotter_t *_self)
   decl_self(tikz_plotter_t, _self);
   fclose(self->f);
 }
+#endif
 
 
 extern void plotter_free(plotter_t *self)
@@ -374,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);
@@ -396,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)
@@ -464,7 +465,7 @@ void draw_interval_tree(const draw_chordal_opts_t *opts,
   struct block_dims *start_dims;
   ir_node *start_block = get_irg_start_block(chordal_env->irg);
 
-  env.arch_env = chordal_env->main_env->arch_env;
+  env.arch_env = chordal_env->birg->main_env->arch_env;
   env.opts = opts;
   env.block_dims = pmap_create();
   env.plotter = plotter;