make block numbers accross functions more deterministic

[libfirm] / ir / be / bechordal_draw.c

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index d502d94..a797a06 100644 (file)
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -209,7 +209,6 @@ 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;
 
@@ -238,7 +237,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;
@@ -248,7 +247,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);
 
@@ -270,12 +269,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);
@@ -288,8 +287,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;
 
@@ -322,10 +320,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);
 
@@ -361,10 +357,9 @@ 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);
+               struct block_dims *dom_dims = pmap_get(struct block_dims, env->block_dims, dom);
 
-               be_lv_foreach(lv, bl, be_lv_state_in, idx) {
-                       ir_node *irn = be_lv_get_irn(lv, bl, idx);
+               be_lv_foreach(lv, bl, be_lv_state_in, irn) {
                        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);
@@ -420,7 +415,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);