projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed debug output of unary x87 nodes
[libfirm]
/
ir
/
be
/
becopyheur.c
diff --git
a/ir/be/becopyheur.c
b/ir/be/becopyheur.c
index
941c05b
..
13679c9
100644
(file)
--- a/
ir/be/becopyheur.c
+++ b/
ir/be/becopyheur.c
@@
-29,7
+29,7
@@
#include "becopystat.h"
#include "bitset.h"
#include "becopystat.h"
#include "bitset.h"
-static firm_dbg_module_t *dbg = NULL;
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
#define SEARCH_FREE_COLORS
#define SEARCH_FREE_COLORS
@@
-247,7
+247,8
@@
static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
int free_col;
/* Get all possible colors */
int free_col;
/* Get all possible colors */
- arch_put_non_ignore_regs(arch_env, cls, free_cols);
+ bitset_copy(free_cols, co->cenv->ignore_colors);
+ bitset_flip_all(free_cols);
/* Exclude colors not assignable to the irn */
arch_get_register_req(arch_env, &req, irn, -1);
/* Exclude colors not assignable to the irn */
arch_get_register_req(arch_env, &req, irn, -1);
@@
-510,7
+511,6
@@
static void ou_optimize(unit_t *ou) {
const arch_env_t *aenv = ou->co->aenv;
const arch_register_class_t *cls = ou->co->cls;
bitset_t *pos_regs = bitset_alloca(cls->n_regs);
const arch_env_t *aenv = ou->co->aenv;
const arch_register_class_t *cls = ou->co->cls;
bitset_t *pos_regs = bitset_alloca(cls->n_regs);
- bitset_t *ign_regs = bitset_alloca(cls->n_regs);
DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
for (i=0; i<ou->node_count; ++i)
DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
for (i=0; i<ou->node_count; ++i)
@@
-522,8
+522,7
@@
static void ou_optimize(unit_t *ou) {
arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
/* exclude ingore colors */
arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
/* exclude ingore colors */
- arch_put_non_ignore_regs(aenv, cls, ign_regs);
- bitset_and(pos_regs, ign_regs);
+ bitset_andnot(pos_regs, ou->co->cenv->ignore_colors);
assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
@@
-580,7
+579,9
@@
static void ou_optimize(unit_t *ou) {
int co_solve_heuristic(copy_opt_t *co) {
unit_t *curr;
int co_solve_heuristic(copy_opt_t *co) {
unit_t *curr;
- dbg = firm_dbg_register("ir.be.copyoptheur");
+ FIRM_DBG_REGISTER(dbg, "ir.be.copyoptheur");
+
+ ASSERT_OU_AVAIL(co);
pinned_global = pset_new_ptr(SLOTS_PINNED_GLOBAL);
list_for_each_entry(unit_t, curr, &co->units, units)
pinned_global = pset_new_ptr(SLOTS_PINNED_GLOBAL);
list_for_each_entry(unit_t, curr, &co->units, units)
@@
-588,6
+589,5
@@
int co_solve_heuristic(copy_opt_t *co) {
ou_optimize(curr);
del_pset(pinned_global);
ou_optimize(curr);
del_pset(pinned_global);
-
return 0;
}
return 0;
}