X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnodemap.c;h=0cddeb2a09379135a5d85b2ba8a6cb7eb78c856b;hb=4f92e524762e0febc361676111b3b5b79addd03a;hp=e069960cdb0690be28022ffb13ae0a159d950db1;hpb=ec2dd561e64477845fe0122b4be3fb3a356e1ac7;p=libfirm

diff --git a/ir/ir/irnodemap.c b/ir/ir/irnodemap.c
index e069960cd..0cddeb2a0 100644
--- a/ir/ir/irnodemap.c
+++ b/ir/ir/irnodemap.c
@@ -38,15 +38,11 @@ static ir_nodemap_entry_t null_nodemap_entry = { NULL, NULL };
 #define HashSetIterator           ir_nodemap_iterator_t
 #define ValueType                 ir_nodemap_entry_t
 #define NullValue                 null_nodemap_entry
-#define KeyType                   const ir_node*
+#define KeyType                   ir_node*
 #define ConstKeyType              const ir_node*
 #define GetKey(value)             (value).node
 #define InitData(self,value,key)  (value).node = (key)
-#ifdef DEBUG_libfirm
 #define Hash(self,key)            ((unsigned)((key)->node_nr))
-#else
-#define Hash(self,key)            HASH_PTR(key)
-#endif
 #define KeysEqual(self,key1,key2) (key1) == (key2)
 #define SetRangeEmpty(ptr,size)   memset(ptr, 0, (size) * sizeof((ptr)[0]))
 #define EntrySetEmpty(value)      (value).node = NULL
@@ -54,12 +50,16 @@ static ir_nodemap_entry_t null_nodemap_entry = { NULL, NULL };
 #define EntryIsEmpty(value)       ((value).node == NULL)
 #define EntryIsDeleted(value)     ((value).node == (ir_node*)-1)
 
-#define hashset_init            _ir_nodemap_init
+void ir_nodemap_init_(ir_nodemap_t *self);
+#define hashset_init            ir_nodemap_init_
 #define hashset_init_size       ir_nodemap_init_size
 #define hashset_destroy         ir_nodemap_destroy
-#define hashset_insert          _ir_nodemap_insert
+ir_nodemap_entry_t *ir_nodemap_insert_(ir_nodemap_t *self, ir_node *node);
+#define hashset_insert          ir_nodemap_insert_
 #define hashset_remove          ir_nodemap_remove
-#define hashset_find            _ir_nodemap_find
+ir_nodemap_entry_t *ir_nodemap_find_(const ir_nodemap_t *self,
+                                     const ir_node *node);
+#define hashset_find            ir_nodemap_find_
 #define hashset_size            ir_nodemap_size
 #define hashset_iterator_init   ir_nodemap_iterator_init
 #define hashset_iterator_next   ir_nodemap_iterator_next
@@ -74,12 +74,12 @@ void ir_nodemap_init(ir_nodemap_t *nodemap)
 
 void *ir_nodemap_get(const ir_nodemap_t *self, const ir_node *node)
 {
-	ir_nodemap_entry_t *entry = _ir_nodemap_find(self, node);
+	ir_nodemap_entry_t *entry = ir_nodemap_find_(self, node);
 	return entry->data;
 }
 
-void ir_nodemap_insert(ir_nodemap_t *self, const ir_node *node, void *data)
+void ir_nodemap_insert(ir_nodemap_t *self, ir_node *node, void *data)
 {
-	ir_nodemap_entry_t *entry = _ir_nodemap_insert(self, node);
+	ir_nodemap_entry_t *entry = ir_nodemap_insert_(self, node);
 	entry->data               = data;
 }