put register classes into arch_env struct, no need for complicated callbacks

[libfirm] / ir / be / bestate.c

diff --git a/ir/be/bestate.c b/ir/be/bestate.c
index bdf0ad6..e2ea5d0 100644 (file)
--- a/ir/be/bestate.c
+++ b/ir/be/bestate.c
@@ -461,7 +461,7 @@ static ir_node *get_end_of_block_insertion_point(ir_node *block)
        if (!is_cfop(last)) {
                last = sched_next(last);
                /* last node must be a cfop, only exception is the start block */
-               assert(last     == get_irg_start_block(get_irn_irg(block)));
+               assert(last == get_irg_start_block(get_irn_irg(block)));
        }
 
        return last;
@@ -507,7 +507,7 @@ static void fix_block_borders(ir_node *block, void *data)
                     pred_info->end_state, need_state));
 
                if (pred_info->end_state != need_state) {
-                       ir_node *insert_point = get_end_of_block_insertion_point(pred);
+                       ir_node *insert_point = get_end_of_block_insertion_point(pred);
 
 
                        DBG((dbg, LEVEL_3, "  Creating reload for %+F\n", need_state));
@@ -516,13 +516,13 @@ static void fix_block_borders(ir_node *block, void *data)
        }
 }
 
-void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env,
+void be_assure_state(ir_graph *irg, const arch_register_t *reg, void *func_env,
                      create_spill_func create_spill,
-                     create_reload_func create_reload) {
+                     create_reload_func create_reload)
+{
        minibelady_env_t env;
-       ir_graph *irg = be_get_birg_irg(birg);
        spill_info_t *info;
-       be_lv_t *lv = be_assure_liveness(birg);
+       be_lv_t *lv = be_assure_liveness(irg);
 
        be_liveness_assure_sets(lv);
        /* construct control flow loop tree */
@@ -535,7 +535,7 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env,
        env.func_env      = func_env;
        env.create_spill  = create_spill;
        env.create_reload = create_reload;
-       env.lv            = be_get_birg_liveness(birg);
+       env.lv            = be_get_irg_liveness(irg);
        env.uses          = be_begin_uses(irg, env.lv);
        env.spills        = NULL;
        ir_nodemap_init(&env.spill_infos);
@@ -559,7 +559,7 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env,
                int i, len;
                ir_node **phis;
 
-               be_ssa_construction_init(&senv, birg);
+               be_ssa_construction_init(&senv, irg);
                if (sched_is_scheduled(info->value))
                        be_ssa_construction_add_copy(&senv, info->value);
                be_ssa_construction_add_copies(&senv,
@@ -591,16 +591,15 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env,
        }
 
        /* some nodes might be dead now. */
-       be_remove_dead_nodes_from_schedule(birg);
+       be_remove_dead_nodes_from_schedule(irg);
 
        ir_nodemap_destroy(&env.spill_infos);
        be_end_uses(env.uses);
        obstack_free(&env.obst, NULL);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_state);
 void be_init_state(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.state");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_state);