X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firlinkednodeset.c;h=6c966052720a51f91d3fdb647ceeba02ba24273c;hb=af82344c3d1ede9a28e652302a8c2bac7bb1c743;hp=e9e625cf860cb958a9514e6730a46347e4c87860;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm diff --git a/ir/ir/irlinkednodeset.c b/ir/ir/irlinkednodeset.c index e9e625cf8..6c9660527 100644 --- a/ir/ir/irlinkednodeset.c +++ b/ir/ir/irlinkednodeset.c @@ -39,21 +39,23 @@ static ir_lnk_nodeset_entry_t null_nodeset_entry; #define KeyType ir_node* #define ConstKeyType const ir_node* #define GetKey(value) (value).node -#define InitData(self,value,key) do { (value).node = (key); (value).list.next = NULL; (value).list.prev = NULL; } while(0) +#define InitData(self,value,key) do { (value).node = (key); (value).list.next = NULL; (value).list.prev = NULL; } while (0) #define Hash(self,key) ((unsigned)((key)->node_nr)) #define KeysEqual(self,key1,key2) (key1) == (key2) #define SetRangeEmpty(ptr,size) memset(ptr, 0, (size) * sizeof((ptr)[0])) #define EntrySetEmpty(value) (value).node = NULL -#define EntrySetDeleted(value) do { (value).node = (ir_node*) -1; list_del(&(value).list); } while(0) +#define EntrySetDeleted(value) do { (value).node = (ir_node*) -1; list_del(&(value).list); } while (0) #define EntryIsEmpty(value) ((value).node == NULL) #define EntryIsDeleted(value) ((value).node == (ir_node*)-1) #define hashset_init ir_lnk_nodeset_init #define hashset_init_size ir_lnk_nodeset_init_size #define hashset_destroy ir_lnk_nodeset_destroy -#define hashset_insert _ir_lnk_nodeset_insert +ir_lnk_nodeset_entry_t *ir_lnk_nodeset_insert_(ir_lnk_nodeset_t *nodeset, ir_node *node); +#define hashset_insert ir_lnk_nodeset_insert_ #define hashset_remove ir_lnk_nodeset_remove -#define hashset_find _ir_lnk_nodeset_find +ir_lnk_nodeset_entry_t *ir_lnk_nodeset_find_(const ir_lnk_nodeset_t *nodeset, const ir_node *node); +#define hashset_find ir_lnk_nodeset_find_ #define hashset_size ir_lnk_nodeset_size #define ADDITIONAL_INIT INIT_LIST_HEAD(&self->elem_list); INIT_LIST_HEAD(&self->all_iters); @@ -68,8 +70,7 @@ static ir_lnk_nodeset_entry_t null_nodeset_entry; * Resize the hashset * @internal */ -static -void resize(HashSet *self, size_t new_size) +static void resize(HashSet *self, size_t new_size) { HashSetEntry *old_entries = self->entries; HashSetEntry *new_entries; @@ -111,7 +112,7 @@ void resize(HashSet *self, size_t new_size) /* Inserts a node into a linked nodeset. */ int ir_lnk_nodeset_insert(ir_lnk_nodeset_t *nodeset, ir_node *node) { - ir_lnk_nodeset_entry_t *entry = _ir_lnk_nodeset_insert(nodeset, node); + ir_lnk_nodeset_entry_t *entry = ir_lnk_nodeset_insert_(nodeset, node); if (entry->list.next == NULL) { /* we have added a new element */ @@ -123,7 +124,7 @@ int ir_lnk_nodeset_insert(ir_lnk_nodeset_t *nodeset, ir_node *node) int ir_lnk_nodeset_contains(const ir_lnk_nodeset_t *nodeset, const ir_node *node) { - return _ir_lnk_nodeset_find(nodeset, node) != NULL; + return ir_lnk_nodeset_find_(nodeset, node) != NULL; } /** @@ -134,7 +135,8 @@ int ir_lnk_nodeset_contains(const ir_lnk_nodeset_t *nodeset, const ir_node *node * @param nodeset Pointer to the nodeset */ void ir_lnk_nodeset_iterator_init(ir_lnk_nodeset_iterator_t *iterator, - const ir_lnk_nodeset_t *nodeset) { + const ir_lnk_nodeset_t *nodeset) +{ iterator->iter = nodeset->elem_list.next; iterator->nodeset = nodeset; } @@ -167,7 +169,8 @@ ir_node *ir_lnk_nodeset_iterator_next(ir_lnk_nodeset_iterator_t *iterator) * @param iterator Pointer to the nodeset iterator. */ void ir_lnk_nodeset_remove_iterator(ir_lnk_nodeset_t *nodeset, - ir_lnk_nodeset_iterator_t *iterator) { + ir_lnk_nodeset_iterator_t *iterator) +{ ir_lnk_nodeset_entry_t *rem = list_entry(iterator->iter->prev, ir_lnk_nodeset_entry_t, list); ir_lnk_nodeset_remove(nodeset, rem->node);