start register allocator again, fix typo

[libfirm] / ir / be / belistsched.c

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 99de8dd..498cf28 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -32,6 +32,7 @@
 #include "debug.h"
 #include "irtools.h"
 
+#include "bemodule.h"
 #include "besched_t.h"
 #include "beutil.h"
 #include "belive_t.h"
@@ -100,8 +101,8 @@ static lc_opt_enum_int_var_t sched_prep_var = {
 };
 
 static const lc_opt_table_entry_t list_sched_option_table[] = {
-       LC_OPT_ENT_ENUM_PTR("prep",   "schedule preparation (none, mris, rss)",                             &sched_prep_var),
-       LC_OPT_ENT_ENUM_PTR("select", "node selector (trivial, random, regpress, muchnik, heur, hmuchnik)", &sched_select_var),
+       LC_OPT_ENT_ENUM_PTR("prep",   "schedule preparation",   &sched_prep_var),
+       LC_OPT_ENT_ENUM_PTR("select", "node selector",          &sched_select_var),
        { NULL }
 };
 #endif /* WITH_LIBCORE */
@@ -173,7 +174,7 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn
        int i, n;
 
     /* Blocks cannot be scheduled. */
-    if (is_Block(irn))
+    if (is_Block(irn) || get_irn_n_edges(irn) == 0)
         return 0;
 
     /*
@@ -353,9 +354,6 @@ static ir_node *add_to_sched(block_sched_env_t *env, ir_node *irn)
     /* If the node consumes/produces data, it is appended to the schedule
      * list, otherwise, it is not put into the list */
     if (must_appear_in_schedule(env->selector, env->selector_block_env, irn)) {
-        sched_info_t *info = get_irn_sched_info(irn);
-        INIT_LIST_HEAD(&info->list);
-        info->scheduled = 1;
                update_sched_liveness(env, irn);
         sched_add_before(env->block, irn);
 
@@ -433,7 +431,6 @@ static void list_sched_block(ir_node *block, void *env_ptr)
        sched_env_t *env                      = env_ptr;
        const list_sched_selector_t *selector = env->selector;
        ir_node *start_node                   = get_irg_start(get_irn_irg(block));
-       sched_info_t *info                    = get_irn_sched_info(block);
 
        block_sched_env_t be;
        const ir_edge_t *edge;
@@ -441,7 +438,7 @@ static void list_sched_block(ir_node *block, void *env_ptr)
        int j, m;
 
        /* Initialize the block's list head that will hold the schedule. */
-       INIT_LIST_HEAD(&info->list);
+       sched_init_block(block);
 
        /* Initialize the block scheduling environment */
        be.sched_info = env->sched_info;
@@ -465,6 +462,9 @@ static void list_sched_block(ir_node *block, void *env_ptr)
                if (get_irn_opcode(irn) == iro_End)
                        continue;
 
+               if (get_irn_n_edges(irn) == 0)
+                       continue;
+
                if (is_Phi(irn)) {
                        /*
                                Phi functions are scheduled immediately, since they     only
@@ -579,7 +579,8 @@ void list_sched(const be_irg_t *birg, be_options_t *be_opts)
        }
 
        /* Assure, that the out edges are computed */
-       edges_assure(irg);
+       edges_deactivate(birg->irg);
+       edges_activate(birg->irg);
 
        switch (list_sched_options.prep) {
                case BE_SCHED_PREP_MRIS:
@@ -622,16 +623,12 @@ void list_sched(const be_irg_t *birg, be_options_t *be_opts)
 /**
  * Register list scheduler options.
  */
-void list_sched_register_options(lc_opt_entry_t *grp) {
-       static int     run_once = 0;
-       lc_opt_entry_t *sched_grp;
-
-       if (! run_once) {
-               run_once  = 1;
-               sched_grp = lc_opt_get_grp(grp, "sched");
+void be_init_listsched(void) {
+       lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+       lc_opt_entry_t *sched_grp = lc_opt_get_grp(be_grp, "listsched");
 
-               lc_opt_add_table(sched_grp, list_sched_option_table);
-               rss_register_options(sched_grp);
-       }
+       lc_opt_add_table(sched_grp, list_sched_option_table);
 }
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_listsched);
 #endif /* WITH_LIBCORE */