X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fset.c;h=9645bf1bab87e25b6dd5bd8df9af5642ff5fa1e3;hb=a999e1baedb84dc9b83059708699dac1c7fdb9a2;hp=fffe229f96e300472fb5bb58b6271e0bf942a080;hpb=23e73ea5baaf7f25c45f97683fa2c14982fc4472;p=libfirm

diff --git a/ir/adt/set.c b/ir/adt/set.c
index fffe229f9..9645bf1ba 100644
--- a/ir/adt/set.c
+++ b/ir/adt/set.c
@@ -1,13 +1,27 @@
 /*
- * Project:     libFIRM
- * File name:   ir/adt/set.c
- * Purpose:     Set --- collection of entries that are unique wrt to a key.
- * Author:      Markus Armbruster
- * Modified by:
- * Created:     1999 by getting from fiasco
- * CVS-ID:      $Id$
- * Copyright:   (c) 1995, 1996 Markus Armbruster
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * 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       implementation of set
+ * @author      Markus Armbruster
+ * @version     $Id$
  */
 
 /*  This code is derived from:
@@ -29,16 +43,11 @@
 
     TODO: Fix Esmond's ugly MixedCapsIdentifiers ;->
  */
-
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
-/* bcopy is not ISO C *
-#define bcopy(X, Y, Z) memcpy((Y), (X), (Z))
-*/
+#include "firm_config.h"
 
 #ifdef PSET
 # define SET pset
@@ -79,30 +88,30 @@
 
 
 typedef struct element {
-  struct element *chain;	/* for chaining Elements */
+  struct element *chain;	/**< for chaining Elements */
   MANGLEP (entry) entry;
 } Element, *Segment;
 
 
 struct SET {
-  unsigned p;			/* Next bucket to be split	*/
-  unsigned maxp;		/* upper bound on p during expansion	*/
-  unsigned nkey;		/* current # keys	*/
-  unsigned nseg;		/* current # segments	*/
+  unsigned p;			/**< Next bucket to be split	*/
+  unsigned maxp;		/**< upper bound on p during expansion	*/
+  unsigned nkey;		/**< current # keys	*/
+  unsigned nseg;		/**< current # segments	*/
   Segment *dir[DIRECTORY_SIZE];
-  MANGLEP(cmp_fun) cmp;		/* function comparing entries */
+  MANGLEP(cmp_fun) cmp;		/**< function comparing entries */
   unsigned iter_i, iter_j;
-  Element *iter_tail;		/* non-NULL while iterating over elts */
+  Element *iter_tail;		/**< non-NULL while iterating over elts */
 #ifdef PSET
-  Element *free_list;		/* list of free Elements */
+  Element *free_list;		/**< list of free Elements */
 #endif
-  struct obstack obst;		/* obstack for allocation all data */
+  struct obstack obst;		/**< obstack for allocation all data */
 #ifdef STATS
   int naccess, ncollision, ndups;
   int max_chain_len;
 #endif
 #ifdef DEBUG
-  const char *tag;
+  const char *tag;              /**< an optionally tag for distinguishing sets */
 #endif
 };
 
@@ -167,6 +176,9 @@ MANGLEP(describe) (SET *table)
       }
     }
   }
+#ifdef STATS
+  MANGLEP(stats)(table);
+#endif
 }
 
 #endif /* !DEBUG */
@@ -176,7 +188,7 @@ SET *
 (PMANGLE(new)) (MANGLEP(cmp_fun) cmp, int nslots)
 {
   int i;
-  SET *table = xmalloc (sizeof (SET));
+  SET *table = xmalloc(sizeof(*table));
 
   if (nslots > SEGMENT_SIZE * DIRECTORY_SIZE)
     nslots = DIRECTORY_SIZE;
@@ -301,7 +313,6 @@ static INLINE unsigned
 Hash (SET *table, unsigned h)
 {
   unsigned address;
-
   address = h & (table->maxp - 1);          /* h % table->maxp */
   if (address < (unsigned)table->p)
     address = h & ((table->maxp << 1) - 1); /* h % (2*table->maxp) */
@@ -405,7 +416,6 @@ MANGLE(_,_search) (SET *table,
   int chain_len = 0;
 
   assert (table);
-  assert (!table->iter_tail);
   assert (key);
 #ifdef DEBUG
   MANGLEP(tag) = table->tag;
@@ -428,6 +438,8 @@ MANGLE(_,_search) (SET *table,
   stat_chain_len (table, chain_len);
 
   if (!q && (action != MANGLE(_,_find))) { /* not found, insert */
+    assert (!table->iter_tail && "insert an element into a set that is iterated");
+
     if (CurrentSegment[SegmentIndex]) stat_dup (table);
 
 #ifdef PSET
@@ -468,6 +480,11 @@ MANGLE(_,_search) (SET *table,
 
 #ifdef PSET
 
+int pset_default_ptr_cmp(const void *x, const void *y)
+{
+	return x != y;
+}
+
 void *
 pset_remove (SET *table, const void *key, unsigned hash)
 {
@@ -542,6 +559,13 @@ MANGLEP(entry) *
   return pset_hinsert (se, key, hash);
 }
 
+void pset_insert_pset_ptr(pset *target, pset *src) {
+  void *elt;
+  for (elt = pset_first(src); elt; elt = pset_next(src)) {
+    pset_insert_ptr(target, elt);
+  }
+}
+
 #else /* !PSET */
 
 void *