- refactor emitter next/prev block handling a bit

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 9b83b11..7524af1 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -472,9 +472,9 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
  */
 static void be_ra_chordal_main(be_irg_t *birg)
 {
-       const be_main_env_t *main_env  = birg->main_env;
-       const arch_isa_t    *isa       = arch_env_get_isa(main_env->arch_env);
-       ir_graph            *irg       = birg->irg;
+       const be_main_env_t *main_env = birg->main_env;
+       const arch_env_t    *arch_env = main_env->arch_env;
+       ir_graph            *irg      = birg->irg;
        int                 j, m;
        be_chordal_env_t    chordal_env;
        struct obstack      obst;
@@ -508,10 +508,10 @@ static void be_ra_chordal_main(be_irg_t *birg)
                /* use one of the generic spiller */
 
                /* Perform the following for each register class. */
-               for (j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) {
+               for (j = 0, m = arch_env_get_n_reg_class(arch_env); j < m; ++j) {
                        post_spill_env_t pse;
                        const arch_register_class_t *cls
-                               = arch_isa_get_reg_class(isa, j);
+                               = arch_env_get_reg_class(arch_env, j);
 
                        if(arch_register_class_flags(cls) & arch_register_class_flag_manual_ra)
                                continue;
@@ -534,7 +534,7 @@ static void be_ra_chordal_main(be_irg_t *birg)
                post_spill_env_t *pse;
 
                /* the backend has it's own spiller */
-               m = arch_isa_get_n_reg_class(isa);
+               m = arch_env_get_n_reg_class(arch_env);
 
                pse = alloca(m * sizeof(pse[0]));