extended IN constraints with reference to out register

[libfirm] / ir / be / belistsched.c

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 3db352a..2d2ab76 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -29,6 +29,8 @@
 #include "beutil.h"
 #include "belive_t.h"
 #include "belistsched.h"
+#include "firm/bearch_firm.h"
+
 
 /**
  * Scheduling environment for the whole graph.
@@ -71,6 +73,8 @@ static ir_node *trivial_select(void *env, void *block_env,
                const struct list_head *sched_head,
                int curr_time, pset *ready_set)
 {
+       ir_node *res;
+
 #if 0
        int i, n = pset_count(ready_set);
        ir_node *irn;
@@ -80,8 +84,7 @@ static ir_node *trivial_select(void *env, void *block_env,
                ready[i++] = irn;
 #endif
 
-
-       ir_node *res = pset_first(ready_set);
+       res = pset_first(ready_set);
        pset_break(ready_set);
        return res;
 }
@@ -98,23 +101,24 @@ const list_sched_selector_t *trivial_selector = &trivial_selector_struct;
 
 static void list_sched_block(ir_node *block, void *env_ptr);
 
-void list_sched(ir_graph *irg, const list_sched_selector_t *selector)
+void list_sched(const struct _arch_isa_t *isa, ir_graph *irg)
 {
-    sched_env_t env;
+       sched_env_t env;
+       const list_sched_selector_t *selector;
 
-    memset(&env, 0, sizeof(env));
-    env.selector = selector;
-    env.selector_env = selector->init_graph ? selector->init_graph(irg) : NULL;
-    env.irg = irg;
+       memset(&env, 0, sizeof(env));
+       selector = env.selector = isa->impl->get_list_sched_selector(isa);
+       env.selector_env = selector->init_graph ? selector->init_graph(isa, irg) : NULL;
+       env.irg = irg;
 
-               /* Assure, that the out edges are computed */
-               edges_assure(irg);
+       /* Assure, that the out edges are computed */
+       edges_assure(irg);
 
-    /* Schedule each single block. */
-    irg_block_walk_graph(irg, list_sched_block, NULL, &env);
+       /* Schedule each single block. */
+       irg_block_walk_graph(irg, list_sched_block, NULL, &env);
 
-               if(selector->finish_graph)
-                       selector->finish_graph(env.selector_env, irg);
+       if(selector->finish_graph)
+               selector->finish_graph(env.selector_env, irg);
 }
 
 
@@ -122,16 +126,13 @@ void list_sched(ir_graph *irg, const list_sched_selector_t *selector)
  * Environment for a block scheduler.
  */
 typedef struct _block_sched_env_t {
-    int curr_time;
-    pset *ready_set;
-    pset *already_scheduled;
-    ir_node *block;
-               firm_dbg_module_t *dbg;
+       int curr_time;
+       pset *ready_set;
+       pset *already_scheduled;
+       ir_node *block;
+       firm_dbg_module_t *dbg;
 } block_sched_env_t;
 
-
-
-
 /**
  * Try to put a node in the ready set.
  * @param env The block scheduler environment.
@@ -195,7 +196,6 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *irn)
  */
 static INLINE void make_users_ready(block_sched_env_t *env, ir_node *irn)
 {
-       int i, n;
        const ir_edge_t *edge;
 
        foreach_out_edge(irn, edge) {
@@ -266,7 +266,6 @@ static ir_node *add_to_sched(block_sched_env_t *env, ir_node *irn)
  */
 static void add_tuple_projs(block_sched_env_t *env, ir_node *irn)
 {
-       int i, n;
        const ir_edge_t *edge;
 
        assert(get_irn_mode(irn) == mode_T && "Mode of node must be tuple");
@@ -294,7 +293,7 @@ static void add_tuple_projs(block_sched_env_t *env, ir_node *irn)
  * Also the outs must have been computed.
  *
  * @param block The block node.
- * @param env Schedulting environment.
+ * @param env Scheduling environment.
  */
 static void list_sched_block(ir_node *block, void *env_ptr)
 {
@@ -304,7 +303,7 @@ static void list_sched_block(ir_node *block, void *env_ptr)
        const list_sched_selector_t *selector = env->selector;
        const ir_edge_t *edge;
        ir_node *irn;
-       int i, n, j, m;
+       int j, m;
        int phi_seen = 0;
        sched_info_t *info = get_irn_sched_info(block);