X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=84bfc6e7978ed45f2da0637ffdc5b4a97ed07a52;hb=822286302c8472f89a7e8492b11bd3a9c702c1fe;hp=30128dea11637d4432f353844f9cd34b5b6f4458;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 30128dea1..84bfc6e79 100644
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -137,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);
 
@@ -243,7 +243,7 @@ const draw_chordal_opts_t draw_chordal_def_opts = {
 	10, 10, 30, 8, 10, 10
 };
 
-typedef struct _draw_chordal_env_t {
+typedef struct draw_chordal_env_t {
 	const be_chordal_env_t      *chordal_env;
 	const arch_register_class_t *cls;
 	pmap                        *block_dims;
@@ -265,7 +265,7 @@ struct block_dims {
 
 static void block_dims_walker(ir_node *block, void *data)
 {
-	draw_chordal_env_t        *env  = data;
+	draw_chordal_env_t        *env  = (draw_chordal_env_t*)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);
@@ -298,7 +298,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   = pmap_get(env->block_dims, bl);
+	struct block_dims         *dims   = (struct block_dims*)pmap_get(env->block_dims, bl);
 	rect_t                    *rect   = &dims->subtree_box;
 	int                       h_space = 0;
 	int                       v_space = 0;
@@ -308,7 +308,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 = pmap_get(env->block_dims, sub);
+		struct block_dims *bl_dim = (struct block_dims*)pmap_get(env->block_dims, sub);
 
 		layout(env, sub, rect->x + rect->w);
 
@@ -330,12 +330,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      = pmap_get(env->block_dims, bl);
+	struct block_dims         *dims      = (struct block_dims*)pmap_get(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 = pmap_get(env->block_dims, sub);
+		struct block_dims *bl_dim = (struct block_dims*)pmap_get(env->block_dims, sub);
 		int height_diff = max_height - bl_dim->subtree_box.h;
 
 		set_y(env, sub, up + height_diff);
@@ -377,12 +377,12 @@ static color_t *reg_to_color(const draw_chordal_env_t *env,
 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 draw_chordal_env_t  *env     = (const draw_chordal_env_t*)data;
+	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;
-	struct block_dims         *dims    = pmap_get(env->block_dims, bl);
+	struct block_dims         *dims    = (struct block_dims*)pmap_get(env->block_dims, bl);
 	char                      buf[64];
 	border_t                  *b;
 	int                       idx;
@@ -421,7 +421,7 @@ static void draw_block(ir_node *bl, void *data)
 	}
 
 	if (dom) {
-		struct block_dims *dom_dims = pmap_get(env->block_dims, dom);
+		struct block_dims *dom_dims = (struct block_dims*)pmap_get(env->block_dims, dom);
 
 		be_lv_foreach(lv, bl, be_lv_state_in, idx) {
 			ir_node *irn = be_lv_get_irn(lv, bl, idx);
@@ -454,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);
 
@@ -463,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;
@@ -480,7 +481,7 @@ void draw_interval_tree(const draw_chordal_opts_t *opts, const be_chordal_env_t
 	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);
+	start_dims = (struct block_dims*)pmap_get(env.block_dims, start_block);
 	draw(&env, &start_dims->subtree_box);
 
 	pmap_destroy(env.block_dims);