projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed C99 feature, adapt to Firm coding conventions.
[libfirm]
/
ir
/
ir
/
irnodeset.c
diff --git
a/ir/ir/irnodeset.c
b/ir/ir/irnodeset.c
index
42bc5ad
..
18d8969
100644
(file)
--- a/
ir/ir/irnodeset.c
+++ b/
ir/ir/irnodeset.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-21,13
+21,14
@@
* @file
* @author Matthias Braun
* @date 30.03.2007
* @file
* @author Matthias Braun
* @date 30.03.2007
- * @brief A nodeset. This should be prefered over a simple pset, because it
+ * @brief A nodeset. This should be prefer
r
ed over a simple pset, because it
tries to guarantee deterministic behavior.
* @version $Id$
*/
#include "config.h"
#include "irnodeset.h"
tries to guarantee deterministic behavior.
* @version $Id$
*/
#include "config.h"
#include "irnodeset.h"
+#include "irnode_t.h"
#include "hashptr.h"
#define DO_REHASH
#include "hashptr.h"
#define DO_REHASH
@@
-37,20
+38,17
@@
#define ValueType ir_node*
#define NullValue NULL
#define DeletedValue ((ir_node*)-1)
#define ValueType ir_node*
#define NullValue NULL
#define DeletedValue ((ir_node*)-1)
-#ifdef FIRM_debug
-#define Hash(this,value) (value)->node_nr
-#else
-#define Hash(this,value) HASH_PTR(value)
-#endif
+#define Hash(this,key) ((unsigned)((key)->node_nr))
#define KeysEqual(this,key1,key2) (key1) == (key2)
#define SetRangeEmpty(ptr,size) memset(ptr, 0, (size) * sizeof((ptr)[0]))
#define KeysEqual(this,key1,key2) (key1) == (key2)
#define SetRangeEmpty(ptr,size) memset(ptr, 0, (size) * sizeof((ptr)[0]))
-#define hashset_init ir_nodeset_init
+void ir_nodeset_init_(ir_nodeset_t *self);
+#define hashset_init ir_nodeset_init_
#define hashset_init_size ir_nodeset_init_size
#define hashset_destroy ir_nodeset_destroy
#define hashset_insert ir_nodeset_insert
#define hashset_remove ir_nodeset_remove
#define hashset_init_size ir_nodeset_init_size
#define hashset_destroy ir_nodeset_destroy
#define hashset_insert ir_nodeset_insert
#define hashset_remove ir_nodeset_remove
-#define hashset_find
_ir_nodeset_find
+#define hashset_find
ir_nodeset_contains
#define hashset_size ir_nodeset_size
#define hashset_iterator_init ir_nodeset_iterator_init
#define hashset_iterator_next ir_nodeset_iterator_next
#define hashset_size ir_nodeset_size
#define hashset_iterator_init ir_nodeset_iterator_init
#define hashset_iterator_next ir_nodeset_iterator_next
@@
-58,7
+56,7
@@
#include "hashset.c"
#include "hashset.c"
-
int ir_nodeset_contains(const ir_nodeset_t *this, const ir_node *node
)
+
void ir_nodeset_init(ir_nodeset_t *nodeset
)
{
{
-
return _ir_nodeset_find(this, node) != NULL
;
+
ir_nodeset_init_size(nodeset, 16)
;
}
}