X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fident%2Fident.c;h=bb2e4ea427823d18b492fefc047955a7f38a38b8;hb=bf9be89cbbf5d6ca1b80fd5736b80f47c1a14e90;hp=a90b0b723eadf9595979b7e9c3fbed2d89380a55;hpb=eb08138c6b80c169945568e4414f491a9bc20388;p=libfirm diff --git a/ir/ident/ident.c b/ir/ident/ident.c index a90b0b723..bb2e4ea42 100644 --- a/ir/ident/ident.c +++ b/ir/ident/ident.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -17,31 +17,21 @@ * PURPOSE. */ -/* - * Project: libFIRM - * File name: ir/common/ident.c - * Purpose: Hash table to store names. - * Author: Goetz Lindenmaier - * Modified by: - * Created: - * CVS-ID: $Id$ - * Copyright: (c) 1999-2003 Universität Karlsruhe +/** + * @file + * @brief Hash table to store names. + * @author Goetz Lindenmaier + * @version $Id$ */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include +#include #include #include #include -#ifdef FIRM_ENABLE_WCHAR -#include -#endif - #include "ident_t.h" #include "set.h" #include "xmalloc.h" @@ -70,8 +60,6 @@ static ident *set_new_id_from_chars(void *handle, const char *str, int len) { set *id_set = handle; - /* GL: Who added this assert? And why? */ - //assert(len > 0); return (ident *)set_hinsert0(id_set, str, len, ID_HASH(unsigned char, str, len)); } @@ -86,7 +74,7 @@ static ident *set_new_id_from_chars(void *handle, const char *str, int len) static ident *set_new_id_from_str(void *handle, const char *str) { assert(str); - return (ident *)set_new_id_from_chars(handle, str, strlen(str)); + return set_new_id_from_chars(handle, str, strlen(str)); } /** @@ -100,6 +88,7 @@ static ident *set_new_id_from_str(void *handle, const char *str) 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; } @@ -115,6 +104,7 @@ static const char *set_get_id_str(void *handle, ident *id) static int set_get_id_strlen(void *handle, ident *id) { struct set_entry *entry = (struct set_entry *)id; + (void) handle; return entry->size; } @@ -122,7 +112,8 @@ static int set_get_id_strlen(void *handle, ident *id) /** * Default implementation using libfirm sets. */ -void set_finish_ident(void *handle) { +void set_finish_ident(void *handle) +{ set *id_set = handle; del_set(id_set); @@ -144,111 +135,6 @@ static int def_get_id_strlen(void *handle, ident *id) return strlen(impl.get_id_str(handle, id)); } -#ifdef FIRM_ENABLE_WCHAR -/** - * Stores a wide character string in the ident module and returns a - * handle for the string. - * - * @param handle the handle for the set - * @param wstr the wide character string which shall be stored - * @param len length of wstr - * - * @return id - a handle for the generated ident - * - * Default implementation using libfirm sets. - */ -static ident *set_new_id_from_wchars(void *handle, const wchar_t *wstr, int len) -{ - set *id_set = handle; - wchar_t *tmp; - - /* can't use hinsert0 here, so copy and add a 0 */ - tmp = alloca((len + 1) * sizeof(*tmp)); - memcpy(tmp, wstr, len * sizeof(*tmp)); - tmp[len] = L'\0'; - - return (ident *)set_hinsert(id_set, tmp, (len + 1) * sizeof(wchar_t), ID_HASH(wchar_t, tmp, len)); -} - -/** - * Stores a wide character string in the ident module and - * returns a handle for the string. - * - * @param handle the handle for the set - * @param wstr the wide character string which shall be stored - * - * Default implementation using libfirm sets. - */ -static ident *set_new_id_from_wcs(void *handle, const wchar_t *wstr) -{ - assert(wstr); - return (ident *)set_new_id_from_wchars(handle, wstr, wcslen(wstr)); -} - -/** - * Returns a wide character string represented by an ident. - * - * @param handle the handle for the set - * @param id the ident - * - * Default implementation using libfirm sets. - */ -static const wchar_t *set_get_id_wcs(void *handle, ident *id) -{ - struct set_entry *entry = (struct set_entry *)id; - - return (const wchar_t *)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_wcslen(void *handle, ident *id) -{ - struct set_entry *entry = (struct set_entry *)id; - - /* len + \0 is stored for wchar_t */ - return entry->size / sizeof(wchar_t) - 1; -} - -/** - * Default implementation if no new_id_from_wcs() is provided. - */ -static ident *def_new_id_from_wcs(void *handle, const wchar_t *wstr) -{ - return impl.new_id_from_wchars(handle, wstr, wcslen(wstr)); -} - -/** - * Default implementation if no new_id_from_wchars() is provided. - */ -static ident *def_new_id_from_wchars(void *handle, const wchar_t *wstr, int len) -{ - return impl.new_id_from_chars(handle, (const char *)wstr, (len + 1) * sizeof(wchar_t)); -} - -/** - * Default implementation if no get_id_wcs() is provided. - */ -static const wchar_t *def_get_id_wcs(void *handle, ident *id) -{ - return (const wchar_t *)impl.get_id_str(handle, id); -} - -/** - * Default implementation if no get_id_wcslen() is provided. - */ -static int def_get_id_wcslen(void *handle, ident *id) -{ - return wcslen(impl.get_id_wcs(handle, id)); -} -#endif /* FIRM_ENABLE_WCHAR */ - /* Initialize the ident module. */ void init_ident(ident_if_t *id_if, int initial_n_idents) { @@ -259,44 +145,26 @@ void init_ident(ident_if_t *id_if, int initial_n_idents) impl.new_id_from_str = def_new_id_from_str; if (! impl.get_id_strlen) impl.get_id_strlen = def_get_id_strlen; - -#ifdef FIRM_ENABLE_WCHAR - if (! impl.new_id_from_wcs) - impl.new_id_from_wcs = def_new_id_from_wcs; - if (! impl.new_id_from_wchars) - impl.new_id_from_wchars = def_new_id_from_wchars; - if (! impl.get_id_wcs) - impl.get_id_wcs = def_get_id_wcs; - if (! impl.get_id_wcslen) - impl.get_id_wcslen = def_get_id_wcslen; -#endif /* FIRM_ENABLE_WCHAR */ - } - else { + } 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; -#ifdef FIRM_ENABLE_WCHAR - impl.new_id_from_wcs = set_new_id_from_wcs; - impl.new_id_from_wchars = set_new_id_from_wchars; - impl.get_id_wcs = set_get_id_wcs; - impl.get_id_wcslen = set_get_id_wcslen; -#endif /* FIRM_ENABLE_WCHAR */ + /* it's ok to use memcmp here, we check only strings */ impl.handle = new_set(memcmp, initial_n_idents); } } ident *new_id_from_str(const char *str) { - assert(str); + assert(str != NULL); return impl.new_id_from_str(impl.handle, str); } ident *new_id_from_chars(const char *str, int len) { - assert(len > 0); return impl.new_id_from_chars(impl.handle, str, len); } @@ -310,7 +178,8 @@ int get_id_strlen(ident *id) return impl.get_id_strlen(impl.handle, id); } -void finish_ident(void) { +void finish_ident(void) +{ if (impl.finish_ident) impl.finish_ident(impl.handle); } @@ -340,33 +209,12 @@ int id_contains_char(ident *id, char c) return strchr(get_id_str(id), c) != NULL; } -#ifdef FIRM_ENABLE_WCHAR - -ident *new_id_from_wcs (const wchar_t *str) -{ - assert(str); - return impl.new_id_from_wcs(impl.handle, str); -} - -ident *new_id_from_wchars (const wchar_t *str, int len) +ident *id_unique(const char *tag) { - assert(len > 0); - return impl.new_id_from_wchars(impl.handle, str, len); -} + static unsigned unique_id = 0; + char buf[256]; -const wchar_t *get_id_wcs(ident *id) -{ - return impl.get_id_wcs(impl.handle, id); + snprintf(buf, sizeof(buf), tag, unique_id); + unique_id++; + return new_id_from_str(buf); } - -int get_id_wcslen(ident *id) -{ - return impl.get_id_wcslen(impl.handle, id); -} - -int id_contains_wchar (ident *id, wchar_t c) -{ - return wcschr(get_id_wcs(id), c) != NULL; -} - -#endif /* FIRM_ENABLE_WCHAR */