summaryrefslogtreecommitdiffhomepage
path: root/ir/ident
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2010-05-26 11:15:23 +0200
committerMatthias Braun <matze@braunis.de>2010-05-26 11:15:23 +0200
commit4d6c06673e8fc5d144bfe16397697ff2812fc22e (patch)
tree76024a13b8c8f47e803e0c3dbc9da9b68a28f636 /ir/ident
parent44c4d8bef4defba812b0765a12d345fa9826f4a9 (diff)
remove the infrastructure for using a custom identifier module and simply always use the default UTF-8 one. Slightly cleanup the code while doing that
[r27589]
Diffstat (limited to 'ir/ident')
-rw-r--r--ir/ident/ident.c175
-rw-r--r--ir/ident/ident_t.h17
-rw-r--r--ir/ident/mangle.c20
3 files changed, 49 insertions, 163 deletions
diff --git a/ir/ident/ident.c b/ir/ident/ident.c
index 018ddc4..29ed01f 100644
--- a/ir/ident/ident.c
+++ b/ir/ident/ident.c
@@ -35,178 +35,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_STR(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)
+const char *get_id_str(const 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(const 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)
+int id_is_prefix(const ident *prefix, const 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 id_is_suffix(const ident *suffix, const 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)
+int id_contains_char(const 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)
diff --git a/ir/ident/ident_t.h b/ir/ident/ident_t.h
index 5919fbc..b81aff6 100644
--- a/ir/ident/ident_t.h
+++ b/ir/ident/ident_t.h
@@ -30,24 +30,15 @@
/**
* Initialize the ident module.
- *
- * @param id_if The ident module interface, if NULL, the default
- * libFirm ident module will be used.
- * @param initial_n_idents Only used in the default libFirm ident module, initial
- * number of entries in the hash table.
*/
-void init_ident (ident_if_t *id_if, int initial_n_idents);
+void init_ident(void);
/**
* Finishes the ident module, frees all entries.
*/
-void finish_ident (void);
+void finish_ident(void);
-/** The hash function of the internal ident module implementation. */
-#define ID_HASH(type, str, len) \
- ((( ((type *)(str))[0] * 33 \
- + ((type *)(str))[(len)>>1]) * 31 \
- + ((type *)(str))[(len)-1]) * 9 \
- + (len))
+/** initializes the name mangling code */
+void firm_init_mangle(void);
#endif
diff --git a/ir/ident/mangle.c b/ir/ident/mangle.c
index 175bd21..da790c6 100644
--- a/ir/ident/mangle.c
+++ b/ir/ident/mangle.c
@@ -25,9 +25,9 @@
*/
#include "config.h"
-# include <stdio.h>
+#include <stdio.h>
-#include "ident.h"
+#include "ident_t.h"
#include "obst.h"
/* Make types visible to allow most efficient access */
@@ -39,13 +39,13 @@
static struct obstack mangle_obst;
/** returned a mangled type name, currently no mangling */
-static inline ident *mangle_type(ir_type *tp)
+static inline ident *mangle_type(const ir_type *tp)
{
assert(tp->kind == k_type);
return tp->name;
}
-ident *id_mangle_entity(ir_entity *ent)
+ident *id_mangle_entity(const ir_entity *ent)
{
ident *type_id;
char *cp;
@@ -65,7 +65,7 @@ ident *id_mangle_entity(ir_entity *ent)
/* Returns a new ident that represents 'firstscnd'. */
-ident *id_mangle(ident *first, ident *scnd)
+ident *id_mangle(const ident *first, const ident *scnd)
{
char *cp;
int len;
@@ -81,7 +81,7 @@ ident *id_mangle(ident *first, ident *scnd)
}
/** Returns a new ident that represents 'prefixscndsuffix'. */
-ident *id_mangle3(const char *prefix, ident *scnd, const char *suffix)
+ident *id_mangle3(const char *prefix, const ident *scnd, const char *suffix)
{
char *cp;
int len;
@@ -98,7 +98,7 @@ ident *id_mangle3(const char *prefix, ident *scnd, const char *suffix)
}
/** Returns a new ident that represents first<c>scnd. */
-static ident *id_mangle_3(ident *first, char c, ident* scnd)
+static ident *id_mangle_3(const ident *first, char c, const ident* scnd)
{
char *cp;
int len;
@@ -115,19 +115,19 @@ static ident *id_mangle_3(ident *first, char c, ident* scnd)
}
/* Returns a new ident that represents first_scnd. */
-ident *id_mangle_u(ident *first, ident* scnd)
+ident *id_mangle_u(const ident *first, const ident* scnd)
{
return id_mangle_3(first, '_', scnd);
}
/* Returns a new ident that represents first.scnd. */
-ident *id_mangle_dot(ident *first, ident* scnd)
+ident *id_mangle_dot(const ident *first, const ident* scnd)
{
return id_mangle_3(first, '.', scnd);
}
/* returns a mangled name for a Win32 function using it's calling convention */
-ident *id_decorate_win32_c_fkt(ir_entity *ent, ident *id)
+ident *id_decorate_win32_c_fkt(const ir_entity *ent, const ident *id)
{
ir_type *tp = get_entity_type(ent);
unsigned cc_mask = get_method_calling_convention(tp);