X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpmap.c;h=e16ad06d3b3a5b8f5879eece943a03d68f89ced0;hb=6c3b7b42bdeccfe6b4282ca717a58fa4e68a3dea;hp=961a2c795d1234770481297196dc1f7b3593a500;hpb=1ab0f17a893cb796b8dd3f71408949eeb13d44b6;p=libfirm

diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c
index 961a2c795..e16ad06d3 100644
--- a/ir/adt/pmap.c
+++ b/ir/adt/pmap.c
@@ -1,76 +1,107 @@
-/* -------------------------------------------------------------------
- * $Id$
- * -------------------------------------------------------------------
- * Datentyp: Vereinfachte Map (hash-map) zum Speichern von
- * Zeigern/Adressen -> Zeigern/Adressen.
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
  *
- * Erstellt: Hubert Schmid, 09.06.2002
- * ---------------------------------------------------------------- */
-
+ * 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.
+ */
+
+/**
+ * @file
+ * @brief       simplified hashmap for pointer -> pointer mappings
+ * @author      Hubert Schmid
+ * @date        09.06.2002
+ * @version     $Id$
+ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "pmap.h"
 
 #include <assert.h>
 #include "set.h"
+#include "hashptr.h"
 
 
 struct pmap {
-  int dummy; /* dummy entry */
+  	int dummy; /* dummy entry */
 };
 
 
-static const int INITIAL_SLOTS = 64;
-
+#define INITIAL_SLOTS 64
 
-static int pmap_entry_cmp(const pmap_entry * entry1, const pmap_entry * entry2, size_t size) {
-  return entry1->key == entry2->key ? 0 : 1;
-}
+/** map a pmap into a set */
+#define M2S(map)  (set *)(map)
 
+/**
+ * compare the keys of two entry pairs
+ */
+static int pmap_entry_cmp(const void *p1, const void *p2, size_t size) {
+	const pmap_entry *entry1 = p1;
+	const pmap_entry *entry2 = p2;
 
-pmap * pmap_create(void) {
-  return (pmap *) new_set((set_cmp_fun) pmap_entry_cmp, INITIAL_SLOTS);
+	return entry1->key != entry2->key;
 }
 
-
-void pmap_destroy(pmap * map) {
-  del_set((set *) map);
+/* Creates a new empty map with an initial number of slots. */
+pmap *pmap_create_ex(int slots) {
+  	return (pmap *)new_set(pmap_entry_cmp, slots);
 }
 
+pmap *pmap_create(void) {
+	return pmap_create_ex(INITIAL_SLOTS);
+}
 
-void pmap_insert(pmap * map, void * key, void * value) {
-  if (pmap_contains(map, key)) {
-    pmap_entry * entry = pmap_find(map, key);
-    entry->value = value;
-  } else {
-    pmap_entry entry;
-    entry.key = key;
-    entry.value = value;
-    set_insert((set *) map, &entry, sizeof(pmap_entry), (unsigned) key);
-  }
+void pmap_destroy(pmap *map) {
+	del_set(M2S(map));
 }
 
+void pmap_insert(pmap *map, const void *key, void *value) {
+	pmap_entry entry, *p;
 
-bool pmap_contains(pmap * map, void * key) {
-  return set_find((set *) map, &key, sizeof(pmap_entry), (unsigned) key) != NULL;
+	entry.key = key;
+	p = set_insert(M2S(map), &entry, sizeof(pmap_entry), HASH_PTR(key));
+	p->value = value;
 }
 
+int pmap_contains(pmap *map, const void *key) {
+	return set_find(M2S(map), &key, sizeof(pmap_entry), HASH_PTR(key)) != NULL;
+}
 
-pmap_entry * pmap_find(pmap * map, void * key) {
-  return (pmap_entry *) set_find((set *) map, &key, sizeof(pmap_entry), (unsigned) key);
+pmap_entry * pmap_find(pmap *map, const void *key) {
+	return (pmap_entry *)set_find(M2S(map), &key, sizeof(pmap_entry), HASH_PTR(key));
 }
 
 
-void * pmap_get(pmap * map, void * key) {
-  pmap_entry * entry = pmap_find(map, key);
-  return entry == NULL ? NULL : entry->value;
+void * pmap_get(pmap *map, const void *key) {
+	pmap_entry * entry = pmap_find(map, key);
+	return entry == NULL ? NULL : entry->value;
 }
 
+int pmap_count(pmap *map) {
+	return set_count(M2S(map));
+}
 
-pmap_entry * pmap_first(pmap * map) {
-  return (pmap_entry *) set_first((set *) map);
+pmap_entry *pmap_first(pmap *map) {
+	return (pmap_entry *) set_first(M2S(map));
 }
 
+pmap_entry *pmap_next(pmap *map) {
+	return (pmap_entry *) set_next(M2S(map));
+}
 
-pmap_entry * pmap_next(pmap * map) {
-  return (pmap_entry *) set_next((set *) map);
+void pmap_break(pmap *map) {
+	set_break(M2S(map));
 }