becopyheur4: Clean up co_mst_irn_init().

[libfirm] / ir / adt / pmap.c

diff --git a/ir/adt/pmap.c b/ir/adt/pmap.c
index 019ebad..8d5090c 100644 (file)
--- a/ir/adt/pmap.c
+++ b/ir/adt/pmap.c
@@ -1,16 +1,16 @@
 /*
- * Project:     libFIRM
- * File name:   ir/adt/eset.c
- * Purpose:     Datentyp: Vereinfachte Map (hash-map) zum Speichern von
- *              Zeigern/Adressen -> Zeigern/Adressen.
- * Author:      Hubert Schmid
- * Modified by:
- * Created:     09.06.2002
- * CVS-ID:      $Id$
- * Copyright:   (c) 2002 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * This file is part of libFirm.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
+/**
+ * @file
+ * @brief       simplified hashmap for pointer -> pointer mappings
+ * @author      Hubert Schmid
+ * @date        09.06.2002
+ */
+#include "config.h"
+
 #include "pmap.h"
 
 #include <assert.h>
@@ -19,70 +19,86 @@
 
 
 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)
 
-static int pmap_entry_cmp(const void *p1, const void *p2, size_t size) {
-  const pmap_entry *entry1 = p1;
-  const pmap_entry *entry2 = p2;
+/**
+ * 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 = (const pmap_entry*) p1;
+       const pmap_entry *entry2 = (const pmap_entry*) p2;
+       (void) size;
 
-  return entry1->key != entry2->key;
+       return entry1->key != entry2->key;
 }
 
-
-pmap *pmap_create(void) {
-  return (pmap *)new_set(pmap_entry_cmp, INITIAL_SLOTS);
+/* Creates a new empty map with an initial number of slots. */
+pmap *pmap_create_ex(size_t slots)
+{
+       return (pmap *)new_set(pmap_entry_cmp, slots);
 }
 
-
-void pmap_destroy(pmap *map) {
-  del_set((set *)map);
+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), HASH_PTR(key));
-  }
+void pmap_destroy(pmap *map)
+{
+       del_set(M2S(map));
 }
 
+void pmap_insert(pmap *map, const void *key, void *value)
+{
+       pmap_entry entry, *p;
 
-int pmap_contains(pmap *map, void *key) {
-  return set_find((set *)map, &key, sizeof(pmap_entry), HASH_PTR(key)) != NULL;
+       entry.key = key;
+       p = set_insert(pmap_entry, M2S(map), &entry, sizeof(pmap_entry), hash_ptr(key));
+       p->value = value;
 }
 
-
-pmap_entry * pmap_find(pmap *map, void *key) {
-  return (pmap_entry *)set_find((set *)map, &key, sizeof(pmap_entry), HASH_PTR(key));
+int pmap_contains(pmap *map, const void *key)
+{
+       return pmap_find(map, key) != NULL;
 }
 
-
-void * pmap_get(pmap *map, void *key) {
-  pmap_entry * entry = pmap_find(map, key);
-  return entry == NULL ? NULL : entry->value;
+pmap_entry * pmap_find(pmap *map, const void *key)
+{
+       pmap_entry const entry = { key, 0 };
+       return set_find(pmap_entry, M2S(map), &entry, sizeof(entry), hash_ptr(key));
 }
 
 
-pmap_entry *pmap_first(pmap *map) {
-  return (pmap_entry *) set_first((set *)map);
+void * (pmap_get)(pmap *map, const void *key)
+{
+       pmap_entry * entry = pmap_find(map, key);
+       return entry == NULL ? NULL : entry->value;
 }
 
+size_t pmap_count(pmap *map)
+{
+       return set_count(M2S(map));
+}
 
-pmap_entry *pmap_next(pmap *map) {
-  return (pmap_entry *) set_next((set *)map);
+pmap_entry *pmap_first(pmap *map)
+{
+       return set_first(pmap_entry, M2S(map));
 }
 
+pmap_entry *pmap_next(pmap *map)
+{
+       return set_next(pmap_entry, M2S(map));
+}
 
-void pmap_break(pmap *map) {
-  set_break((set *)map);
+void pmap_break(pmap *map)
+{
+       set_break(M2S(map));
 }