#include "irtools.h"
#include "debug.h"
#include "iredges_t.h"
-#include "adt/raw_bitset.h"
+#include "raw_bitset.h"
#include "statev.h"
#include "irgwalk.h"
#include "belive_t.h"
#include "beirg.h"
#include "bearch.h"
-#include "benode_t.h"
+#include "benode.h"
#include "besched.h"
#include "bera.h"
#include "beintlive_t.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
typedef struct be_pre_spill_env_t {
- be_irg_t *birg;
+ ir_graph *irg;
const arch_register_class_t *cls;
} be_pre_spill_env_t;
{
const arch_register_class_t *cls = env->cls;
ir_node *block = get_nodes_block(node);
- const be_irg_t *birg = env->birg;
- be_lv_t *lv = birg->lv;
+ const ir_graph *irg = env->irg;
+ be_lv_t *lv = be_get_irg_liveness(irg);
unsigned *tmp = NULL;
unsigned *def_constr = NULL;
int arity = get_irn_arity(node);
/* if the constraint is the same, no copy is necessary
* TODO generalise unequal but overlapping constraints */
- if (rbitset_equal(req->limited, req2->limited, cls->n_regs))
+ if (rbitsets_equal(req->limited, req2->limited, cls->n_regs))
continue;
-#if 0
- /* Matze: looks fishy to me disabled it for now */
- if (be_is_Copy(get_irn_n(insn->irn, a_op->pos)))
- continue;
-#endif
-
copy = be_new_Copy(cls, block, in);
stat_ev_int("constr_copy", 1);
}
}
-void be_pre_spill_prepare_constr(be_irg_t *birg,
+void be_pre_spill_prepare_constr(ir_graph *irg,
const arch_register_class_t *cls)
{
- ir_graph *irg = birg->irg;
be_pre_spill_env_t env;
memset(&env, 0, sizeof(env));
- env.birg = birg;
- env.cls = cls;
+ env.irg = irg;
+ env.cls = cls;
+
+ be_assure_liveness(irg);
+
irg_block_walk_graph(irg, pre_spill_prepare_constr_walker, NULL, &env);
}
be_add_module_to_list(&spillers, name, spiller);
}
-void be_do_spill(be_irg_t *birg, const arch_register_class_t *cls)
+void be_do_spill(ir_graph *irg, const arch_register_class_t *cls)
{
assert(selected_spiller != NULL);
- if (selected_spiller != NULL) {
- selected_spiller->spill(birg, cls);
- }
+
+ selected_spiller->spill(irg, cls);
}
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spilloptions);
void be_init_spilloptions(void)
{
lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
FIRM_DBG_REGISTER(dbg, "firm.be.spillprepare");
}
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spilloptions);