Use backend interface for map descriptors.

From-SVN: r174943
This commit is contained in:
Ian Lance Taylor 2011-06-11 06:21:55 +00:00
parent 70f910247b
commit 891daafaf8
9 changed files with 151 additions and 161 deletions

View file

@ -18,7 +18,7 @@ __go_map_delete (struct __go_map *map, const void *key)
{
const struct __go_map_descriptor *descriptor;
const struct __go_type_descriptor *key_descriptor;
size_t key_offset;
uintptr_t key_offset;
_Bool (*equalfn) (const void*, const void*, size_t);
size_t key_hash;
size_t key_size;

View file

@ -18,7 +18,7 @@ __go_map_rehash (struct __go_map *map)
{
const struct __go_map_descriptor *descriptor;
const struct __go_type_descriptor *key_descriptor;
size_t key_offset;
uintptr_t key_offset;
size_t key_size;
size_t (*hashfn) (const void *, size_t);
uintptr_t old_bucket_count;
@ -78,7 +78,7 @@ __go_map_index (struct __go_map *map, const void *key, _Bool insert)
{
const struct __go_map_descriptor *descriptor;
const struct __go_type_descriptor *key_descriptor;
size_t key_offset;
uintptr_t key_offset;
_Bool (*equalfn) (const void*, const void*, size_t);
size_t key_hash;
size_t key_size;

View file

@ -22,15 +22,15 @@ struct __go_map_descriptor
key_type key;
value_type value;
This is the size of that struct. */
size_t __entry_size;
uintptr_t __entry_size;
/* The offset of the key field in a map entry struct. */
size_t __key_offset;
uintptr_t __key_offset;
/* The offset of the value field in a map entry struct (the value
field immediately follows the key field, but there may be some
bytes inserted for alignment). */
size_t __val_offset;
uintptr_t __val_offset;
};
struct __go_map