projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename type entity into ir_entity
[libfirm]
/
ir
/
adt
/
eset.c
diff --git
a/ir/adt/eset.c
b/ir/adt/eset.c
index
9bfe45e
..
def5ee8
100644
(file)
--- a/
ir/adt/eset.c
+++ b/
ir/adt/eset.c
@@
-11,29
+11,35
@@
* Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE.
*/
* Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE.
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "eset.h"
#include "set.h"
#include "eset.h"
#include "set.h"
-
+#include "hashptr.h"
struct eset {
int dummy; /* dummy entry */
};
struct eset {
int dummy; /* dummy entry */
};
-static const int INITIAL_SLOTS = 64;
+#define INITIAL_SLOTS 64
+static int pcmp(const void *p1, const void *p2, size_t size) {
+ const void **q1 = (const void **)p1;
+ const void **q2 = (const void **)p2;
-static int pcmp(const void ** p1, const void ** p2, size_t size) {
- return *p1 != *p2;
+ return *q1 != *q2;
}
eset * eset_create(void) {
}
eset * eset_create(void) {
- return (eset *) new_set(
(set_cmp_fun)
pcmp, INITIAL_SLOTS);
+ return (eset *) new_set(pcmp, INITIAL_SLOTS);
}
}
-eset * eset_copy(eset *
source) {
+eset * eset_copy(eset *source) {
eset * ret = eset_create();
void * p;
for (p = eset_first(source); p; p = eset_next(source)) {
eset * ret = eset_create();
void * p;
for (p = eset_first(source); p; p = eset_next(source)) {
@@
-43,37
+49,41
@@
eset * eset_copy(eset * source) {
}
}
-void eset_destroy(eset *
s) {
- del_set((set *)
s);
+void eset_destroy(eset *s) {
+ del_set((set *)s);
}
}
+/* Returns the number of elements in the set. */
+int eset_count(eset *s) {
+ return set_count((set *)s);
+}
-void eset_insert(eset *
s, void *
p) {
+void eset_insert(eset *
s, void *
p) {
if (!eset_contains(s, p)) {
if (!eset_contains(s, p)) {
- set_insert((set *)
s, &p, sizeof(void *), (unsigned) p
);
+ set_insert((set *)
s, &p, sizeof(p), HASH_PTR(p)
);
}
}
}
}
-
bool eset_contains(eset * s, void *
p) {
- return set_find((set *)
s, &p, sizeof(void *), (unsigned) p
) != NULL;
+
int eset_contains(eset *s, void *
p) {
+ return set_find((set *)
s, &p, sizeof(p), HASH_PTR(p)
) != NULL;
}
}
-void * eset_first(eset *
s) {
+void * eset_first(eset *s) {
void * p = set_first((set *) s);
void * p = set_first((set *) s);
- return p == NULL ? NULL : *((void *
*)
p);
+ return p == NULL ? NULL : *((void *
*)
p);
}
void * eset_next(eset *s) {
}
void * eset_next(eset *s) {
- void *
p = set_next((set *) s);
- return p == NULL ? NULL : *((void *
*)
p);
+ void *p = set_next((set *) s);
+ return p == NULL ? NULL : *((void *
*)
p);
}
}
-void eset_insert_all(eset *
target, eset *
source) {
- void *
p;
+void eset_insert_all(eset *
target, eset *
source) {
+ void *p;
for (p = eset_first(source); p; p = eset_next(source)) {
eset_insert(target, p);
}
for (p = eset_first(source); p; p = eset_next(source)) {
eset_insert(target, p);
}