X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=d502d94c07bda896082b57336e76dd49879a5fe5;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=a64733da7745ba42b2e3222a5ba810b9cf8bcf64;hpb=ab182d4b9ed44239ab3ff1d08b2f8e14a3699ccf;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index a64733da7..d502d94c0 100644
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -22,7 +22,6 @@
  * @brief       Paint chordal graphs.
  * @author      Sebastian Hack
  * @date        12.05.2005
- * @version     $Id$
  */
 #include "config.h"
 
@@ -34,7 +33,7 @@
 #include "irgwalk.h"
 #include "irprintf.h"
 #include "iredges_t.h"
-#include "irtools.h"
+#include "util.h"
 
 #include "belive_t.h"
 #include "bechordal_t.h"
@@ -151,7 +150,7 @@ static void ps_finish(plotter_t *_self)
 	fclose(self->f);
 }
 
-const plotter_if_t ps_plotter_vtab = {
+static const plotter_if_t ps_plotter_vtab = {
 	ps_begin,
 	ps_setcolor,
 	get_color,
@@ -174,65 +173,6 @@ plotter_t *new_plotter_ps(const char *filename)
 	return p;
 }
 
-/*
-   _____ _ _     _____  ____  _       _   _
-  |_   _(_) | __|__  / |  _ \| | ___ | |_| |_ ___ _ __
-    | | | | |/ /  / /  | |_) | |/ _ \| __| __/ _ \ '__|
-    | | | |   <  / /_  |  __/| | (_) | |_| ||  __/ |
-    |_| |_|_|\_\/____| |_|   |_|\___/ \__|\__\___|_|
-
-*/
-
-/* chriswue: the following seems to be unused and can be deleted? */
-#if 0
-typedef struct {
-	base_plotter_t inh;
-	const char *filename;
-	FILE *f;
-} tikz_plotter_t;
-
-static void tikz_begin(plotter_t *_self, const rect_t *vis)
-{
-	FILE *f;
-	decl_self(tikz_plotter_t, _self);
-
-	f = self->f = fopen(self->filename, "wt");
-	fprintf(f, "\\begin{tikzpicture}\n");
-}
-
-static void tikz_setcolor(plotter_t *_self, const color_t *color)
-{
-	set_color(_self, color);
-}
-
-static void tikz_line(plotter_t *_self, int x1, int y1, int x2, int y2)
-{
-	decl_self(tikz_plotter_t, _self);
-	fprintf(self->f, "\t\\draw (%d,%d) -- (%d,%d);\n", x1, y1, x2, y2);
-}
-
-static void tikz_box(plotter_t *_self, const rect_t *rect)
-{
-	decl_self(tikz_plotter_t, _self);
-
-	fprintf(self->f, "\t\\draw (%d,%d) rectangle (%d, %d)\n",
-		rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
-}
-
-void tikz_text(plotter_t *_self, int x, int y, const char *str)
-{
-	decl_self(tikz_plotter_t, _self);
-	fprintf(self->f, "\t\\draw (%d,%d) node {%s};\n", x, y, str);
-}
-
-static void tikz_finish(plotter_t *_self)
-{
-	decl_self(tikz_plotter_t, _self);
-	fclose(self->f);
-}
-#endif /* if 0 */
-
-
 extern void plotter_free(plotter_t *self)
 {
 	self->vtab->free(self);
@@ -265,7 +205,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 +238,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 +248,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 +270,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 +317,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 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 +361,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);
@@ -446,24 +386,24 @@ static void draw_block(ir_node *bl, void *data)
 
 static void draw(draw_chordal_env_t *env, const rect_t *start_box)
 {
+	ir_graph  *irg = env->chordal_env->irg;
 	plotter_t *p = env->plotter;
-	be_lv_t *lv;
 	rect_t bbox;
 
 	bbox.x = bbox.y = 0;
 	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->irg);
-	be_liveness_assure_sets(lv);
-	be_liveness_assure_chk(lv);
+	be_assure_live_sets(irg);
+	be_assure_live_chk(irg);
 
 	p->vtab->begin(p, &bbox);
 	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)
+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 +420,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);