X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=e3dcb8978330c085c2e398eb56dfff986b853ee2;hb=9e9c84725fd3fcfbcb819d6d6b88f8da91f121a9;hp=c898c0660c446385f2cdeb43961391dc74073915;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index c898c0660..e3dcb8978 100644
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -34,7 +34,7 @@
 #include "error.h"
 #include "debug.h"
 
-#include "bearch_t.h"
+#include "bearch.h"
 #include "belive.h"
 #include "besched.h"
 #include "beloopana.h"
@@ -55,7 +55,8 @@ struct _be_loopana_t {
 	be_irg_t *birg;
 };
 
-static int cmp_loop_info(const void *a, const void *b, size_t size) {
+static int cmp_loop_info(const void *a, const void *b, size_t size)
+{
 	const be_loop_info_t *i1 = a;
 	const be_loop_info_t *i2 = b;
 	(void) size;
@@ -65,19 +66,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));
 
@@ -93,8 +93,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));
@@ -110,7 +110,8 @@ static unsigned be_compute_block_pressure(be_loopana_t *loop_ana,
  * @param cls       The register class to compute pressure for.
  * @return The highest register pressure in the given loop.
  */
-static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, const arch_register_class_t *cls) {
+static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, const arch_register_class_t *cls)
+{
 	int            i, max;
 	unsigned       pressure;
 	be_loop_info_t *entry, key;
@@ -124,16 +125,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);
@@ -219,7 +215,8 @@ be_loopana_t *be_new_loop_pressure(be_irg_t *birg,
  * Returns the computed register pressure for the given class and loop.
  * @return The pressure or INT_MAX if not found
  */
-unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_t *cls, ir_loop *loop) {
+unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_t *cls, ir_loop *loop)
+{
 	unsigned pressure = INT_MAX;
 	be_loop_info_t *entry, key;
 
@@ -232,7 +229,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;
 }
@@ -240,7 +237,8 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
 /**
  * Frees the loop analysis object.
  */
-void be_free_loop_pressure(be_loopana_t *loop_ana) {
+void be_free_loop_pressure(be_loopana_t *loop_ana)
+{
 	del_set(loop_ana->data);
 	xfree(loop_ana);
 }