- BugFix: ensure that Convs are created in the right block

[libfirm] / ir / be / beifg_std.c

diff --git a/ir/be/beifg_std.c b/ir/be/beifg_std.c
index b139f19..1ef6d1e 100644 (file)
--- a/ir/be/beifg_std.c
+++ b/ir/be/beifg_std.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,9 +24,7 @@
  * @date    18.11.2005
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -45,7 +43,7 @@
 #include "beifg_t.h"
 #include "bechordal_t.h"
 #include "beirg_t.h"
-#include "bera.h"
+#include "beintlive_t.h"
 
 typedef struct _ifg_std_t ifg_std_t;
 
@@ -62,8 +60,7 @@ static void ifg_std_free(void *self)
 static int ifg_std_connected(const void *self, const ir_node *a, const ir_node *b)
 {
        const ifg_std_t *ifg = self;
-       be_lv_t         *lv  = ifg->env->birg->lv;
-       return values_interfere(lv, a, b);
+       return values_interfere(ifg->env->birg, a, b);
 }
 
 typedef struct _nodes_iter_t {
@@ -102,7 +99,7 @@ static void find_nodes(const void *self, void *iter) {
        it->nodes = obstack_finish(&it->obst);
 }
 
-static INLINE void node_break(nodes_iter_t *it, int force)
+static inline void node_break(nodes_iter_t *it, int force)
 {
        if((it->curr >= it->n || force) && it->nodes) {
                obstack_free(&it->obst, NULL);
@@ -131,11 +128,13 @@ static ir_node *ifg_std_nodes_begin(const void *self, void *iter)
 
 static ir_node *ifg_std_nodes_next(const void *self, void *iter)
 {
+       (void) self;
        return get_next_node(iter);
 }
 
 static void ifg_std_nodes_break(const void *self, void *iter)
 {
+       (void) self;
        node_break(iter, 1);
 }
 
@@ -191,8 +190,9 @@ static void find_neighbours(const ifg_std_t *ifg, adj_iter_t *it, const ir_node
        ir_nodeset_iterator_init(&it->iter, &it->neighbours);
 }
 
-static INLINE void neighbours_break(adj_iter_t *it, int force)
+static inline void neighbours_break(adj_iter_t *it, int force)
 {
+       (void) force;
        assert(it->valid == 1);
        ir_nodeset_destroy(&it->neighbours);
        it->valid = 0;
@@ -216,11 +216,13 @@ static ir_node *ifg_std_neighbours_begin(const void *self, void *iter, const ir_
 
 static ir_node *ifg_std_neighbours_next(const void *self, void *iter)
 {
+       (void) self;
        return get_next_neighbour(iter);
 }
 
 static void ifg_std_neighbours_break(const void *self, void *iter)
 {
+       (void) self;
        neighbours_break(iter, 1);
 }
 
@@ -234,7 +236,7 @@ typedef struct _cliques_iter_t {
        pset *living;
 } cliques_iter_t;
 
-static INLINE void free_clique_iter(cliques_iter_t *it) {
+static inline void free_clique_iter(cliques_iter_t *it) {
        it->n_blocks = -1;
        obstack_free(&it->ob, NULL);
        del_pset(it->living);
@@ -252,7 +254,7 @@ static void get_blocks_dom_order(ir_node *blk, void *env) {
  * NOTE: Be careful when changing this function!
  *       First understand the control flow of consecutive calls.
  */
-static INLINE int get_next_clique(cliques_iter_t *it) {
+static inline int get_next_clique(cliques_iter_t *it) {
 
        /* continue in the block we left the last time */
        for (; it->blk < it->n_blocks; it->blk++) {
@@ -326,11 +328,13 @@ static int ifg_std_cliques_begin(const void *self, void *iter, ir_node **buf)
 
 static int ifg_std_cliques_next(const void *self, void *iter)
 {
+       (void) self;
        return get_next_clique(iter);
 }
 
 static void ifg_std_cliques_break(const void *self, void *iter)
 {
+       (void) self;
        free_clique_iter(iter);
 }
 
@@ -366,7 +370,7 @@ static const be_ifg_impl_t ifg_std_impl = {
 
 be_ifg_t *be_ifg_std_new(const be_chordal_env_t *env)
 {
-       ifg_std_t *ifg = xmalloc(sizeof(*ifg));
+       ifg_std_t *ifg = XMALLOC(ifg_std_t);
 
        ifg->impl = &ifg_std_impl;
        ifg->env  = env;