remove #ifdef HAVE_CONFIG_Hs

[libfirm] / ir / be / bechordal_draw.c

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 6f4ef2f..fdcff5c 100644 (file)
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,9 +24,7 @@
  * @date        12.05.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -75,6 +73,7 @@ static int get_width(const plotter_t *_self) {
 }
 
 static void plotter_default_free(plotter_t *self) {
+       (void) self;
 }
 
 typedef struct {
@@ -162,7 +161,7 @@ const plotter_if_t ps_plotter_vtab = {
 
 plotter_t *new_plotter_ps(const char *filename)
 {
-       ps_plotter_t *ps_plotter = xmalloc(sizeof(*ps_plotter));
+       ps_plotter_t *ps_plotter = XMALLOC(ps_plotter_t);
        plotter_t *p = (plotter_t *) ps_plotter;
 
        ps_plotter->filename = filename;
@@ -241,7 +240,6 @@ const draw_chordal_opts_t draw_chordal_def_opts = {
 
 typedef struct _draw_chordal_env_t {
        const be_chordal_env_t      *chordal_env;
-       const arch_env_t            *arch_env;
        const arch_register_class_t *cls;
        pmap                        *block_dims;
        plotter_t                   *plotter;
@@ -273,7 +271,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);
+               const arch_register_t *reg = arch_get_irn_register(irn);
                int                   col  = arch_register_get_index(reg);
 
                dims->max_step  = MAX(dims->max_step, b->step);
@@ -322,7 +320,7 @@ static void layout(const draw_chordal_env_t *env, ir_node *bl, int x)
        dims->box.x = x + doz(rect->w, dims->box.w) / 2;
        dims->box.y = rect->h + v_space;
 
-       rect->h += dims->box.h + v_space;
+       rect->h = dims->box.y + dims->box.h;
 }
 
 static void set_y(const draw_chordal_env_t *env, ir_node *bl, int up)
@@ -348,6 +346,8 @@ static color_t *reg_to_color(const draw_chordal_env_t *env,
 {
        int             phi_arg = 0;
        const ir_edge_t *edge;
+       (void) env;
+       (void) rel_bl;
 
        foreach_out_edge(irn, edge)
                phi_arg |= is_Phi(edge->src);
@@ -375,27 +375,26 @@ static void draw_block(ir_node *bl, void *data)
        static const color_t      black    = { 0, 0, 0 };
        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());
        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                   *irn;
        border_t                  *b;
+       int                       idx;
 
        ir_snprintf(buf, sizeof(buf), "%F", bl);
 
        env->plotter->vtab->set_color(env->plotter, &black);
        env->plotter->vtab->box(env->plotter, &dims->box);
 
-#if 0
+#if 1
        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);
+                       const arch_register_t *reg = arch_get_irn_register(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;
@@ -420,9 +419,10 @@ static void draw_block(ir_node *bl, void *data)
        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, -1, env->cls)) {
-                               const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
+               be_lv_foreach(lv, bl, be_lv_state_in, idx) {
+                       ir_node *irn = be_lv_get_irn(lv, bl, idx);
+                       if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
+                               const arch_register_t *reg = arch_get_irn_register(irn);
                                int     col = arch_register_get_index(reg);
                                int     x   = (col + 1) * opts->h_inter_gap;
                                color_t color;
@@ -438,20 +438,21 @@ static void draw_block(ir_node *bl, void *data)
                        }
                }
        }
-
-       del_pset(live_in);
 }
 
 static void draw(draw_chordal_env_t *env, const rect_t *start_box)
 {
        plotter_t *p = env->plotter;
+       be_lv_t *lv;
        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;
 
-       be_assure_liveness(env->chordal_env->birg);
+       lv = be_assure_liveness(env->chordal_env->birg);
+       be_liveness_assure_sets(lv);
+       be_liveness_assure_chk(lv);
 
        p->vtab->begin(p, &bbox);
        irg_block_walk_graph(env->chordal_env->irg, draw_block, NULL, env);
@@ -463,7 +464,6 @@ void draw_interval_tree(const draw_chordal_opts_t *opts, const be_chordal_env_t
        struct block_dims  *start_dims;
        ir_node            *start_block = get_irg_start_block(chordal_env->irg);
 
-       env.arch_env    = chordal_env->birg->main_env->arch_env;
        env.opts        = opts;
        env.block_dims  = pmap_create();
        env.plotter     = plotter;