X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=c9a1edb844b3edb4da0b10467ca107932871bb0a;hb=59e2d36967edfaaa770afdf3d498bed3b39e55ee;hp=137eb2c019afc6683f44178dc8f1c08312016f58;hpb=bb5461e3f6f900c09222814f2eec779684f28f73;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 137eb2c01..c9a1edb84 100644
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,11 +22,8 @@
  * @brief       Paint chordal graphs.
  * @author      Sebastian Hack
  * @date        12.05.2005
- * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -36,13 +33,14 @@
 #include "irgwalk.h"
 #include "irprintf.h"
 #include "iredges_t.h"
-#include "irtools.h"
+#include "util.h"
 
+#include "bearch.h"
 #include "belive_t.h"
 #include "bechordal_t.h"
-#include "besched_t.h"
+#include "besched.h"
 #include "bechordal_draw.h"
-#include "beirg_t.h"
+#include "beirg.h"
 
 typedef struct {
 	be_chordal_env_t *env;
@@ -54,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;
 }
 
@@ -102,10 +105,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)
@@ -134,7 +133,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);
 
@@ -148,7 +147,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,
@@ -163,7 +162,7 @@ const plotter_if_t ps_plotter_vtab = {
 
 plotter_t *new_plotter_ps(const char *filename)
 {
-	ps_plotter_t *ps_plotter = xmalloc(sizeof(*ps_plotter));
+	ps_plotter_t *ps_plotter = XMALLOC(ps_plotter_t);
 	plotter_t *p = (plotter_t *) ps_plotter;
 
 	ps_plotter->filename = filename;
@@ -171,65 +170,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);
@@ -240,9 +180,8 @@ 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_env_t            *arch_env;
 	const arch_register_class_t *cls;
 	pmap                        *block_dims;
 	plotter_t                   *plotter;
@@ -263,19 +202,17 @@ 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 = obstack_alloc(&env->obst, sizeof(*dims));
-	border_t                  *b;
+	struct block_dims         *dims = OALLOCZ(&env->obst, struct block_dims);
 
-	memset(dims, 0, sizeof(*dims));
 	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(env->arch_env, irn);
-		int                   col  = arch_register_get_index(reg);
+		const arch_register_t *reg = arch_get_irn_register(irn);
+		int                    col = reg->index;
 
 		dims->max_step  = MAX(dims->max_step, b->step);
 		dims->max_color = MAX(dims->max_color, col);
@@ -284,12 +221,8 @@ static void block_dims_walker(ir_node *block, void *data)
 
 	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);
 }
@@ -297,7 +230,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   = pmap_get(struct block_dims, env->block_dims, bl);
 	rect_t                    *rect   = &dims->subtree_box;
 	int                       h_space = 0;
 	int                       v_space = 0;
@@ -307,7 +240,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 = pmap_get(struct block_dims, env->block_dims, sub);
 
 		layout(env, sub, rect->x + rect->w);
 
@@ -323,18 +256,18 @@ static void layout(const draw_chordal_env_t *env, ir_node *bl, int x)
 	dims->box.x = x + doz(rect->w, dims->box.w) / 2;
 	dims->box.y = rect->h + v_space;
 
-	rect->h += dims->box.h + v_space;
+	rect->h = dims->box.y + dims->box.h;
 }
 
 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      = pmap_get(struct block_dims, 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 = pmap_get(struct block_dims, env->block_dims, sub);
 		int height_diff = max_height - bl_dim->subtree_box.h;
 
 		set_y(env, sub, up + height_diff);
@@ -347,61 +280,42 @@ 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             phi_arg = 0;
-	const ir_edge_t *edge;
+	int phi_arg = 0;
 	(void) env;
 	(void) rel_bl;
 
 	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;
 }
 
 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);
-	pset                      *live_in = be_lv_pset_put_in(lv, bl, pset_new_ptr_default());
+	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    = pmap_get(struct block_dims, env->block_dims, bl);
 	char                      buf[64];
-	ir_node                   *irn;
-	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 0
 	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(env->arch_env, b->irn);
-			int col      = arch_register_get_index(reg);
+			const arch_register_t *reg = arch_get_irn_register(b->irn);
 			int live_out = be_is_live_out(lv, bl, b->irn);
-			int x        = (col + 1) * opts->h_inter_gap;
+			int x        = (reg->index + 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);
 
@@ -421,55 +335,50 @@ static void draw_block(ir_node *bl, void *data)
 	}
 
 	if (dom) {
-		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, -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;
-				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);
-			}
+		struct block_dims *dom_dims = pmap_get(struct block_dims, env->block_dims, dom);
+
+		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);
 		}
 	}
-
-	del_pset(live_in);
 }
 
 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->birg);
-	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;
 	ir_node            *start_block = get_irg_start_block(chordal_env->irg);
 
-	env.arch_env    = chordal_env->birg->main_env->arch_env;
 	env.opts        = opts;
 	env.block_dims  = pmap_create();
 	env.plotter     = plotter;
@@ -481,7 +390,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 = pmap_get(struct block_dims, env.block_dims, start_block);
 	draw(&env, &start_dims->subtree_box);
 
 	pmap_destroy(env.block_dims);