missing files added

[libfirm] / ir / be / beifg.c

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index c3224c6..1e80f11 100644 (file)
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -12,23 +12,9 @@
 
 #include <stdlib.h>
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
-#ifdef __linux__
-#include <malloc.h>
-#endif /* __linux__ */
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
 #include <libcore/lc_timing.h>
-#endif /* WITH_LIBCORE */
 
 #include "bitset.h"
 
@@ -39,10 +25,10 @@
 #include "irbitset.h"
 #include "beifg_t.h"
 #include "beifg_impl.h"
-#include "irphase.h"
 #include "irphase_t.h"
 #include "bechordal.h"
 #include "error.h"
+#include "xmalloc.h"
 
 #include "becopystat.h"
 #include "becopyopt.h"
@@ -55,7 +41,7 @@
 typedef struct _coloring_t coloring_t;
 
 struct _coloring_t {
-       phase_t ph;
+       ir_phase ph;
        const arch_env_t *arch_env;
        ir_graph *irg;
 };
@@ -75,7 +61,7 @@ size_t (be_ifg_cliques_iter_size)(const be_ifg_t *ifg)
        return ifg->impl->cliques_iter_size;
 }
 
-static void *regs_irn_data_init(phase_t *ph, ir_node *irn, void *data)
+static void *regs_irn_data_init(ir_phase *ph, ir_node *irn, void *data)
 {
        coloring_t *coloring = (coloring_t *) ph;
        return (void *) arch_get_irn_register(coloring->arch_env, irn);
@@ -380,7 +366,6 @@ void be_ifg_check_sorted_to_file(const be_ifg_t *ifg, FILE *f)
 
 void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 {
-#ifdef WITH_LIBCORE
        int tests = BE_CH_PERFORMANCETEST_COUNT;
        coloring_t coloring;
 
@@ -585,7 +570,6 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
        }
 
        chordal_env->ifg = old_if;
-#endif /* WITH_LIBCORE */
 }
 
 void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump_dot_cb_t *cb, void *self)
@@ -637,33 +621,33 @@ void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump
        bitset_free(nodes);
 }
 
-static void int_comp_rec(const be_chordal_env_t *cenv, ir_node *n, bitset_t *seen)
+static void int_comp_rec(be_irg_t *birg, be_ifg_t *ifg, ir_node *n, bitset_t *seen)
 {
-       void *neigh_it  = be_ifg_neighbours_iter_alloca(cenv->ifg);
+       void    *neigh_it = be_ifg_neighbours_iter_alloca(ifg);
        ir_node *m;
 
-       be_ifg_foreach_neighbour(cenv->ifg, neigh_it, n, m) {
-               if(!bitset_contains_irn(seen, m) && !arch_irn_is(cenv->birg->main_env->arch_env, m, ignore)) {
+       be_ifg_foreach_neighbour(ifg, neigh_it, n, m) {
+               if(!bitset_contains_irn(seen, m) && !arch_irn_is(birg->main_env->arch_env, m, ignore)) {
                        bitset_add_irn(seen, m);
-                       int_comp_rec(cenv, m, seen);
+                       int_comp_rec(birg, ifg, m, seen);
                }
        }
 
 }
 
-static int int_component_stat(const be_chordal_env_t *cenv)
+static int int_component_stat(be_irg_t *birg, be_ifg_t *ifg)
 {
-       int n_comp     = 0;
-       void *nodes_it = be_ifg_nodes_iter_alloca(cenv->ifg);
-       bitset_t *seen = bitset_irg_malloc(cenv->irg);
+       int      n_comp    = 0;
+       void     *nodes_it = be_ifg_nodes_iter_alloca(ifg);
+       bitset_t *seen     = bitset_irg_malloc(birg->irg);
 
        ir_node *n;
 
-       be_ifg_foreach_node(cenv->ifg, nodes_it, n) {
-               if(!bitset_contains_irn(seen, n) && !arch_irn_is(cenv->birg->main_env->arch_env, n, ignore)) {
+       be_ifg_foreach_node(ifg, nodes_it, n) {
+               if (! bitset_contains_irn(seen, n) && ! arch_irn_is(birg->main_env->arch_env, n, ignore)) {
                        ++n_comp;
                        bitset_add_irn(seen, n);
-                       int_comp_rec(cenv, n, seen);
+                       int_comp_rec(birg, ifg, n, seen);
                }
        }
 
@@ -671,24 +655,24 @@ static int int_component_stat(const be_chordal_env_t *cenv)
        return n_comp;
 }
 
-void be_ifg_stat(const be_chordal_env_t *cenv, be_ifg_stat_t *stat)
+void be_ifg_stat(be_irg_t *birg, be_ifg_t *ifg, be_ifg_stat_t *stat)
 {
-       void *nodes_it  = be_ifg_nodes_iter_alloca(cenv->ifg);
-       void *neigh_it  = be_ifg_neighbours_iter_alloca(cenv->ifg);
-       bitset_t *nodes = bitset_irg_malloc(cenv->irg);
-
-       ir_node *n, *m;
+       void     *nodes_it = be_ifg_nodes_iter_alloca(ifg);
+       void     *neigh_it = be_ifg_neighbours_iter_alloca(ifg);
+       bitset_t *nodes    = bitset_irg_malloc(birg->irg);
+       ir_node  *n, *m;
 
        memset(stat, 0, sizeof(stat[0]));
-       be_ifg_foreach_node(cenv->ifg, nodes_it, n) {
+
+       be_ifg_foreach_node(ifg, nodes_it, n) {
                stat->n_nodes += 1;
-               be_ifg_foreach_neighbour(cenv->ifg, neigh_it, n, m) {
+               be_ifg_foreach_neighbour(ifg, neigh_it, n, m) {
                        bitset_add_irn(nodes, n);
                        stat->n_edges += !bitset_contains_irn(nodes, m);
                }
        }
 
-       stat->n_comps = int_component_stat(cenv);
+       stat->n_comps = int_component_stat(birg, ifg);
        bitset_free(nodes);
 }