make firm compilable with a c++ compiler

[libfirm] / ir / ana / cdep.c

diff --git a/ir/ana/cdep.c b/ir/ana/cdep.c
index 41e6e13..4af268e 100644 (file)
--- a/ir/ana/cdep.c
+++ b/ir/ana/cdep.c
@@ -20,6 +20,7 @@
 /**
  * @file
  * @brief   Implementation of cdep
+ * @author  Christoph Mallon
  * @version $Id$
  */
 #include <assert.h>
@@ -43,12 +44,14 @@ typedef struct cdep_info {
 static cdep_info *cdep_data;
 
 /* Return a list of all control dependences of a block. */
-ir_cdep *find_cdep(const ir_node *block) {
-       return pmap_get(cdep_data->cdep_map, (void *)block);
+ir_cdep *find_cdep(const ir_node *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) {
+void exchange_cdep(ir_node *old, const ir_node *nw)
+{
        ir_cdep *cdep = find_cdep(nw);
        pmap_insert(cdep_data->cdep_map, old, cdep);
 }
@@ -56,14 +59,15 @@ void exchange_cdep(ir_node *old, const ir_node *nw) {
 /**
  * Adds a control dependence from node to dep_on.
  */
-static void add_cdep(ir_node *node, ir_node *dep_on) {
+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
 
        if (dep == NULL) {
-               ir_cdep *newdep = obstack_alloc(&cdep_data->obst, sizeof(*newdep));
+               ir_cdep *newdep = OALLOC(&cdep_data->obst, ir_cdep);
 
                newdep->node = dep_on;
                newdep->next = NULL;
@@ -76,7 +80,7 @@ static void add_cdep(ir_node *node, ir_node *dep_on) {
                        if (dep->next == NULL) break;
                        dep = dep->next;
                }
-               newdep = obstack_alloc(&cdep_data->obst, sizeof(*newdep));
+               newdep = OALLOC(&cdep_data->obst, ir_cdep);
                newdep->node = dep_on;
                newdep->next = NULL;
                dep->next = newdep;
@@ -91,10 +95,10 @@ typedef struct cdep_env {
 /**
  * Pre-block-walker: calculate the control dependence
  */
-static void cdep_pre(ir_node *node, void *ctx) {
-       cdep_env *env = ctx;
-       unsigned int n;
-       unsigned int i;
+static void cdep_pre(ir_node *node, void *ctx)
+{
+       cdep_env *env = (cdep_env*) ctx;
+       int i;
 
        /* special case:
         * start and end block have no control dependency
@@ -102,8 +106,7 @@ static void cdep_pre(ir_node *node, void *ctx) {
        if (node == env->start_block) return;
        if (node == env->end_block) return;
 
-       n = get_Block_n_cfgpreds(node);
-       for (i = 0; i < n; i++) {
+       for (i = get_Block_n_cfgpreds(node) - 1; i >= 0; --i) {
                ir_node *pred = get_Block_cfgpred_block(node, i);
                ir_node *pdom;
                ir_node *dependee;
@@ -150,12 +153,13 @@ static int cdep_edge_hook(FILE *F, ir_node *block)
 }
 
 /* Compute the control dependence graph for a graph. */
-void compute_cdep(ir_graph *irg) {
-       ir_node *start_block, *rem;
+void compute_cdep(ir_graph *irg)
+{
+       ir_node *rem;
        cdep_env env;
 
        free_cdep(irg);
-       cdep_data = xmalloc(sizeof(*cdep_data));
+       cdep_data = XMALLOC(cdep_info);
        obstack_init(&cdep_data->obst);
 
        cdep_data->cdep_map = pmap_create();
@@ -166,12 +170,12 @@ void compute_cdep(ir_graph *irg) {
           the ipdom of the startblock is the end block.
           Firm does NOT add the phantom edge from Start to End.
         */
-       start_block = get_irg_start_block(irg);
-       rem = get_Block_ipostdom(start_block);
-       set_Block_ipostdom(start_block, get_irg_end_block(irg));
-
        env.start_block = get_irg_start_block(irg);
        env.end_block   = get_irg_end_block(irg);
+
+       rem = get_Block_ipostdom(env.start_block);
+       set_Block_ipostdom(env.start_block, env.end_block);
+
        irg_block_walk_graph(irg, cdep_pre, NULL, &env);
 
 #if 0
@@ -183,11 +187,12 @@ void compute_cdep(ir_graph *irg) {
 #endif
 
        /* restore the post dominator relation */
-       set_Block_ipostdom(start_block, rem);
+       set_Block_ipostdom(env.start_block, rem);
 }
 
 /* Free the control dependence info. */
-void free_cdep(ir_graph *irg) {
+void free_cdep(ir_graph *irg)
+{
        (void) irg;
        if (cdep_data != NULL) {
                pmap_destroy(cdep_data->cdep_map);
@@ -198,7 +203,8 @@ 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) {
+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) {
@@ -208,7 +214,8 @@ int is_cdep_on(const ir_node *dependee, const ir_node *candidate) {
 }
 
 /* Check whether dependee is (possible iterated) control dependent on candidate. */
-int is_iterated_cdep_on(ir_node *dependee, ir_node *candidate) {
+int is_iterated_cdep_on(ir_node *dependee, ir_node *candidate)
+{
        const ir_cdep *dep;
 
        while ((dep = find_cdep(dependee)) != NULL) {
@@ -220,14 +227,16 @@ int is_iterated_cdep_on(ir_node *dependee, ir_node *candidate) {
 }
 
 /* If block is control dependent on exactly one node, return this node, else NULL. */
-ir_node *get_unique_cdep(const ir_node *block) {
+ir_node *get_unique_cdep(const ir_node *block)
+{
        ir_cdep *cdep = find_cdep(block);
 
        return cdep != NULL && cdep->next == NULL ? cdep->node : NULL;
 }
 
 /* Check if the given block is control dependent of more than one node. */
-int has_multiple_cdep(const ir_node *block) {
+int has_multiple_cdep(const ir_node *block)
+{
        ir_cdep *cdep = find_cdep(block);
 
        return cdep != NULL && cdep->next != NULL;