Use foreach_set() instead of reimplementing it.

[libfirm] / ir / be / beloopana.c

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 8c05a5d..9d2f812 100644 (file)
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,14 +22,13 @@
  * @brief       Compute register pressure in loops.
  * @author      Christian Wuerdig
  * @date        19.02.2007
- * @version     $Id$
  */
 #include "config.h"
 
 #include "set.h"
 #include "pset.h"
 #include "irnode.h"
-#include "irtools.h"
+#include "util.h"
 #include "irloop_t.h"
 #include "error.h"
 #include "debug.h"
@@ -40,9 +39,9 @@
 #include "beloopana.h"
 #include "bemodule.h"
 
-DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL);
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-#define HASH_LOOP_INFO(info) (HASH_PTR((info)->loop) ^ HASH_PTR((info)->cls))
+#define HASH_LOOP_INFO(info) (hash_ptr((info)->loop) ^ hash_ptr((info)->cls))
 
 typedef struct be_loop_info_t {
        ir_loop                     *loop;
@@ -78,7 +77,7 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
        be_lv_t      *lv = be_get_irg_liveness(irg);
        ir_nodeset_t  live_nodes;
        ir_node      *irn;
-       int          max_live;
+       size_t        max_live;
 
        DBG((dbg, LEVEL_1, "Processing Block %+F\n", block));
 
@@ -88,7 +87,7 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
        max_live   = ir_nodeset_size(&live_nodes);
 
        sched_foreach_reverse(block, irn) {
-               int cnt;
+               size_t cnt;
 
                if (is_Phi(irn))
                        break;
@@ -98,14 +97,14 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
                max_live = MAX(cnt, max_live);
        }
 
-       DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %u)\n", block, cls->name, max_live));
+       DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %zu)\n", block, cls->name, max_live));
 
        ir_nodeset_destroy(&live_nodes);
        return max_live;
 }
 
 /**
- * Compute the highest register pressure in a loop and it's sub-loops.
+ * Compute the highest register pressure in a loop and its sub-loops.
  * @param loop_ana  The loop ana object.
  * @param loop      The loop to compute pressure for.
  * @param cls       The register class to compute pressure for.
@@ -114,11 +113,11 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
 static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
                                          const arch_register_class_t *cls)
 {
-       int            i, max;
+       size_t         i, max;
        unsigned       pressure;
        be_loop_info_t *entry, key;
 
-       DBG((dbg, LEVEL_1, "\nProcessing Loop %d\n", loop->loop_nr));
+       DBG((dbg, LEVEL_1, "\nProcessing Loop %ld\n", loop->loop_nr));
        assert(get_loop_n_elements(loop) > 0);
        pressure = 0;
 
@@ -136,7 +135,7 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
 
                pressure = MAX(pressure, son_pressure);
        }
-       DBG((dbg, LEVEL_1, "Done with loop %d, pressure %u for class %s\n", loop->loop_nr, pressure, cls->name));
+       DBG((dbg, LEVEL_1, "Done with loop %ld, pressure %u for class %s\n", loop->loop_nr, pressure, cls->name));
 
        /* update info in set */
        key.loop            = loop;
@@ -166,10 +165,7 @@ be_loopana_t *be_new_loop_pressure_cls(ir_graph *irg,
        DBG((dbg, LEVEL_1, " Computing register pressure for class %s:\n", cls->name));
        DBG((dbg, LEVEL_1, "=====================================================\n", cls->name));
 
-       /* construct control flow loop tree */
-       if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
-               construct_cf_backedges(irg);
-       }
+       assure_loopinfo(irg);
 
        be_compute_loop_pressure(loop_ana, get_irg_loop(irg), cls);
 
@@ -192,10 +188,7 @@ be_loopana_t *be_new_loop_pressure(ir_graph *irg,
        loop_ana->data = new_set(cmp_loop_info, 16);
        loop_ana->irg  = irg;
 
-       /* construct control flow loop tree */
-       if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
-               construct_cf_backedges(irg);
-       }
+       assure_loopinfo(irg);
 
        if (cls != NULL) {
                be_compute_loop_pressure(loop_ana, irg_loop, cls);
@@ -244,7 +237,7 @@ void be_free_loop_pressure(be_loopana_t *loop_ana)
        xfree(loop_ana);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana)
 void be_init_loopana(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.loopana");