cleanup: Remove pointless assert(is_${NODE}(x)) just before get_${NODE}_${FOO}(x...
[libfirm] / ir / be / bechordal_draw.c
index 56cd302..9d012cf 100644 (file)
@@ -35,6 +35,7 @@
 #include "iredges_t.h"
 #include "util.h"
 
+#include "bearch.h"
 #include "belive_t.h"
 #include "bechordal_t.h"
 #include "besched.h"
@@ -173,65 +174,6 @@ plotter_t *new_plotter_ps(const char *filename)
        return p;
 }
 
-/*
-   _____ _ _     _____  ____  _       _   _
-  |_   _(_) | __|__  / |  _ \| | ___ | |_| |_ ___ _ __
-    | | | | |/ /  / /  | |_) | |/ _ \| __| __/ _ \ '__|
-    | | | |   <  / /_  |  __/| | (_) | |_| ||  __/ |
-    |_| |_|_|\_\/____| |_|   |_|\___/ \__|\__\___|_|
-
-*/
-
-/* chriswue: the following seems to be unused and can be deleted? */
-#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 /* if 0 */
-
-
 extern void plotter_free(plotter_t *self)
 {
        self->vtab->free(self);
@@ -268,14 +210,13 @@ static void block_dims_walker(ir_node *block, void *data)
        struct list_head          *head = get_block_border_head(env->chordal_env, block);
        const draw_chordal_opts_t *opts = env->opts;
        struct block_dims         *dims = OALLOCZ(&env->obst, struct block_dims);
-       border_t                  *b;
 
        dims->min_step = INT_MAX;
 
-       list_for_each_entry_reverse(border_t, b, head, list) {
+       foreach_border_head(head, b) {
                ir_node               *irn = b->irn;
                const arch_register_t *reg = arch_get_irn_register(irn);
-               int                   col  = arch_register_get_index(reg);
+               int                    col = reg->index;
 
                dims->max_step  = MAX(dims->max_step, b->step);
                dims->max_color = MAX(dims->max_color, col);
@@ -297,7 +238,7 @@ static void block_dims_walker(ir_node *block, void *data)
 static void layout(const draw_chordal_env_t *env, ir_node *bl, int x)
 {
        const draw_chordal_opts_t *opts   = env->opts;
-       struct block_dims         *dims   = (struct block_dims*)pmap_get(env->block_dims, bl);
+       struct block_dims         *dims   = pmap_get(struct block_dims, env->block_dims, bl);
        rect_t                    *rect   = &dims->subtree_box;
        int                       h_space = 0;
        int                       v_space = 0;
@@ -307,7 +248,7 @@ static void layout(const draw_chordal_env_t *env, ir_node *bl, int x)
        rect->x = x;
 
        dominates_for_each(bl, sub) {
-               struct block_dims *bl_dim = (struct block_dims*)pmap_get(env->block_dims, sub);
+               struct block_dims *bl_dim = pmap_get(struct block_dims, env->block_dims, sub);
 
                layout(env, sub, rect->x + rect->w);
 
@@ -329,12 +270,12 @@ static void layout(const draw_chordal_env_t *env, ir_node *bl, int x)
 static void set_y(const draw_chordal_env_t *env, ir_node *bl, int up)
 {
        const draw_chordal_opts_t *opts      = env->opts;
-       struct block_dims         *dims      = (struct block_dims*)pmap_get(env->block_dims, bl);
+       struct block_dims         *dims      = pmap_get(struct block_dims, env->block_dims, bl);
        int                       max_height = dims->subtree_box.h - dims->box.h - opts->v_gap;
        ir_node                   *sub;
 
        dominates_for_each(bl, sub) {
-               struct block_dims *bl_dim = (struct block_dims*)pmap_get(env->block_dims, sub);
+               struct block_dims *bl_dim = pmap_get(struct block_dims, env->block_dims, sub);
                int height_diff = max_height - bl_dim->subtree_box.h;
 
                set_y(env, sub, up + height_diff);
@@ -347,8 +288,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             phi_arg = 0;
-       const ir_edge_t *edge;
+       int phi_arg = 0;
        (void) env;
        (void) rel_bl;
 
@@ -381,10 +321,8 @@ static void draw_block(ir_node *bl, void *data)
        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    = (struct block_dims*)pmap_get(env->block_dims, bl);
+       struct block_dims         *dims    = pmap_get(struct block_dims, env->block_dims, bl);
        char                      buf[64];
-       border_t                  *b;
-       int                       idx;
 
        ir_snprintf(buf, sizeof(buf), "%F", bl);
 
@@ -395,12 +333,11 @@ static void draw_block(ir_node *bl, void *data)
        env->plotter->vtab->text(env->plotter, dims->box.x, dims->box.y, buf);
 #endif
 
-       list_for_each_entry(border_t, b, head, list) {
+       foreach_border_head(head, b) {
                if (b->is_def) {
                        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;
+                       int x        = (reg->index + 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);
 
@@ -420,42 +357,37 @@ static void draw_block(ir_node *bl, void *data)
        }
 
        if (dom) {
-               struct block_dims *dom_dims = (struct block_dims*)pmap_get(env->block_dims, dom);
-
-               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;
-
-                               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(struct block_dims, env->block_dims, dom);
+
+               be_lv_foreach_cls(lv, bl, be_lv_state_in, env->cls, irn) {
+                       const arch_register_t *reg = arch_get_irn_register(irn);
+                       int                    x   = (reg->index + 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);
                }
        }
 }
 
 static void draw(draw_chordal_env_t *env, const rect_t *start_box)
 {
+       ir_graph  *irg = env->chordal_env->irg;
        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;
 
-       lv = be_assure_liveness(env->chordal_env->irg);
-       be_liveness_assure_sets(lv);
-       be_liveness_assure_chk(lv);
+       be_assure_live_sets(irg);
+       be_assure_live_chk(irg);
 
        p->vtab->begin(p, &bbox);
        irg_block_walk_graph(env->chordal_env->irg, draw_block, NULL, env);
@@ -480,7 +412,7 @@ void draw_interval_tree(const draw_chordal_opts_t *opts,
        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 = (struct block_dims*)pmap_get(env.block_dims, start_block);
+       start_dims = pmap_get(struct block_dims, env.block_dims, start_block);
        draw(&env, &start_dims->subtree_box);
 
        pmap_destroy(env.block_dims);