X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg.c;h=2b3715e8f20f08ba0f04ae1f5485df69fb662c86;hb=697556f8c542202201aa2455397bf49c71f819c3;hp=3b3b4394c350c659536f6d5c48aece940060ff15;hpb=02046d6f22e734521c84dfb2f342cf61e6442c2f;p=libfirm

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index 3b3b4394c..2b3715e8f 100644
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -1,10 +1,28 @@
-/**
- * @file   beifg.c
- * @date   18.11.2005
- * @author Sebastian Hack
+/*
+ * Copyright (C) 1995-2008 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.
  *
- * Copyright (C) 2005 Universitaet Karlsruhe
- * Released under the GPL
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       Interface for interference graphs.
+ * @author      Sebastian Hack
+ * @date        18.11.2005
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -12,26 +30,11 @@
 
 #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"
-
 #include "irgwalk.h"
 #include "irnode_t.h"
 #include "irprintf.h"
@@ -39,14 +42,14 @@
 #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"
 #include "beirg_t.h"
+#include "bemodule.h"
 
 /** Defines values for the ifg performance test */
 #define BE_CH_PERFORMANCETEST_MIN_NODES (50)
@@ -55,9 +58,9 @@
 typedef struct _coloring_t coloring_t;
 
 struct _coloring_t {
-	phase_t ph;
+	ir_phase         ph;
 	const arch_env_t *arch_env;
-	ir_graph *irg;
+	ir_graph         *irg;
 };
 
 size_t (be_ifg_nodes_iter_size)(const be_ifg_t *ifg)
@@ -75,15 +78,17 @@ 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, const ir_node *irn, void *data)
 {
 	coloring_t *coloring = (coloring_t *) ph;
+	(void) data;
+
 	return (void *) arch_get_irn_register(coloring->arch_env, irn);
 }
 
 coloring_t *coloring_init(coloring_t *c, ir_graph *irg, const arch_env_t *aenv)
 {
-	phase_init(&c->ph, "regs_map", irg, PHASE_DEFAULT_GROWTH, regs_irn_data_init);
+	phase_init(&c->ph, "regs_map", irg, PHASE_DEFAULT_GROWTH, regs_irn_data_init, NULL);
 	c->arch_env = aenv;
 	c->irg = irg;
 	return c;
@@ -256,8 +261,8 @@ static int be_ifg_check_cmp_nodes(const void *a, const void *b)
 	const ir_node *node_a = *(ir_node **)a;
 	const ir_node *node_b = *(ir_node **)b;
 
-	long nr_a = get_irn_node_nr(node_a);
-	long nr_b = get_irn_node_nr(node_b);
+	long nr_a = get_irn_idx(node_a);
+	long nr_b = get_irn_idx(node_b);
 
 	return QSORT_CMP(nr_a, nr_b);
 }
@@ -380,7 +385,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 +589,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)
@@ -719,7 +722,7 @@ static lc_opt_enum_int_var_t ifg_flavor_var = {
 
 static const lc_opt_table_entry_t be_ifg_options[] = {
 	LC_OPT_ENT_ENUM_PTR ("ifg", "interference graph flavour", &ifg_flavor_var),
-	{ NULL }
+	LC_OPT_LAST
 };
 
 void be_init_ifg(void)