X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=aae7fae74493d53e763c6fa5e57c0d0490db7382;hb=493edb72be97161f5c8762e4589631a6e7083a29;hp=55664b9a9caf3169e853ceb4facac781617137ed;hpb=3bb47464dc990c9def630a208a12da1bdd035bbb;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 55664b9a9..aae7fae74 100644
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,19 +8,19 @@
  * @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"
@@ -42,7 +28,7 @@
 
 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 +61,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));
 
@@ -142,7 +127,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;
@@ -219,7 +204,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;