Generate new_bd_* instead of new_rd_* functions in the backend. The nodes are always...

[libfirm] / ir / be / beloopana.c

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index eb00490..f256bc3 100644 (file)
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -24,9 +24,7 @@
  * @date        19.02.2007
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "set.h"
 #include "pset.h"
@@ -67,26 +65,24 @@ static int cmp_loop_info(const void *a, const void *b, size_t size) {
 
 /**
  * Compute the highest register pressure in a block.
- * @param loop_ana  The loop ana object.
+ * @param birg      The graph.
  * @param block     The block to compute pressure for.
  * @param cls       The register class to compute pressure for.
  * @return The highest register pressure in the given block.
  */
-static unsigned be_compute_block_pressure(be_loopana_t *loop_ana,
+static unsigned be_compute_block_pressure(const be_irg_t *birg,
                ir_node *block, const arch_register_class_t *cls)
 {
-       const be_irg_t   *birg       = loop_ana->birg;
-       const arch_env_t *aenv       = be_get_birg_arch_env(birg);
-       be_lv_t          *lv         = be_get_birg_liveness(birg);
-       ir_nodeset_t      live_nodes;
-       ir_node          *irn;
-       int              max_live;
+       be_lv_t      *lv = be_get_birg_liveness(birg);
+       ir_nodeset_t  live_nodes;
+       ir_node      *irn;
+       int          max_live;
 
        DBG((dbg, LEVEL_1, "Processing Block %+F\n", block));
 
        /* determine largest pressure with this block */
        ir_nodeset_init(&live_nodes);
-       be_liveness_end_of_block(lv, aenv, cls, block, &live_nodes);
+       be_liveness_end_of_block(lv, cls, block, &live_nodes);
        max_live   = ir_nodeset_size(&live_nodes);
 
        sched_foreach_reverse(block, irn) {
@@ -95,9 +91,9 @@ static unsigned be_compute_block_pressure(be_loopana_t *loop_ana,
                if (is_Phi(irn))
                        break;
 
-               be_liveness_transfer(aenv, cls, irn, &live_nodes);
-               cnt        = ir_nodeset_size(&live_nodes);
-               max_live   = MAX(cnt, max_live);
+               be_liveness_transfer(cls, irn, &live_nodes);
+               cnt      = ir_nodeset_size(&live_nodes);
+               max_live = MAX(cnt, max_live);
        }
 
        DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %u)\n", block, cls->name, max_live));
@@ -127,16 +123,11 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
                unsigned     son_pressure;
                loop_element elem = get_loop_element(loop, i);
 
-               switch (*elem.kind) {
-                       case k_ir_node:
-                               son_pressure = be_compute_block_pressure(loop_ana, elem.node, cls);
-                               break;
-                       case k_ir_loop:
-                               son_pressure = be_compute_loop_pressure(loop_ana, elem.son, cls);
-                               break;
-                       default:
-                               panic("Unknown element found in loop");
-                               break;
+               if (*elem.kind == k_ir_node)
+                       son_pressure = be_compute_block_pressure(loop_ana->birg, elem.node, cls);
+               else {
+                       assert(*elem.kind == k_ir_loop);
+                       son_pressure = be_compute_loop_pressure(loop_ana, elem.son, cls);
                }
 
                pressure = MAX(pressure, son_pressure);
@@ -162,7 +153,7 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
 be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg,
                                        const arch_register_class_t *cls) {
        ir_graph     *irg      = be_get_birg_irg(birg);
-       be_loopana_t *loop_ana = xmalloc(sizeof(*loop_ana));
+       be_loopana_t *loop_ana = XMALLOC(be_loopana_t);
 
        loop_ana->data = new_set(cmp_loop_info, 16);
        loop_ana->birg = birg;
@@ -190,7 +181,7 @@ be_loopana_t *be_new_loop_pressure(be_irg_t *birg,
                                    const arch_register_class_t *cls)
 {
        ir_graph         *irg      = be_get_birg_irg(birg);
-       be_loopana_t     *loop_ana = xmalloc(sizeof(*loop_ana));
+       be_loopana_t     *loop_ana = XMALLOC(be_loopana_t);
        ir_loop          *irg_loop = get_irg_loop(irg);
        const arch_env_t *arch_env = be_get_birg_arch_env(birg);
        int               i;
@@ -235,7 +226,7 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
        if (entry)
                pressure = entry->max_pressure;
        else
-               assert(0 && "Pressure not computed for given class and loop object.");
+               panic("Pressure not computed for given class and loop object.");
 
        return pressure;
 }