sparc: Do not force the object file format to ELF.

[libfirm] / ir / be / bespillbelady.c

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 34b53e0..6b249f5 100644 (file)
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -22,14 +22,12 @@
  * @brief       Beladys spillalgorithm.
  * @author      Daniel Grund, Matthias Braun
  * @date        20.09.2005
- * @version     $Id$
  */
 #include "config.h"
 
 #include <stdbool.h>
 
 #include "obst.h"
-#include "irprintf_t.h"
 #include "irgraph.h"
 #include "irnode.h"
 #include "irmode.h"
@@ -40,6 +38,7 @@
 #include "irprintf.h"
 #include "irnodeset.h"
 #include "irtools.h"
+#include "statev_t.h"
 #include "util.h"
 
 #include "beutil.h"
@@ -79,7 +78,7 @@ typedef struct loc_t {
 
 typedef struct workset_t {
        unsigned len;     /**< current length */
-       loc_t    vals[0]; /**< array of the values/distances in this working set */
+       loc_t    vals[];  /**< array of the values/distances in this working set */
 } workset_t;
 
 static struct obstack               obst;
@@ -213,9 +212,17 @@ static const loc_t *workset_contains(const workset_t *ws, const ir_node *val)
 
 static int loc_compare(const void *a, const void *b)
 {
-       const loc_t *p = (const loc_t*)a;
-       const loc_t *q = (const loc_t*)b;
-       return p->time - q->time;
+       const loc_t   *p  = ((const loc_t*) a);
+       const loc_t   *q  = ((const loc_t*) b);
+       const unsigned pt = p->time;
+       const unsigned qt = q->time;
+
+       if (pt < qt)
+               return -1;
+       if (pt > qt)
+               return 1;
+
+       return get_irn_node_nr(p->node) - get_irn_node_nr(q->node);
 }
 
 static void workset_sort(workset_t *workset)
@@ -475,11 +482,6 @@ static loc_t to_take_or_not_to_take(ir_node* first, ir_node *node,
        loc.node    = node;
        loc.spilled = false;
 
-       if (!arch_irn_consider_in_reg_alloc(cls, node)) {
-               loc.time = USES_INFINITY;
-               return loc;
-       }
-
        /* We have to keep nonspillable nodes in the workingset */
        if (arch_get_irn_flags(skip_Proj_const(node)) & arch_irn_flags_dont_spill) {
                loc.time = 0;
@@ -533,13 +535,11 @@ static void decide_start_workset(const ir_node *block)
 {
        ir_loop    *loop = get_irn_loop(block);
        ir_node    *first;
-       ir_node    *node;
        loc_t       loc;
        loc_t      *starters;
        loc_t      *delayed;
        unsigned    len;
        unsigned    i;
-       int         in;
        unsigned    ws_count;
        int         free_slots, free_pressure_slots;
        unsigned    pressure;
@@ -551,7 +551,7 @@ static void decide_start_workset(const ir_node *block)
        arity           = get_irn_arity(block);
        pred_worksets   = ALLOCAN(workset_t*, arity);
        all_preds_known = true;
-       for (in = 0; in < arity; ++in) {
+       for (int in = 0; in < arity; ++in) {
                ir_node      *pred_block = get_Block_cfgpred_block(block, in);
                block_info_t *pred_info  = get_block_info(pred_block);
 
@@ -598,10 +598,8 @@ static void decide_start_workset(const ir_node *block)
        }
 
        /* check all Live-Ins */
-       be_lv_foreach(lv, block, be_lv_state_in, in) {
-               ir_node *node = be_lv_get_irn(lv, block, in);
+       be_lv_foreach_cls(lv, block, be_lv_state_in, cls, node) {
                unsigned available;
-
                if (all_preds_known) {
                        available = available_in_all_preds(pred_worksets, arity, node, false);
                } else {
@@ -754,7 +752,6 @@ static void decide_start_workset(const ir_node *block)
 static void process_block(ir_node *block)
 {
        workset_t    *new_vals;
-       ir_node      *irn;
        unsigned      iter;
        block_info_t *block_info;
        int           arity;
@@ -786,9 +783,11 @@ static void process_block(ir_node *block)
        set_block_info(block, block_info);
 
        DB((dbg, DBG_WSETS, "Start workset for %+F:\n", block));
-       workset_foreach(ws, irn, iter) {
-               DB((dbg, DBG_WSETS, "  %+F (%u)\n", irn,
-                    workset_get_time(ws, iter)));
+       {
+               ir_node *irn;
+               workset_foreach(ws, irn, iter) {
+                       DB((dbg, DBG_WSETS, "  %+F (%u)\n", irn, workset_get_time(ws, iter)));
+               }
        }
 
        block_info->start_workset = workset_clone(ws);
@@ -799,8 +798,6 @@ static void process_block(ir_node *block)
        new_vals = new_workset();
 
        sched_foreach(block, irn) {
-               int i, arity;
-               ir_node *value;
                assert(workset_get_length(ws) <= n_regs);
 
                /* Phis are no real instr (see insert_starters()) */
@@ -814,20 +811,16 @@ static void process_block(ir_node *block)
 
                /* allocate all values _used_ by this instruction */
                workset_clear(new_vals);
-               for (i = 0, arity = get_irn_arity(irn); i < arity; ++i) {
-                       ir_node *in = get_irn_n(irn, i);
-                       if (!arch_irn_consider_in_reg_alloc(cls, in))
-                               continue;
-
+               be_foreach_use(irn, cls, in_req_, in, in_req,
                        /* (note that "spilled" is irrelevant here) */
                        workset_insert(new_vals, in, false);
-               }
+               );
                displace(new_vals, 1);
 
                /* allocate all values _defined_ by this instruction */
                workset_clear(new_vals);
-               be_foreach_definition(irn, cls, value,
-                       assert(req_->width == 1);
+               be_foreach_definition(irn, cls, value, req,
+                       assert(req->width == 1);
                        workset_insert(new_vals, value, false);
                );
                displace(new_vals, 0);
@@ -836,8 +829,11 @@ static void process_block(ir_node *block)
        /* Remember end-workset for this block */
        block_info->end_workset = workset_clone(ws);
        DB((dbg, DBG_WSETS, "End workset for %+F:\n", block));
-       workset_foreach(ws, irn, iter)
-               DB((dbg, DBG_WSETS, "  %+F (%u)\n", irn, workset_get_time(ws, iter)));
+       {
+               ir_node *irn;
+               workset_foreach(ws, irn, iter)
+                       DB((dbg, DBG_WSETS, "  %+F (%u)\n", irn, workset_get_time(ws, iter)));
+       }
 }
 
 /**
@@ -947,7 +943,7 @@ static void be_spill_belady(ir_graph *irg, const arch_register_class_t *rcls)
 {
        int i;
 
-       be_liveness_assure_sets(be_assure_liveness(irg));
+       be_assure_live_sets(irg);
 
        stat_ev_tim_push();
        assure_loopinfo(irg);