* Copyright (C) 2005 Universitaet Karlsruhe
* Released under the GPL
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <limits.h>
#include "pmap.h"
+#include "pset.h"
#include "irgwalk.h"
#include "irprintf.h"
-#include "irouts.h"
+#include "iredges_t.h"
#include "belive_t.h"
#include "bechordal_t.h"
}
const draw_chordal_opts_t draw_chordal_def_opts = {
- 10, 10, 30, 8
+ 10, 10, 30, 8, 10, 10
};
typedef struct _draw_chordal_env_t {
rect_t subtree_box;
};
+#undef min
static INLINE int min(int a, int b)
{
return a < b ? a : b;
}
+#undef max
static INLINE int max(int a, int b)
{
return a > b ? a : b;
struct block_dims *dims = pmap_get(env->block_dims, bl);
ir_node *sub;
rect_t *rect = &dims->subtree_box;
- int h_space = 0;
+ int h_space = 0, v_space = 0;
memset(rect, 0, sizeof(*rect));
rect->x = x;
rect->h = max(rect->h, bl_dim->subtree_box.h);
h_space = opts->h_gap;
+ v_space = opts->v_gap;
}
rect->w = max(rect->w, dims->box.w + opts->h_gap);
dims->box.x = x + doz(rect->w, dims->box.w) / 2;
- dims->box.y = rect->h + opts->v_gap;
+ dims->box.y = rect->h + v_space;
- rect->h += dims->box.h + opts->v_gap;
+ rect->h += dims->box.h + v_space;
}
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 *irn, color_t *color)
+ ir_node *rel_bl, ir_node *irn, color_t *color)
{
int i, n, phi_arg = 0;
+ const ir_edge_t *edge;
- for(i = 0, n = get_irn_n_outs(irn); i < n && !phi_arg; ++i)
- phi_arg |= is_Phi(get_irn_out(irn, i));
+ 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
+ {
+ 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
return color;
static const color_t black = { 0, 0, 0 };
const draw_chordal_env_t *env = data;
- pset *live_in = get_live_in(bl);
+ pset *live_in = put_live_in(bl, pset_new_ptr_default());
ir_node *irn;
border_t *b;
struct list_head *head = get_block_border_head(env->chordal_env, bl);
if(b->is_def) {
const arch_register_t *reg = arch_get_irn_register(env->arch_env, b->irn, 0);
int col = arch_register_get_index(reg);
+ int live_out = is_live_out(bl, b->irn);
int x = (col + 1) * opts->h_inter_gap;
- int ystart = (b->step + dims->min_step) * opts->v_inter_gap;
- int ystop = (b->other_end->step - dims->min_step)
- * opts->v_inter_gap + opts->v_inter_gap / 2;
+ 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);
color_t color;
- reg_to_color(env, b->irn, &color);
+ reg_to_color(env, bl, b->irn, &color);
x += dims->box.x;
ystart += dims->box.y;
env->plotter->vtab->set_color(env->plotter, &color);
env->plotter->vtab->line(env->plotter, x, ystart, x, ystop);
+
+ env->plotter->vtab->line(env->plotter, x - 2, ystart, x + 2, ystart);
+ env->plotter->vtab->line(env->plotter, x - 2, ystop, x + 2, ystop);
}
}
int x = (col + 1) * opts->h_inter_gap;
color_t color;
- reg_to_color(env, irn, &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);
+ dims->box.x + x,
+ dims->box.y + dims->box.h,
+ dom_dims->box.x + x,
+ dom_dims->box.y);
}
}
}
-#if 0
- if(dom) {
- struct block_dims *dom_dims = pmap_get(env->block_dims, dom);
- rect_t line;
-
- line.x = dims->box.x;
- line.y = dims->box.y;
- line.w = dom_dims->box.x;
- line.h = dom_dims->box.y;
-
- env->plotter->vtab->line(env->plotter, &line);
- }
-#endif
+ del_pset(live_in);
}
-static void draw(draw_chordal_env_t *env, const rect_t *bbox)
+static void draw(draw_chordal_env_t *env, const rect_t *start_box)
{
plotter_t *p = env->plotter;
+ 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;
- p->vtab->begin(p, bbox);
- irg_block_walk_graph(env->chordal_env->irg, draw_block, NULL, env);
+ p->vtab->begin(p, &bbox);
+ irg_block_walk_graph(env->chordal_env->session_env->irg, draw_block, NULL, env);
p->vtab->finish(p);
}
{
draw_chordal_env_t env;
struct block_dims *start_dims;
- ir_node *start_block = get_irg_start_block(chordal_env->irg);
+ ir_node *start_block = get_irg_start_block(chordal_env->session_env->irg);
env.arch_env = arch_env;
env.opts = opts;
env.chordal_env = chordal_env;
obstack_init(&env.obst);
- irg_block_walk_graph(chordal_env->irg, block_dims_walker, NULL, &env);
- layout(&env, start_block, 0);
- set_y(&env, start_block, 0);
+ irg_block_walk_graph(chordal_env->session_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);
draw(&env, &start_dims->subtree_box);