Fixed initialization of option tables

[libfirm] / ir / be / bespillslots.c

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index 9d38eae..6086523 100644 (file)
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -17,11 +17,12 @@
  * PURPOSE.
  */
 
-/*
- * Author:      Matthias Braun
- * Date:               26.7.06
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/**
+ * @file
+ * @brief       Spillslot coalescer.
+ * @author      Matthias Braun
+ * @date        26.07.2006
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,13 +31,12 @@
 #include <stdlib.h>
 
 #include "set.h"
-
+#include "array.h"
 #include "irgwalk.h"
 #include "ircons.h"
 #include "irprintf.h"
 #include "execfreq.h"
 #include "unionfind.h"
-#include "type.h"
 #include "irdump_t.h"
 
 #include "benode_t.h"
@@ -48,8 +48,9 @@
 #include "bestatevent.h"
 #include "bespilloptions.h"
 #include "bemodule.h"
-#include "bera.h"
+#include "beintlive_t.h"
 #include "beirg_t.h"
+#include "bearch_t.h"
 
 #define DBG_COALESCING         1
 #define DBG_INTERFERENCES      2
@@ -97,6 +98,8 @@ static int cmp_spill(const void* d1, const void* d2, size_t size)
 {
        const spill_t* s1 = d1;
        const spill_t* s2 = d2;
+       (void) size;
+
        return s1->spill != s2->spill;
 }
 
@@ -273,7 +276,6 @@ static void do_greedy_coalescing(be_fec_env_t *env)
        int affinity_edge_count;
        bitset_t **interferences;
        int* spillslot_unionfind;
-       const be_lv_t *lv = be_get_birg_liveness(env->birg);
 
        spillcount = set_count(env->spills);
        if(spillcount == 0)
@@ -313,7 +315,7 @@ static void do_greedy_coalescing(be_fec_env_t *env)
                        if (is_NoMem(spill2))
                                continue;
 
-                       if (values_interfere(lv, spill1, spill2)) {
+                       if (values_interfere(env->birg, spill1, spill2)) {
                                DBG((dbg, DBG_INTERFERENCES, "Slot %d and %d interfere\n", i, i2));
                                bitset_set(interferences[i], i2);
                                bitset_set(interferences[i2], i);
@@ -417,6 +419,8 @@ static int cmp_memperm(const void* d1, const void* d2, size_t size)
 {
        const memperm_t* e1 = d1;
        const memperm_t* e2 = d2;
+       (void) size;
+
        return e1->block != e2->block;
 }
 
@@ -631,7 +635,6 @@ static void create_memperms(be_fec_env_t *env)
                        be_set_MemPerm_out_entity(mempermnode, i, entry->out);
                        set_irg_current_block(irg, memperm->block);
                        proj = new_Proj(mempermnode, get_irn_mode(arg), i);
-                       sched_add_before(blockend, proj);
 
                        set_irn_n(entry->node, entry->pos, proj);
                }
@@ -663,7 +666,7 @@ be_fec_env_t *be_new_frame_entity_coalescer(be_irg_t *birg)
        const arch_env_t *arch_env = birg->main_env->arch_env;
        be_fec_env_t     *env      = xmalloc(sizeof(env[0]));
 
-       be_assure_liveness(birg);
+       be_liveness_assure_chk(be_assure_liveness(birg));
 
        obstack_init(&env->obst);
        env->arch_env       = arch_env;
@@ -727,8 +730,8 @@ static void collect_spills_walker(ir_node *node, void *data)
        if (!arch_irn_class_is(arch_env, node, reload))
                return;
 
-       mode = get_irn_mode(node);
-       cls = arch_get_irn_reg_class(arch_env, node, -1);
+       mode  = get_irn_mode(node);
+       cls   = arch_get_irn_reg_class(arch_env, node, -1);
        align = arch_isa_get_reg_class_alignment(arch_env_get_isa(arch_env), cls);
 
        be_node_needs_frame_entity(env, node, mode, align);