X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnodeset.c;h=18d89699c2e1623683a1de3bbb84d06d47f481e6;hb=a08e6f04aa3669cff094f94a9484c7c2bb1314d0;hp=261d6ec04f77554aec49353b5229f7c4a31ce29e;hpb=c7e0fc01c73e1b5dd23ad057e7e4d18bfe850ea9;p=libfirm

diff --git a/ir/ir/irnodeset.c b/ir/ir/irnodeset.c
index 261d6ec04..18d89699c 100644
--- a/ir/ir/irnodeset.c
+++ b/ir/ir/irnodeset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -38,45 +38,25 @@
 #define ValueType                 ir_node*
 #define NullValue                 NULL
 #define DeletedValue              ((ir_node*)-1)
-#ifdef DEBUG_libfirm
 #define Hash(this,key)            ((unsigned)((key)->node_nr))
-#else
-#define Hash(this,key)            HASH_PTR(key)
-#endif
 #define KeysEqual(this,key1,key2) (key1) == (key2)
 #define SetRangeEmpty(ptr,size)   memset(ptr, 0, (size) * sizeof((ptr)[0]))
-#define ValueCmp(a,b)             ((int) get_irn_idx(a) - (int) get_irn_idx(b))
 
-#define hashset_init            _ir_nodeset_init
+void ir_nodeset_init_(ir_nodeset_t *self);
+#define hashset_init            ir_nodeset_init_
 #define hashset_init_size       ir_nodeset_init_size
 #define hashset_destroy         ir_nodeset_destroy
 #define hashset_insert          ir_nodeset_insert
 #define hashset_remove          ir_nodeset_remove
-#define hashset_find            _ir_nodeset_find
+#define hashset_find            ir_nodeset_contains
 #define hashset_size            ir_nodeset_size
 #define hashset_iterator_init   ir_nodeset_iterator_init
 #define hashset_iterator_next   ir_nodeset_iterator_next
 #define hashset_remove_iterator ir_nodeset_remove_iterator
 
-#ifdef IR_NODESET_USE_ORDERED_SETS
-
-#define hashset_insert_quick    ir_nodeset_insert_quick
-#define hashset_remove_quick    ir_nodeset_remove_quick
-#define hashset_fixup           ir_nodeset_fixup
-#include "arrayset.c"
-
-#else
-
 #include "hashset.c"
 
-#endif /* IR_NODESET_USE_ORDERED_SETS */
-
 void ir_nodeset_init(ir_nodeset_t *nodeset)
 {
 	ir_nodeset_init_size(nodeset, 16);
 }
-
-int ir_nodeset_contains(const ir_nodeset_t *nodeset, const ir_node *node)
-{
-	return _ir_nodeset_find(nodeset, node);
-}