sparc: fix wrong incsp in omit-fp mode

[libfirm] / ir / be / beschednormal.c

diff --git a/ir/be/beschednormal.c b/ir/be/beschednormal.c
index 5e8bafd..ffa7788 100644 (file)
--- a/ir/be/beschednormal.c
+++ b/ir/be/beschednormal.c
@@ -34,6 +34,7 @@
 #include "irtools.h"
 #include "irgwalk.h"
 #include "benode.h"
+#include "bemodule.h"
 #include "array_t.h"
 
 // XXX there is no one time init for schedulers
@@ -53,8 +54,7 @@ static int must_be_scheduled(const ir_node* const irn)
 }
 
 
-static ir_node *normal_select(void *block_env, ir_nodeset_t *ready_set,
-                              ir_nodeset_t *live_set)
+static ir_node *normal_select(void *block_env, ir_nodeset_t *ready_set)
 {
        instance_t* inst = (instance_t*)block_env;
        ir_node*    irn;
@@ -62,8 +62,6 @@ static ir_node *normal_select(void *block_env, ir_nodeset_t *ready_set,
        ir_node*    last = NULL;
        ir_nodeset_iterator_t iter;
 
-       (void)live_set;
-
        for (irn = inst->curr_list; irn != NULL; last = irn, irn = next) {
                next = (ir_node*)get_irn_link(irn);
                if (ir_nodeset_contains(ready_set, irn)) {
@@ -154,7 +152,6 @@ static int normal_tree_cost(ir_node* irn, instance_t *inst)
 
        if (fc == NULL) {
                irn_cost_pair* costs;
-               int            i;
                ir_node*       block = get_nodes_block(irn);
 
                fc = OALLOCF(&inst->obst, flag_and_cost, costs, arity);
@@ -163,7 +160,6 @@ static int normal_tree_cost(ir_node* irn, instance_t *inst)
 
                for (i = 0; i < arity; ++i) {
                        ir_node* pred = get_irn_n(irn, i);
-                       int cost;
 
                        if (is_Phi(irn) || get_irn_mode(pred) == mode_M || is_Block(pred)) {
                                cost = 0;
@@ -174,7 +170,6 @@ static int normal_tree_cost(ir_node* irn, instance_t *inst)
                                ir_node*       real_pred;
 
                                cost = normal_tree_cost(pred, inst);
-                               if (be_is_Barrier(pred)) cost = 1; // XXX hack: the barrier causes all users to have a reguse of #regs
                                if (!arch_irn_is_ignore(pred)) {
                                        real_pred = (is_Proj(pred) ? get_Proj_pred(pred) : pred);
                                        pred_fc = get_irn_fc(real_pred);
@@ -376,14 +371,11 @@ static void normal_sched_block(ir_node* block, void* env)
 }
 
 
-static void *normal_init_graph(const list_sched_selector_t *vtab,
-                               ir_graph *irg)
+static void *normal_init_graph(ir_graph *irg)
 {
        instance_t   *inst = XMALLOC(instance_t);
        ir_heights_t *heights;
 
-       (void)vtab;
-
        be_clear_links(irg);
 
        obstack_init(&inst->obst);
@@ -438,14 +430,22 @@ static void normal_finish_graph(void *env)
        xfree(inst);
 }
 
-const list_sched_selector_t normal_selector = {
-       normal_init_graph,
-       normal_init_block,
-       normal_select,
-       NULL,              /* node_ready */
-       NULL,              /* node_selected */
-       NULL,              /* exectime */
-       NULL,              /* latency */
-       NULL,              /* finish_block */
-       normal_finish_graph
-};
+static void sched_normal(ir_graph *irg)
+{
+       static const list_sched_selector_t normal_selector = {
+               normal_init_graph,
+               normal_init_block,
+               normal_select,
+               NULL,              /* node_ready */
+               NULL,              /* node_selected */
+               NULL,              /* finish_block */
+               normal_finish_graph
+       };
+       be_list_sched_graph(irg, &normal_selector);
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched_normal)
+void be_init_sched_normal(void)
+{
+       be_register_scheduler("normal", sched_normal);
+}