X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=3b2c8e1085c629cbe90e8dc64e4d9eb5f94dc476;hb=e4691fe2e5046a9b2ae912e23e92ddcdcd2bb6e9;hp=3448520c026f83ca9e6cdc6fd584cbf3fd0c22aa;hpb=5316c6fdb1dec69a9082218cbe67b6ec43dc4e39;p=libfirm diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c index 3448520c0..3b2c8e108 100644 --- a/ir/be/bechordal_draw.c +++ b/ir/be/bechordal_draw.c @@ -205,7 +205,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, 0); + const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn); int col = arch_register_get_index(reg); dims->max_step = max(dims->max_step, b->step); @@ -277,7 +277,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 i, n, phi_arg = 0; + int phi_arg = 0; const ir_edge_t *edge; foreach_out_edge(irn, edge) @@ -327,7 +327,7 @@ static void draw_block(ir_node *bl, void *data) 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, 0); + 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 x = (col + 1) * opts->h_inter_gap; @@ -354,8 +354,8 @@ static void draw_block(ir_node *bl, void *data) 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, 0, env->cls)) { - const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn, 0); + 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); int col = arch_register_get_index(reg); int x = (col + 1) * opts->h_inter_gap; @@ -385,30 +385,28 @@ static void draw(draw_chordal_env_t *env, const rect_t *start_box) bbox.h = start_box->h + 2 * env->opts->y_margin; p->vtab->begin(p, &bbox); - irg_block_walk_graph(env->chordal_env->session_env->irg, draw_block, NULL, env); + irg_block_walk_graph(env->chordal_env->irg, draw_block, NULL, env); p->vtab->finish(p); } void draw_interval_tree(const draw_chordal_opts_t *opts, - const be_chordal_env_t *chordal_env, - plotter_t *plotter, const arch_env_t *arch_env, - const arch_register_class_t *cls) + const be_chordal_env_t *chordal_env, + plotter_t *plotter) { draw_chordal_env_t env; struct block_dims *start_dims; - ir_node *start_block = get_irg_start_block(chordal_env->session_env->irg); + ir_node *start_block = get_irg_start_block(chordal_env->irg); - env.arch_env = arch_env; + env.arch_env = chordal_env->main_env->arch_env; env.opts = opts; env.block_dims = pmap_create(); env.plotter = plotter; - env.chordal_env = chordal_env; - env.cls = cls; + env.cls = chordal_env->cls; env.max_color = 0; env.chordal_env = chordal_env; obstack_init(&env.obst); - irg_block_walk_graph(chordal_env->session_env->irg, block_dims_walker, NULL, &env); + 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 = pmap_get(env.block_dims, start_block);