X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=a5e7be2618cfbcbcbb9ff0182fe8db533adba0c8;hb=5bb8cd35a8074112fa2da8b8f68d7c77918119e5;hp=160412ea06711c467762198cf1e6cbf212a12ca3;hpb=e07b61c6ed5d198a484761f8a40a4f26520d964d;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 160412ea0..a5e7be261 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"
@@ -36,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"
@@ -57,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;
@@ -67,26 +66,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 +92,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));
@@ -113,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;
@@ -127,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);
@@ -160,7 +153,8 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
  * @return The loop analysis object.
  */
 be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg,
-                                       const arch_register_class_t *cls) {
+                                       const arch_register_class_t *cls)
+{
 	ir_graph     *irg      = be_get_birg_irg(birg);
 	be_loopana_t *loop_ana = XMALLOC(be_loopana_t);
 
@@ -222,7 +216,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;
 
@@ -235,7 +230,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;
 }
@@ -243,14 +238,14 @@ 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);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana);
 void be_init_loopana(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.loopana");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana);