Hi,
This adds a demangler for the D programming language to libiberty,
intended to be used in GDB and Binutils. GDB already has a trimmed
down implementation of this, but have been advised that here would be
a better location to house it.
Notes that I think are of interest / questions I have about how I've done this.
- The implementation is some 1200 SLOC (and may grow), so I've put it
in a new file, as opposed included cplus-dem.c. Is this reasonable?
- This borrows and extends the mini string package in cplus-dem.c,
because it was the simplest to use when writing this. The GDB
implementation uses obstack, and I'm aware of dyn_string, but I can't
say I'm a fan of using either.
- GDB has a testsuite that provides most of the coverage for what this
code should be doing.
- List of functions in d-demangle.c can be added to the ChangeLog upon request.
- I haven't signed any copyright assignments to GCC. But I have
papers from Donald ready to send across.
Regards
Iain
---
Add D demangling support for version 2 of the ABI.
include/ChangeLog
2014-08-03 Iain Buclaw <ibuc...@gdcproject.org>
* demangle.h (DMGL_DLANG): New macro.
(DMGL_STYLE_MASK): Add DMGL_DLANG.
(demangling_styles): Add dlang_demangling.
(DLANG_DEMANGLING_STYLE_STRING): New macro.
(DLANG_DEMANGLING): New macro.
(dlang_demangle): New prototype.
libibery/ChangeLog
2014-08-03 Iain Buclaw <ibuc...@gdcproject.org>
* Makefile.in (CFILES): Add d-demangle.c.
(REQUIRED_OFILES): Add d-demangle.o.
* cplus-dem.c (libiberty_demanglers): Add dlang_demangling case.
(cplus_demangle): Likewise.
* d-demangle.c: New file.
---
diff --git a/include/demangle.h b/include/demangle.h
index bbad71b..d2a6731 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -63,9 +63,10 @@ extern "C" {
#define DMGL_EDG (1 << 13)
#define DMGL_GNU_V3 (1 << 14)
#define DMGL_GNAT (1 << 15)
+#define DMGL_DLANG (1 << 16)
/* If none of these are set, use 'current_demangling_style' as the default. */
-#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT)
+#define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT|DMGL_DLANG)
/* Enumeration of possible demangling styles.
@@ -87,7 +88,8 @@ extern enum demangling_styles
edg_demangling = DMGL_EDG,
gnu_v3_demangling = DMGL_GNU_V3,
java_demangling = DMGL_JAVA,
- gnat_demangling = DMGL_GNAT
+ gnat_demangling = DMGL_GNAT,
+ dlang_demangling = DMGL_DLANG
} current_demangling_style;
/* Define string names for the various demangling styles. */
@@ -102,6 +104,7 @@ extern enum demangling_styles
#define GNU_V3_DEMANGLING_STYLE_STRING "gnu-v3"
#define JAVA_DEMANGLING_STYLE_STRING "java"
#define GNAT_DEMANGLING_STYLE_STRING "gnat"
+#define DLANG_DEMANGLING_STYLE_STRING "dlang"
/* Some macros to test what demangling style is active. */
@@ -115,6 +118,7 @@ extern enum demangling_styles
#define GNU_V3_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNU_V3)
#define JAVA_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_JAVA)
#define GNAT_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_GNAT)
+#define DLANG_DEMANGLING (((int) CURRENT_DEMANGLING_STYLE) & DMGL_DLANG)
/* Provide information about the available demangle styles. This code is
pulled from gdb into libiberty because it is useful to binutils also. */
@@ -169,6 +173,9 @@ java_demangle_v3 (const char *mangled);
char *
ada_demangle (const char *mangled, int options);
+extern char *
+dlang_demangle (const char *mangled, int options);
+
enum gnu_v3_ctor_kinds {
gnu_v3_complete_object_ctor = 1,
gnu_v3_base_object_ctor,
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 44e340f..9b87720 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
basename.c bcmp.c bcopy.c bsearch.c bzero.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
- dwarfnames.c dyn-string.c \
+ d-demangle.c dwarfnames.c dyn-string.c \
fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
@@ -167,7 +167,7 @@ REQUIRED_OFILES = \
./md5.$(objext) ./sha1.$(objext) ./alloca.$(objext) \
./argv.$(objext) \
./choose-temp.$(objext) ./concat.$(objext) \
- ./cp-demint.$(objext) ./crc32.$(objext) \
+ ./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
@@ -714,6 +714,14 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/dyn-string.c $(OUTPUT_OPTION)
+./d-demangle.$(objext): $(srcdir)/d-demangle.c config.h $(INCDIR)/ansidecl.h \
+ $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
+ $(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/d-demangle.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/d-demangle.c $(OUTPUT_OPTION)
+
./fdmatch.$(objext): $(srcdir)/fdmatch.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/libiberty.h
if [ x"$(PICFLAG)" != x ]; then \
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 52767cc..c68b981 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -306,6 +306,12 @@ const struct demangler_engine libiberty_demanglers[] =
}
,
{
+ DLANG_DEMANGLING_STYLE_STRING,
+ dlang_demangling,
+ "DLANG style demangling"
+ }
+ ,
+ {
NULL, unknown_demangling, NULL
}
};
@@ -870,6 +876,13 @@ cplus_demangle (const char *mangled, int options)
if (GNAT_DEMANGLING)
return ada_demangle (mangled, options);
+ if (DLANG_DEMANGLING)
+ {
+ ret = dlang_demangle (mangled, options);
+ if (ret)
+ return ret;
+ }
+
ret = internal_cplus_demangle (work, mangled);
squangle_mop_up (work);
return (ret);
diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c
new file mode 100644
index 0000000..799528e
--- /dev/null
+++ b/libiberty/d-demangle.c
@@ -0,0 +1,1354 @@
+/* Demangler for the D programming language
+ Copyright 2014 Free Software Foundation, Inc.
+ Written by Iain Buclaw (ibuc...@gdcproject.org)
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+In addition to the permissions in the GNU Library General Public
+License, the Free Software Foundation gives you unlimited permission
+to link the compiled version of this file into combinations with other
+programs, and to distribute those combinations without any restriction
+coming from the use of this file. (The Library Public License
+restrictions do apply in other respects; for example, they cover
+modification of the file, and distribution when not linked into a
+combined executable.)
+
+Libiberty is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB.
+If not, see <http://www.gnu.org/licenses/>. */
+
+/* This file exports one function; dlang_demangle.
+
+ This file imports strtol and strtold for decoding mangled literals. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "safe-ctype.h"
+
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+long strtol (const char *nptr, char **endptr, int base);
+long double strtold (const char *nptr, char **endptr);
+#endif
+
+#include <demangle.h>
+#include "libiberty.h"
+
+/* A mini string-handling package */
+
+typedef struct string /* Beware: these aren't required to be */
+{ /* '\0' terminated. */
+ char *b; /* pointer to start of string */
+ char *p; /* pointer after last character */
+ char *e; /* pointer after end of allocated space */
+} string;
+
+static void
+string_need (string *s, int n)
+{
+ int tem;
+
+ if (s->b == NULL)
+ {
+ if (n < 32)
+ {
+ n = 32;
+ }
+ s->p = s->b = XNEWVEC (char, n);
+ s->e = s->b + n;
+ }
+ else if (s->e - s->p < n)
+ {
+ tem = s->p - s->b;
+ n += tem;
+ n *= 2;
+ s->b = XRESIZEVEC (char, s->b, n);
+ s->p = s->b + tem;
+ s->e = s->b + n;
+ }
+}
+
+static void
+string_delete (string *s)
+{
+ if (s->b != NULL)
+ {
+ XDELETEVEC (s->b);
+ s->b = s->e = s->p = NULL;
+ }
+}
+
+static void
+string_init (string *s)
+{
+ s->b = s->p = s->e = NULL;
+}
+
+static int
+string_length (string *s)
+{
+ if (s->p == s->b)
+ {
+ return 0;
+ }
+ return s->p - s->b;
+}
+
+static void
+string_setlength (string *s, int n)
+{
+ if (n - string_length (s) < 0)
+ {
+ s->p = s->b + n;
+ }
+}
+
+static void
+string_append (string *p, const char *s)
+{
+ int n = strlen (s);
+ string_need (p, n);
+ memcpy (p->p, s, n);
+ p->p += n;
+}
+
+static void
+string_appendn (string *p, const char *s, int n)
+{
+ if (n != 0)
+ {
+ string_need (p, n);
+ memcpy (p->p, s, n);
+ p->p += n;
+ }
+}
+
+static void
+string_prependn (string *p, const char *s, int n)
+{
+ char *q;
+
+ if (n != 0)
+ {
+ string_need (p, n);
+ for (q = p->p - 1; q >= p->b; q--)
+ {
+ q[n] = q[0];
+ }
+ memcpy (p->b, s, n);
+ p->p += n;
+ }
+}
+
+static void
+string_prepend (string *p, const char *s)
+{
+ if (s != NULL && *s != '\0')
+ {
+ string_prependn (p, s, strlen (s));
+ }
+}
+
+
+/* Prototypes for D demangling functions */
+static const char *dlang_call_convention (string *, const char *);
+
+static const char *dlang_attributes (string *, const char *);
+
+static const char *dlang_function_type (string *, const char *);
+
+static const char *dlang_function_args (string *, const char *);
+
+static const char *dlang_type (string *, const char *);
+
+static const char *dlang_identifier (string *, const char *);
+
+static const char *dlang_parse_integer (string *, const char *, char);
+
+static const char *dlang_parse_real (string *, const char *);
+
+static const char *dlang_parse_string (string *, const char *);
+
+static const char *dlang_parse_arrayliteral (string *, const char *);
+
+static const char *dlang_parse_assocarray (string *, const char *);
+
+static const char *dlang_parse_structlit (string *, const char *, const char *);
+
+static const char *dlang_value (string *, const char *, const char *, char);
+
+static int dlang_call_convention_p (const char *);
+
+static const char *dlang_parse_symbol (string *, const char *);
+
+static const char *dlang_parse_tuple (string *, const char *);
+
+static const char *dlang_template_args (string *, const char *);
+
+static const char *dlang_parse_template (string *, const char *, long);
+
+#define ASCII2HEX(c) \
+ (('a' <= (c) && (c) <= 'f') ? \
+ ((c) - 'a' + 10) \
+ : (('A' <= (c) && (c) <= 'F') ? \
+ ((c) - 'A' + 10) \
+ : (('0' <= (c) && (c) <= '9') ? \
+ ((c) - '0') \
+ : 0 \
+ ) \
+ ) \
+ )
+
+/* Demangle the calling convention from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_call_convention (string *decl, const char *mangled)
+{
+ if (mangled == NULL || *mangled == '\0')
+ return mangled;
+
+ switch (*mangled)
+ {
+ case 'F': /* (D) */
+ mangled++;
+ break;
+ case 'U': /* (C) */
+ mangled++;
+ string_append (decl, "extern(C) ");
+ break;
+ case 'W': /* (Windows) */
+ mangled++;
+ string_append (decl, "extern(Windows) ");
+ break;
+ case 'V': /* (Pascal) */
+ mangled++;
+ string_append (decl, "extern(Pascal) ");
+ break;
+ case 'R': /* (C++) */
+ mangled++;
+ string_append (decl, "extern(C++) ");
+ break;
+ default:
+ return NULL;
+ }
+
+ return mangled;
+}
+
+/* Demangle the D function attributes from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_attributes (string *decl, const char *mangled)
+{
+ if (mangled == NULL || *mangled == '\0')
+ return mangled;
+
+ while (*mangled == 'N')
+ {
+ mangled++;
+ switch (*mangled)
+ {
+ case 'a': /* pure */
+ mangled++;
+ string_append (decl, "pure ");
+ continue;
+ case 'b': /* nothrow */
+ mangled++;
+ string_append (decl, "nothrow ");
+ continue;
+ case 'c': /* ref */
+ mangled++;
+ string_append (decl, "ref ");
+ continue;
+ case 'd': /* @property */
+ mangled++;
+ string_append (decl, "@property ");
+ continue;
+ case 'e': /* @trusted */
+ mangled++;
+ string_append (decl, "@trusted ");
+ continue;
+ case 'f': /* @safe */
+ mangled++;
+ string_append (decl, "@safe ");
+ continue;
+ case 'g':
+ case 'h':
+ /* inout parameter is represented as 'Ng'.
+ vector parameter is represented as 'Nh'.
+ If we see this, then we know we're really in the
+ parameter list. Rewind and break. */
+ mangled--;
+ break;
+ case 'i': /* @nogc */
+ mangled++;
+ string_append (decl, "@nogc ");
+ continue;
+ }
+ break;
+ }
+
+ return mangled;
+}
+
+/* Demangle the function type from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_function_type (string *decl, const char *mangled)
+{
+ string attr, args, type;
+ size_t szattr, szargs, sztype;
+
+ if (mangled == NULL || *mangled == '\0')
+ return mangled;
+
+ /* The order of the mangled string is:
+ CallConvention FuncAttrs Arguments ArgClose Type
+
+ The demangled string is re-ordered as:
+ CallConvention Type Arguments FuncAttrs
+ */
+ string_init (&attr);
+ string_init (&args);
+ string_init (&type);
+
+ /* Function call convention. */
+ mangled = dlang_call_convention (decl, mangled);
+
+ /* Function attributes. */
+ mangled = dlang_attributes (&attr, mangled);
+ szattr = string_length (&attr);
+
+ /* Function arguments. */
+ mangled = dlang_function_args (&args, mangled);
+ szargs = string_length (&args);
+
+ /* Function return type. */
+ mangled = dlang_type (&type, mangled);
+ sztype = string_length (&type);
+
+ /* Append to decl in order. */
+ string_appendn (decl, type.b, sztype);
+ string_append (decl, "(");
+ string_appendn (decl, args.b, szargs);
+ string_append (decl, ") ");
+ string_appendn (decl, attr.b, szattr);
+
+ string_delete (&attr);
+ string_delete (&args);
+ string_delete (&type);
+ return mangled;
+}
+
+/* Demangle the argument list from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_function_args (string *decl, const char *mangled)
+{
+ size_t n = 0;
+
+ while (mangled && *mangled != '\0')
+ {
+ switch (*mangled)
+ {
+ case 'X': /* (variadic T t...) style. */
+ mangled++;
+ string_append (decl, "...");
+ return mangled;
+ case 'Y': /* (variadic T t, ...) style. */
+ mangled++;
+ string_append (decl, ", ...");
+ return mangled;
+ case 'Z': /* Normal function. */
+ mangled++;
+ return mangled;
+ }
+
+ if (n++)
+ string_append (decl, ", ");
+
+ if (*mangled == 'M') /* scope(T) */
+ {
+ mangled++;
+ string_append (decl, "scope ");
+ }
+
+ switch (*mangled)
+ {
+ case 'J': /* out(T) */
+ mangled++;
+ string_append (decl, "out ");
+ break;
+ case 'K': /* ref(T) */
+ mangled++;
+ string_append (decl, "ref ");
+ break;
+ case 'L': /* lazy(T) */
+ mangled++;
+ string_append (decl, "lazy ");
+ break;
+ }
+ mangled = dlang_type (decl, mangled);
+ }
+
+ return mangled;
+}
+
+/* Demangle the type from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_type (string *decl, const char *mangled)
+{
+ if (mangled == NULL || *mangled == '\0')
+ return mangled;
+
+ switch (*mangled)
+ {
+ case 'O': /* shared(T) */
+ mangled++;
+ string_append (decl, "shared(");
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, ")");
+ return mangled;
+ case 'x': /* const(T) */
+ mangled++;
+ string_append (decl, "const(");
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, ")");
+ return mangled;
+ case 'y': /* immutable(T) */
+ mangled++;
+ string_append (decl, "immutable(");
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, ")");
+ return mangled;
+ case 'N':
+ mangled++;
+ if (*mangled == 'g') /* wild(T) */
+ {
+ mangled++;
+ string_append (decl, "inout(");
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, ")");
+ return mangled;
+ }
+ else if (*mangled == 'h') /* vector(T) */
+ {
+ mangled++;
+ string_append (decl, "__vector(");
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, ")");
+ return mangled;
+ }
+ else
+ return NULL;
+ case 'A': /* dynamic array (T[]) */
+ mangled++;
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, "[]");
+ return mangled;
+ case 'G': /* static array (T[N]) */
+ {
+ const char *numptr;
+ size_t num = 0;
+ mangled++;
+
+ numptr = mangled;
+ while (ISDIGIT (*mangled))
+ {
+ num++;
+ mangled++;
+ }
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, "[");
+ string_appendn (decl, numptr, num);
+ string_append (decl, "]");
+ return mangled;
+ }
+ case 'H': /* associative array (T[T]) */
+ {
+ string type;
+ size_t sztype;
+ mangled++;
+
+ string_init (&type);
+ mangled = dlang_type (&type, mangled);
+ sztype = string_length (&type);
+
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, "[");
+ string_appendn (decl, type.b, sztype);
+ string_append (decl, "]");
+
+ string_delete (&type);
+ return mangled;
+ }
+ case 'P': /* pointer (T*) */
+ mangled++;
+ mangled = dlang_type (decl, mangled);
+ string_append (decl, "*");
+ return mangled;
+ case 'I': /* ident T */
+ case 'C': /* class T */
+ case 'S': /* struct T */
+ case 'E': /* enum T */
+ case 'T': /* typedef T */
+ mangled++;
+ return dlang_parse_symbol (decl, mangled);
+ case 'D': /* delegate T */
+ mangled++;
+ mangled = dlang_function_type (decl, mangled);
+ string_append (decl, "delegate");
+ return mangled;
+ case 'B': /* tuple T */
+ mangled++;
+ return dlang_parse_tuple (decl, mangled);
+
+ /* Function types */
+ case 'F': case 'U': case 'W':
+ case 'V': case 'R':
+ mangled = dlang_function_type (decl, mangled);
+ string_append (decl, "function");
+ return mangled;
+
+ /* Basic types */
+ case 'n':
+ mangled++;
+ string_append (decl, "none");
+ return mangled;
+ case 'v':
+ mangled++;
+ string_append (decl, "void");
+ return mangled;
+ case 'g':
+ mangled++;
+ string_append (decl, "byte");
+ return mangled;
+ case 'h':
+ mangled++;
+ string_append (decl, "ubyte");
+ return mangled;
+ case 's':
+ mangled++;
+ string_append (decl, "short");
+ return mangled;
+ case 't':
+ mangled++;
+ string_append (decl, "ushort");
+ return mangled;
+ case 'i':
+ mangled++;
+ string_append (decl, "int");
+ return mangled;
+ case 'k':
+ mangled++;
+ string_append (decl, "uint");
+ return mangled;
+ case 'l':
+ mangled++;
+ string_append (decl, "long");
+ return mangled;
+ case 'm':
+ mangled++;
+ string_append (decl, "ulong");
+ return mangled;
+ case 'f':
+ mangled++;
+ string_append (decl, "float");
+ return mangled;
+ case 'd':
+ mangled++;
+ string_append (decl, "double");
+ return mangled;
+ case 'e':
+ mangled++;
+ string_append (decl, "real");
+ return mangled;
+
+ /* Imaginary and Complex types */
+ case 'o':
+ mangled++;
+ string_append (decl, "ifloat");
+ return mangled;
+ case 'p':
+ mangled++;
+ string_append (decl, "idouble");
+ return mangled;
+ case 'j':
+ mangled++;
+ string_append (decl, "ireal");
+ return mangled;
+ case 'q':
+ mangled++;
+ string_append (decl, "cfloat");
+ return mangled;
+ case 'r':
+ mangled++;
+ string_append (decl, "cdouble");
+ return mangled;
+ case 'c':
+ mangled++;
+ string_append (decl, "creal");
+ return mangled;
+
+ /* Other types */
+ case 'b':
+ mangled++;
+ string_append (decl, "bool");
+ return mangled;
+ case 'a':
+ mangled++;
+ string_append (decl, "char");
+ return mangled;
+ case 'u':
+ mangled++;
+ string_append (decl, "wchar");
+ return mangled;
+ case 'w':
+ mangled++;
+ string_append (decl, "dchar");
+ return mangled;
+
+ default: /* unhandled */
+ return NULL;
+ }
+}
+
+/* Extract the identifier from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_identifier (string *decl, const char *mangled)
+{
+ if (mangled == NULL || *mangled == '\0')
+ return mangled;
+
+ if (ISDIGIT (*mangled))
+ {
+ char *endptr;
+ long i = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || i <= 0 || strlen (endptr) < (size_t) i)
+ return NULL;
+
+ mangled = endptr;
+
+ /* May be a template instance. */
+ if (i >= 5 && strncmp (mangled, "__T", 3) == 0)
+ {
+ /* Template symbol. */
+ if (ISDIGIT (mangled[3]) && mangled[3] != '0')
+ return dlang_parse_template (decl, mangled, i);
+
+ return NULL;
+ }
+
+ if (strncmp (mangled, "__ctor", i) == 0)
+ {
+ /* Constructor symbol for a class/struct. */
+ string_append (decl, "this");
+ mangled += i;
+ return mangled;
+ }
+ else if (strncmp (mangled, "__dtor", i) == 0)
+ {
+ /* Destructor symbol for a class/struct. */
+ string_append (decl, "~this");
+ mangled += i;
+ return mangled;
+ }
+ else if (strncmp (mangled, "__postblit", i) == 0)
+ {
+ /* Postblit symbol for a struct. */
+ string_append (decl, "this(this)");
+ mangled += i;
+ return mangled;
+ }
+ else if (strncmp (mangled, "__initZ", i+1) == 0)
+ {
+ /* The static initialiser for a given symbol. */
+ string_prepend (decl, "init for ");
+ mangled += i + 1;
+ return mangled;
+ }
+ else if (strncmp (mangled, "__ClassZ", i+1) == 0)
+ {
+ /* The classinfo symbol for a given class. */
+ string_prepend (decl, "classinfo for ");
+ mangled += i + 1;
+ return mangled;
+ }
+ else if (strncmp (mangled, "__vtblZ", i+1) == 0)
+ {
+ /* The vtable symbol for a given class. */
+ string_prepend (decl, "vtable for ");
+ mangled += i + 1;
+ return mangled;
+ }
+ else if (strncmp (mangled, "__InterfaceZ", i+1) == 0)
+ {
+ /* The interface symbol for a given class. */
+ string_prepend (decl, "interface for ");
+ mangled += i + 1;
+ return mangled;
+ }
+ else if (strncmp (mangled, "__ModuleInfoZ", i+1) == 0)
+ {
+ /* The ModuleInfo symbol for a given module. */
+ string_prepend (decl, "moduleinfo for ");
+ mangled += i + 1;
+ return mangled;
+ }
+
+ string_appendn (decl, mangled, i);
+ mangled += i;
+ }
+ else
+ return NULL;
+
+ return mangled;
+}
+
+/* Extract the integer value from MANGLED and append it to DECL,
+ where TYPE is the type it should be represented as.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_parse_integer (string *decl, const char *mangled, char type)
+{
+ if (type == 'a' || type == 'u' || type == 'w')
+ {
+ /* Parse character value. */
+ char value[10];
+ int pos = 10;
+ int width = 0;
+ char *endptr;
+ long val = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || val < 0)
+ return NULL;
+
+ string_append (decl, "'");
+
+ if (type == 'a' && val >= 0x20 && val < 0x7F)
+ {
+ /* Represent as a character literal. */
+ char c = (char) val;
+ string_appendn (decl, &c, 1);
+ }
+ else
+ {
+ /* Represent as a hexadecimal value. */
+ switch (type)
+ {
+ case 'a': /* char */
+ string_append (decl, "\\x");
+ width = 2;
+ break;
+ case 'u': /* wchar */
+ string_append (decl, "\\u");
+ width = 4;
+ break;
+ case 'w': /* dchar */
+ string_append (decl, "'\\U");
+ width = 8;
+ break;
+ }
+
+ while (val > 0)
+ {
+ int digit = val % 16;
+
+ if (digit < 10)
+ value[--pos] = (char)(digit + '0');
+ else
+ value[--pos] = (char)((digit - 10) + 'a');
+
+ val /= 16;
+ width--;
+ }
+
+ for (; width > 0; width--)
+ value[--pos] = '0';
+
+ string_appendn (decl, &(value[pos]), 10 - pos);
+ }
+ string_append (decl, "'");
+ mangled = endptr;
+ }
+ else if (type == 'b')
+ {
+ /* Parse boolean value. */
+ char *endptr;
+ long val = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || val < 0)
+ return NULL;
+
+ string_append (decl, val ? "true" : "false");
+ mangled = endptr;
+ }
+ else
+ {
+ /* Parse integer value. */
+ const char *numptr = mangled;
+ size_t num = 0;
+
+ while (ISDIGIT (*mangled))
+ {
+ num++;
+ mangled++;
+ }
+ string_appendn (decl, numptr, num);
+
+ /* Append suffix. */
+ switch (type)
+ {
+ case 'h': /* ubyte */
+ case 't': /* ushort */
+ case 'k': /* uint */
+ string_append (decl, "u");
+ break;
+ case 'l': /* long */
+ string_append (decl, "L");
+ break;
+ case 'm': /* ulong */
+ string_append (decl, "uL");
+ break;
+ }
+ }
+
+ return mangled;
+}
+
+/* Extract the floating-point value from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_parse_real (string *decl, const char *mangled)
+{
+ char buffer[64];
+ int len = 0;
+ long double value;
+ char *endptr;
+
+ /* Handle NAN and +-INF. */
+ if (strncmp (mangled, "NAN", 3) == 0)
+ {
+ string_append (decl, "NaN");
+ mangled += 3;
+ return mangled;
+ }
+ else if (strncmp (mangled, "INF", 3) == 0)
+ {
+ string_append (decl, "Inf");
+ mangled += 3;
+ return mangled;
+ }
+ else if (strncmp (mangled, "NINF", 4) == 0)
+ {
+ string_append (decl, "-Inf");
+ mangled += 4;
+ return mangled;
+ }
+
+ /* Hexadecimal prefix and leading bit. */
+ if (*mangled == 'N')
+ {
+ buffer[len++] = '-';
+ mangled++;
+ }
+
+ if (!ISXDIGIT (*mangled))
+ return NULL;
+
+ buffer[len++] = '0';
+ buffer[len++] = 'x';
+ buffer[len++] = *mangled;
+ buffer[len++] = '.';
+ mangled++;
+
+ /* Significand. */
+ while (ISXDIGIT (*mangled))
+ {
+ buffer[len++] = *mangled;
+ mangled++;
+ }
+
+ /* Exponent. */
+ if (*mangled != 'P')
+ return NULL;
+
+ buffer[len++] = 'p';
+ mangled++;
+
+ if (*mangled == 'N')
+ {
+ buffer[len++] = '-';
+ mangled++;
+ }
+
+ while (ISDIGIT (*mangled))
+ {
+ buffer[len++] = *mangled;
+ mangled++;
+ }
+
+ /* Convert buffer from hexadecimal to floating-point. */
+ buffer[len] = '\0';
+ value = strtold (buffer, &endptr);
+
+ if (endptr == NULL || endptr != (buffer + len))
+ return NULL;
+
+ len = snprintf (buffer, sizeof(buffer), "%#Lg", value);
+ string_appendn (decl, buffer, len);
+ return mangled;
+}
+
+/* Extract the string value from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_parse_string (string *decl, const char *mangled)
+{
+ char type = *mangled;
+ char *endptr;
+ long len;
+
+ mangled++;
+ len = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || len < 0)
+ return NULL;
+
+ mangled = endptr;
+ if (*mangled != '_')
+ return NULL;
+
+ mangled++;
+ string_append (decl, "\"");
+ while (len--)
+ {
+ if (ISXDIGIT (mangled[0]) && ISXDIGIT (mangled[1]))
+ {
+ char a = ASCII2HEX (mangled[0]);
+ char b = ASCII2HEX (mangled[1]);
+ char val = (a << 4) | b;
+ string_appendn (decl, &val, 1);
+ }
+ else
+ return NULL;
+
+ mangled += 2;
+ }
+ string_append (decl, "\"");
+
+ if (type != 'a')
+ string_appendn (decl, &type, 1);
+
+ return mangled;
+}
+
+/* Extract the static array value from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_parse_arrayliteral (string *decl, const char *mangled)
+{
+ char *endptr;
+ long elements = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || elements < 0)
+ return NULL;
+
+ mangled = endptr;
+ string_append (decl, "[");
+ while (elements--)
+ {
+ mangled = dlang_value (decl, mangled, NULL, '\0');
+ if (elements != 0)
+ string_append (decl, ", ");
+ }
+
+ string_append (decl, "]");
+ return mangled;
+}
+
+/* Extract the associative array value from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_parse_assocarray (string *decl, const char *mangled)
+{
+ char *endptr;
+ long elements = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || elements < 0)
+ return NULL;
+
+ mangled = endptr;
+ string_append (decl, "[");
+ while (elements--)
+ {
+ mangled = dlang_value (decl, mangled, NULL, '\0');
+ string_append (decl, ":");
+ mangled = dlang_value (decl, mangled, NULL, '\0');
+
+ if (elements != 0)
+ string_append (decl, ", ");
+ }
+
+ string_append (decl, "]");
+ return mangled;
+}
+
+/* Extract the struct literal value for NAME from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_parse_structlit (string *decl, const char *mangled, const char *name)
+{
+ char *endptr;
+ long args = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || args < 0)
+ return NULL;
+
+ mangled = endptr;
+ if (name != NULL)
+ string_append (decl, name);
+
+ string_append (decl, "(");
+ while (args--)
+ {
+ mangled = dlang_value (decl, mangled, NULL, '\0');
+ if (args != 0)
+ string_append (decl, ", ");
+ }
+
+ string_append (decl, ")");
+ return mangled;
+}
+
+/* Extract the value from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_value (string *decl, const char *mangled, const char *name, char type)
+{
+ if (mangled == NULL || *mangled == '\0')
+ return mangled;
+
+ switch (*mangled)
+ {
+ /* Null value. */
+ case 'n':
+ mangled++;
+ string_append (decl, "null");
+ break;
+
+ /* Integral values. */
+ case 'N':
+ mangled++;
+ string_append (decl, "-");
+ mangled = dlang_parse_integer (decl, mangled, type);
+ break;
+
+ case 'i':
+ mangled++;
+ if (*mangled < '0' || *mangled > '9')
+ return NULL;
+ /* Fall through */
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ mangled = dlang_parse_integer (decl, mangled, type);
+ break;
+
+ /* Real value. */
+ case 'e':
+ mangled++;
+ mangled = dlang_parse_real (decl, mangled);
+ break;
+
+ /* Complex value. */
+ case 'c':
+ mangled++;
+ mangled = dlang_parse_real (decl, mangled);
+ string_append (decl, "+");
+ if (mangled == NULL || *mangled != 'c')
+ return NULL;
+ mangled++;
+ mangled = dlang_parse_real (decl, mangled);
+ string_append (decl, "i");
+ break;
+
+ /* String values. */
+ case 'a': /* UTF8 */
+ case 'w': /* UTF16 */
+ case 'd': /* UTF32 */
+ mangled = dlang_parse_string (decl, mangled);
+ break;
+
+ /* Array values. */
+ case 'A':
+ mangled++;
+ if (type == 'H')
+ mangled = dlang_parse_assocarray (decl, mangled);
+ else
+ mangled = dlang_parse_arrayliteral (decl, mangled);
+ break;
+
+ /* Struct values. */
+ case 'S':
+ mangled++;
+ mangled = dlang_parse_structlit (decl, mangled, name);
+ break;
+
+ default:
+ return NULL;
+ }
+
+ return mangled;
+}
+
+int
+dlang_call_convention_p (const char *mangled)
+{
+ size_t i;
+
+ switch (*mangled)
+ {
+ case 'F': case 'U': case 'V':
+ case 'W': case 'R':
+ return 1;
+
+ case 'M': /* Prefix for functions needing 'this' */
+ i = 1;
+ if (mangled[i] == 'x')
+ i++;
+
+ switch (mangled[i])
+ {
+ case 'F': case 'U': case 'V':
+ case 'W': case 'R':
+ return 1;
+ }
+
+ default:
+ return 0;
+ }
+}
+
+/* Extract and demangle the symbol in MANGLED and append it to DECL.
+ Returns the remaining signature on success or NULL on failure. */
+const char *
+dlang_parse_symbol (string *decl, const char *mangled)
+{
+ size_t n = 0;
+ do
+ {
+ if (n++)
+ string_append (decl, ".");
+
+ mangled = dlang_identifier (decl, mangled);
+
+ if (mangled && dlang_call_convention_p (mangled))
+ {
+ int saved;
+
+ /* Skip over 'this' parameter. */
+ if (*mangled == 'M')
+ mangled += (mangled[1] == 'x') ? 2 : 1;
+
+ /* Skip over calling convention and attributes in qualified name. */
+ saved = string_length (decl);
+ mangled = dlang_call_convention (decl, mangled);
+ mangled = dlang_attributes (decl, mangled);
+ string_setlength (decl, saved);
+
+ string_append (decl, "(");
+ mangled = dlang_function_args (decl, mangled);
+ string_append (decl, ")");
+
+ /* Demangle the function return type as a kind of sanity test. */
+ if (mangled && !ISDIGIT (*mangled))
+ {
+ saved = string_length (decl);
+ mangled = dlang_type (decl, mangled);
+ string_setlength (decl, saved);
+ }
+ }
+ }
+ while (mangled && ISDIGIT (*mangled));
+
+ return mangled;
+}
+
+/* Demangle the tuple from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_parse_tuple (string *decl, const char *mangled)
+{
+ char *endptr;
+ long elements = strtol (mangled, &endptr, 10);
+
+ if (endptr == NULL || elements < 0)
+ return NULL;
+
+ mangled = endptr;
+ string_append (decl, "Tuple!(");
+
+ while (elements--)
+ {
+ mangled = dlang_type (decl, mangled);
+ if (elements != 0)
+ string_append (decl, ", ");
+ }
+
+ string_append (decl, ")");
+ return mangled;
+}
+
+/* Demangle the argument list from MANGLED and append it to DECL.
+ Return the remaining string on success or NULL on failure. */
+const char *
+dlang_template_args (string *decl, const char *mangled)
+{
+ size_t n = 0;
+
+ while (mangled && *mangled != '\0')
+ {
+ switch (*mangled)
+ {
+ case 'Z': /* End of parameter list. */
+ mangled++;
+ return mangled;
+ }
+
+ if (n++)
+ string_append (decl, ", ");
+
+ switch (*mangled)
+ {
+ case 'S': /* Symbol parameter. */
+ mangled++;
+ mangled = dlang_parse_symbol (decl, mangled);
+ break;
+ case 'T': /* Type parameter. */
+ mangled++;
+ mangled = dlang_type (decl, mangled);
+ break;
+ case 'V': /* Value parameter. */
+ {
+ string name;
+ char type;
+
+ /* Peek at the type. */
+ mangled++;
+ type = *mangled;
+
+ /* In the few instances where the type is actually desired in
+ the output, it should precede the value from dlang_value. */
+ string_init (&name);
+ mangled = dlang_type (&name, mangled);
+ string_need (&name, 1);
+ *(name.p) = '\0';
+
+ mangled = dlang_value (decl, mangled, name.b, type);
+ string_delete (&name);
+ break;
+ }
+
+ default:
+ return NULL;
+ }
+ }
+
+ return mangled;
+}
+
+/* Extract and demangle the template symbol in MANGLED, expected to
+ be made up of LEN characters, and append it to DECL.
+ Returns the remaining signature on success or NULL on failure. */
+const char *
+dlang_parse_template (string *decl, const char *mangled, long len)
+{
+ const char *start = mangled;
+
+ /* Template instance names have the types and values of its parameters
+ encoded into it.
+
+ TemplateInstanceName:
+ Number __T LName TemplateArgs Z
+ ^
+ The start pointer should be at the above location, and LEN should be
+ the value of the decoded number.
+ */
+ if (strncmp (mangled, "__T", 3) != 0)
+ return NULL;
+
+ mangled += 3;
+
+ /* Template identifier. */
+ mangled = dlang_identifier (decl, mangled);
+
+ /* Template arguments. */
+ string_append (decl, "!(");
+ mangled = dlang_template_args (decl, mangled);
+ string_append (decl, ")");
+
+ /* Check for template name length mismatch. */
+ if (mangled && (mangled - start) != len)
+ return NULL;
+
+ return mangled;
+}
+
+/* Extract and demangle the symbol in MANGLED. Returns the demangled
+ signature on success or NULL on failure. */
+
+char *
+dlang_demangle (const char *mangled, int option ATTRIBUTE_UNUSED)
+{
+ string decl;
+ char *demangled = NULL;
+
+ if (mangled == NULL || *mangled == '\0')
+ return NULL;
+
+ if (strncmp (mangled, "_D", 2) != 0)
+ return NULL;
+
+ string_init (&decl);
+
+ if (strcmp (mangled, "_Dmain") == 0)
+ {
+ string_append (&decl, "D main");
+ }
+ else
+ {
+ mangled += 2;
+
+ if (dlang_parse_symbol (&decl, mangled) == NULL)
+ string_delete (&decl);
+ }
+
+ if (string_length (&decl) > 0)
+ {
+ string_need (&decl, 1);
+ *(decl.p) = '\0';
+ demangled = decl.b;
+ }
+
+ return demangled;
+}
+
