X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpmap.c;h=4dffe1fdd268bfb24da17f7af49c380753f9d4af;hb=1aae5548ce7f7bbef249702b53db8b08fbc8f28d;hp=019ebadbea641d5b20d071634f79d3de3f0a5318;hpb=7306fdd547a7a90b5d6d20039e03e212c50d2329;p=libfirm

diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c
index 019ebadbe..4dffe1fdd 100644
--- a/ir/adt/pmap.c
+++ b/ir/adt/pmap.c
@@ -1,6 +1,6 @@
 /*
  * Project:     libFIRM
- * File name:   ir/adt/eset.c
+ * File name:   ir/adt/pmap.c
  * Purpose:     Datentyp: Vereinfachte Map (hash-map) zum Speichern von
  *              Zeigern/Adressen -> Zeigern/Adressen.
  * Author:      Hubert Schmid
@@ -10,6 +10,9 @@
  * Copyright:   (c) 2002 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "pmap.h"
 
@@ -19,70 +22,72 @@
 
 
 struct pmap {
-  int dummy; /* dummy entry */
+  	int dummy; /* dummy entry */
 };
 
 
 #define INITIAL_SLOTS 64
 
+/** 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;
+	const pmap_entry *entry1 = p1;
+	const pmap_entry *entry2 = p2;
 
-  return entry1->key != entry2->key;
+	return entry1->key != entry2->key;
 }
 
+/* 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 *)new_set(pmap_entry_cmp, INITIAL_SLOTS);
+	return pmap_create_ex(INITIAL_SLOTS);
 }
 
-
 void pmap_destroy(pmap *map) {
-  del_set((set *)map);
+	del_set(M2S(map));
 }
 
+void pmap_insert(pmap *map, const void *key, void *value) {
+	pmap_entry entry, *p;
 
-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), HASH_PTR(key));
-  }
+	entry.key = key;
+	p = set_insert(M2S(map), &entry, sizeof(pmap_entry), HASH_PTR(key));
+	p->value = value;
 }
 
-
-int pmap_contains(pmap *map, void *key) {
-  return set_find((set *)map, &key, sizeof(pmap_entry), HASH_PTR(key)) != NULL;
+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), HASH_PTR(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);
+	return (pmap_entry *) set_first(M2S(map));
 }
 
-
 pmap_entry *pmap_next(pmap *map) {
-  return (pmap_entry *) set_next((set *)map);
+	return (pmap_entry *) set_next(M2S(map));
 }
 
-
 void pmap_break(pmap *map) {
-  set_break((set *)map);
+	set_break(M2S(map));
 }