From: Michael Beck Date: Mon, 5 Dec 2005 12:23:34 +0000 (+0000) Subject: wchar support added X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=6283bc10025ad08777566d67739383953a424ef2;p=libfirm wchar support added [r7040] --- diff --git a/ir/ident/ident.c b/ir/ident/ident.c index 16192a917..49abd69d8 100644 --- a/ir/ident/ident.c +++ b/ir/ident/ident.c @@ -20,6 +20,17 @@ #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif +#ifdef HAVE_MALLOC_H +#include +#endif + +#ifdef FIRM_ENABLE_WCHAR +#include +#endif + #include "ident_t.h" #include "set.h" @@ -49,7 +60,7 @@ static ident *set_new_id_from_chars(void *handle, const char *str, int len) /* GL: Who added this assert? And why? */ //assert(len > 0); - return (ident *)set_hinsert0(id_set, str, len, ID_HASH(str, len)); + return (ident *)set_hinsert0(id_set, str, len, ID_HASH(unsigned char, str, len)); } /** @@ -121,6 +132,111 @@ 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) { @@ -131,13 +247,30 @@ 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 { - 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; + 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 */ impl.handle = new_set(memcmp, initial_n_idents); } @@ -195,12 +328,33 @@ int id_contains_char(ident *id, char c) return strchr(get_id_str(id), c) != NULL; } -int print_id (ident *id) +#ifdef FIRM_ENABLE_WCHAR + +ident *new_id_from_wcs (const wchar_t *str) { - return printf("%s", get_id_str(id)); + assert(str); + return impl.new_id_from_wcs(impl.handle, str); } -int fprint_id (FILE *F, ident *id) +ident *new_id_from_wchars (const wchar_t *str, int len) { - return fprintf(F, "%s", get_id_str(id)); + assert(len > 0); + return impl.new_id_from_wchars(impl.handle, str, len); } + +const wchar_t *get_id_wcs(ident *id) +{ + return impl.get_id_wcs(impl.handle, id); +} + +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 */ diff --git a/ir/ident/ident.h b/ir/ident/ident.h index a2707d024..9843e3532 100644 --- a/ir/ident/ident.h +++ b/ir/ident/ident.h @@ -16,14 +16,14 @@ * * Identifiers are used in the firm library. This is the interface to it. */ +#ifndef _IDENT_H_ +#define _IDENT_H_ +#include "firm_config.h" -# ifndef _IDENT_H_ -# define _IDENT_H_ - -# include -# include -# include "firm_common.h" +#ifdef FIRM_ENABLE_WCHAR +#include +#endif /* Identifiers */ @@ -42,6 +42,9 @@ typedef const struct ident ident; * The ident module interface. */ typedef struct _ident_if_t { + /** The handle. */ + void *handle; + /** * Store a string and create an ident. * This function may be NULL, new_id_from_chars() @@ -78,9 +81,43 @@ typedef struct _ident_if_t { */ void (*finish_ident)(void *handle); - /** The handle. */ - void *handle; +#ifdef FIRM_ENABLE_WCHAR + /** + * Store a wide character string and create an ident. + * This function may be NULL, new_id_from_wchars() + * is then used to emulate it's behavior. + * + * @param wstr - the string which shall be stored + */ + ident *(*new_id_from_wcs)(void *handle, const wchar_t *wstr); + + /** + * Store a wide character string and create an ident. + * This function may be NULL, new_id_from_chars() is then used appropriate. + * Beware: the string might not be stored at a right alignment! + * + * @param wstr - the wide character string which shall be stored + * @param len - the length of the string + */ + ident *(*new_id_from_wchars)(void *handle, const wchar_t *wstr, int len); + + /** + * Returns a wide character string represented by an ident. + * This function may be NULL, get_id_str() is then used. + * This assume that the strings are stored at an address aligned + * for wchar_t, so beware! + */ + const wchar_t *(*get_id_wcs)(void *handle, ident *id); + /** + * Returns the length of the string represented by an ident. + * This function may be NULL, get_id_wcs() is then used + * to emulate it's behavior. + * + * @param id - the ident + */ + int (*get_id_wcslen)(void *handle, ident *id); +#endif } ident_if_t; /** @@ -136,6 +173,7 @@ const char *get_id_str (ident *id); * @see new_id_from_str(), new_id_from_chars(), get_id_str() */ int get_id_strlen(ident *id); + /** * Returns true if prefix is a prefix of an ident. * @@ -176,29 +214,71 @@ int id_is_suffix (ident *suffix, ident *id); */ int id_contains_char (ident *id, char c); +#ifdef FIRM_ENABLE_WCHAR /** - * Prints the ident to stdout. + * Store a wide character string and create an ident. + * + * Stores a string in the ident module and returns a handle for the string. * - * @param id - The ident to be printed. + * Copies the string. @p str must be zero terminated + * + * @param str - the wide character string which shall be stored * - * @return - * number of bytes written + * @return id - a handle for the generated ident * - * @see new_id_from_str(), new_id_from_chars(), get_id_str(), id_is_prefix(), fprint_id() + * @see get_id_wcs(), get_id_wcs() */ -int print_id (ident *id); +ident *new_id_from_wcs (const wchar_t *str); + +/** Store a wide character string and create an ident. + * + * Stores a string in the ident module and returns a handle for the string. + * Copies the string. This version takes non-zero-terminated strings. + * + * @param wstr - the wide character string (or whatever) which shall be stored + * @param len - the length of string + * + * @return id - a handle for the generated ident + * + * @see new_id_from_str(), get_id_strlen() + */ +ident *new_id_from_wchars (const wchar_t *str, int len); /** - * Prints the ident to the file passed. + * Returns a wide character string represented by an ident. + * + * Returns the string represented by id. This string is + * NULL terminated. The string may not be changed. * - * @param F - file pointer to print the ident to. - * @param id - The ident to print and the file. + * @param id - the ident * - * @return - * number of btes written + * @return cp - a string * - * @see new_id_from_str(), new_id_from_chars(), get_id_str(), id_is_prefix(), print_id() + * @see new_id_from_wcs(), new_id_from_wchars(), get_id_wcslen() */ -int fprint_id (FILE *F, ident *id); +const wchar_t *get_id_wcs(ident *id); + +/** + * Returns the length of the wide character string represented by an ident. + * + * @param id - the ident + * + * @return len - the length of the string + * + * @see new_id_from_wcs(), new_id_from_wchars(), get_id_wcs() + */ +int get_id_wcslen(ident *id); + +/** + * Return true if an ident contains a given character. + * + * @param id - the ident + * @param c - the character + * + * @see new_id_from_wcs(), new_id_from_chars(), get_id_str() + */ +int id_contains_wchar (ident *id, wchar_t c); + +#endif /* FIRM_ENABLE_WCHAR */ # endif /* _IDENT_H_ */ diff --git a/ir/ident/ident_t.h b/ir/ident/ident_t.h index 2aa19470d..2fbf2d65a 100644 --- a/ir/ident/ident_t.h +++ b/ir/ident/ident_t.h @@ -31,10 +31,10 @@ void init_ident (ident_if_t *id_if, int initial_n_idents); void finish_ident (void); /** The hash function of the internal ident module implementation. */ -#define ID_HASH(str, len) \ - ((( ((unsigned char *)(str))[0] * 33 \ - + ((unsigned char *)(str))[(len)>>1]) * 31 \ - + ((unsigned char *)(str))[(len)-1]) * 9 \ +#define ID_HASH(type, str, len) \ + ((( ((type *)(str))[0] * 33 \ + + ((type *)(str))[(len)>>1]) * 31 \ + + ((type *)(str))[(len)-1]) * 9 \ + (len)) # endif /* _IDENT_T_H_ */