/**
* Calculates a hash value for a node.
*/
-unsigned nodeset_hash(ir_node *n);
+unsigned nodeset_hash(const ir_node *n);
/**
* Creates a new nodeset.
* @returns
* created nodeset
*/
-#define new_nodeset(slots) new_pset(pset_default_ptr_cmp, (slots))
+static INLINE nodeset *new_nodeset(int slots)
+{
+ return new_pset(pset_default_ptr_cmp, slots);
+}
+
+/*
+ * Define some convenience macros.
+ */
+#define new_nodeset_default() new_nodeset(64)
/**
* Deletes a nodeset.
* @note
* This does NOT delete the elements of this node set, just it's pointers!
*/
-#define del_nodeset(nset) del_pset(nset)
+static INLINE void del_nodeset(nodeset *nset)
+{
+ del_pset(nset);
+}
/**
* Returns the number of nodes in a nodeset.
*
* @param nset the nodeset
*/
-#define nodeset_count(nset) pset_count(nset)
+static INLINE int nodeset_count(nodeset *nset)
+{
+ return pset_count(nset);
+}
/**
* Searches a node in a node set.
* @return
* the pointer of the found node in the nodeset or NULL if it was not found
*/
-#define nodeset_find(nset, key) (ir_node *)pset_find((nset), (key), nodeset_hash(key))
+static INLINE ir_node *nodeset_find(nodeset *nset, ir_node *key)
+{
+ return (ir_node *) pset_find(nset, key, nodeset_hash(key));
+}
/**
* Inserts a node into a pset.
* that should be inserted is already in the set, this functions does
* nothing but returning its already existing set_entry.
*/
-#define nodeset_insert(nset, key) (ir_node *)pset_insert((nset), (key), nodeset_hash(key))
+static INLINE ir_node *nodeset_insert(nodeset *nset, ir_node *key)
+{
+ return (ir_node *) pset_insert(nset, key, nodeset_hash(key));
+}
/**
* Removes a node from a nodeset.
* Further, it is allowed to remove elements during an iteration
* including the current one.
*/
-#define nodeset_remove(nset, key) (ir_node *)pset_remove((nset), (key), nodeset_hash(key))
+static INLINE ir_node *nodeset_remove(nodeset *nset, ir_node *key)
+{
+ return (ir_node *) pset_remove(nset, key, nodeset_hash(key));
+}
/**
* Returns the first node of a nodeset.
*
* @return a node or NULL if the set is empty
*/
-#define nodeset_first(nset) (ir_node *)pset_first(nset)
+static INLINE ir_node *nodeset_first(nodeset *nset)
+{
+ return (ir_node *) pset_first(nset);
+}
/**
* Returns the next node of a nodeset.
*
* @return a node or NULL if the iteration is finished
*/
-#define nodeset_next(nset) (ir_node *)pset_next(nset)
+static INLINE ir_node *nodeset_next(nodeset *nset)
+{
+ return (ir_node *) pset_next(nset);
+}
/**
* Breaks the iteration of a set. Must be called before
*
* @param nset the nodeset
*/
-#define nodeset_break(nset) pset_break(nset)
+static INLINE void nodeset_break(nodeset *nset)
+{
+ pset_break(nset);
+}
/**
* Iterate over a node set.
+ *
+ * @param nset the nodeset
+ * @param irn the iterator node
*/
-#define foreach_nodeset(set, irn) for (irn = nodeset_first(set); irn; irn = nodeset_next(set))
+#define foreach_nodeset(nset, irn) for (irn = nodeset_first(nset); irn; irn = nodeset_next(nset))
#endif /* _BENODESETS_H */