X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fvalueset.c;h=a5f79259554b27fc00ba0197e9daf799aa61fc9b;hb=ca21c59ea00ff05918de26952e91ac39f1589e01;hp=9975017056ca002604fe5f2c85dedc4cf70ee63e;hpb=f1d7e66e77700d6224db461ab66971812989250b;p=libfirm diff --git a/ir/ir/valueset.c b/ir/ir/valueset.c index 997501705..a5f792595 100644 --- a/ir/ir/valueset.c +++ b/ir/ir/valueset.c @@ -40,12 +40,12 @@ static ir_valueset_entry_t null_valueset_entry; #define KeyType ir_node* #define ConstKeyType const ir_node* #define GetKey(entry) (entry).value -#define InitData(self,entry,key) do { (entry).value = (key); (entry).list.next = NULL; (entry).list.prev = NULL; } while(0) +#define InitData(self,entry,key) do { (entry).value = (key); (entry).list.next = NULL; (entry).list.prev = NULL; } while (0) #define Hash(self,key) ir_node_hash(key) #define KeysEqual(self,key1,key2) (key1) == (key2) #define SetRangeEmpty(ptr,size) memset(ptr, 0, (size) * sizeof((ptr)[0])) #define EntrySetEmpty(entry) (entry).value = NULL -#define EntrySetDeleted(entry) do { (entry).data.value = (ir_node*) -1; list_del(&(entry).data.list); } while(0) +#define EntrySetDeleted(entry) do { (entry).data.value = (ir_node*) -1; list_del(&(entry).data.list); } while (0) #define EntryIsEmpty(entry) ((entry).data.value == NULL) #define EntryIsDeleted(entry) ((entry).data.value == (ir_node*)-1) @@ -69,10 +69,8 @@ static ir_valueset_entry_t null_valueset_entry; * Resize the hashset * @internal */ -static INLINE -void resize(HashSet *self, size_t new_size) +static void resize(HashSet *self, size_t new_size) { - size_t num_buckets = self->num_buckets; HashSetEntry *old_entries = self->entries; HashSetEntry *new_entries; list_head list = self->elem_list; @@ -150,12 +148,14 @@ void *ir_valueset_lookup(const ir_valueset_t *valueset, const ir_node *value) } void ir_valueset_iterator_init(ir_valueset_iterator_t *iterator, - const ir_valueset_t *valueset) { + const ir_valueset_t *valueset) +{ iterator->iter = valueset->elem_list.next; iterator->valueset = valueset; } -ir_node *ir_valueset_iterator_next(ir_valueset_iterator_t *iterator, ir_node **expr) { +ir_node *ir_valueset_iterator_next(ir_valueset_iterator_t *iterator, ir_node **expr) +{ ir_valueset_entry_t *entry; if (iterator->iter == &iterator->valueset->elem_list) { @@ -170,7 +170,8 @@ ir_node *ir_valueset_iterator_next(ir_valueset_iterator_t *iterator, ir_node **e return entry->value; } -void ir_valueset_remove_iterator(ir_valueset_t *valueset, ir_valueset_iterator_t *iterator) { +void ir_valueset_remove_iterator(ir_valueset_t *valueset, ir_valueset_iterator_t *iterator) +{ ir_valueset_entry_t *rem = list_entry(iterator->iter->prev, ir_valueset_entry_t, list); ir_valueset_remove(valueset, rem->value);