beifg: Factorise code to count interference components.

[libfirm] / ir / ir / irgwalk_blk.c

diff --git a/ir/ir/irgwalk_blk.c b/ir/ir/irgwalk_blk.c
index e001742..f19a096 100644 (file)
--- a/ir/ir/irgwalk_blk.c
+++ b/ir/ir/irgwalk_blk.c
@@ -1,27 +1,12 @@
 /*
- * 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.
  */
 
 /**
  * @file
  * @brief   Blockwise walker implementation
  * @author  Michael Beck
- * @version $Id$
  */
 #include "config.h"
 
@@ -32,6 +17,7 @@
 #include "irhooks.h"
 #include "array.h"
 #include "hashptr.h"
+#include "ircons.h"
 
 #define _get_walk_arity(env, node) \
        ((env)->follow_deps ? get_irn_ins_or_deps((node)) : get_irn_arity((node)))
@@ -79,7 +65,7 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
        block_entry_t *elem;
 
        key.block = block;
-       elem = (block_entry_t*)pset_find(ctx->blk_map, &key, HASH_PTR(block));
+       elem = (block_entry_t*)pset_find(ctx->blk_map, &key, hash_ptr(block));
        if (elem)
                return elem;
 
@@ -91,7 +77,7 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
        elem->cf_list    = NEW_ARR_F(ir_node *, 0);
        elem->entry_list = NEW_ARR_F(ir_node *, 0);
 
-       return (block_entry_t*)pset_insert(ctx->blk_map, elem, HASH_PTR(block));
+       return (block_entry_t*)pset_insert(ctx->blk_map, elem, hash_ptr(block));
 }
 
 /**