X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firlinkednodemap.c;h=74aa1488c43a609748fb2aca8ec1f2298d7e0a35;hb=1bfa7deeecc4d07014b8195e25cfe6471ebd2cd5;hp=0c510f84dd33437180205bb28ef04a87b4fed560;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm diff --git a/ir/ir/irlinkednodemap.c b/ir/ir/irlinkednodemap.c index 0c510f84d..74aa1488c 100644 --- a/ir/ir/irlinkednodemap.c +++ b/ir/ir/irlinkednodemap.c @@ -51,9 +51,12 @@ static ir_lnk_nodemap_entry_t null_nodemap_entry; #define hashset_init ir_lnk_nodemap_init #define hashset_init_size ir_lnk_nodemap_init_size #define hashset_destroy ir_lnk_nodemap_destroy -#define hashset_insert _ir_lnk_nodemap_insert +ir_lnk_nodemap_entry_t *ir_lnk_nodemap_insert_(ir_lnk_nodemap_t *self, ir_node *node); +#define hashset_insert ir_lnk_nodemap_insert_ #define hashset_remove ir_lnk_nodemap_remove -#define hashset_find _ir_lnk_nodemap_find +ir_lnk_nodemap_entry_t *ir_lnk_nodemap_find_(const ir_lnk_nodemap_t *self, + const ir_node *node); +#define hashset_find ir_lnk_nodemap_find_ #define hashset_size ir_lnk_nodemap_size #define ADDITIONAL_INIT INIT_LIST_HEAD(&self->elem_list); INIT_LIST_HEAD(&self->all_iters); @@ -68,8 +71,7 @@ static ir_lnk_nodemap_entry_t null_nodemap_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; @@ -110,7 +112,7 @@ void resize(HashSet *self, size_t new_size) int ir_lnk_nodemap_put(ir_lnk_nodemap_t *nodemap, ir_node *node, void *data) { - ir_lnk_nodemap_entry_t *entry = _ir_lnk_nodemap_insert(nodemap, node); + ir_lnk_nodemap_entry_t *entry = ir_lnk_nodemap_insert_(nodemap, node); entry->data = data; if (entry->list.next == NULL) { @@ -123,7 +125,7 @@ int ir_lnk_nodemap_put(ir_lnk_nodemap_t *nodemap, ir_node *node, void *data) void *ir_lnk_nodemap_get(const ir_lnk_nodemap_t *nodemap, const ir_node *node) { - ir_lnk_nodemap_entry_t *entry = _ir_lnk_nodemap_find(nodemap, node); + ir_lnk_nodemap_entry_t *entry = ir_lnk_nodemap_find_(nodemap, node); return entry->data; } @@ -135,7 +137,8 @@ void *ir_lnk_nodemap_get(const ir_lnk_nodemap_t *nodemap, const ir_node *node) * @param nodemap Pointer to the nodemap */ void ir_lnk_nodemap_iterator_init(ir_lnk_nodemap_iterator_t *iterator, - const ir_lnk_nodemap_t *nodemap) { + const ir_lnk_nodemap_t *nodemap) +{ iterator->iter = nodemap->elem_list.next; iterator->nodemap = nodemap; } @@ -168,7 +171,8 @@ ir_node *ir_lnk_nodemap_iterator_next(ir_lnk_nodemap_iterator_t *iterator) * @param iterator Pointer to the nodemap iterator. */ void ir_lnk_nodemap_remove_iterator(ir_lnk_nodemap_t *nodemap, - ir_lnk_nodemap_iterator_t *iterator) { + ir_lnk_nodemap_iterator_t *iterator) +{ ir_lnk_nodemap_entry_t *rem = list_entry(iterator->iter->prev, ir_lnk_nodemap_entry_t, list); ir_lnk_nodemap_remove(nodemap, rem->node);