bechordal: Remove the attribute other_end from struct border_t.

[libfirm] / ir / be / bechordal_draw.c

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 9d012cf..e9d7853 100644 (file)
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -105,10 +91,6 @@ static void ps_begin(plotter_t *_self, const rect_t *vis)
        f = self->f = fopen(self->filename, "wt");
        fprintf(f, "%%!PS-Adobe-2.0\n");
        fprintf(f, "%%%%BoundingBox: %d %d %d %d\n", vis->x, vis->y, vis->w, vis->h);
-#if 0
-       fprintf(f, "/mainfont /Courier findfont %f scalefont def\n", 10.0);
-       fprintf(f, "mainfont setfont\n");
-#endif /* if 0 */
 }
 
 static void ps_setcolor(plotter_t *_self, const color_t *color)
@@ -225,12 +207,8 @@ static void block_dims_walker(ir_node *block, void *data)
 
        dims->min_step = 1;
 
-#if 1
        dims->box.w = (dims->max_color + 2) * opts->h_inter_gap;
        dims->box.h = dims->max_step * opts->v_inter_gap;
-#else /* ! if 1 */
-       dims->box.w = dims->box.h = 10;
-#endif /* if 1 */
 
        pmap_insert(env->block_dims, block, dims);
 }
@@ -295,21 +273,9 @@ static color_t *reg_to_color(const draw_chordal_env_t *env,
        foreach_out_edge(irn, edge)
                phi_arg |= is_Phi(edge->src);
 
-#if 1
        color->r = is_Phi(irn) ? 0.5 : 0.0;
        color->g = phi_arg ? 0.5 : 0.0;
        color->b = 0.0;
-#else /* ! if 1 */
-       {
-               int live_in  = is_live_in(rel_bl, irn);
-               int live_out = is_live_out(rel_bl, irn);
-
-               color->r = live_in;
-               color->g = live_out;
-               color->b = 0.0;
-       }
-#endif /* if 1 */
-
        return color;
 }
 
@@ -329,20 +295,24 @@ static void draw_block(ir_node *bl, void *data)
        env->plotter->vtab->set_color(env->plotter, &black);
        env->plotter->vtab->box(env->plotter, &dims->box);
 
-#if 1
        env->plotter->vtab->text(env->plotter, dims->box.x, dims->box.y, buf);
-#endif
 
        foreach_border_head(head, b) {
                if (b->is_def) {
-                       const arch_register_t *reg = arch_get_irn_register(b->irn);
-                       int live_out = be_is_live_out(lv, bl, b->irn);
+                       /* Walk from def to use, so the link is set before retrieved. */
+                       set_irn_link(b->irn, b);
+               } else {
+                       ir_node               *const irn = b->irn;
+                       border_t        const *const def = (border_t const*)get_irn_link(irn);
+                       arch_register_t const *const reg = arch_get_irn_register(irn);
+
+                       int live_out = be_is_live_out(lv, bl, irn);
                        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);
+                       int ystart   = def->step * opts->v_inter_gap;
+                       int ystop    =   b->step * opts->v_inter_gap + (live_out ? 0 : opts->v_inter_gap / 2);
 
                        color_t color;
-                       reg_to_color(env, bl, b->irn, &color);
+                       reg_to_color(env, bl, irn, &color);
 
                        x      += dims->box.x;
                        ystart += dims->box.y;
@@ -390,7 +360,9 @@ static void draw(draw_chordal_env_t *env, const rect_t *start_box)
        be_assure_live_chk(irg);
 
        p->vtab->begin(p, &bbox);
-       irg_block_walk_graph(env->chordal_env->irg, draw_block, NULL, env);
+       ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+       irg_block_walk_graph(irg, draw_block, NULL, env);
+       ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
        p->vtab->finish(p);
 }