X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fset.c;h=f2e4dd756aeb5ded6fbd65af43491cd881012cd7;hb=d0d85962ef52c14950db90e5981a7bea36023ab3;hp=f81fa39b49e247befc231b7c4a76e25725823c0d;hpb=52f81431d0ce32baf8a3e75bbca29067b655f5a8;p=libfirm diff --git a/ir/adt/set.c b/ir/adt/set.c index f81fa39b4..f2e4dd756 100644 --- a/ir/adt/set.c +++ b/ir/adt/set.c @@ -33,7 +33,7 @@ /* $Id$ */ #ifdef HAVE_CONFIG_H -# include +# include "config.h" #endif /* bcopy is not ISO C * @@ -59,7 +59,6 @@ #include #include #include -#include "misc.h" #include "xmalloc.h" #ifdef PSET # include "pset.h" @@ -80,30 +79,30 @@ typedef struct element { - struct element *chain; /* for chaining Elements */ + struct element *chain; /**< for chaining Elements */ MANGLEP (entry) entry; } Element, *Segment; struct SET { - short p; /* Next bucket to be split */ - short maxp; /* upper bound on p during expansion */ - int nkey; /* current # keys */ - short 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 */ - int iter_i, iter_j; - Element *iter_tail; /* non-NULL while iterating over elts */ + MANGLEP(cmp_fun) cmp; /**< function comparing entries */ + unsigned iter_i, iter_j; + 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 }; @@ -145,14 +144,14 @@ stat_chain_len (SET *table, int chain_len) const char *MANGLEP(tag); -static void +void MANGLEP(describe) (SET *table) { - int i, j, collide; + unsigned i, j, collide; Element *ptr; Segment *seg; - printf ("p=%d maxp=%d nkey=%d nseg=%d\n", + printf ("p=%u maxp=%u nkey=%u nseg=%u\n", table->p, table->maxp, table->nkey, table->nseg); for (i = 0; i < table->nseg; i++) { seg = table->dir[i]; @@ -162,12 +161,15 @@ MANGLEP(describe) (SET *table) while (ptr) { if (collide) printf ("<%3d>", collide); else printf ("table"); - printf ("[%d][%3d]: %u %p\n", i, j, ptr->entry.hash, ptr->entry.dptr); + printf ("[%d][%3d]: %u %p\n", i, j, ptr->entry.hash, (void *)ptr->entry.dptr); ptr = ptr->chain; collide++; } } } +#ifdef STATS + MANGLEP(stats)(table); +#endif } #endif /* !DEBUG */ @@ -177,12 +179,16 @@ SET * (PMANGLE(new)) (MANGLEP(cmp_fun) cmp, int nslots) { int i; - SET *table = xmalloc (sizeof (SET)); - - /* Adjust nslots up to next power of 2, minimum SEGMENT_SIZE */ - assert (nslots >= 0); - for (i = SEGMENT_SIZE; i < nslots; i <<= 1) assert (i < (i << 1)); - nslots = i >> SEGMENT_SIZE_SHIFT; + SET *table = xmalloc(sizeof(*table)); + + if (nslots > SEGMENT_SIZE * DIRECTORY_SIZE) + nslots = DIRECTORY_SIZE; + else { + assert (nslots >= 0); + /* Adjust nslots up to next power of 2, minimum SEGMENT_SIZE */ + for (i = SEGMENT_SIZE; i < nslots; i <<= 1); + nslots = i >> SEGMENT_SIZE_SHIFT; + } table->nseg = table->p = table->nkey = 0; table->maxp = nslots << SEGMENT_SIZE_SHIFT; @@ -198,7 +204,7 @@ SET * table->dir[i] = (Segment *)obstack_alloc (&table->obst, sizeof (Segment) * SEGMENT_SIZE); - memset (table->dir[i], 0, sizeof (Segment) * SEGMENT_SIZE); + memset(table->dir[i], 0, sizeof (Segment) * SEGMENT_SIZE); table->nseg++; } @@ -223,6 +229,12 @@ PMANGLE(del) (SET *table) xfree (table); } +int +MANGLEP(count) (SET *table) +{ + return table->nkey; +} + /* * do one iteration step, return 1 * if still data in the set, 0 else @@ -263,7 +275,8 @@ MANGLEP(first) (SET *table) void * MANGLEP(next) (SET *table) { - assert (table->iter_tail); + if (!table->iter_tail) + return NULL; /* follow collision chain */ table->iter_tail = table->iter_tail->chain; @@ -281,7 +294,6 @@ MANGLEP(next) (SET *table) void MANGLEP(break) (SET *table) { - assert (table->iter_tail); table->iter_tail = NULL; } @@ -292,7 +304,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) */ @@ -345,6 +356,7 @@ expand_table (SET *table) (Segment *)obstack_alloc (&table->obst, sizeof(Segment) * SEGMENT_SIZE); memset(table->dir[NewSegmentDir], 0, sizeof(Segment) * SEGMENT_SIZE); + table->nseg++; } NewSegment = table->dir[NewSegmentDir]; @@ -354,7 +366,6 @@ expand_table (SET *table) table->maxp <<= 1; /* table->maxp *= 2 */ table->p = 0; } - table->nseg++; /* Relocate records to the new bucket */ Previous = &OldSegment[OldSegmentIndex]; @@ -396,7 +407,6 @@ MANGLE(_,_search) (SET *table, int chain_len = 0; assert (table); - assert (!table->iter_tail); assert (key); #ifdef DEBUG MANGLEP(tag) = table->tag; @@ -419,6 +429,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 @@ -459,6 +471,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) { @@ -490,9 +507,24 @@ pset_remove (SET *table, const void *key, unsigned hash) stat_chain_len (table, chain_len); q = *p; + + if (q == table->iter_tail) { + /* removing current element */ + table->iter_tail = q->chain; + if (!table->iter_tail) { + /* go to next segment */ + do { + if (!iter_step (table)) + break; + } while (!table->dir[table->iter_i][table->iter_j]); + table->iter_tail = table->dir[table->iter_i][table->iter_j]; + } + } + *p = (*p)->chain; q->chain = table->free_list; table->free_list = q; + --table->nkey; return q->entry.dptr; } @@ -518,6 +550,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 *