typo fixed

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 3fd710d..a0971d9 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -13,12 +13,13 @@
 #include "bitset.h"
 
 #include "irprog.h"
+#include "irgopt.h"
 #include "irgraph.h"
 #include "irdump.h"
 #include "phiclass.h"
 
 #include "be_t.h"
-#include "bera_t.h"
+#include "bechordal_t.h"
 #include "benumb_t.h"
 #include "besched_t.h"
 #include "belistsched.h"
@@ -28,7 +29,9 @@
 #include "bearch.h"
 #include "becopyoptmain.h"
 #include "becopystat.h"
+#include "bessadestr.h"
 #include "bearch_firm.h"
+#include "benode_t.h"
 
 #include "beasm_dump_globals.h"
 #include "beasm_asm_gnu.h"
@@ -44,35 +47,58 @@ void be_init(void)
        be_sched_init();
        be_liveness_init();
        be_numbering_init();
-       be_ra_init();
        be_ra_chordal_init();
        be_copy_opt_init();
-#ifdef DO_STAT
-       stat_init();
-#endif
+       copystat_init();
+}
+
+static be_main_env_t *be_init_env(be_main_env_t *env)
+{
+  const arch_isa_if_t *isa = &firm_isa;
+
+  obstack_init(&env->obst);
+
+  env->arch_env = obstack_alloc(&env->obst, sizeof(env->arch_env[0]));
+  arch_env_init(env->arch_env, isa);
+  env->arch_env->isa->init();
+
+  env->node_factory = obstack_alloc(&env->obst, sizeof(*env->node_factory));
+  be_node_factory_init(env->node_factory, isa);
+
+  arch_env_add_irn_handler(env->arch_env, &firm_irn_handler);
+  arch_env_add_irn_handler(env->arch_env,
+      be_node_get_irn_handler(env->node_factory));
+
+  return env;
 }
 
-static void be_init_arch_env(arch_env_t *env)
+be_main_session_env_t *be_init_session_env(be_main_session_env_t *env,
+    be_main_env_t *main_env, ir_graph *irg)
 {
-  arch_env_init(env, &firm_isa);
-  arch_env_add_irn_handler(env, &firm_irn_handler);
+  env->main_env = main_env;
+  env->irg = irg;
 
-  env->isa->init();
+  return env;
 }
 
 static void be_main_loop(void)
 {
        int i, n;
-  arch_env_t env;
-  const arch_isa_if_t *isa;
-
-  be_init_arch_env(&env);
+       be_main_env_t env;
+       const arch_isa_if_t *isa;
 
-  isa = arch_env_get_isa(&env);
+       be_init_env(&env);
+       isa = arch_env_get_isa(env.arch_env);
 
+       /* For all graphs */
        for(i = 0, n = get_irp_n_irgs(); i < n; ++i) {
                int j, m;
                ir_graph *irg = get_irp_irg(i);
+               be_main_session_env_t session;
+
+               be_init_session_env(&session, &env, irg);
+
+               remove_critical_cf_edges(irg);
 
                localize_consts(irg);
 #ifdef DUMP_LOCALIZED
@@ -87,27 +113,25 @@ static void be_main_loop(void)
                /* Liveness analysis */
                be_liveness(irg);
 
-#ifdef DO_STAT
-               stat_reset();
-#endif
+               copystat_reset();
+               copystat_collect_irg(irg, env.arch_env);
                /* Perform the following for each register class. */
                for(j = 0, m = isa->get_n_reg_class(); j < m; ++j) {
+                       be_chordal_env_t *chordal_env;
                        const arch_register_class_t *cls = isa->get_reg_class(j);
 
-                       be_ra_chordal(irg, &env, cls);
+                       chordal_env = be_ra_chordal(irg, env.arch_env, cls);
 
 #ifdef DUMP_ALLOCATED
-                       dump_allocated_irg(&env, irg, "");
-#endif
-#ifdef DO_STAT
-                       stat_collect_irg(irg);
+                       dump_allocated_irg(env.arch_env, irg, "");
 #endif
-                       be_copy_opt(irg, isa, cls);
-                       be_ra_chordal_done(irg);
+                       copystat_collect_cls(chordal_env);
+
+                       be_copy_opt(chordal_env);
+                       be_ssa_destruction(&session, chordal_env);
+                       be_ra_chordal_done(chordal_env);
                }
-#ifdef DO_STAT
-               stat_dump(irg);
-#endif
+               copystat_dump_pretty(irg);
            be_numbering_done(irg);
        }
 }