projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement binary emitter for fpush.
[libfirm]
/
ir
/
adt
/
set.c
diff --git
a/ir/adt/set.c
b/ir/adt/set.c
index
6411e38
..
0db15e7
100644
(file)
--- a/
ir/adt/set.c
+++ b/
ir/adt/set.c
@@
-43,11
+43,7
@@
TODO: Fix Esmond's ugly MixedCapsIdentifiers ;->
*/
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
#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);
}
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;
stat_chain_len (SET *table, int chain_len)
{
table->ncollision += chain_len;
@@
-210,10
+206,7
@@
SET *
/* Make segments */
for (i = 0; i < nslots; ++i) {
/* 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++;
}
table->nseg++;
}
@@
-248,7
+241,7
@@
MANGLEP(count) (SET *table)
* do one iteration step, return 1
* if still data in the set, 0 else
*/
* 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) {
iter_step (SET *table)
{
if (++table->iter_j >= SEGMENT_SIZE) {
@@
-309,7
+302,7
@@
MANGLEP(break) (SET *table)
/*
* limit the hash value
*/
/*
* limit the hash value
*/
-static
INLINE
unsigned
+static
inline
unsigned
Hash (SET *table, unsigned h)
{
unsigned address;
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
*/
* 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
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) {
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];
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 = 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
}
q->entry.dptr = (void *)key;
#else