X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fhashset.c;h=d0a3e7e1f435e63b9cd5897ec3a8774dde34e2b1;hb=31ef53136fdb86d4a98919c2148c95cadea4ea81;hp=e9f3ecd35eb6b2f4eb4d90c3311674638d8189f9;hpb=5af4cb6fd26054ef16c8da79d534abacb2a32c6e;p=libfirm

diff --git a/ir/adt/hashset.c b/ir/adt/hashset.c
index e9f3ecd35..d0a3e7e1f 100644
--- a/ir/adt/hashset.c
+++ b/ir/adt/hashset.c
@@ -79,7 +79,7 @@
 
 #ifndef Hash
 #define ID_HASH
-#define Hash(self,key)        ((unsigned)(key))
+#define Hash(self,key)        ((unsigned)(((char *)key) - (char *)0))
 #endif /* Hash */
 
 #ifdef DO_REHASH
@@ -95,7 +95,7 @@
 
 #ifndef Alloc
 #include "xmalloc.h"
-#define Alloc(size)    (HashSetEntry*) xmalloc((size) * sizeof(HashSetEntry))
+#define Alloc(size) XMALLOCN(HashSetEntry, (size))
 #define Free(ptr)      free(ptr)
 #endif /* Alloc */
 
@@ -192,6 +192,8 @@
 #ifndef hashset_size
 #error You have to redefine hashset_size
 #endif
+
+#ifndef NO_ITERATOR
 #ifndef hashset_iterator_init
 #error You have to redefine hashset_iterator_init
 #endif
@@ -201,6 +203,7 @@
 #ifndef hashset_remove_iterator
 #error You have to redefine hashset_remove_iterator
 #endif
+#endif
 
 /**
  * Returns the number of elements in the hashset
@@ -263,6 +266,19 @@ InsertReturnValue insert_nogrow(HashSet *self, KeyType key)
 	}
 }
 
+/**
+ * calculate shrink and enlarge limits
+ * @internal
+ */
+static INLINE
+void reset_thresholds(HashSet *self)
+{
+	self->enlarge_threshold = (size_t) HT_OCCUPANCY_FLT(self->num_buckets);
+	self->shrink_threshold  = (size_t) HT_EMPTY_FLT(self->num_buckets);
+	self->consider_shrink   = 0;
+}
+
+#ifndef HAVE_OWN_RESIZE
 /**
  * Inserts an element into a hashset under the assumption that the hashset
  * contains no deleted entries and the element doesn't exist in the hashset yet.
@@ -306,18 +322,6 @@ void insert_new(HashSet *self, unsigned hash, ValueType value)
 	}
 }
 
-/**
- * calculate shrink and enlarge limits
- * @internal
- */
-static INLINE
-void reset_thresholds(HashSet *self)
-{
-	self->enlarge_threshold = (size_t) HT_OCCUPANCY_FLT(self->num_buckets);
-	self->shrink_threshold  = (size_t) HT_EMPTY_FLT(self->num_buckets);
-	self->consider_shrink   = 0;
-}
-
 /**
  * Resize the hashset
  * @internal
@@ -356,6 +360,12 @@ void resize(HashSet *self, size_t new_size)
 	/* now we can free the old array */
 	Free(old_entries);
 }
+#else
+
+/* resize must be defined outside */
+static INLINE void resize(HashSet *self, size_t new_size);
+
+#endif
 
 /**
  * grow the hashset if adding 1 more elements would make it too crowded
@@ -404,9 +414,9 @@ void maybe_shrink(HashSet *self)
 }
 
 /**
- * Insert an element into the hashset. If no element with key key exists yet,
+ * Insert an element into the hashset. If no element with the given key exists yet,
  * then a new one is created and initialized with the InitData function.
- * Otherwise the exisiting element is returned (for hashs where key is equal to
+ * Otherwise the existing element is returned (for hashs where key is equal to
  * value, nothing is returned.)
  *
  * @param self   the hashset
@@ -425,7 +435,7 @@ InsertReturnValue hashset_insert(HashSet *self, KeyType key)
 }
 
 /**
- * Searchs for an element with key @p key.
+ * Searches for an element with key @p key.
  *
  * @param self      the hashset
  * @param key       the key to search for
@@ -521,12 +531,15 @@ void init_size(HashSet *self, size_t initial_size)
 #ifndef NDEBUG
 	self->entries_version = 0;
 #endif
+#ifdef ADDITIONAL_INIT
+	ADDITIONAL_INIT
+#endif
 
 	reset_thresholds(self);
 }
 
 /**
- * Initialializes a hashset with the default size. The memory for the set has to
+ * Initializes a hashset with the default size. The memory for the set has to
  * already allocated.
  */
 void hashset_init(HashSet *self)
@@ -540,6 +553,9 @@ void hashset_init(HashSet *self)
  */
 void hashset_destroy(HashSet *self)
 {
+#ifdef ADDITIONAL_TERM
+	ADDITIONAL_TERM
+#endif
 	Free(self->entries);
 #ifndef NDEBUG
 	self->entries = NULL;
@@ -547,7 +563,7 @@ void hashset_destroy(HashSet *self)
 }
 
 /**
- * Initializes a hashset expecting expected_element size
+ * Initializes a hashset expecting expected_element size.
  */
 void hashset_init_size(HashSet *self, size_t expected_elements)
 {
@@ -563,6 +579,7 @@ void hashset_init_size(HashSet *self, size_t expected_elements)
 	init_size(self, po2size);
 }
 
+#ifndef NO_ITERATOR
 /**
  * Initializes a hashset iterator. The memory for the allocator has to be
  * already allocated.
@@ -621,5 +638,6 @@ void hashset_remove_iterator(HashSet *self, const HashSetIterator *iter)
 	self->num_deleted++;
 	self->consider_shrink = 1;
 }
+#endif /* NO_ITERATOR */
 
-#endif
+#endif /* HashSet */