X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg.h;h=f0da29d023ffe3bc619c46f8138bb1b723bfb08c;hb=0318dc1a48ce72b311592c28affc31fabc95f026;hp=64a6aadaaa56dbbf91859f9789e9a29d7445f783;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm

diff --git a/ir/be/beifg.h b/ir/be/beifg.h
index 64a6aadaa..f0da29d02 100644
--- a/ir/be/beifg.h
+++ b/ir/be/beifg.h
@@ -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.
  *
@@ -30,43 +30,67 @@
 #include <stdio.h>
 
 #include "irnode.h"
+#include "irnodeset.h"
 
 #include "becopyopt.h"
 #include "beirg.h"
 
-typedef struct _be_ifg_impl_t   be_ifg_impl_t;
-typedef struct _be_ifg_t        be_ifg_t;
-
-#define be_ifg_nodes_iter_alloca(self)          (alloca(be_ifg_nodes_iter_size(self)))
-#define be_ifg_neighbours_iter_alloca(self)     (alloca(be_ifg_neighbours_iter_size(self)))
-#define be_ifg_cliques_iter_alloca(self)        (alloca(be_ifg_cliques_iter_size(self)))
-
-size_t   (be_ifg_nodes_iter_size)(const be_ifg_t *self);
-size_t   (be_ifg_neighbours_iter_size)(const be_ifg_t *self);
-size_t   (be_ifg_cliques_iter_size)(const be_ifg_t *self);
-void     (be_ifg_free)(be_ifg_t *self);
-int      (be_ifg_connected)(const be_ifg_t *self, const ir_node *a, const ir_node *b);
-ir_node *(be_ifg_neighbours_begin)(const be_ifg_t *self, void *iter, const ir_node *irn);
-ir_node *(be_ifg_neighbours_next)(const be_ifg_t *self, void *iter);
-void     (be_ifg_neighbours_break)(const be_ifg_t *self, void *iter);
-ir_node *(be_ifg_nodes_begin)(const be_ifg_t *self, void *iter);
-ir_node *(be_ifg_nodes_next)(const be_ifg_t *self, void *iter);
-void     (be_ifg_nodes_break)(const be_ifg_t *self, void *iter);
-int      (be_ifg_cliques_begin)(const be_ifg_t *self, void *iter, ir_node **buf);
-int      (be_ifg_cliques_next)(const be_ifg_t *self, void *iter);
-void     (be_ifg_cliques_break)(const be_ifg_t *self, void *iter);
-int      (be_ifg_degree)(const be_ifg_t *self, const ir_node *irn);
-
-#define be_ifg_foreach_neighbour(self, iter, irn, pos) \
-	for(pos = be_ifg_neighbours_begin(self, iter, irn); (pos); pos = be_ifg_neighbours_next(self, iter))
-
-#define be_ifg_foreach_node(self, iter, pos) \
-	for(pos = be_ifg_nodes_begin(self, iter); (pos); pos = be_ifg_nodes_next(self, iter))
-
-#define be_ifg_foreach_clique(self, iter, buf, count) \
-	for(*(count) = be_ifg_cliques_begin(self, iter, buf); \
+typedef struct be_ifg_t {
+	const be_chordal_env_t *env;
+} be_ifg_t;
+
+typedef struct nodes_iter_t {
+	const be_chordal_env_t *env;
+	struct obstack         obst;
+	int                    n;
+	int                    curr;
+	ir_node                **nodes;
+} nodes_iter_t;
+
+typedef struct neighbours_iter_t {
+	const be_chordal_env_t *env;
+	const ir_node        *irn;
+	int                   valid;
+	ir_nodeset_t          neighbours;
+	ir_nodeset_iterator_t iter;
+} neighbours_iter_t;
+
+typedef struct cliques_iter_t {
+	struct obstack ob;
+	const be_chordal_env_t *cenv;
+	ir_node **buf;
+	ir_node **blocks;
+	int n_blocks, blk;
+	struct list_head *bor;
+	pset *living;
+} cliques_iter_t;
+
+void     be_ifg_free(be_ifg_t *ifg);
+int      be_ifg_connected(const be_ifg_t *ifg, const ir_node *a,
+                          const ir_node *b);
+ir_node *be_ifg_neighbours_begin(const be_ifg_t *ifg, neighbours_iter_t *iter,
+                                 const ir_node *irn);
+ir_node *be_ifg_neighbours_next(neighbours_iter_t *iter);
+void     be_ifg_neighbours_break(neighbours_iter_t *iter);
+ir_node *be_ifg_nodes_begin(const be_ifg_t *ifg, nodes_iter_t *iter);
+ir_node *be_ifg_nodes_next(nodes_iter_t *iter);
+void     be_ifg_nodes_break(nodes_iter_t *iter);
+int      be_ifg_cliques_begin(const be_ifg_t *ifg, cliques_iter_t *iter,
+                              ir_node **buf);
+int      be_ifg_cliques_next(cliques_iter_t *iter);
+void     be_ifg_cliques_break(cliques_iter_t *iter);
+int      be_ifg_degree(const be_ifg_t *ifg, const ir_node *irn);
+
+#define be_ifg_foreach_neighbour(ifg, iter, irn, pos) \
+	for(pos = be_ifg_neighbours_begin(ifg, iter, irn); pos != NULL; pos = be_ifg_neighbours_next(iter))
+
+#define be_ifg_foreach_node(ifg, iter, pos) \
+	for(pos = be_ifg_nodes_begin(ifg, iter); pos != NULL; pos = be_ifg_nodes_next(iter))
+
+#define be_ifg_foreach_clique(ifg, iter, buf, count) \
+	for(*(count) = be_ifg_cliques_begin(ifg, iter, buf); \
         *(count) != -1 ; \
-        *(count) = be_ifg_cliques_next(self, iter))
+        *(count) = be_ifg_cliques_next(iter))
 
 typedef struct {
 	int n_nodes;
@@ -74,7 +98,7 @@ typedef struct {
 	int n_comps;
 } be_ifg_stat_t;
 
-void be_ifg_stat(be_irg_t *birg, be_ifg_t *ifg, be_ifg_stat_t *stat);
+void be_ifg_stat(ir_graph *irg, be_ifg_t *ifg, be_ifg_stat_t *stat);
 
 be_ifg_t *be_create_ifg(const be_chordal_env_t *env);
 
@@ -87,7 +111,7 @@ be_ifg_t *be_create_ifg(const be_chordal_env_t *env);
                           |_|            |___/
 */
 
-typedef struct _be_ifg_dump_dot_cb_t {
+typedef struct be_ifg_dump_dot_cb_t {
 	int  (*is_dump_node)(void *self, ir_node *irn);
 	void (*graph_attr)(FILE *f, void *self);
 	void (*node_attr)(FILE *f, void *self, ir_node *irn);
@@ -97,9 +121,5 @@ typedef struct _be_ifg_dump_dot_cb_t {
 } be_ifg_dump_dot_cb_t;
 
 void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump_dot_cb_t *cb, void *self);
-void be_ifg_check_sorted(const be_ifg_t *ifg);
-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);
 
-
-#endif /* FIRM_BE_BEIFG_H */
+#endif