X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=56cd302caf389d08c8a744e8a20a9a2820f4bac3;hb=bd019d8cd785c1a433c19dee44bf3f9e82397286;hp=ab646be4e8e49b92fe7771724d20e5f6a18838de;hpb=d6768d8d4427959eb045aafb1d15bd189beaa5dd;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index ab646be4e..56cd302ca 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,13 @@
 #include "irgwalk.h"
 #include "irprintf.h"
 #include "iredges_t.h"
-#include "irtools.h"
+#include "util.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 +51,33 @@ 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;
 }
 
 typedef struct {
@@ -133,7 +136,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);
 
@@ -147,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,
@@ -162,7 +165,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;
@@ -239,9 +242,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;
@@ -251,29 +253,28 @@ typedef struct _draw_chordal_env_t {
 } draw_chordal_env_t;
 
 struct block_dims {
-	int    max_step;
-	int    min_step;
-	int    max_color;
-	rect_t box;
-	rect_t subtree_box;
+	unsigned max_step;
+	int      min_step;
+	int      max_color;
+	rect_t   box;
+	rect_t   subtree_box;
 };
 
 #define doz(a, b) MAX((a) - (b), 0)
 
 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));
+	struct block_dims         *dims = OALLOCZ(&env->obst, struct block_dims);
 	border_t                  *b;
 
-	memset(dims, 0, sizeof(*dims));
 	dims->min_step = INT_MAX;
 
 	list_for_each_entry_reverse(border_t, b, head, list) {
 		ir_node               *irn = b->irn;
-		const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
+		const arch_register_t *reg = arch_get_irn_register(irn);
 		int                   col  = arch_register_get_index(reg);
 
 		dims->max_step  = MAX(dims->max_step, b->step);
@@ -296,7 +297,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;
@@ -306,7 +307,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);
 
@@ -322,18 +323,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      = (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);
@@ -348,6 +349,8 @@ static color_t *reg_to_color(const draw_chordal_env_t *env,
 {
 	int             phi_arg = 0;
 	const ir_edge_t *edge;
+	(void) env;
+	(void) rel_bl;
 
 	foreach_out_edge(irn, edge)
 		phi_arg |= is_Phi(edge->src);
@@ -373,29 +376,28 @@ 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);
-	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    = (struct block_dims*)pmap_get(env->block_dims, bl);
 	char                      buf[64];
-	ir_node                   *irn;
 	border_t                  *b;
+	int                       idx;
 
 	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
+#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) {
 		if (b->is_def) {
-			const arch_register_t *reg = arch_get_irn_register(env->arch_env, b->irn);
+			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;
@@ -418,11 +420,12 @@ 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);
 
-		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);
+		be_lv_foreach(lv, bl, be_lv_state_in, idx) {
+			ir_node *irn = be_lv_get_irn(lv, bl, idx);
+			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;
@@ -438,32 +441,34 @@ static void draw_block(ir_node *bl, void *data)
 			}
 		}
 	}
-
-	del_pset(live_in);
 }
 
 static void draw(draw_chordal_env_t *env, const rect_t *start_box)
 {
 	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;
 
-	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);
 
 	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;
@@ -475,7 +480,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);