/*
- * 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>
#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;
#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;
}
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);
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;
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;
draw_chordal_env_t *env = 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);
{
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 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);
char buf[64];
- ir_node *irn;
border_t *b;
int idx;
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;
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->arch_env, env->cls, irn)) {
- const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
+ 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;
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);
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;