More missing config.h

[libfirm] / ir / be / belistsched.c

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index f534120..765d1e4 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -100,8 +100,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 +173,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;
 
     /*
@@ -465,6 +465,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
@@ -512,7 +515,7 @@ static void list_sched_block(ir_node *block, void *env_ptr)
 
                /* Keeps must be scheduled immediatly */
                foreach_nodeset(be.cands, irn) {
-                       if (be_is_Keep(irn) || be_is_CopyKeep(irn)) {
+                       if (be_is_Keep(irn) || be_is_CopyKeep(irn) || get_irn_mode(irn) == mode_M) {
                                nodeset_break(be.cands);
                                break;
                        }
@@ -579,7 +582,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:
@@ -628,7 +632,7 @@ void list_sched_register_options(lc_opt_entry_t *grp) {
 
        if (! run_once) {
                run_once  = 1;
-               sched_grp = lc_opt_get_grp(grp, "sched");
+               sched_grp = lc_opt_get_grp(grp, "listsched");
 
                lc_opt_add_table(sched_grp, list_sched_option_table);
                rss_register_options(sched_grp);