X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fident%2Fident.c;h=8a23dfae629b54f13b77f765ea5bd0f9d08e36d8;hb=b9a1bfdbce56c76bd4d5ff772963628523ecfc41;hp=018ddc4ce24cb5d49f6085f70bf6830c8594188c;hpb=ea75e9d38674b468f602a0699fb64b9c01254797;p=libfirm diff --git a/ir/ident/ident.c b/ir/ident/ident.c index 018ddc4ce..8a23dfae6 100644 --- a/ir/ident/ident.c +++ b/ir/ident/ident.c @@ -21,7 +21,6 @@ * @file * @brief Hash table to store names. * @author Goetz Lindenmaier - * @version $Id$ */ #include "config.h" @@ -35,178 +34,73 @@ #include "ident_t.h" #include "set.h" #include "xmalloc.h" +#include "hashptr.h" -/* for debugging only, not the real implementation */ -struct _ident { - char reserved[sizeof(unsigned) + sizeof(size_t)]; - char data[1]; -}; +static set *id_set; -/** The current ident module implementation. */ -static ident_if_t impl; - -/** - * Stores a string in the ident module and returns a handle for the string. - * - * @param handle the handle for the set - * @param str the string which shall be stored - * @param len length of str in bytes - * - * @return id - a handle for the generated ident - * - * Default implementation using libfirm sets. - */ -static ident *set_new_id_from_chars(void *handle, const char *str, int len) +void init_ident(void) { - set *id_set = handle; - - return (ident *)set_hinsert0(id_set, str, len, ID_HASH(unsigned char, str, len)); + /* it's ok to use memcmp here, we check only strings */ + id_set = new_set(memcmp, 128); } -/** - * Stores a string in the ident module and returns a handle for the string. - * - * @param handle the handle for the set - * @param str the string (or whatever) which shall be stored - * - * Default implementation using libfirm sets. - */ -static ident *set_new_id_from_str(void *handle, const char *str) +ident *new_id_from_chars(const char *str, size_t len) { - assert(str); - return set_new_id_from_chars(handle, str, strlen(str)); -} - -/** - * Returns a string represented by an ident. - * - * @param handle the handle for the set - * @param id the ident - * - * Default implementation using libfirm sets. - */ -static const char *set_get_id_str(void *handle, ident *id) -{ - struct set_entry *entry = (struct set_entry *)id; - (void) handle; - - return (const char *)entry->dptr; -} - -/** - * Returns the length of the string represented by an ident. - * - * @param handle the handle for the set - * @param id the ident - * - * Default implementation using libfirm sets. - */ -static int set_get_id_strlen(void *handle, ident *id) -{ - struct set_entry *entry = (struct set_entry *)id; - (void) handle; - - return entry->size; -} - -/** - * Default implementation using libfirm sets. - */ -static void set_finish_ident(void *handle) -{ - set *id_set = handle; - - del_set(id_set); -} - -/** - * Default implementation if no new_id_from_str() is provided. - */ -static ident *def_new_id_from_str(void *handle, const char *str) -{ - return impl.new_id_from_chars(handle, str, strlen(str)); -} - -/** - * Default implementation if no get_id_strlen() is provided. - */ -static int def_get_id_strlen(void *handle, ident *id) -{ - return strlen(impl.get_id_str(handle, id)); -} - -/* Initialize the ident module. */ -void init_ident(ident_if_t *id_if, int initial_n_idents) -{ - if (id_if) { - memcpy(&impl, id_if, sizeof(impl)); - - if (! impl.new_id_from_str) - impl.new_id_from_str = def_new_id_from_str; - if (! impl.get_id_strlen) - impl.get_id_strlen = def_get_id_strlen; - } else { - impl.new_id_from_str = set_new_id_from_str; - impl.new_id_from_chars = set_new_id_from_chars; - impl.get_id_str = set_get_id_str; - impl.get_id_strlen = set_get_id_strlen; - impl.finish_ident = set_finish_ident; - - /* it's ok to use memcmp here, we check only strings */ - impl.handle = new_set(memcmp, initial_n_idents); - } + unsigned hash = hash_data((const unsigned char*)str, len); + ident *result = (ident*) set_hinsert0(id_set, str, len, hash); + return result; } ident *new_id_from_str(const char *str) { - assert(str != NULL); - return impl.new_id_from_str(impl.handle, str); -} - -ident *new_id_from_chars(const char *str, int len) -{ - return impl.new_id_from_chars(impl.handle, str, len); + assert(str != NULL); + return new_id_from_chars(str, strlen(str)); } const char *get_id_str(ident *id) { - return impl.get_id_str(impl.handle, id); + struct set_entry *entry = (struct set_entry*) id; + return (const char*) entry->dptr; } -int get_id_strlen(ident *id) +size_t get_id_strlen(ident *id) { - return impl.get_id_strlen(impl.handle, id); + struct set_entry *entry = (struct set_entry*) id; + return entry->size; } void finish_ident(void) { - if (impl.finish_ident) - impl.finish_ident(impl.handle); + del_set(id_set); + id_set = NULL; } int id_is_prefix(ident *prefix, ident *id) { - if (get_id_strlen(prefix) > get_id_strlen(id)) return 0; - return 0 == memcmp(get_id_str(prefix), get_id_str(id), get_id_strlen(prefix)); + size_t prefix_len = get_id_strlen(prefix); + if (prefix_len > get_id_strlen(id)) + return 0; + return 0 == memcmp(get_id_str(prefix), get_id_str(id), prefix_len); } int id_is_suffix(ident *suffix, ident *id) { - int suflen = get_id_strlen(suffix); - int idlen = get_id_strlen(id); - const char *part; + size_t suflen = get_id_strlen(suffix); + size_t idlen = get_id_strlen(id); + const char *part; - if (suflen > idlen) return 0; + if (suflen > idlen) + return 0; - part = get_id_str(id); - part = part + (idlen - suflen); + part = get_id_str(id); + part = part + (idlen - suflen); - return 0 == memcmp(get_id_str(suffix), part, suflen); + return 0 == memcmp(get_id_str(suffix), part, suflen); } int id_contains_char(ident *id, char c) { - return strchr(get_id_str(id), c) != NULL; + return strchr(get_id_str(id), c) != NULL; } ident *id_unique(const char *tag)