irgraph: Use get_irg_obstack() instead of accessing irg->obst directly.

[libfirm] / ir / be / beloopana.c

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 9c33d76..c1190da 100644 (file)
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -22,27 +22,27 @@
  * @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"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belive.h"
 #include "besched.h"
 #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;
@@ -75,10 +75,9 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
                                           ir_node *block,
                                           const arch_register_class_t *cls)
 {
-       be_lv_t      *lv = be_get_irg_liveness(irg);
-       ir_nodeset_t  live_nodes;
-       ir_node      *irn;
-       size_t        max_live;
+       be_lv_t     *lv = be_get_irg_liveness(irg);
+       ir_nodeset_t live_nodes;
+       size_t       max_live;
 
        DBG((dbg, LEVEL_1, "Processing Block %+F\n", block));
 
@@ -105,7 +104,7 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
 }
 
 /**
- * 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.
@@ -142,7 +141,7 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
        key.loop            = loop;
        key.cls             = cls;
        key.max_pressure    = 0;
-       entry               = (be_loop_info_t*)set_insert(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
+       entry               = set_insert(be_loop_info_t, loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
        entry->max_pressure = MAX(entry->max_pressure, pressure);
 
        return pressure;
@@ -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);
@@ -225,7 +218,7 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
 
        key.loop = loop;
        key.cls  = cls;
-       entry    = (be_loop_info_t*)set_find(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
+       entry    = set_find(be_loop_info_t, loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
 
        if (entry)
                pressure = entry->max_pressure;
@@ -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");