X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=c93410e5812f249dfc2c9c74a09785c99519ff63;hb=efdb09dd64658e15cd9fd2599884bfe72bba7fd2;hp=547319f68ea268f065e52464f4d06076acbafb30;hpb=6a4b9102668449bea6e3c0905df74f7ffff2768b;p=libfirm diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c index 547319f68..c93410e58 100644 --- a/ir/be/bechordal_draw.c +++ b/ir/be/bechordal_draw.c @@ -52,27 +52,32 @@ typedef struct { #define decl_self(type, from) \ type *self = (type *) from -static void set_color(plotter_t *_self, const color_t *color) { +static void set_color(plotter_t *_self, const color_t *color) +{ decl_self(base_plotter_t, _self); self->color = color; } -static const color_t *get_color(const plotter_t *_self) { +static const color_t *get_color(const plotter_t *_self) +{ decl_self(const base_plotter_t, _self); return self->color; } -static void set_width(plotter_t *_self, int width) { +static void set_width(plotter_t *_self, int width) +{ decl_self(base_plotter_t, _self); self->width = width; } -static int get_width(const plotter_t *_self) { +static int get_width(const plotter_t *_self) +{ decl_self(const base_plotter_t, _self); return self->width; } -static void plotter_default_free(plotter_t *self) { +static void plotter_default_free(plotter_t *self) +{ (void) self; } @@ -132,7 +137,7 @@ static void ps_box(plotter_t *_self, const rect_t *rect) rect->x, rect->y, rect->w, rect->h); } -void ps_text(plotter_t *_self, int x, int y, const char *str) +static void ps_text(plotter_t *_self, int x, int y, const char *str) { decl_self(ps_plotter_t, _self); @@ -373,7 +378,7 @@ static void draw_block(ir_node *bl, void *data) { static const color_t black = { 0, 0, 0 }; const draw_chordal_env_t *env = data; - const be_lv_t *lv = be_get_birg_liveness(env->chordal_env->birg); + const be_lv_t *lv = be_get_irg_liveness(env->chordal_env->irg); 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; @@ -449,7 +454,7 @@ static void draw(draw_chordal_env_t *env, const rect_t *start_box) 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->birg); + lv = be_assure_liveness(env->chordal_env->irg); be_liveness_assure_sets(lv); be_liveness_assure_chk(lv); @@ -458,7 +463,8 @@ static void draw(draw_chordal_env_t *env, const rect_t *start_box) p->vtab->finish(p); } -void draw_interval_tree(const draw_chordal_opts_t *opts, const be_chordal_env_t *chordal_env, plotter_t *plotter) { +void draw_interval_tree(const draw_chordal_opts_t *opts, 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->irg);