Changed phase node initializer to take const ir_node

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 357afb0..62d5d4c 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -49,8 +49,10 @@
 #include "irtools.h"
 #include "irvrfy.h"
 #include "irprintf.h"
+#include "iroptimize.h"
 #include "firmstat.h"
 #include "execfreq.h"
+#include "irprofile.h"
 
 #include "bearch_t.h"
 #include "be_t.h"
@@ -61,7 +63,6 @@
 #include "besched_t.h"
 #include "belistsched.h"
 #include "belive_t.h"
-#include "bespillbelady.h"
 #include "bera.h"
 #include "bechordal_t.h"
 #include "beifg.h"
@@ -74,7 +75,6 @@
 #include "beschedmris.h"
 #include "bestat.h"
 #include "beverify.h"
-#include "beprofile.h"
 #include "be_dbgout.h"
 #include "beirg_t.h"
 
@@ -399,6 +399,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
        }
 
        be_init_env(&env, file_handle);
+       env.cup_name = cup_name;
 
        isa = arch_env_get_isa(env.arch_env);
 
@@ -433,12 +434,12 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                or try to read in profile data for current translation unit.
        */
        if (be_options.opt_profile) {
-               ir_graph *prof_init_irg = be_profile_instrument(prof_filename, profile_default);
+               ir_graph *prof_init_irg = ir_profile_instrument(prof_filename, profile_default);
                initialize_birg(&birgs[num_birgs], prof_init_irg, &env);
                num_birgs++;
                set_method_img_section(get_irg_entity(prof_init_irg), section_constructors);
        } else {
-               be_profile_read(prof_filename);
+               ir_profile_read(prof_filename);
        }
 
        /* For all graphs */
@@ -451,6 +452,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /* set the current graph (this is important for several firm functions) */
                current_ir_graph = irg;
 
+               be_sched_init_phase(irg);
+
                /* reset the phi handler. */
                be_phi_handler_reset(env.phi_handler);
 
@@ -534,8 +537,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /**
                 * Create execution frequencies from profile data or estimate some
                 */
-               if (be_profile_has_data())
-                       birg->exec_freq = be_create_execfreqs_from_profile(irg);
+               if (ir_profile_has_data())
+                       birg->exec_freq = ir_create_execfreqs_from_profile(irg);
                else
                        birg->exec_freq = compute_execfreq(irg, 10);
 
@@ -724,6 +727,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 #undef LC_EMIT_RA
 #undef LC_EMIT
 
+               be_sched_free_phase(irg);
+
                be_free_birg(birg);
 
         /* switched off due to statistics (statistic module needs all irgs) */
@@ -735,7 +740,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 #endif /* if 0 */
                stat_ev_ctx_pop("bemain_irg");
        }
-       be_profile_free();
+       ir_profile_free();
        be_done_env(&env);
 
 #undef BE_TIMER_POP
@@ -801,23 +806,6 @@ void be_main(FILE *file_handle, const char *cup_name)
 #endif
 }
 
-/** The debug info retriever function. */
-static retrieve_dbg_func retrieve_dbg = NULL;
-
-/* Sets a debug info retriever. */
-void be_set_debug_retrieve(retrieve_dbg_func func) {
-       retrieve_dbg = func;
-}
-
-/* Retrieve the debug info. */
-const char *be_retrieve_dbg_info(const dbg_info *dbg, unsigned *line) {
-       if (retrieve_dbg)
-               return retrieve_dbg(dbg, line);
-
-       *line = 0;
-       return NULL;
-}
-
 unsigned be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *cls, bitset_t *bs)
 {
        if (bs == NULL)