add correct compare functions for be nodes

[libfirm] / ir / be / belive.c

diff --git a/ir/be/belive.c b/ir/be/belive.c
index c9eda11..f422869 100644 (file)
--- a/ir/be/belive.c
+++ b/ir/be/belive.c
@@ -1,7 +1,28 @@
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
 /**
- * Interblock liveness analysis.
- * @author Sebastian Hack
- * @date 6.12.2004
+ * @file
+ * @brief       Interblock liveness analysis.
+ * @author      Sebastian Hack
+ * @date        06.12.2004
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -17,8 +38,9 @@
 #include "beutil.h"
 #include "belive_t.h"
 #include "besched_t.h"
+#include "bemodule.h"
 
-#define DBG_MODULE              "firm.be.liveness"
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 #define LV_STD_SIZE             128
 #define LV_USE_BINARY_SEARCH
@@ -238,7 +260,7 @@ static int be_lv_remove(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
                        payload[n - 1].u.node.flags = 0;
 
                        --irn_live[0].u.head.n_members;
-                       DBG((li->dbg, LEVEL_3, "\tdeleting %+F from %+F at pos %d\n", irn, bl, pos));
+                       DBG((dbg, LEVEL_3, "\tdeleting %+F from %+F at pos %d\n", irn, bl, pos));
                        return 1;
                }
        }
@@ -265,7 +287,7 @@ static void register_node(be_lv_t *lv, const ir_node *irn)
 static INLINE void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
        struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
-       DBG((lv->dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block));
+       DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block));
        n->flags |= be_lv_state_in;
        register_node(lv, irn);
 }
@@ -276,7 +298,7 @@ static INLINE void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
 static INLINE void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
        struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
-       DBG((lv->dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block));
+       DBG((dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block));
        n->flags |= be_lv_state_out | be_lv_state_end;
        register_node(lv, irn);
 }
@@ -287,7 +309,7 @@ static INLINE void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
 static INLINE void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
        struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
-       DBG((lv->dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block));
+       DBG((dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block));
        n->flags |= be_lv_state_end;
        register_node(lv, irn);
 }
@@ -439,7 +461,7 @@ static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
        }
 }
 
-static void *lv_phase_data_init(phase_t *phase, ir_node *irn, void *old)
+static void *lv_phase_data_init(ir_phase *phase, ir_node *irn, void *old)
 {
        struct _be_lv_info_t *info = phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
        memset(info, 0, LV_STD_SIZE * sizeof(info[0]));
@@ -462,13 +484,12 @@ be_lv_t *be_liveness(ir_graph *irg)
        be_lv_t *lv = xmalloc(sizeof(lv[0]));
 
        memset(lv, 0, sizeof(lv[0]));
-       FIRM_DBG_REGISTER(lv->dbg, DBG_MODULE);
        lv->irg = irg;
        lv->nodes = bitset_malloc(2 * get_irg_last_idx(irg));
        lv->hook_info.context = lv;
        lv->hook_info.hook._hook_node_info = lv_dump_block;
        register_hook(hook_node_info, &lv->hook_info);
-       phase_init(&lv->ph, "liveness", irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init);
+       phase_init(&lv->ph, "liveness", irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
        compute_liveness(lv);
 
        return lv;
@@ -486,7 +507,7 @@ void be_liveness_recompute(be_lv_t *lv)
                bitset_clear_all(lv->nodes);
 
        phase_free(&lv->ph);
-       phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init);
+       phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
        compute_liveness(lv);
 }
 
@@ -512,7 +533,7 @@ void be_liveness_remove(be_lv_t *lv, ir_node *irn)
        w.lv   = lv;
        w.data = irn;
        dom_tree_walk(get_nodes_block(irn), lv_remove_irn_walker, NULL, &w);
-       if(idx <= bitset_size(lv->nodes))
+       if(idx < bitset_size(lv->nodes))
                bitset_clear(lv->nodes, idx);
 }
 
@@ -676,20 +697,13 @@ int be_check_dominance(ir_graph *irg)
 pset *be_liveness_transfer(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_node *irn, pset *live)
 {
        int i, n;
-       FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE);
-
-       DEBUG_ONLY(
-               const ir_node *x;
-               DBG((dbg, LEVEL_1, "%+F\n", irn));
-               for(x = pset_first(live); x; x = pset_next(live))
-                       DBG((dbg, LEVEL_1, "\tlive: %+F\n", x));
-       )
 
        /* You should better break out of your loop when hitting the first phi function. */
        assert(!is_Phi(irn) && "liveness_transfer produces invalid results for phi nodes");
 
        if(arch_irn_consider_in_reg_alloc(arch_env, cls, irn)) {
                ir_node *del = pset_remove_ptr(live, irn);
+               (void) del;
                assert(irn == del);
        }
 
@@ -749,3 +763,10 @@ pset *be_liveness_nodes_live_at_input(const be_lv_t *lv, const arch_env_t *arch_
 
        return live;
 }
+
+void be_init_live(void)
+{
+       FIRM_DBG_REGISTER(dbg, "firm.be.liveness");
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);