added const irn classifier

modified scheduler

diff --git a/ir/be/bearch.h b/ir/be/bearch.h
index 9a093d6..a6b5ca0 100644 (file)
--- a/ir/be/bearch.h
+++ b/ir/be/bearch.h
@@ -183,7 +183,8 @@ typedef enum _arch_irn_class_t {
   arch_irn_class_copy,
   arch_irn_class_perm,
   arch_irn_class_branch,
-  arch_irn_class_call
+  arch_irn_class_call,
+  arch_irn_class_const,
 } arch_irn_class_t;
 
 /**

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 8358986..98e028c 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -84,15 +84,30 @@ static ir_node *trivial_select(void *block_env, nodeset *ready_set)
 {
        const arch_env_t *arch_env = block_env;
        ir_node *irn = NULL;
+       int const_last = 0;
 
-       /* assure that branches are executed last */
+       /* assure that branches and constants are executed last */
        for (irn = nodeset_first(ready_set); irn; irn = nodeset_next(ready_set)) {
-               if (arch_irn_classify(arch_env, irn) != arch_irn_class_branch) {
+               arch_irn_class_t irn_class = arch_irn_classify(arch_env, irn);
+
+               if (irn_class != arch_irn_class_branch && (const_last ? (irn_class != arch_irn_class_const) : 1)) {
                        nodeset_break(ready_set);
                        return irn;
                }
        }
 
+       /* assure that constants are executed before branches */
+       if (const_last) {
+               for (irn = nodeset_first(ready_set); irn; irn = nodeset_next(ready_set)) {
+                       if (arch_irn_classify(arch_env, irn) != arch_irn_class_branch) {
+                               nodeset_break(ready_set);
+                               return irn;
+                       }
+               }
+       }
+
+
+       /* at last: schedule branches */
        irn = nodeset_first(ready_set);
        nodeset_break(ready_set);