used new assure_doms() function

[libfirm] / ir / be / beifg.c

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index 4e569ab..e329de7 100644 (file)
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -21,10 +21,30 @@
 #include <alloca.h>
 #endif
 
+#include "bitset.h"
+
 #include "irnode_t.h"
 #include "irprintf.h"
 #include "beifg_t.h"
 
+size_t (be_ifg_nodes_iter_size)(const void *self)
+{
+       const be_ifg_t *ifg = self;
+       return ifg->impl->nodes_iter_size;
+}
+
+size_t (be_ifg_neighbours_iter_size)(const void *self)
+{
+       const be_ifg_t *ifg = self;
+       return ifg->impl->neighbours_iter_size;
+}
+
+size_t (be_ifg_cliques_iter_size)(const void *self)
+{
+       const be_ifg_t *ifg = self;
+       return ifg->impl->cliques_iter_size;
+}
+
 void (be_ifg_free)(void *self)
 {
        be_ifg_t *ifg = self;
@@ -73,6 +93,24 @@ void (be_ifg_nodes_break)(const void *self, void *iter)
        ifg->impl->nodes_break(self, iter);
 }
 
+int (be_ifg_cliques_begin)(const void *self, void *iter, ir_node **buf)
+{
+       const be_ifg_t *ifg = self;
+       return ifg->impl->cliques_begin(self, iter, buf);
+}
+
+int (be_ifg_cliques_next)(const void *self, void *iter)
+{
+       const be_ifg_t *ifg = self;
+       return ifg->impl->cliques_next(self, iter);
+}
+
+void (be_ifg_cliques_break)(const void *self, void *iter)
+{
+       const be_ifg_t *ifg = self;
+       ifg->impl->cliques_break(self, iter);
+}
+
 int (be_ifg_degree)(const void *self, const ir_node *irn)
 {
        const be_ifg_t *ifg = self;
@@ -85,11 +123,12 @@ int be_ifg_is_simplicial(const be_ifg_t *ifg, const ir_node *irn)
        int degree = be_ifg_degree(ifg, irn);
        void *iter = be_ifg_neighbours_iter_alloca(ifg);
 
-       ir_node **neighbours = malloc(degree * sizeof(neighbours[0]));
+       ir_node **neighbours = xmalloc(degree * sizeof(neighbours[0]));
 
        ir_node *curr;
        int i, j;
 
+       i = 0;
        be_ifg_foreach_neighbour(ifg, iter, irn, curr)
                neighbours[i++] = curr;
 
@@ -108,7 +147,7 @@ int be_ifg_is_simplicial(const be_ifg_t *ifg, const ir_node *irn)
 
 void be_ifg_check(const be_ifg_t *ifg)
 {
-       void *iter1 = be_ifg_neighbours_iter_alloca(ifg);
+       void *iter1 = be_ifg_nodes_iter_alloca(ifg);
        void *iter2 = be_ifg_neighbours_iter_alloca(ifg);
 
        ir_node *n, *m;
@@ -120,3 +159,52 @@ void be_ifg_check(const be_ifg_t *ifg)
                                ir_fprintf(stderr, "%+F is a neighbour of %+F but they are not connected!\n", n, m);
        }
 }
+
+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 *nodes_it  = be_ifg_nodes_iter_alloca(ifg);
+       void *neigh_it  = be_ifg_neighbours_iter_alloca(ifg);
+       bitset_t *nodes = bitset_malloc(get_irg_last_idx(irg));
+
+       ir_node *n, *m;
+
+       fprintf(file, "graph G {\n\tgraph [");
+       if(cb->graph_attr)
+               cb->graph_attr(file, self);
+       fprintf(file, "];\n");
+
+       if(cb->at_begin)
+               cb->at_begin(file, self);
+
+       be_ifg_foreach_node(ifg, nodes_it, n) {
+               if(cb->is_dump_node && cb->is_dump_node(self, n)) {
+                       int idx = get_irn_idx(n);
+                       bitset_set(nodes, idx);
+                       fprintf(file, "\tnode [");
+                       if(cb->node_attr)
+                               cb->node_attr(file, self, n);
+                       fprintf(file, "]; n%d;\n", idx);
+               }
+       }
+
+       /* Check, if all neighbours are indeed connected to the node. */
+       be_ifg_foreach_node(ifg, nodes_it, n) {
+               be_ifg_foreach_neighbour(ifg, neigh_it, n, m) {
+                       int n_idx = get_irn_idx(n);
+                       int m_idx = get_irn_idx(m);
+
+                       if(n_idx < m_idx && bitset_is_set(nodes, n_idx) && bitset_is_set(nodes, m_idx)) {
+                               fprintf(file, "\tn%d -- n%d [", n_idx, m_idx);
+                               if(cb->edge_attr)
+                                       cb->edge_attr(file, self, n, m);
+                               fprintf(file, "];\n");
+                       }
+               }
+       }
+
+       if(cb->at_end)
+               cb->at_end(file, self);
+
+       fprintf(file, "}\n");
+       bitset_free(nodes);
+}