X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fset.c;h=0db15e7d58f83152daf16bdff24eb021f4e470b1;hb=6b124543aff56817fcfe6d5b5ff181ac5c790e73;hp=812e7b0c1c12479adc377824d49fff23e6f46563;hpb=92869d69702fc0fd8e77832b9b68c60cb0d3e82a;p=libfirm

diff --git a/ir/adt/set.c b/ir/adt/set.c
index 812e7b0c1..0db15e7d5 100644
--- a/ir/adt/set.c
+++ b/ir/adt/set.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -43,11 +43,7 @@
 
     TODO: Fix Esmond's ugly MixedCapsIdentifiers ;->
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "firm_config.h"
+#include "config.h"
 
 #ifdef PSET
 # define SET pset
@@ -130,7 +126,7 @@ MANGLEP(stats) (SET *table)
 	  table->naccess, table->ncollision, table->nkey, table->ndups, table->max_chain_len, nfree);
 }
 
-static INLINE void
+static inline void
 stat_chain_len (SET *table, int chain_len)
 {
   table->ncollision += chain_len;
@@ -188,7 +184,7 @@ SET *
 (PMANGLE(new)) (MANGLEP(cmp_fun) cmp, int nslots)
 {
   int i;
-  SET *table = xmalloc(sizeof(*table));
+  SET *table = XMALLOC(SET);
 
   if (nslots > SEGMENT_SIZE * DIRECTORY_SIZE)
     nslots = DIRECTORY_SIZE;
@@ -210,10 +206,7 @@ SET *
 
   /* Make segments */
   for (i = 0;  i < nslots;  ++i) {
-    table->dir[i] = (Segment *)obstack_alloc (&table->obst,
-					      sizeof (Segment) * SEGMENT_SIZE);
-
-    memset(table->dir[i], 0, sizeof (Segment) * SEGMENT_SIZE);
+    table->dir[i] = OALLOCNZ(&table->obst, Segment, SEGMENT_SIZE);
     table->nseg++;
   }
 
@@ -248,7 +241,7 @@ MANGLEP(count) (SET *table)
  * do one iteration step, return 1
  * if still data in the set, 0 else
  */
-static INLINE int
+static inline int
 iter_step (SET *table)
 {
   if (++table->iter_j >= SEGMENT_SIZE) {
@@ -309,7 +302,7 @@ MANGLEP(break) (SET *table)
 /*
  * limit the hash value
  */
-static INLINE unsigned
+static inline unsigned
 Hash (SET *table, unsigned h)
 {
   unsigned address;
@@ -323,7 +316,7 @@ Hash (SET *table, unsigned h)
  * returns non-zero if the number of elements in
  * the set is greater then number of segments * MAX_LOAD_FACTOR
  */
-static INLINE int
+static inline int
 loaded (SET *table)
 {
   return (  ++table->nkey
@@ -361,10 +354,7 @@ expand_table (SET *table)
     NewSegmentDir   = NewAddress >> SEGMENT_SIZE_SHIFT;
     NewSegmentIndex = NewAddress & (SEGMENT_SIZE-1);
     if (NewSegmentIndex == 0) {
-      table->dir[NewSegmentDir] =
-	(Segment *)obstack_alloc (&table->obst,
-				  sizeof(Segment) * SEGMENT_SIZE);
-      memset(table->dir[NewSegmentDir], 0, sizeof(Segment) * SEGMENT_SIZE);
+      table->dir[NewSegmentDir] = OALLOCNZ(&table->obst, Segment, SEGMENT_SIZE);
       table->nseg++;
     }
     NewSegment = table->dir[NewSegmentDir];
@@ -447,7 +437,7 @@ MANGLE(_,_search) (SET *table,
       q = table->free_list;
       table->free_list = table->free_list->chain;
     } else {
-      q = obstack_alloc (&table->obst, sizeof (Element));
+      q = OALLOC(&table->obst, Element);
     }
     q->entry.dptr = (void *)key;
 #else