/*
- * 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.
*
* @date 12.05.2005
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <limits.h>
}
static void plotter_default_free(plotter_t *self) {
+ (void) self;
}
typedef struct {
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;
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;
} 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)
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);
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)
{
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);
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());
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);
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;
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);
+ 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;
}
}
}
-
- 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->birg);
+ 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);
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;