X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fopt%2Fcombo.c;h=a56ec0aa02fa3db06e9af2ea00afda78bdd1fb21;hb=4de03dcc6a6b5cff24c69afeeb2698c4a4506b19;hp=505e24bebb25855c0b25e36b5a2a494ea6c8effa;hpb=8e4e49e66d1d578b31a5ffce9bb6ff94ba985dfb;p=libfirm

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index 505e24beb..a56ec0aa0 100644
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -544,7 +544,7 @@ static listmap_entry_t *listmap_find(listmap_t *map, void *id)
 	key.id   = id;
 	key.list = NULL;
 	key.next = NULL;
-	entry = (listmap_entry_t*)set_insert(map->map, &key, sizeof(key), HASH_PTR(id));
+	entry = (listmap_entry_t*)set_insert(map->map, &key, sizeof(key), hash_ptr(id));
 
 	if (entry->list == NULL) {
 		/* a new entry, put into the list */
@@ -571,7 +571,7 @@ static unsigned opcode_hash(const opcode_key_t *entry)
 	unsigned hash = (unsigned)(PTR_TO_INT(mode) * 9 + code) + get_irn_arity(n);
 
 	if (code == iro_Const)
-		hash ^= (unsigned)HASH_PTR(get_Const_tarval(n));
+		hash ^= (unsigned)hash_ptr(get_Const_tarval(n));
 	else if (code == iro_Proj)
 		hash += (unsigned)get_Proj_proj(n);
 	return hash;
@@ -3463,8 +3463,8 @@ static void set_compute_functions(void)
 	size_t i, n;
 
 	/* set the default compute function */
-	for (i = 0, n = get_irp_n_opcodes(); i < n; ++i) {
-		ir_op *op = get_irp_opcode(i);
+	for (i = 0, n = ir_get_n_opcodes(); i < n; ++i) {
+		ir_op *op = ir_get_opcode(i);
 		op->ops.generic = (op_func)default_compute;
 	}