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
429145e
..
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 },
@@
-205,7
+202,7
@@
static void *co2_irn_init(ir_phase *ph, const 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;
@@
-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;
@@
-310,7
+307,7
@@
static void incur_constraint_costs(co2_t *env, const ir_node *irn, col_cost_pair
{
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;
@@
-893,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) {
@@
-1064,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);
@@
-1099,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, (ir_node *)
irn->irn, reg);
+ arch_set_irn_register(
(ir_node*)
irn->irn, reg);
}
}
}
}
@@
-1157,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";
@@
-1182,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)
@@
-1204,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)
@@
-1262,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);