fixed some minor bugs

[libfirm] / ir / be / beifg.h

diff --git a/ir/be/beifg.h b/ir/be/beifg.h
index 1e6caf3..7130a13 100644 (file)
--- a/ir/be/beifg.h
+++ b/ir/be/beifg.h
@@ -10,31 +10,40 @@
 #ifndef _BEIFG_H
 #define _BEIFG_H
 
-#include "obst.h"
-#include "bechordal_t.h"
-
-typedef struct _be_ifg_impl_t  be_ifg_impl_t;
-typedef struct _be_ifg_t                               be_ifg_t;
-
-struct _be_ifg_impl_t {
-       void (*free)(void *self);
-
-       int (*connected)(void *self, const ir_node *a, const ir_node *b);
-       int (*neighbours_arr)(void *self, const ir_node *irn, ir_node **arr, size_t n);
-       int (*neighbours_obst)(void *self, const ir_node *irn, struct obstack *obst);
-       int (*degree)(void *self, const ir_node *irn);
-};
-
-struct _be_ifg_t {
-       const be_ifg_impl_t *impl;
-};
-
-#define be_ifg_free(self)                                                                              ((self)->impl->free(self))
-#define be_ifg_connected(self,a,b)                                             ((self)->impl->connected(self, a, b))
-#define be_ifg_neighbours_arr(self,irn,arr,n)  ((self)->impl->neighbours_arr(self, irn, arr, n))
-#define be_ifg_neighbours_obst(self,irn,obst)  ((self)->impl->neighbours_arr(self, irn, obst))
-#define be_ifg_degree(self,irn)                                                                ((self)->impl->degree(self, irn))
-
-be_ifg_t *be_ifg_std_new(const be_chordal_env_t *env);
+#include "firm_types.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 void *self);
+size_t   (be_ifg_neighbours_iter_size)(const void *self);
+size_t   (be_ifg_cliques_iter_size)(const void *self);
+void     (be_ifg_free)(void *self);
+int      (be_ifg_connected)(const void *self, const ir_node *a, const ir_node *b);
+ir_node *(be_ifg_neighbours_begin)(const void *self, void *iter, const ir_node *irn);
+ir_node *(be_ifg_neighbours_next)(const void *self, void *iter);
+void     (be_ifg_neighbours_break)(const void *self, void *iter);
+ir_node *(be_ifg_nodes_begin)(const void *self, void *iter);
+ir_node *(be_ifg_nodes_next)(const void *self, void *iter);
+void     (be_ifg_nodes_break)(const void *self, void *iter);
+int      (be_ifg_cliques_begin)(const void *self, void *iter, ir_node **buf);
+int      (be_ifg_cliques_next)(const void *self, void *iter);
+void     (be_ifg_cliques_break)(const void *self, void *iter);
+int      (be_ifg_degree)(const void *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); \
+        *(count) != -1 ; \
+        *(count) = be_ifg_cliques_next(self, iter))
 
 #endif /* _BEIFG_H */