projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use be_put_ignore_regs() instead of duplicating its logic.
[libfirm]
/
ir
/
be
/
becopyheur2.c
diff --git
a/ir/be/becopyheur2.c
b/ir/be/becopyheur2.c
index
7dc890e
..
9065efe
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.
*
@@
-28,8
+28,8
@@
#include "config.h"
#endif
#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
+66,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
+134,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
+194,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);
@@
-250,13
+249,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;
@@
-306,7
+305,7
@@
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;
@@
-338,14
+337,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
+400,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
+425,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
+445,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
+512,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
+553,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
+631,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
+862,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;
@@
-1103,7
+1103,7
@@
static void writeback_colors(co2_t *env)
for(irn = env->touched; irn; irn = irn->touched_next) {
const arch_register_t *reg = arch_register_for_index(env->co->cls, irn->orig_col);
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(aenv,
(ir_node *)
irn->irn, reg);
}
}
}
}
@@
-1261,9
+1261,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);