Adapted some issues noticed during removal of unused variables.

[libfirm] / ir / ana / cdep.c

diff --git a/ir/ana/cdep.c b/ir/ana/cdep.c
index 4af268e..498ffbd 100644 (file)
--- a/ir/ana/cdep.c
+++ b/ir/ana/cdep.c
@@ -32,7 +32,7 @@
 #include "pmap.h"
 #include "obst.h"
 #include "xmalloc.h"
-#include "cdep.h"
+#include "cdep_t.h"
 #include "irprintf.h"
 #include "irdump.h"
 
@@ -43,16 +43,27 @@ typedef struct cdep_info {
 
 static cdep_info *cdep_data;
 
+ir_node *(get_cdep_node)(const ir_cdep *cdep)
+{
+       return _get_cdep_node(cdep);
+}
+
+ir_cdep *(get_cdep_next)(const ir_cdep *cdep)
+{
+       return _get_cdep_next(cdep);
+}
+
 /* Return a list of all control dependences of a block. */
 ir_cdep *find_cdep(const ir_node *block)
 {
+       assert(is_Block(block));
        return (ir_cdep*) pmap_get(cdep_data->cdep_map, block);
 }
 
-/* Replace the control dependence info of old by the info of nw. */
 void exchange_cdep(ir_node *old, const ir_node *nw)
 {
        ir_cdep *cdep = find_cdep(nw);
+       assert(is_Block(old));
        pmap_insert(cdep_data->cdep_map, old, cdep);
 }
 
@@ -62,10 +73,8 @@ void exchange_cdep(ir_node *old, const ir_node *nw)
 static void add_cdep(ir_node *node, ir_node *dep_on)
 {
        ir_cdep *dep = find_cdep(node);
-#if 0
-       ir_fprintf(stderr, "Adding cdep of %+F on %+F\n", node, dep_on);
-#endif
 
+       assert(is_Block(dep_on));
        if (dep == NULL) {
                ir_cdep *newdep = OALLOC(&cdep_data->obst, ir_cdep);
 
@@ -76,7 +85,7 @@ static void add_cdep(ir_node *node, ir_node *dep_on)
                ir_cdep *newdep;
 
                for (;;) {
-                       if (dep->node == dep_on) return;
+                       if (get_cdep_node(dep) == dep_on) return;
                        if (dep->next == NULL) break;
                        dep = dep->next;
                }
@@ -129,17 +138,6 @@ static int cdep_edge_hook(FILE *F, ir_node *block)
 {
        ir_cdep *cd;
 
-#if 0
-       ir_node *pdom = get_Block_ipostdom(block);
-       if (pdom != NULL) {
-               fprintf(
-                       F,
-                       "edge:{sourcename:\"n%ld\" targetname:\"n%ld\" color:gold}\n",
-                       get_irn_node_nr(pdom), get_irn_node_nr(block)
-               );
-       }
-#endif
-
        for (cd = find_cdep(block); cd != NULL; cd = cd->next) {
                fprintf(
                        F,
@@ -152,7 +150,6 @@ static int cdep_edge_hook(FILE *F, ir_node *block)
        return 0;
 }
 
-/* Compute the control dependence graph for a graph. */
 void compute_cdep(ir_graph *irg)
 {
        ir_node *rem;
@@ -190,7 +187,6 @@ void compute_cdep(ir_graph *irg)
        set_Block_ipostdom(env.start_block, rem);
 }
 
-/* Free the control dependence info. */
 void free_cdep(ir_graph *irg)
 {
        (void) irg;
@@ -202,39 +198,23 @@ void free_cdep(ir_graph *irg)
        }
 }
 
-/* Check whether dependee is (directly) control dependent on candidate. */
 int is_cdep_on(const ir_node *dependee, const ir_node *candidate)
 {
        const ir_cdep *dep;
 
        for (dep = find_cdep(dependee); dep != NULL; dep = dep->next) {
-               if (dep->node == candidate) return 1;
-       }
-       return 0;
-}
-
-/* Check whether dependee is (possible iterated) control dependent on candidate. */
-int is_iterated_cdep_on(ir_node *dependee, ir_node *candidate)
-{
-       const ir_cdep *dep;
-
-       while ((dep = find_cdep(dependee)) != NULL) {
-               if (dep->next != NULL) return 0;
-               if (dep->node == candidate) return 1;
-               dependee = dep->node;
+               if (get_cdep_node(dep) == candidate) return 1;
        }
        return 0;
 }
 
-/* If block is control dependent on exactly one node, return this node, else NULL. */
 ir_node *get_unique_cdep(const ir_node *block)
 {
        ir_cdep *cdep = find_cdep(block);
 
-       return cdep != NULL && cdep->next == NULL ? cdep->node : NULL;
+       return cdep != NULL && cdep->next == NULL ? get_cdep_node(cdep) : NULL;
 }
 
-/* Check if the given block is control dependent of more than one node. */
 int has_multiple_cdep(const ir_node *block)
 {
        ir_cdep *cdep = find_cdep(block);