X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=f256bc3cb16ec566879efdb386753413fc8d3b7b;hb=04906225f6fe1bc22f73b5d6a98eb9c0992a9b54;hp=61a18fbd2ab5ba8be82ecb443fe142c7220a7ca1;hpb=85f2a7413f3356c2cfad953b52913f2ba79413f6;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 61a18fbd2..f256bc3cb 100644
--- 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,19 +65,18 @@ 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;
-	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));
 
@@ -95,8 +92,8 @@ static unsigned be_compute_block_pressure(be_loopana_t *loop_ana,
 			break;
 
 		be_liveness_transfer(cls, irn, &live_nodes);
-		cnt        = ir_nodeset_size(&live_nodes);
-		max_live   = MAX(cnt, max_live);
+		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));
@@ -126,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);
@@ -234,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;
 }