#define DUMP_AFTER 2
#define DUMP_ALL 2 * DUMP_AFTER - 1
-static int dump_flags = 0;
-static int dbg_level = 0;
+static unsigned dump_flags = 0;
+static int dbg_level = 0;
#ifdef WITH_LIBCORE
static const lc_opt_enum_mask_items_t dump_items[] = {
};
static const lc_opt_table_entry_t options[] = {
- LC_OPT_ENT_ENUM_MASK("dump", "dump ifg before, after or after each cloud", &dump_var),
+ LC_OPT_ENT_ENUM_MASK("dump", "dump ifg cloud", &dump_var),
LC_OPT_ENT_INT ("dbg", "debug level for the Java coalescer", &dbg_level),
{ NULL }
};
arch_register_req_t req;
unsigned n_regs = co->cls->n_regs;
+ // ir_printf("%+F\n", irn);
arch_get_register_req(co->aenv, &req, irn, BE_OUT_POS(0));
if(arch_register_req_is(&req, limited)) {
bitset_t *adm = bitset_alloca(n_regs);
req.limited(req.limited_env, adm);
for(i = 0; i < n_regs; ++i)
- if(!bitset_is_set(adm, i) && col_map[i] >= 0)
+ if(!bitset_is_set(adm, i) && col_map[i] >= 0) {
+ // printf("\tforbidding color: %d\n", i);
be_java_coal_forbid_color(coal, t_idx, col_map[i]);
+ }
}
}
col_map = alloca(n_regs * sizeof(col_map[0]));
inv_col_map = alloca(n_regs * sizeof(inv_col_map[0]));
- memset(inv_col_map, 0, sizeof(inv_col_map[0]) * n_regs);
+ memset(inv_col_map, -1, sizeof(inv_col_map[0]) * n_regs);
for(i = 0, j = 0; i < n_regs; ++i) {
const arch_register_t *reg = &co->cls->regs[i];
- col_map[i] = i;
- inv_col_map[i] = i;
+ col_map[i] = -1;
if(!arch_register_type_is(reg, ignore)) {
- //col_map[i] = j;
- //inv_col_map[j] = i;
+ col_map[i] = j;
+ inv_col_map[j] = i;
++j;
}
}
if(bitset_is_set(nodes, idx)) {
unsigned t_idx = node_map[idx];
unsigned col = inv_col_map[be_java_coal_get_color(coal, t_idx)];
- const arch_register_t *reg = &co->cls->regs[col];
+ const arch_register_t *reg;
+
+ assert(col < n_regs);
+ reg = &co->cls->regs[col];
arch_set_irn_register(co->aenv, n, reg);
}
}