projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted r27079. Seems to be wrong.
[libfirm]
/
ir
/
be
/
bechordal_draw.c
diff --git
a/ir/be/bechordal_draw.c
b/ir/be/bechordal_draw.c
index
34dc7cb
..
547319f
100644
(file)
--- a/
ir/be/bechordal_draw.c
+++ b/
ir/be/bechordal_draw.c
@@
-24,9
+24,7
@@
* @date 12.05.2005
* @version $Id$
*/
* @date 12.05.2005
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include <limits.h>
#include <limits.h>
@@
-40,9
+38,9
@@
#include "belive_t.h"
#include "bechordal_t.h"
#include "belive_t.h"
#include "bechordal_t.h"
-#include "besched
_t
.h"
+#include "besched.h"
#include "bechordal_draw.h"
#include "bechordal_draw.h"
-#include "beirg
_t
.h"
+#include "beirg.h"
typedef struct {
be_chordal_env_t *env;
typedef struct {
be_chordal_env_t *env;
@@
-163,7
+161,7
@@
const plotter_if_t ps_plotter_vtab = {
plotter_t *new_plotter_ps(const char *filename)
{
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;
plotter_t *p = (plotter_t *) ps_plotter;
ps_plotter->filename = filename;
@@
-242,7
+240,6
@@
const draw_chordal_opts_t draw_chordal_def_opts = {
typedef struct _draw_chordal_env_t {
const be_chordal_env_t *chordal_env;
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;
const arch_register_class_t *cls;
pmap *block_dims;
plotter_t *plotter;
@@
-266,15
+263,14
@@
static void block_dims_walker(ir_node *block, void *data)
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;
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;
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;
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);
int col = arch_register_get_index(reg);
dims->max_step = MAX(dims->max_step, b->step);
@@
-397,7
+393,7
@@
static void draw_block(ir_node *bl, void *data)
list_for_each_entry(border_t, b, head, list) {
if (b->is_def) {
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;
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;
@@
-424,8
+420,8
@@
static void draw_block(ir_node *bl, void *data)
be_lv_foreach(lv, bl, be_lv_state_in, idx) {
ir_node *irn = be_lv_get_irn(lv, bl, idx);
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;
int col = arch_register_get_index(reg);
int x = (col + 1) * opts->h_inter_gap;
color_t color;
@@
-467,7
+463,6
@@
void draw_interval_tree(const draw_chordal_opts_t *opts, const be_chordal_env_t
struct block_dims *start_dims;
ir_node *start_block = get_irg_start_block(chordal_env->irg);
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;
env.opts = opts;
env.block_dims = pmap_create();
env.plotter = plotter;