/*
- * 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.
*
TODO: Fix Esmond's ugly MixedCapsIdentifiers ;->
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#ifdef PSET
# define SET pset
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;
(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;
/* 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++;
}
* 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) {
/*
* limit the hash value
*/
-static INLINE unsigned
+static inline unsigned
Hash (SET *table, unsigned h)
{
unsigned address;
* 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
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];
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
return pset_hinsert (se, key, hash);
}
-void pset_insert_pset_ptr(pset *target, pset *src) {
+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);