X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fset.c;h=eceee451cae49f7eda3e62117463720f4dbf5ec9;hb=38249b0311df91904bb3a566a770efe650f40efc;hp=8ddd09acc4f7ed8ddae43b961b6fc264325cd02f;hpb=974215da1a935f250766874d0f7a7ddfa34bc4ef;p=libfirm diff --git a/ir/adt/set.c b/ir/adt/set.c index 8ddd09acc..eceee451c 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,9 +43,7 @@ TODO: Fix Esmond's ugly MixedCapsIdentifiers ;-> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef PSET # define SET pset @@ -128,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; @@ -186,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; @@ -246,7 +244,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) { @@ -307,7 +305,7 @@ MANGLEP(break) (SET *table) /* * limit the hash value */ -static INLINE unsigned +static inline unsigned Hash (SET *table, unsigned h) { unsigned address; @@ -321,7 +319,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