remove MacroBlock concept

[libfirm] / ir / be / bespill.c

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index f6d5ad2..de71ea8 100644 (file)
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -29,7 +29,7 @@
 #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"
 
@@ -39,7 +39,7 @@
 #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"
@@ -50,7 +50,7 @@
 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;
 
@@ -58,8 +58,8 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
 {
        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);
@@ -136,15 +136,9 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *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);
 
@@ -203,7 +197,7 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
                req = arch_get_register_req(node, i);
                if (req->cls != cls)
                        continue;
-               if (! (req->type & arch_register_req_type_limited))
+               if (!(req->type & arch_register_req_type_limited))
                        continue;
 
                in = get_irn_n(node, i);
@@ -245,14 +239,16 @@ static void pre_spill_prepare_constr_walker(ir_node *block, void *data)
        }
 }
 
-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);
 }
 
@@ -277,14 +273,14 @@ void be_register_spiller(const char *name, be_spiller_t *spiller)
        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");
@@ -296,5 +292,3 @@ void be_init_spilloptions(void)
 
        FIRM_DBG_REGISTER(dbg, "firm.be.spillprepare");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spilloptions);