X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbechordal_draw.c;h=e6f70a4c04bae4955a0c99c1da98040603347a1c;hb=423bb1857e09b6d0b510e87676e396fa84002a98;hp=4baf3d5a099281700f5240f77a0c72c0ca0aa34f;hpb=3c2c8da0b29805ca3ce8a17cc23a60ffaa6e0ec1;p=libfirm diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c index 4baf3d5a0..e6f70a4c0 100644 --- 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. */ /** @@ -35,6 +21,7 @@ #include "iredges_t.h" #include "util.h" +#include "bearch.h" #include "belive_t.h" #include "bechordal_t.h" #include "besched.h" @@ -104,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) @@ -195,7 +178,6 @@ typedef struct draw_chordal_env_t { struct block_dims { unsigned max_step; - int min_step; int max_color; rect_t box; rect_t subtree_box; @@ -209,28 +191,19 @@ 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); env->max_color = MAX(env->max_color, col); } - 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 +268,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; } @@ -323,28 +284,30 @@ static void draw_block(ir_node *bl, void *data) const draw_chordal_opts_t *opts = env->opts; struct block_dims *dims = pmap_get(struct block_dims, env->block_dims, bl); char buf[64]; - border_t *b; ir_snprintf(buf, sizeof(buf), "%F", bl); 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 - 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 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); + /* 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 = 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; @@ -361,22 +324,19 @@ static void draw_block(ir_node *bl, void *data) if (dom) { struct block_dims *dom_dims = pmap_get(struct block_dims, env->block_dims, dom); - 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); - 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); - } + 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); } } } @@ -395,7 +355,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); }