projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the MIPS scheduler by removing stale arch_env uses.
[libfirm]
/
ir
/
be
/
becopyheur2.c
diff --git
a/ir/be/becopyheur2.c
b/ir/be/becopyheur2.c
index
7dc890e
..
c1ce637
100644
(file)
--- a/
ir/be/becopyheur2.c
+++ b/
ir/be/becopyheur2.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-24,12
+24,10
@@
* @date 14.04.2006
* @version $Id$
*/
* @date 14.04.2006
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
-#include
<libcore/lc_opts.h>
-#include
<libcore/lc_opts_enum.h>
+#include
"lc_opts.h"
+#include
"lc_opts_enum.h"
#include <stdlib.h>
#include <limits.h>
#include <stdlib.h>
#include <limits.h>
@@
-66,7
+64,6
@@
static int subtree_iter = 4;
static int max_depth = 20;
static double constr_factor = 0.9;
static int max_depth = 20;
static double constr_factor = 0.9;
-/* Options using libcore */
static const lc_opt_enum_mask_items_t dump_items[] = {
{ "before", DUMP_BEFORE },
{ "after", DUMP_AFTER },
static const lc_opt_enum_mask_items_t dump_items[] = {
{ "before", DUMP_BEFORE },
{ "after", DUMP_AFTER },
@@
-135,7
+132,7
@@
typedef struct {
} co2_t;
struct _co2_irn_t {
} co2_t;
struct _co2_irn_t {
-
ir_node
*irn;
+
const ir_node
*irn;
affinity_node_t *aff;
co2_irn_t *touched_next;
col_t tmp_col;
affinity_node_t *aff;
co2_irn_t *touched_next;
col_t tmp_col;
@@
-195,7
+192,7
@@
typedef struct {
#define get_co2_irn(co2, irn) ((co2_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn))
#define get_co2_cloud_irn(co2, irn) ((co2_cloud_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn))
#define get_co2_irn(co2, irn) ((co2_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn))
#define get_co2_cloud_irn(co2, irn) ((co2_cloud_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn))
-static void *co2_irn_init(ir_phase *ph, ir_node *irn, void *data)
+static void *co2_irn_init(ir_phase *ph,
const
ir_node *irn, void *data)
{
co2_t *env = (co2_t *) ph;
affinity_node_t *a = get_affinity_info(env->co, irn);
{
co2_t *env = (co2_t *) ph;
affinity_node_t *a = get_affinity_info(env->co, irn);
@@
-205,7
+202,7
@@
static void *co2_irn_init(ir_phase *ph, ir_node *irn, void *data)
memset(ci, 0, size);
INIT_LIST_HEAD(&ci->changed_list);
ci->touched_next = env->touched;
memset(ci, 0, size);
INIT_LIST_HEAD(&ci->changed_list);
ci->touched_next = env->touched;
- ci->orig_col = get_irn_col(
env->co,
irn);
+ ci->orig_col = get_irn_col(irn);
env->touched = ci;
ci->irn = irn;
ci->aff = a;
env->touched = ci;
ci->irn = irn;
ci->aff = a;
@@
-250,13
+247,13
@@
int cmp_edges(const void *a, const void *b)
return QSORT_CMP(q->costs, p->costs);
}
return QSORT_CMP(q->costs, p->costs);
}
-static col_t get_col(co2_t *env, ir_node *irn)
+static col_t get_col(co2_t *env,
const
ir_node *irn)
{
co2_irn_t *ci = get_co2_irn(env, irn);
return ci->tmp_fixed ? ci->tmp_col : ci->orig_col;
}
{
co2_irn_t *ci = get_co2_irn(env, irn);
return ci->tmp_fixed ? ci->tmp_col : ci->orig_col;
}
-static INLINE int color_is_fix(co2_t *env, ir_node *irn)
+static INLINE int color_is_fix(co2_t *env,
const
ir_node *irn)
{
co2_irn_t *ci = get_co2_irn(env, irn);
return ci->fixed || ci->tmp_fixed;
{
co2_irn_t *ci = get_co2_irn(env, irn);
return ci->fixed || ci->tmp_fixed;
@@
-267,7
+264,7
@@
static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci)
if(ci->adm_cache == NULL) {
const arch_register_req_t *req;
ci->adm_cache = bitset_obstack_alloc(phase_obst(&env->ph), env->n_regs);
if(ci->adm_cache == NULL) {
const arch_register_req_t *req;
ci->adm_cache = bitset_obstack_alloc(phase_obst(&env->ph), env->n_regs);
- req = arch_get_register_req(
env->co->aenv,
ci->irn, BE_OUT_POS(0));
+ req = arch_get_register_req(ci->irn, BE_OUT_POS(0));
if(arch_register_req_is(req, limited)) {
int i, n;
if(arch_register_req_is(req, limited)) {
int i, n;
@@
-306,11
+303,11
@@
static INLINE int is_constrained(co2_t *env, co2_irn_t *ci)
return ci->is_constrained;
}
return ci->is_constrained;
}
-static void incur_constraint_costs(co2_t *env, ir_node *irn, col_cost_pair_t *col_costs, int costs)
+static void incur_constraint_costs(co2_t *env,
const
ir_node *irn, col_cost_pair_t *col_costs, int costs)
{
const arch_register_req_t *req;
{
const arch_register_req_t *req;
- req = arch_get_register_req(
env->co->aenv,
irn, BE_OUT_POS(0));
+ req = arch_get_register_req(irn, BE_OUT_POS(0));
if (arch_register_req_is(req, limited)) {
unsigned n_regs = env->co->cls->n_regs;
if (arch_register_req_is(req, limited)) {
unsigned n_regs = env->co->cls->n_regs;
@@
-338,14
+335,14
@@
static void incur_constraint_costs(co2_t *env, ir_node *irn, col_cost_pair_t *co
*/
static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *col_costs)
{
*/
static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *col_costs)
{
-
ir_node *irn
= ci->irn;
+
const ir_node *irn
= ci->irn;
be_ifg_t *ifg = env->co->cenv->ifg;
int n_regs = env->co->cls->n_regs;
bitset_t *forb = bitset_alloca(n_regs);
affinity_node_t *a = ci->aff;
bitset_pos_t elm;
be_ifg_t *ifg = env->co->cenv->ifg;
int n_regs = env->co->cls->n_regs;
bitset_t *forb = bitset_alloca(n_regs);
affinity_node_t *a = ci->aff;
bitset_pos_t elm;
- ir_node *pos;
+
const
ir_node *pos;
void *it;
int i;
void *it;
int i;
@@
-401,6
+398,7
@@
static void single_color_cost(co2_t *env, co2_irn_t *ci, col_t col, col_cost_pai
seq[i].costs = INT_MAX;
}
seq[i].costs = INT_MAX;
}
+ (void) ci;
assert(is_color_admissible(env, ci, col));
seq[col].col = 0;
seq[0].col = col;
assert(is_color_admissible(env, ci, col));
seq[col].col = 0;
seq[0].col = col;
@@
-425,9
+423,9
@@
static void materialize_coloring(struct list_head *h)
}
}
}
}
-static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth);
+static int change_color_not(co2_t *env,
const
ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth);
-static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct list_head *parent_changed, int depth)
+static int recolor(co2_t *env,
const
ir_node *irn, col_cost_pair_t *col_list, struct list_head *parent_changed, int depth)
{
int n_regs = env->co->cls->n_regs;
be_ifg_t *ifg = env->co->cenv->ifg;
{
int n_regs = env->co->cls->n_regs;
be_ifg_t *ifg = env->co->cenv->ifg;
@@
-445,7
+443,7
@@
static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct l
int neigh_ok = 1;
struct list_head changed;
int neigh_ok = 1;
struct list_head changed;
- ir_node *n;
+
const
ir_node *n;
void *it;
DBG((env->dbg, LEVEL_3, "\t\t%2{firm:indent}trying color %d(%d) on %+F\n", depth, tgt_col, costs, irn));
void *it;
DBG((env->dbg, LEVEL_3, "\t\t%2{firm:indent}trying color %d(%d) on %+F\n", depth, tgt_col, costs, irn));
@@
-512,7
+510,7
@@
static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct l
return res;
}
return res;
}
-static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth)
+static int change_color_not(co2_t *env,
const
ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth)
{
co2_irn_t *ci = get_co2_irn(env, irn);
int res = 0;
{
co2_irn_t *ci = get_co2_irn(env, irn);
int res = 0;
@@
-553,7
+551,7
@@
static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list
return res;
}
return res;
}
-static int change_color_single(co2_t *env, ir_node *irn, col_t tgt_col, struct list_head *parent_changed, int depth)
+static int change_color_single(co2_t *env,
const
ir_node *irn, col_t tgt_col, struct list_head *parent_changed, int depth)
{
co2_irn_t *ci = get_co2_irn(env, irn);
col_t col = get_col(env, irn);
{
co2_irn_t *ci = get_co2_irn(env, irn);
col_t col = get_col(env, irn);
@@
-631,7
+629,7
@@
static void node_color_badness(co2_cloud_irn_t *ci, int *badness)
bitset_t *bs = bitset_alloca(n_regs);
bitset_pos_t elm;
bitset_t *bs = bitset_alloca(n_regs);
bitset_pos_t elm;
- ir_node *irn;
+
const
ir_node *irn;
void *it;
admissible_colors(env, &ci->inh, bs);
void *it;
admissible_colors(env, &ci->inh, bs);
@@
-862,7
+860,7
@@
static co2_cloud_t *new_cloud(co2_t *env, affinity_node_t *a)
static void apply_coloring(co2_cloud_irn_t *ci, col_t col, int depth)
{
static void apply_coloring(co2_cloud_irn_t *ci, col_t col, int depth)
{
- ir_node *irn = ci->inh.irn;
+
const
ir_node *irn = ci->inh.irn;
int *front = FRONT_BASE(ci, col);
int i, ok;
struct list_head changed;
int *front = FRONT_BASE(ci, col);
int i, ok;
struct list_head changed;
@@
-892,15
+890,13
@@
static void process_cloud(co2_cloud_t *cloud)
co2_t *env = cloud->env;
int n_regs = env->n_regs;
int n_edges = 0;
co2_t *env = cloud->env;
int n_regs = env->n_regs;
int n_edges = 0;
- int *mst_edges =
xmalloc(cloud->n_memb * cloud->n_memb * sizeof(mst_edges[0])
);
+ int *mst_edges =
XMALLOCNZ(int, cloud->n_memb * cloud->n_memb
);
pdeq *q;
edge_t *edges;
int i;
int best_col;
pdeq *q;
edge_t *edges;
int i;
int best_col;
- memset(mst_edges, 0, cloud->n_memb * cloud->n_memb * sizeof(mst_edges[0]));
-
/* Collect all edges in the cloud on an obstack and sort the increasingly */
obstack_init(&cloud->obst);
for(i = 0; i < cloud->n_memb; ++i) {
/* Collect all edges in the cloud on an obstack and sort the increasingly */
obstack_init(&cloud->obst);
for(i = 0; i < cloud->n_memb; ++i) {
@@
-1063,7
+1059,7
@@
static void process(co2_t *env)
}
i = 0;
}
i = 0;
- clouds =
xmalloc(n_clouds * sizeof(clouds[0])
);
+ clouds =
XMALLOCN(co2_cloud_t*, n_clouds
);
list_for_each_entry(co2_cloud_t, pos, &env->cloud_head, list)
clouds[i++] = pos;
qsort(clouds, n_clouds, sizeof(clouds[0]), cmp_clouds_gt);
list_for_each_entry(co2_cloud_t, pos, &env->cloud_head, list)
clouds[i++] = pos;
qsort(clouds, n_clouds, sizeof(clouds[0]), cmp_clouds_gt);
@@
-1098,12
+1094,11
@@
static void process(co2_t *env)
static void writeback_colors(co2_t *env)
{
static void writeback_colors(co2_t *env)
{
- const arch_env_t *aenv = env->co->aenv;
co2_irn_t *irn;
for(irn = env->touched; irn; irn = irn->touched_next) {
const arch_register_t *reg = arch_register_for_index(env->co->cls, irn->orig_col);
co2_irn_t *irn;
for(irn = env->touched; irn; irn = irn->touched_next) {
const arch_register_t *reg = arch_register_for_index(env->co->cls, irn->orig_col);
- arch_set_irn_register(
aenv,
irn->irn, reg);
+ arch_set_irn_register(
(ir_node*)
irn->irn, reg);
}
}
}
}
@@
-1156,11
+1151,11
@@
static const char *get_dot_color_name(size_t col)
return col < (sizeof(names)/sizeof(names[0])) ? names[col] : "white";
}
return col < (sizeof(names)/sizeof(names[0])) ? names[col] : "white";
}
-static const char *get_dot_shape_name(co2_
t *env, co2_
irn_t *ci)
+static const char *get_dot_shape_name(co2_irn_t *ci)
{
const arch_register_req_t *req;
{
const arch_register_req_t *req;
- req = arch_get_register_req(
env->co->aenv,
ci->irn, BE_OUT_POS(0));
+ req = arch_get_register_req(ci->irn, BE_OUT_POS(0));
if(arch_register_req_is(req, limited))
return "diamond";
if(arch_register_req_is(req, limited))
return "diamond";
@@
-1181,8
+1176,8
@@
static void ifg_dump_graph_attr(FILE *f, void *self)
static int ifg_is_dump_node(void *self, ir_node *irn)
{
static int ifg_is_dump_node(void *self, ir_node *irn)
{
-
co2_t *env =
self;
- return !arch_irn_is(
env->co->aenv,
irn, ignore);
+
(void)
self;
+ return !arch_irn_is(irn, ignore);
}
static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)
}
static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)
@@
-1203,7
+1198,7
@@
static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)
}
ir_fprintf(f, "label=\"%+F%s\" style=filled peripheries=%d color=%s shape=%s", irn, buf, peri,
}
ir_fprintf(f, "label=\"%+F%s\" style=filled peripheries=%d color=%s shape=%s", irn, buf, peri,
- get_dot_color_name(get_col(env, irn)), get_dot_shape_name(
env,
ci));
+ get_dot_color_name(get_col(env, irn)), get_dot_shape_name(ci));
}
static void ifg_dump_at_end(FILE *file, void *self)
}
static void ifg_dump_at_end(FILE *file, void *self)
@@
-1261,9
+1256,7
@@
int co_solve_heuristic_new(copy_opt_t *co)
env.co = co;
env.n_regs = co->cls->n_regs;
env.ignore_regs = bitset_alloca(co->cls->n_regs);
env.co = co;
env.n_regs = co->cls->n_regs;
env.ignore_regs = bitset_alloca(co->cls->n_regs);
- arch_put_non_ignore_regs(co->aenv, co->cls, env.ignore_regs);
- bitset_flip_all(env.ignore_regs);
- be_abi_put_ignore_regs(co->cenv->birg->abi, co->cls, env.ignore_regs);
+ be_put_ignore_regs(co->cenv->birg, co->cls, env.ignore_regs);
FIRM_DBG_REGISTER(env.dbg, "firm.be.co2");
INIT_LIST_HEAD(&env.cloud_head);
FIRM_DBG_REGISTER(env.dbg, "firm.be.co2");
INIT_LIST_HEAD(&env.cloud_head);