2003-11-21 04:27:58 +01:00
|
|
|
/* Demangler for g++ V3 ABI.
|
|
|
|
Copyright (C) 2003 Free Software Foundation, Inc.
|
|
|
|
Written by Ian Lance Taylor <ian@wasabisystems.com>.
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-08-12 08:58:17 +02:00
|
|
|
This file is part of the libiberty library, which is part of GCC.
|
2000-09-08 19:50:54 +02:00
|
|
|
|
2003-08-12 08:58:17 +02:00
|
|
|
This file is free software; you can redistribute it and/or modify
|
2000-06-05 04:28:41 +02:00
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
2002-03-12 21:34:15 +01:00
|
|
|
In addition to the permissions in the GNU 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 General 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.)
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
This program 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 General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#include <stdio.h>
|
2000-07-23 17:57:38 +02:00
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "ansidecl.h"
|
|
|
|
#include "libiberty.h"
|
2000-06-07 22:35:43 +02:00
|
|
|
#include "demangle.h"
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* This code implements a demangler for the g++ V3 ABI. The ABI is
|
|
|
|
described on this web page:
|
|
|
|
http://www.codesourcery.com/cxx-abi/abi.html#mangling
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
This code was written while looking at the demangler written by
|
|
|
|
Alex Samuel <samuel@codesourcery.com>.
|
|
|
|
|
|
|
|
This code first pulls the mangled name apart into a list of
|
|
|
|
components, and then walks the list generating the demangled
|
|
|
|
name. */
|
|
|
|
|
|
|
|
/* Avoid pulling in the ctype tables for this simple usage. */
|
|
|
|
#define IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* The prefix prepended by GCC to an identifier represnting the
|
|
|
|
anonymous namespace. */
|
|
|
|
#define ANONYMOUS_NAMESPACE_PREFIX "_GLOBAL_"
|
2003-11-21 04:27:58 +01:00
|
|
|
#define ANONYMOUS_NAMESPACE_PREFIX_LEN \
|
|
|
|
(sizeof (ANONYMOUS_NAMESPACE_PREFIX) - 1)
|
2000-09-05 03:01:12 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Information we keep for operators. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_operator_info
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Mangled name. */
|
|
|
|
const char *code;
|
|
|
|
/* Real name. */
|
|
|
|
const char *name;
|
|
|
|
/* Number of arguments. */
|
|
|
|
int args;
|
|
|
|
};
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* How to print the value of a builtin type. */
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
enum d_builtin_type_print
|
|
|
|
{
|
|
|
|
/* Print as (type)val. */
|
|
|
|
D_PRINT_DEFAULT,
|
|
|
|
/* Print as integer. */
|
|
|
|
D_PRINT_INT,
|
|
|
|
/* Print as long, with trailing `l'. */
|
|
|
|
D_PRINT_LONG,
|
|
|
|
/* Print as bool. */
|
|
|
|
D_PRINT_BOOL,
|
|
|
|
/* Print in usual way, but here to detect void. */
|
|
|
|
D_PRINT_VOID
|
2000-06-05 04:28:41 +02:00
|
|
|
};
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Information we keep for a builtin type. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_builtin_type_info
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Type name. */
|
|
|
|
const char *name;
|
|
|
|
/* Type name when using Java. */
|
|
|
|
const char *java_name;
|
|
|
|
/* How to print a value of this type. */
|
|
|
|
enum d_builtin_type_print print;
|
|
|
|
};
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Component types found in mangled names. */
|
|
|
|
|
|
|
|
enum d_comp_type
|
|
|
|
{
|
|
|
|
/* A name. */
|
|
|
|
D_COMP_NAME,
|
|
|
|
/* A qualified name. */
|
|
|
|
D_COMP_QUAL_NAME,
|
|
|
|
/* A typed name. */
|
|
|
|
D_COMP_TYPED_NAME,
|
|
|
|
/* A template. */
|
|
|
|
D_COMP_TEMPLATE,
|
|
|
|
/* A template parameter. */
|
|
|
|
D_COMP_TEMPLATE_PARAM,
|
|
|
|
/* A constructor. */
|
|
|
|
D_COMP_CTOR,
|
|
|
|
/* A destructor. */
|
|
|
|
D_COMP_DTOR,
|
|
|
|
/* A vtable. */
|
|
|
|
D_COMP_VTABLE,
|
|
|
|
/* A VTT structure. */
|
|
|
|
D_COMP_VTT,
|
|
|
|
/* A construction vtable. */
|
|
|
|
D_COMP_CONSTRUCTION_VTABLE,
|
|
|
|
/* A typeinfo structure. */
|
|
|
|
D_COMP_TYPEINFO,
|
|
|
|
/* A typeinfo name. */
|
|
|
|
D_COMP_TYPEINFO_NAME,
|
|
|
|
/* A typeinfo function. */
|
|
|
|
D_COMP_TYPEINFO_FN,
|
|
|
|
/* A thunk. */
|
|
|
|
D_COMP_THUNK,
|
|
|
|
/* A virtual thunk. */
|
|
|
|
D_COMP_VIRTUAL_THUNK,
|
|
|
|
/* A covariant thunk. */
|
|
|
|
D_COMP_COVARIANT_THUNK,
|
|
|
|
/* A Java class. */
|
|
|
|
D_COMP_JAVA_CLASS,
|
|
|
|
/* A guard variable. */
|
|
|
|
D_COMP_GUARD,
|
|
|
|
/* A reference temporary. */
|
|
|
|
D_COMP_REFTEMP,
|
|
|
|
/* A standard substitution. */
|
|
|
|
D_COMP_SUB_STD,
|
|
|
|
/* The restrict qualifier. */
|
|
|
|
D_COMP_RESTRICT,
|
|
|
|
/* The volatile qualifier. */
|
|
|
|
D_COMP_VOLATILE,
|
|
|
|
/* The const qualifier. */
|
|
|
|
D_COMP_CONST,
|
|
|
|
/* A vendor qualifier. */
|
|
|
|
D_COMP_VENDOR_TYPE_QUAL,
|
|
|
|
/* A pointer. */
|
|
|
|
D_COMP_POINTER,
|
|
|
|
/* A reference. */
|
|
|
|
D_COMP_REFERENCE,
|
|
|
|
/* A complex type. */
|
|
|
|
D_COMP_COMPLEX,
|
|
|
|
/* An imaginary type. */
|
|
|
|
D_COMP_IMAGINARY,
|
|
|
|
/* A builtin type. */
|
|
|
|
D_COMP_BUILTIN_TYPE,
|
|
|
|
/* A vendor's builtin type. */
|
|
|
|
D_COMP_VENDOR_TYPE,
|
|
|
|
/* A function type. */
|
|
|
|
D_COMP_FUNCTION_TYPE,
|
|
|
|
/* An array type. */
|
|
|
|
D_COMP_ARRAY_TYPE,
|
|
|
|
/* A pointer to member type. */
|
|
|
|
D_COMP_PTRMEM_TYPE,
|
|
|
|
/* An argument list. */
|
|
|
|
D_COMP_ARGLIST,
|
|
|
|
/* A template argument list. */
|
|
|
|
D_COMP_TEMPLATE_ARGLIST,
|
|
|
|
/* An operator. */
|
|
|
|
D_COMP_OPERATOR,
|
|
|
|
/* An extended operator. */
|
|
|
|
D_COMP_EXTENDED_OPERATOR,
|
|
|
|
/* A typecast. */
|
|
|
|
D_COMP_CAST,
|
|
|
|
/* A unary expression. */
|
|
|
|
D_COMP_UNARY,
|
|
|
|
/* A binary expression. */
|
|
|
|
D_COMP_BINARY,
|
|
|
|
/* Arguments to a binary expression. */
|
|
|
|
D_COMP_BINARY_ARGS,
|
|
|
|
/* A trinary expression. */
|
|
|
|
D_COMP_TRINARY,
|
|
|
|
/* Arguments to a trinary expression. */
|
|
|
|
D_COMP_TRINARY_ARG1,
|
|
|
|
D_COMP_TRINARY_ARG2,
|
|
|
|
/* A literal. */
|
|
|
|
D_COMP_LITERAL
|
2000-06-05 04:28:41 +02:00
|
|
|
};
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* A component of the mangled name. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
/* The type of this component. */
|
|
|
|
enum d_comp_type type;
|
|
|
|
union
|
|
|
|
{
|
|
|
|
/* For D_COMP_NAME. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
/* A pointer to the name (not NULL terminated) and it's
|
|
|
|
length. */
|
|
|
|
const char *s;
|
|
|
|
int len;
|
|
|
|
} s_name;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For D_COMP_OPERATOR. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
/* Operator. */
|
|
|
|
const struct d_operator_info *op;
|
|
|
|
} s_operator;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For D_COMP_EXTENDED_OPERATOR. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
/* Number of arguments. */
|
|
|
|
int args;
|
|
|
|
/* Name. */
|
|
|
|
struct d_comp *name;
|
|
|
|
} s_extended_operator;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For D_COMP_CTOR. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
enum gnu_v3_ctor_kinds kind;
|
|
|
|
struct d_comp *name;
|
|
|
|
} s_ctor;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For D_COMP_DTOR. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
enum gnu_v3_dtor_kinds kind;
|
|
|
|
struct d_comp *name;
|
|
|
|
} s_dtor;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For D_COMP_BUILTIN_TYPE. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
const struct d_builtin_type_info *type;
|
|
|
|
} s_builtin;
|
|
|
|
|
|
|
|
/* For D_COMP_SUB_STD. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
const char* string;
|
|
|
|
} s_string;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For D_COMP_TEMPLATE_PARAM. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
long number;
|
|
|
|
} s_number;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For other types. */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
struct d_comp *left;
|
|
|
|
struct d_comp *right;
|
|
|
|
} s_binary;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
} u;
|
|
|
|
};
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#define d_left(dc) ((dc)->u.s_binary.left)
|
|
|
|
#define d_right(dc) ((dc)->u.s_binary.right)
|
|
|
|
|
|
|
|
/* The information structure we pass around. */
|
|
|
|
|
|
|
|
struct d_info
|
|
|
|
{
|
|
|
|
/* The string we are demangling. */
|
|
|
|
const char *s;
|
|
|
|
/* The options passed to the demangler. */
|
|
|
|
int options;
|
|
|
|
/* The next character in the string to consider. */
|
|
|
|
const char *n;
|
|
|
|
/* The array of components. */
|
|
|
|
struct d_comp *comps;
|
|
|
|
/* The index of the next available component. */
|
|
|
|
int next_comp;
|
|
|
|
/* The number of available component structures. */
|
|
|
|
int num_comps;
|
|
|
|
/* The array of substitutions. */
|
|
|
|
struct d_comp **subs;
|
|
|
|
/* The index of the next substitution. */
|
|
|
|
int next_sub;
|
|
|
|
/* The number of available entries in the subs array. */
|
|
|
|
int num_subs;
|
|
|
|
/* The last name we saw, for constructors and destructors. */
|
|
|
|
struct d_comp *last_name;
|
|
|
|
};
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#define d_peek_char(di) (*((di)->n))
|
|
|
|
#define d_peek_next_char(di) ((di)->n[1])
|
|
|
|
#define d_advance(di, i) ((di)->n += (i))
|
|
|
|
#define d_next_char(di) (*((di)->n++))
|
|
|
|
#define d_str(di) ((di)->n)
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* A list of templates. This is used while printing. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_print_template
|
|
|
|
{
|
|
|
|
/* Next template on the list. */
|
|
|
|
struct d_print_template *next;
|
|
|
|
/* This template. */
|
|
|
|
const struct d_comp *template;
|
|
|
|
};
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* A list of type modifiers. This is used while printing. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_print_mod
|
|
|
|
{
|
|
|
|
/* Next modifier on the list. These are in the reverse of the order
|
|
|
|
in which they appeared in the mangled string. */
|
|
|
|
struct d_print_mod *next;
|
|
|
|
/* The modifier. */
|
|
|
|
const struct d_comp *mod;
|
|
|
|
/* Whether this modifier was printed. */
|
|
|
|
int printed;
|
2003-11-27 00:33:05 +01:00
|
|
|
/* The list of templates which applies to this modifier. */
|
|
|
|
struct d_print_template *templates;
|
2003-11-21 04:27:58 +01:00
|
|
|
};
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* We use this structure to hold information during printing. */
|
|
|
|
|
|
|
|
struct d_print_info
|
|
|
|
{
|
|
|
|
/* The options passed to the demangler. */
|
|
|
|
int options;
|
|
|
|
/* Buffer holding the result. */
|
|
|
|
char *buf;
|
|
|
|
/* Current length of data in buffer. */
|
|
|
|
size_t len;
|
|
|
|
/* Allocated size of buffer. */
|
|
|
|
size_t alc;
|
|
|
|
/* The current list of templates, if any. */
|
|
|
|
struct d_print_template *templates;
|
|
|
|
/* The current list of modifiers (e.g., pointer, reference, etc.),
|
|
|
|
if any. */
|
|
|
|
struct d_print_mod *modifiers;
|
|
|
|
/* Set to 1 if we had a memory allocation failure. */
|
|
|
|
int allocation_failure;
|
|
|
|
};
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#define d_print_saw_error(dpi) ((dpi)->buf == NULL)
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#define d_append_char(dpi, c) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if ((dpi)->buf != NULL && (dpi)->len < (dpi)->alc) \
|
|
|
|
(dpi)->buf[(dpi)->len++] = (c); \
|
|
|
|
else \
|
|
|
|
d_print_append_char ((dpi), (c)); \
|
|
|
|
} \
|
|
|
|
while (0)
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#define d_append_buffer(dpi, s, l) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if ((dpi)->buf != NULL && (dpi)->len + (l) <= (dpi)->alc) \
|
|
|
|
{ \
|
|
|
|
memcpy ((dpi)->buf + (dpi)->len, (s), (l)); \
|
|
|
|
(dpi)->len += l; \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
d_print_append_buffer ((dpi), (s), (l)); \
|
|
|
|
} \
|
|
|
|
while (0)
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#define d_append_string(dpi, s) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
size_t d_append_string_len = strlen (s); \
|
|
|
|
d_append_buffer ((dpi), (s), d_append_string_len); \
|
|
|
|
} \
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
while (0)
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
2003-11-21 04:27:58 +01:00
|
|
|
static void d_dump PARAMS ((struct d_comp *, int));
|
2000-06-05 04:28:41 +02:00
|
|
|
#endif
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *d_make_empty PARAMS ((struct d_info *,
|
|
|
|
enum d_comp_type));
|
|
|
|
static struct d_comp *d_make_comp PARAMS ((struct d_info *, enum d_comp_type,
|
|
|
|
struct d_comp *, struct d_comp *));
|
|
|
|
static struct d_comp *d_make_name PARAMS ((struct d_info *, const char *,
|
|
|
|
int));
|
|
|
|
static struct d_comp *d_make_builtin_type PARAMS ((struct d_info *,
|
|
|
|
const struct d_builtin_type_info *));
|
|
|
|
static struct d_comp *d_make_operator PARAMS ((struct d_info *,
|
|
|
|
const struct d_operator_info *));
|
|
|
|
static struct d_comp *d_make_extended_operator PARAMS ((struct d_info *,
|
|
|
|
int,
|
|
|
|
struct d_comp *));
|
|
|
|
static struct d_comp *d_make_ctor PARAMS ((struct d_info *,
|
|
|
|
enum gnu_v3_ctor_kinds,
|
|
|
|
struct d_comp *));
|
|
|
|
static struct d_comp *d_make_dtor PARAMS ((struct d_info *,
|
|
|
|
enum gnu_v3_dtor_kinds,
|
|
|
|
struct d_comp *));
|
|
|
|
static struct d_comp *d_make_template_param PARAMS ((struct d_info *, long));
|
|
|
|
static struct d_comp *d_make_sub PARAMS ((struct d_info *, const char *));
|
2003-11-27 00:33:05 +01:00
|
|
|
static struct d_comp *d_mangled_name PARAMS ((struct d_info *, int));
|
2003-11-21 04:27:58 +01:00
|
|
|
static int has_return_type PARAMS ((struct d_comp *));
|
|
|
|
static int is_ctor_dtor_or_conversion PARAMS ((struct d_comp *));
|
2003-11-24 19:42:39 +01:00
|
|
|
static struct d_comp *d_encoding PARAMS ((struct d_info *, int));
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *d_name PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_nested_name PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_prefix PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_unqualified_name PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_source_name PARAMS ((struct d_info *));
|
|
|
|
static long d_number PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_identifier PARAMS ((struct d_info *, int));
|
|
|
|
static struct d_comp *d_operator_name PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_special_name PARAMS ((struct d_info *));
|
|
|
|
static int d_call_offset PARAMS ((struct d_info *, int));
|
|
|
|
static struct d_comp *d_ctor_dtor_name PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_type PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp **d_cv_qualifiers PARAMS ((struct d_info *,
|
|
|
|
struct d_comp **));
|
|
|
|
static struct d_comp *d_function_type PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_bare_function_type PARAMS ((struct d_info *, int));
|
|
|
|
static struct d_comp *d_class_enum_type PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_array_type PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_pointer_to_member_type PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_template_param PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_template_args PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_template_arg PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_expression PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_expr_primary PARAMS ((struct d_info *));
|
|
|
|
static struct d_comp *d_local_name PARAMS ((struct d_info *));
|
|
|
|
static int d_discriminator PARAMS ((struct d_info *));
|
|
|
|
static int d_add_substitution PARAMS ((struct d_info *, struct d_comp *));
|
|
|
|
static struct d_comp *d_substitution PARAMS ((struct d_info *));
|
|
|
|
static void d_print_resize PARAMS ((struct d_print_info *, size_t));
|
|
|
|
static void d_print_append_char PARAMS ((struct d_print_info *, int));
|
|
|
|
static void d_print_append_buffer PARAMS ((struct d_print_info *, const char *,
|
|
|
|
size_t));
|
|
|
|
static void d_print_error PARAMS ((struct d_print_info *));
|
|
|
|
static char *d_print PARAMS ((int, const struct d_comp *, size_t *));
|
|
|
|
static void d_print_comp PARAMS ((struct d_print_info *,
|
|
|
|
const struct d_comp *));
|
|
|
|
static void d_print_identifier PARAMS ((struct d_print_info *, const char *,
|
|
|
|
int));
|
|
|
|
static void d_print_mod_list PARAMS ((struct d_print_info *,
|
|
|
|
struct d_print_mod *));
|
|
|
|
static void d_print_mod PARAMS ((struct d_print_info *,
|
|
|
|
const struct d_comp *));
|
|
|
|
static void d_print_function_type PARAMS ((struct d_print_info *,
|
|
|
|
const struct d_comp *,
|
|
|
|
struct d_print_mod *));
|
|
|
|
static void d_print_array_type PARAMS ((struct d_print_info *,
|
|
|
|
const struct d_comp *,
|
|
|
|
struct d_print_mod *));
|
|
|
|
static void d_print_expr_op PARAMS ((struct d_print_info *,
|
|
|
|
const struct d_comp *));
|
|
|
|
static void d_print_cast PARAMS ((struct d_print_info *,
|
|
|
|
const struct d_comp *));
|
|
|
|
static int d_init_info PARAMS ((const char *, int, size_t, struct d_info *));
|
|
|
|
static char *d_demangle PARAMS ((const char *, int, size_t *));
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
static void
|
|
|
|
d_dump (dc, indent)
|
|
|
|
struct d_comp *dc;
|
|
|
|
int indent;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dc == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < indent; ++i)
|
|
|
|
putchar (' ');
|
|
|
|
|
|
|
|
switch (dc->type)
|
|
|
|
{
|
|
|
|
case D_COMP_NAME:
|
|
|
|
printf ("name '%.*s'\n", dc->u.s_name.len, dc->u.s_name.s);
|
|
|
|
return;
|
|
|
|
case D_COMP_TEMPLATE_PARAM:
|
|
|
|
printf ("template parameter %ld\n", dc->u.s_number.number);
|
|
|
|
return;
|
|
|
|
case D_COMP_CTOR:
|
|
|
|
printf ("constructor %d\n", (int) dc->u.s_ctor.kind);
|
|
|
|
d_dump (dc->u.s_ctor.name, indent + 2);
|
|
|
|
return;
|
|
|
|
case D_COMP_DTOR:
|
|
|
|
printf ("destructor %d\n", (int) dc->u.s_dtor.kind);
|
|
|
|
d_dump (dc->u.s_dtor.name, indent + 2);
|
|
|
|
return;
|
|
|
|
case D_COMP_SUB_STD:
|
|
|
|
printf ("standard substitution %s\n", dc->u.s_string.string);
|
|
|
|
return;
|
|
|
|
case D_COMP_BUILTIN_TYPE:
|
|
|
|
printf ("builtin type %s\n", dc->u.s_builtin.type->name);
|
|
|
|
return;
|
|
|
|
case D_COMP_OPERATOR:
|
|
|
|
printf ("operator %s\n", dc->u.s_operator.op->name);
|
|
|
|
return;
|
|
|
|
case D_COMP_EXTENDED_OPERATOR:
|
|
|
|
printf ("extended operator with %d args\n",
|
|
|
|
dc->u.s_extended_operator.args);
|
|
|
|
d_dump (dc->u.s_extended_operator.name, indent + 2);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_QUAL_NAME:
|
|
|
|
printf ("qualified name\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TYPED_NAME:
|
|
|
|
printf ("typed name\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TEMPLATE:
|
|
|
|
printf ("template\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_VTABLE:
|
|
|
|
printf ("vtable\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_VTT:
|
|
|
|
printf ("VTT\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_CONSTRUCTION_VTABLE:
|
|
|
|
printf ("construction vtable\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TYPEINFO:
|
|
|
|
printf ("typeinfo\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TYPEINFO_NAME:
|
|
|
|
printf ("typeinfo name\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TYPEINFO_FN:
|
|
|
|
printf ("typeinfo function\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_THUNK:
|
|
|
|
printf ("thunk\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_VIRTUAL_THUNK:
|
|
|
|
printf ("virtual thunk\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_COVARIANT_THUNK:
|
|
|
|
printf ("covariant thunk\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_JAVA_CLASS:
|
|
|
|
printf ("java class\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_GUARD:
|
|
|
|
printf ("guard\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_REFTEMP:
|
|
|
|
printf ("reference temporary\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_RESTRICT:
|
|
|
|
printf ("restrict\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_VOLATILE:
|
|
|
|
printf ("volatile\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_CONST:
|
|
|
|
printf ("const\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_VENDOR_TYPE_QUAL:
|
|
|
|
printf ("vendor type qualifier\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_POINTER:
|
|
|
|
printf ("pointer\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_REFERENCE:
|
|
|
|
printf ("reference\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_COMPLEX:
|
|
|
|
printf ("complex\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_IMAGINARY:
|
|
|
|
printf ("imaginary\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_VENDOR_TYPE:
|
|
|
|
printf ("vendor type\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_FUNCTION_TYPE:
|
|
|
|
printf ("function type\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_ARRAY_TYPE:
|
|
|
|
printf ("array type\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_PTRMEM_TYPE:
|
|
|
|
printf ("pointer to member type\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_ARGLIST:
|
|
|
|
printf ("argument list\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TEMPLATE_ARGLIST:
|
|
|
|
printf ("template argument list\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_CAST:
|
|
|
|
printf ("cast\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_UNARY:
|
|
|
|
printf ("unary operator\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_BINARY:
|
|
|
|
printf ("binary operator\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_BINARY_ARGS:
|
|
|
|
printf ("binary operator arguments\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TRINARY:
|
|
|
|
printf ("trinary operator\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TRINARY_ARG1:
|
|
|
|
printf ("trinary operator arguments 1\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_TRINARY_ARG2:
|
|
|
|
printf ("trinary operator arguments 1\n");
|
|
|
|
break;
|
|
|
|
case D_COMP_LITERAL:
|
|
|
|
printf ("literal\n");
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_dump (d_left (dc), indent + 2);
|
|
|
|
d_dump (d_right (dc), indent + 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CP_DEMANGLE_DEBUG */
|
|
|
|
|
|
|
|
/* Add a new component. */
|
|
|
|
|
|
|
|
static struct d_comp *
|
|
|
|
d_make_empty (di, type)
|
|
|
|
struct d_info *di;
|
|
|
|
enum d_comp_type type;
|
|
|
|
{
|
|
|
|
struct d_comp *p;
|
|
|
|
|
|
|
|
if (di->next_comp >= di->num_comps)
|
|
|
|
return NULL;
|
|
|
|
p = &di->comps[di->next_comp];
|
|
|
|
p->type = type;
|
|
|
|
++di->next_comp;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add a new generic component. */
|
|
|
|
|
|
|
|
static struct d_comp *
|
|
|
|
d_make_comp (di, type, left, right)
|
|
|
|
struct d_info *di;
|
|
|
|
enum d_comp_type type;
|
|
|
|
struct d_comp *left;
|
|
|
|
struct d_comp *right;
|
|
|
|
{
|
|
|
|
struct d_comp *p;
|
|
|
|
|
|
|
|
/* We check for errors here. A typical error would be a NULL return
|
2003-11-27 00:33:05 +01:00
|
|
|
from a subroutine. We catch those here, and return NULL
|
|
|
|
upward. */
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
/* These types require two parameters. */
|
|
|
|
case D_COMP_QUAL_NAME:
|
|
|
|
case D_COMP_TYPED_NAME:
|
|
|
|
case D_COMP_TEMPLATE:
|
|
|
|
case D_COMP_VENDOR_TYPE_QUAL:
|
|
|
|
case D_COMP_PTRMEM_TYPE:
|
|
|
|
case D_COMP_UNARY:
|
|
|
|
case D_COMP_BINARY:
|
|
|
|
case D_COMP_BINARY_ARGS:
|
|
|
|
case D_COMP_TRINARY:
|
|
|
|
case D_COMP_TRINARY_ARG1:
|
|
|
|
case D_COMP_TRINARY_ARG2:
|
|
|
|
case D_COMP_LITERAL:
|
|
|
|
if (left == NULL || right == NULL)
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* These types only require one parameter. */
|
|
|
|
case D_COMP_VTABLE:
|
|
|
|
case D_COMP_VTT:
|
|
|
|
case D_COMP_CONSTRUCTION_VTABLE:
|
|
|
|
case D_COMP_TYPEINFO:
|
|
|
|
case D_COMP_TYPEINFO_NAME:
|
|
|
|
case D_COMP_TYPEINFO_FN:
|
|
|
|
case D_COMP_THUNK:
|
|
|
|
case D_COMP_VIRTUAL_THUNK:
|
|
|
|
case D_COMP_COVARIANT_THUNK:
|
|
|
|
case D_COMP_JAVA_CLASS:
|
|
|
|
case D_COMP_GUARD:
|
|
|
|
case D_COMP_REFTEMP:
|
|
|
|
case D_COMP_POINTER:
|
|
|
|
case D_COMP_REFERENCE:
|
|
|
|
case D_COMP_COMPLEX:
|
|
|
|
case D_COMP_IMAGINARY:
|
|
|
|
case D_COMP_VENDOR_TYPE:
|
|
|
|
case D_COMP_ARGLIST:
|
|
|
|
case D_COMP_TEMPLATE_ARGLIST:
|
|
|
|
case D_COMP_CAST:
|
|
|
|
if (left == NULL)
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* This needs a right parameter, but the left parameter can be
|
|
|
|
empty. */
|
|
|
|
case D_COMP_ARRAY_TYPE:
|
|
|
|
if (right == NULL)
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* These are allowed to have no parameters--in some cases they
|
|
|
|
will be filled in later. */
|
|
|
|
case D_COMP_FUNCTION_TYPE:
|
|
|
|
case D_COMP_RESTRICT:
|
|
|
|
case D_COMP_VOLATILE:
|
|
|
|
case D_COMP_CONST:
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Other types should not be seen here. */
|
|
|
|
default:
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
p = d_make_empty (di, type);
|
|
|
|
if (p != NULL)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
p->u.s_binary.left = left;
|
|
|
|
p->u.s_binary.right = right;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
return p;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new name component. */
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_name (di, s, len)
|
|
|
|
struct d_info *di;
|
|
|
|
const char *s;
|
|
|
|
int len;
|
|
|
|
{
|
|
|
|
struct d_comp *p;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
p = d_make_empty (di, D_COMP_NAME);
|
|
|
|
if (p != NULL)
|
|
|
|
{
|
|
|
|
p->u.s_name.s = s;
|
|
|
|
p->u.s_name.len = len;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
return p;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new builtin type component. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_builtin_type (di, type)
|
|
|
|
struct d_info *di;
|
|
|
|
const struct d_builtin_type_info *type;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *p;
|
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (type == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
p = d_make_empty (di, D_COMP_BUILTIN_TYPE);
|
|
|
|
if (p != NULL)
|
|
|
|
p->u.s_builtin.type = type;
|
|
|
|
return p;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new operator component. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_operator (di, op)
|
|
|
|
struct d_info *di;
|
|
|
|
const struct d_operator_info *op;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *p;
|
|
|
|
|
|
|
|
p = d_make_empty (di, D_COMP_OPERATOR);
|
|
|
|
if (p != NULL)
|
|
|
|
p->u.s_operator.op = op;
|
|
|
|
return p;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new extended operator component. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_extended_operator (di, args, name)
|
|
|
|
struct d_info *di;
|
|
|
|
int args;
|
|
|
|
struct d_comp *name;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *p;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (name == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
p = d_make_empty (di, D_COMP_EXTENDED_OPERATOR);
|
|
|
|
if (p != NULL)
|
|
|
|
{
|
|
|
|
p->u.s_extended_operator.args = args;
|
|
|
|
p->u.s_extended_operator.name = name;
|
|
|
|
}
|
|
|
|
return p;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new constructor component. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_ctor (di, kind, name)
|
|
|
|
struct d_info *di;
|
|
|
|
enum gnu_v3_ctor_kinds kind;
|
|
|
|
struct d_comp *name;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *p;
|
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (name == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
p = d_make_empty (di, D_COMP_CTOR);
|
|
|
|
if (p != NULL)
|
|
|
|
{
|
|
|
|
p->u.s_ctor.kind = kind;
|
|
|
|
p->u.s_ctor.name = name;
|
|
|
|
}
|
|
|
|
return p;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new destructor component. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_dtor (di, kind, name)
|
|
|
|
struct d_info *di;
|
|
|
|
enum gnu_v3_dtor_kinds kind;
|
|
|
|
struct d_comp *name;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *p;
|
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (name == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
p = d_make_empty (di, D_COMP_DTOR);
|
|
|
|
if (p != NULL)
|
|
|
|
{
|
|
|
|
p->u.s_dtor.kind = kind;
|
|
|
|
p->u.s_dtor.name = name;
|
|
|
|
}
|
|
|
|
return p;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new template parameter. */
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_template_param (di, i)
|
|
|
|
struct d_info *di;
|
|
|
|
long i;
|
2000-10-23 01:59:25 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *p;
|
|
|
|
|
|
|
|
p = d_make_empty (di, D_COMP_TEMPLATE_PARAM);
|
|
|
|
if (p != NULL)
|
|
|
|
p->u.s_number.number = i;
|
|
|
|
return p;
|
2000-10-23 01:59:25 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new standard substitution component. */
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_make_sub (di, name)
|
|
|
|
struct d_info *di;
|
|
|
|
const char *name;
|
2000-10-23 01:59:25 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *p;
|
|
|
|
|
|
|
|
p = d_make_empty (di, D_COMP_SUB_STD);
|
|
|
|
if (p != NULL)
|
|
|
|
p->u.s_string.string = name;
|
|
|
|
return p;
|
2000-10-23 01:59:25 +02:00
|
|
|
}
|
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
/* <mangled-name> ::= _Z <encoding>
|
|
|
|
|
|
|
|
TOP_LEVEL is non-zero when called at the top level. */
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
2003-11-27 00:33:05 +01:00
|
|
|
d_mangled_name (di, top_level)
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_info *di;
|
2003-11-27 00:33:05 +01:00
|
|
|
int top_level;
|
2000-10-23 01:59:25 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != '_')
|
|
|
|
return NULL;
|
|
|
|
if (d_next_char (di) != 'Z')
|
|
|
|
return NULL;
|
2003-11-27 00:33:05 +01:00
|
|
|
return d_encoding (di, top_level);
|
2000-10-23 01:59:25 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Return whether a function should have a return type. The argument
|
|
|
|
is the function name, which may be qualified in various ways. The
|
|
|
|
rules are that template functions have return types with some
|
|
|
|
exceptions, function types which are not part of a function name
|
|
|
|
mangling have return types with some exceptions, and non-template
|
|
|
|
function names do not have return types. The exceptions are that
|
|
|
|
constructors, destructors, and conversion operators do not have
|
|
|
|
return types. */
|
2000-10-23 01:59:25 +02:00
|
|
|
|
|
|
|
static int
|
2003-11-21 04:27:58 +01:00
|
|
|
has_return_type (dc)
|
|
|
|
struct d_comp *dc;
|
2000-10-23 01:59:25 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dc == NULL)
|
|
|
|
return 0;
|
|
|
|
switch (dc->type)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
case D_COMP_TEMPLATE:
|
|
|
|
return ! is_ctor_dtor_or_conversion (d_left (dc));
|
2003-11-21 22:34:55 +01:00
|
|
|
case D_COMP_RESTRICT:
|
|
|
|
case D_COMP_VOLATILE:
|
|
|
|
case D_COMP_CONST:
|
|
|
|
case D_COMP_VENDOR_TYPE_QUAL:
|
|
|
|
return has_return_type (d_left (dc));
|
2003-11-21 04:27:58 +01:00
|
|
|
}
|
2000-10-23 01:59:25 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Return whether a name is a constructor, a destructor, or a
|
|
|
|
conversion operator. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static int
|
2003-11-21 04:27:58 +01:00
|
|
|
is_ctor_dtor_or_conversion (dc)
|
|
|
|
struct d_comp *dc;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dc == NULL)
|
|
|
|
return 0;
|
|
|
|
switch (dc->type)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
case D_COMP_QUAL_NAME:
|
|
|
|
return is_ctor_dtor_or_conversion (d_right (dc));
|
|
|
|
case D_COMP_CTOR:
|
|
|
|
case D_COMP_DTOR:
|
|
|
|
case D_COMP_CAST:
|
|
|
|
return 1;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <encoding> ::= <(function) name> <bare-function-type>
|
|
|
|
::= <(data) name>
|
2003-11-24 19:42:39 +01:00
|
|
|
::= <special-name>
|
|
|
|
|
|
|
|
TOP_LEVEL is non-zero when called at the top level, in which case
|
|
|
|
if DMGL_PARAMS is not set we do not demangle the function
|
|
|
|
parameters. We only set this at the top level, because otherwise
|
|
|
|
we would not correctly demangle names in local scopes. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
2003-11-24 19:42:39 +01:00
|
|
|
d_encoding (di, top_level)
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_info *di;
|
2003-11-24 19:42:39 +01:00
|
|
|
int top_level;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char peek = d_peek_char (di);
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (peek == 'G' || peek == 'T')
|
|
|
|
return d_special_name (di);
|
|
|
|
else
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *dc;
|
|
|
|
|
|
|
|
dc = d_name (di);
|
2003-11-27 00:33:05 +01:00
|
|
|
|
|
|
|
if (dc != NULL && top_level && (di->options & DMGL_PARAMS) == 0)
|
|
|
|
{
|
|
|
|
/* Strip off any initial CV-qualifiers, as they really apply
|
|
|
|
to the `this' parameter, and they were not output by the
|
|
|
|
v2 demangler without DMGL_PARAMS. */
|
|
|
|
while (dc->type == D_COMP_RESTRICT
|
|
|
|
|| dc->type == D_COMP_VOLATILE
|
|
|
|
|| dc->type == D_COMP_CONST)
|
|
|
|
dc = d_left (dc);
|
|
|
|
return dc;
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
peek = d_peek_char (di);
|
2003-11-27 00:33:05 +01:00
|
|
|
if (peek == '\0' || peek == 'E')
|
2003-11-21 04:27:58 +01:00
|
|
|
return dc;
|
|
|
|
return d_make_comp (di, D_COMP_TYPED_NAME, dc,
|
|
|
|
d_bare_function_type (di, has_return_type (dc)));
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* <name> ::= <nested-name>
|
|
|
|
::= <unscoped-name>
|
|
|
|
::= <unscoped-template-name> <template-args>
|
|
|
|
::= <local-name>
|
|
|
|
|
|
|
|
<unscoped-name> ::= <unqualified-name>
|
|
|
|
::= St <unqualified-name>
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
<unscoped-template-name> ::= <unscoped-name>
|
|
|
|
::= <substitution>
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct d_comp *
|
|
|
|
d_name (di)
|
|
|
|
struct d_info *di;
|
|
|
|
{
|
|
|
|
char peek = d_peek_char (di);
|
|
|
|
struct d_comp *dc;
|
|
|
|
|
|
|
|
switch (peek)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'N':
|
|
|
|
return d_nested_name (di);
|
|
|
|
|
|
|
|
case 'Z':
|
|
|
|
return d_local_name (di);
|
|
|
|
|
|
|
|
case 'S':
|
|
|
|
{
|
|
|
|
int subst;
|
|
|
|
|
|
|
|
if (d_peek_next_char (di) != 't')
|
|
|
|
{
|
|
|
|
dc = d_substitution (di);
|
|
|
|
subst = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
d_advance (di, 2);
|
|
|
|
dc = d_make_comp (di, D_COMP_QUAL_NAME, d_make_name (di, "std", 3),
|
|
|
|
d_unqualified_name (di));
|
|
|
|
subst = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (d_peek_char (di) != 'I')
|
|
|
|
{
|
|
|
|
/* The grammar does not permit this case to occur if we
|
|
|
|
called d_substitution() above (i.e., subst == 1). We
|
|
|
|
don't bother to check. */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This is <template-args>, which means that we just saw
|
|
|
|
<unscoped-template-name>, which is a substitution
|
|
|
|
candidate if we didn't just get it from a
|
|
|
|
substitution. */
|
|
|
|
if (! subst)
|
|
|
|
{
|
|
|
|
if (! d_add_substitution (di, dc))
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
dc = d_make_comp (di, D_COMP_TEMPLATE, dc, d_template_args (di));
|
|
|
|
}
|
|
|
|
|
|
|
|
return dc;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
dc = d_unqualified_name (di);
|
|
|
|
if (d_peek_char (di) == 'I')
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
/* This is <template-args>, which means that we just saw
|
|
|
|
<unscoped-template-name>, which is a substitution
|
|
|
|
candidate. */
|
|
|
|
if (! d_add_substitution (di, dc))
|
|
|
|
return NULL;
|
|
|
|
dc = d_make_comp (di, D_COMP_TEMPLATE, dc, d_template_args (di));
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
return dc;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E
|
|
|
|
::= N [<CV-qualifiers>] <template-prefix> <template-args> E
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_nested_name (di)
|
|
|
|
struct d_info *di;
|
|
|
|
{
|
|
|
|
struct d_comp *ret;
|
|
|
|
struct d_comp **pret;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'N')
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
pret = d_cv_qualifiers (di, &ret);
|
|
|
|
if (pret == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
*pret = d_prefix (di);
|
|
|
|
if (*pret == NULL)
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'E')
|
2000-06-05 04:28:41 +02:00
|
|
|
return NULL;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return ret;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <prefix> ::= <prefix> <unqualified-name>
|
|
|
|
::= <template-prefix> <template-args>
|
|
|
|
::= <template-param>
|
|
|
|
::=
|
|
|
|
::= <substitution>
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
<template-prefix> ::= <prefix> <(template) unqualified-name>
|
|
|
|
::= <template-param>
|
|
|
|
::= <substitution>
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct d_comp *
|
|
|
|
d_prefix (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *ret = NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
while (1)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char peek;
|
|
|
|
enum d_comp_type comb_type;
|
|
|
|
struct d_comp *dc;
|
|
|
|
|
|
|
|
peek = d_peek_char (di);
|
|
|
|
if (peek == '\0')
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* The older code accepts a <local-name> here, but I don't see
|
|
|
|
that in the grammar. The older code does not accept a
|
|
|
|
<template-param> here. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
comb_type = D_COMP_QUAL_NAME;
|
|
|
|
if (IS_DIGIT (peek)
|
|
|
|
|| (peek >= 'a' && peek <= 'z')
|
|
|
|
|| peek == 'C'
|
|
|
|
|| peek == 'D')
|
|
|
|
dc = d_unqualified_name (di);
|
|
|
|
else if (peek == 'S')
|
|
|
|
dc = d_substitution (di);
|
|
|
|
else if (peek == 'I')
|
|
|
|
{
|
|
|
|
if (ret == NULL)
|
|
|
|
return NULL;
|
|
|
|
comb_type = D_COMP_TEMPLATE;
|
|
|
|
dc = d_template_args (di);
|
|
|
|
}
|
|
|
|
else if (peek == 'T')
|
|
|
|
dc = d_template_param (di);
|
|
|
|
else if (peek == 'E')
|
|
|
|
return ret;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (ret == NULL)
|
|
|
|
ret = dc;
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
2003-11-21 04:27:58 +01:00
|
|
|
ret = d_make_comp (di, comb_type, ret, dc);
|
|
|
|
|
|
|
|
if (peek != 'S' && d_peek_char (di) != 'E')
|
|
|
|
{
|
|
|
|
if (! d_add_substitution (di, ret))
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <unqualified-name> ::= <operator-name>
|
|
|
|
::= <ctor-dtor-name>
|
|
|
|
::= <source-name>
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_unqualified_name (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char peek;
|
|
|
|
|
|
|
|
peek = d_peek_char (di);
|
|
|
|
if (IS_DIGIT (peek))
|
|
|
|
return d_source_name (di);
|
|
|
|
else if (peek >= 'a' && peek <= 'z')
|
|
|
|
return d_operator_name (di);
|
|
|
|
else if (peek == 'C' || peek == 'D')
|
|
|
|
return d_ctor_dtor_name (di);
|
|
|
|
else
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <source-name> ::= <(positive length) number> <identifier> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_source_name (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
long len;
|
|
|
|
struct d_comp *ret;
|
|
|
|
|
|
|
|
len = d_number (di);
|
|
|
|
if (len <= 0)
|
|
|
|
return NULL;
|
|
|
|
ret = d_identifier (di, len);
|
|
|
|
di->last_name = ret;
|
|
|
|
return ret;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* number ::= [n] <(non-negative decimal integer)> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static long
|
|
|
|
d_number (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
int sign;
|
|
|
|
char peek;
|
|
|
|
long ret;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
sign = 1;
|
|
|
|
peek = d_peek_char (di);
|
|
|
|
if (peek == 'n')
|
|
|
|
{
|
|
|
|
sign = -1;
|
|
|
|
d_advance (di, 1);
|
|
|
|
peek = d_peek_char (di);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
ret = 0;
|
|
|
|
while (1)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (! IS_DIGIT (peek))
|
|
|
|
return ret * sign;
|
|
|
|
ret = ret * 10 + peek - '0';
|
|
|
|
d_advance (di, 1);
|
|
|
|
peek = d_peek_char (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* identifier ::= <(unqualified source code identifier)> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_identifier (di, len)
|
|
|
|
struct d_info *di;
|
|
|
|
int len;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
const char *name;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
name = d_str (di);
|
|
|
|
d_advance (di, len);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Look for something which looks like a gcc encoding of an
|
|
|
|
anonymous namespace, and replace it with a more user friendly
|
|
|
|
name. */
|
|
|
|
if (len >= (int) ANONYMOUS_NAMESPACE_PREFIX_LEN + 2
|
|
|
|
&& memcmp (name, ANONYMOUS_NAMESPACE_PREFIX,
|
|
|
|
ANONYMOUS_NAMESPACE_PREFIX_LEN) == 0)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
const char *s;
|
|
|
|
|
|
|
|
s = name + ANONYMOUS_NAMESPACE_PREFIX_LEN;
|
|
|
|
if ((*s == '.' || *s == '_' || *s == '$')
|
|
|
|
&& s[1] == 'N')
|
|
|
|
return d_make_name (di, "(anonymous namespace)",
|
|
|
|
sizeof "(anonymous namespace)" - 1);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
return d_make_name (di, name, len);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* operator_name ::= many different two character encodings.
|
|
|
|
::= cv <type>
|
|
|
|
::= v <digit> <source-name>
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static const struct d_operator_info d_operators[] =
|
|
|
|
{
|
|
|
|
{ "aN", "&=", 2 },
|
|
|
|
{ "aS", "=", 2 },
|
|
|
|
{ "aa", "&&", 2 },
|
|
|
|
{ "ad", "&", 1 },
|
|
|
|
{ "an", "&", 2 },
|
|
|
|
{ "cl", "()", 0 },
|
|
|
|
{ "cm", ",", 2 },
|
|
|
|
{ "co", "~", 1 },
|
|
|
|
{ "dV", "/=", 2 },
|
|
|
|
{ "da", "delete[]", 1 },
|
|
|
|
{ "de", "*", 1 },
|
|
|
|
{ "dl", "delete", 1 },
|
|
|
|
{ "dv", "/", 2 },
|
|
|
|
{ "eO", "^=", 2 },
|
|
|
|
{ "eo", "^", 2 },
|
|
|
|
{ "eq", "==", 2 },
|
|
|
|
{ "ge", ">=", 2 },
|
|
|
|
{ "gt", ">", 2 },
|
|
|
|
{ "ix", "[]", 2 },
|
|
|
|
{ "lS", "<<=", 2 },
|
|
|
|
{ "le", "<=", 2 },
|
|
|
|
{ "ls", "<<", 2 },
|
|
|
|
{ "lt", "<", 2 },
|
|
|
|
{ "mI", "-=", 2 },
|
|
|
|
{ "mL", "*=", 2 },
|
|
|
|
{ "mi", "-", 2 },
|
|
|
|
{ "ml", "*", 2 },
|
|
|
|
{ "mm", "--", 1 },
|
|
|
|
{ "na", "new[]", 1 },
|
|
|
|
{ "ne", "!=", 2 },
|
|
|
|
{ "ng", "-", 1 },
|
|
|
|
{ "nt", "!", 1 },
|
|
|
|
{ "nw", "new", 1 },
|
|
|
|
{ "oR", "|=", 2 },
|
|
|
|
{ "oo", "||", 2 },
|
|
|
|
{ "or", "|", 2 },
|
|
|
|
{ "pL", "+=", 2 },
|
|
|
|
{ "pl", "+", 2 },
|
|
|
|
{ "pm", "->*", 2 },
|
|
|
|
{ "pp", "++", 1 },
|
|
|
|
{ "ps", "+", 1 },
|
|
|
|
{ "pt", "->", 2 },
|
|
|
|
{ "qu", "?", 3 },
|
|
|
|
{ "rM", "%=", 2 },
|
|
|
|
{ "rS", ">>=", 2 },
|
|
|
|
{ "rm", "%", 2 },
|
|
|
|
{ "rs", ">>", 2 },
|
|
|
|
{ "st", "sizeof ", 1 },
|
|
|
|
{ "sz", "sizeof ", 1 }
|
|
|
|
};
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_operator_name (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char c1;
|
|
|
|
char c2;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
c1 = d_next_char (di);
|
|
|
|
c2 = d_next_char (di);
|
|
|
|
if (c1 == 'v' && IS_DIGIT (c2))
|
|
|
|
return d_make_extended_operator (di, c2 - '0', d_source_name (di));
|
|
|
|
else if (c1 == 'c' && c2 == 'v')
|
|
|
|
return d_make_comp (di, D_COMP_CAST, d_type (di), NULL);
|
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
int low = 0;
|
|
|
|
int high = sizeof (d_operators) / sizeof (d_operators[0]);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
const struct d_operator_info *p;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
i = low + (high - low) / 2;
|
|
|
|
p = d_operators + i;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (c1 == p->code[0] && c2 == p->code[1])
|
|
|
|
return d_make_operator (di, p);
|
|
|
|
|
|
|
|
if (c1 < p->code[0] || (c1 == p->code[0] && c2 < p->code[1]))
|
|
|
|
high = i;
|
|
|
|
else
|
|
|
|
low = i + 1;
|
|
|
|
if (low == high)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <special-name> ::= TV <type>
|
|
|
|
::= TT <type>
|
|
|
|
::= TI <type>
|
|
|
|
::= TS <type>
|
|
|
|
::= GV <(object) name>
|
|
|
|
::= T <call-offset> <(base) encoding>
|
|
|
|
::= Tc <call-offset> <call-offset> <(base) encoding>
|
|
|
|
Also g++ extensions:
|
|
|
|
::= TC <type> <(offset) number> _ <(base) type>
|
|
|
|
::= TF <type>
|
|
|
|
::= TJ <type>
|
|
|
|
::= GR <name>
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_special_name (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char c;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
c = d_next_char (di);
|
|
|
|
if (c == 'T')
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (d_next_char (di))
|
|
|
|
{
|
|
|
|
case 'V':
|
|
|
|
return d_make_comp (di, D_COMP_VTABLE, d_type (di), NULL);
|
|
|
|
case 'T':
|
|
|
|
return d_make_comp (di, D_COMP_VTT, d_type (di), NULL);
|
|
|
|
case 'I':
|
|
|
|
return d_make_comp (di, D_COMP_TYPEINFO, d_type (di), NULL);
|
|
|
|
case 'S':
|
|
|
|
return d_make_comp (di, D_COMP_TYPEINFO_NAME, d_type (di), NULL);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'h':
|
|
|
|
if (! d_call_offset (di, 'h'))
|
|
|
|
return NULL;
|
2003-11-24 19:42:39 +01:00
|
|
|
return d_make_comp (di, D_COMP_THUNK, d_encoding (di, 0), NULL);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'v':
|
|
|
|
if (! d_call_offset (di, 'v'))
|
|
|
|
return NULL;
|
2003-11-24 19:42:39 +01:00
|
|
|
return d_make_comp (di, D_COMP_VIRTUAL_THUNK, d_encoding (di, 0),
|
2003-11-21 04:27:58 +01:00
|
|
|
NULL);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'c':
|
|
|
|
if (! d_call_offset (di, '\0'))
|
|
|
|
return NULL;
|
|
|
|
if (! d_call_offset (di, '\0'))
|
|
|
|
return NULL;
|
2003-11-24 19:42:39 +01:00
|
|
|
return d_make_comp (di, D_COMP_COVARIANT_THUNK, d_encoding (di, 0),
|
2003-11-21 04:27:58 +01:00
|
|
|
NULL);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'C':
|
|
|
|
{
|
|
|
|
struct d_comp *derived_type;
|
|
|
|
long offset;
|
|
|
|
struct d_comp *base_type;
|
|
|
|
|
|
|
|
derived_type = d_type (di);
|
|
|
|
offset = d_number (di);
|
|
|
|
if (offset < 0)
|
|
|
|
return NULL;
|
|
|
|
if (d_next_char (di) != '_')
|
|
|
|
return NULL;
|
|
|
|
base_type = d_type (di);
|
|
|
|
/* We don't display the offset. FIXME: We should display
|
|
|
|
it in verbose mode. */
|
|
|
|
return d_make_comp (di, D_COMP_CONSTRUCTION_VTABLE, base_type,
|
|
|
|
derived_type);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'F':
|
|
|
|
return d_make_comp (di, D_COMP_TYPEINFO_FN, d_type (di), NULL);
|
|
|
|
case 'J':
|
|
|
|
return d_make_comp (di, D_COMP_JAVA_CLASS, d_type (di), NULL);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else if (c == 'G')
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (d_next_char (di))
|
|
|
|
{
|
|
|
|
case 'V':
|
|
|
|
return d_make_comp (di, D_COMP_GUARD, d_name (di), NULL);
|
|
|
|
|
|
|
|
case 'R':
|
|
|
|
return d_make_comp (di, D_COMP_REFTEMP, d_name (di), NULL);
|
|
|
|
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <call-offset> ::= h <nv-offset> _
|
|
|
|
::= v <v-offset> _
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
<nv-offset> ::= <(offset) number>
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
<v-offset> ::= <(offset) number> _ <(virtual offset) number>
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
The C parameter, if not '\0', is a character we just read which is
|
|
|
|
the start of the <call-offset>.
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
We don't display the offset information anywhere. FIXME: We should
|
|
|
|
display it in verbose mode. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static int
|
|
|
|
d_call_offset (di, c)
|
|
|
|
struct d_info *di;
|
|
|
|
int c;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
long offset;
|
|
|
|
long virtual_offset;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (c == '\0')
|
|
|
|
c = d_next_char (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (c == 'h')
|
|
|
|
offset = d_number (di);
|
|
|
|
else if (c == 'v')
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
offset = d_number (di);
|
|
|
|
if (d_next_char (di) != '_')
|
|
|
|
return 0;
|
|
|
|
virtual_offset = d_number (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
|
|
|
return 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != '_')
|
|
|
|
return 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <ctor-dtor-name> ::= C1
|
|
|
|
::= C2
|
|
|
|
::= C3
|
|
|
|
::= D0
|
|
|
|
::= D1
|
|
|
|
::= D2
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct d_comp *
|
|
|
|
d_ctor_dtor_name (di)
|
|
|
|
struct d_info *di;
|
|
|
|
{
|
|
|
|
switch (d_next_char (di))
|
|
|
|
{
|
|
|
|
case 'C':
|
|
|
|
{
|
|
|
|
enum gnu_v3_ctor_kinds kind;
|
|
|
|
|
|
|
|
switch (d_next_char (di))
|
|
|
|
{
|
|
|
|
case '1':
|
|
|
|
kind = gnu_v3_complete_object_ctor;
|
|
|
|
break;
|
|
|
|
case '2':
|
|
|
|
kind = gnu_v3_base_object_ctor;
|
|
|
|
break;
|
|
|
|
case '3':
|
|
|
|
kind = gnu_v3_complete_object_allocating_ctor;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return d_make_ctor (di, kind, di->last_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
case 'D':
|
|
|
|
{
|
|
|
|
enum gnu_v3_dtor_kinds kind;
|
|
|
|
|
|
|
|
switch (d_next_char (di))
|
|
|
|
{
|
|
|
|
case '0':
|
|
|
|
kind = gnu_v3_deleting_dtor;
|
|
|
|
break;
|
|
|
|
case '1':
|
|
|
|
kind = gnu_v3_complete_object_dtor;
|
|
|
|
break;
|
|
|
|
case '2':
|
|
|
|
kind = gnu_v3_base_object_dtor;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return d_make_dtor (di, kind, di->last_name);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <type> ::= <builtin-type>
|
|
|
|
::= <function-type>
|
|
|
|
::= <class-enum-type>
|
|
|
|
::= <array-type>
|
|
|
|
::= <pointer-to-member-type>
|
|
|
|
::= <template-param>
|
|
|
|
::= <template-template-param> <template-args>
|
|
|
|
::= <substitution>
|
|
|
|
::= <CV-qualifiers> <type>
|
|
|
|
::= P <type>
|
|
|
|
::= R <type>
|
|
|
|
::= C <type>
|
|
|
|
::= G <type>
|
|
|
|
::= U <source-name> <type>
|
|
|
|
|
|
|
|
<builtin-type> ::= various one letter codes
|
|
|
|
::= u <source-name>
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static const struct d_builtin_type_info d_builtin_types[26] =
|
|
|
|
{
|
|
|
|
/* a */ { "signed char", "signed char", D_PRINT_INT },
|
|
|
|
/* b */ { "bool", "boolean", D_PRINT_BOOL },
|
|
|
|
/* c */ { "char", "byte", D_PRINT_INT },
|
|
|
|
/* d */ { "double", "double", D_PRINT_DEFAULT },
|
|
|
|
/* e */ { "long double", "long double", D_PRINT_DEFAULT },
|
|
|
|
/* f */ { "float", "float", D_PRINT_DEFAULT },
|
|
|
|
/* g */ { "__float128", "__float128", D_PRINT_DEFAULT },
|
|
|
|
/* h */ { "unsigned char", "unsigned char", D_PRINT_INT },
|
|
|
|
/* i */ { "int", "int", D_PRINT_INT },
|
|
|
|
/* j */ { "unsigned int", "unsigned", D_PRINT_INT },
|
|
|
|
/* k */ { NULL, NULL, D_PRINT_DEFAULT },
|
|
|
|
/* l */ { "long", "long", D_PRINT_LONG },
|
|
|
|
/* m */ { "unsigned long", "unsigned long", D_PRINT_LONG },
|
|
|
|
/* n */ { "__int128", "__int128", D_PRINT_DEFAULT },
|
|
|
|
/* o */ { "unsigned __int128", "unsigned __int128", D_PRINT_DEFAULT },
|
|
|
|
/* p */ { NULL, NULL, D_PRINT_DEFAULT },
|
|
|
|
/* q */ { NULL, NULL, D_PRINT_DEFAULT },
|
|
|
|
/* r */ { NULL, NULL, D_PRINT_DEFAULT },
|
|
|
|
/* s */ { "short", "short", D_PRINT_INT },
|
|
|
|
/* t */ { "unsigned short", "unsigned short", D_PRINT_INT },
|
|
|
|
/* u */ { NULL, NULL, D_PRINT_DEFAULT },
|
|
|
|
/* v */ { "void", "void", D_PRINT_VOID },
|
|
|
|
/* w */ { "wchar_t", "char", D_PRINT_INT },
|
|
|
|
/* x */ { "long long", "long", D_PRINT_DEFAULT },
|
|
|
|
/* y */ { "unsigned long long", "unsigned long long", D_PRINT_DEFAULT },
|
|
|
|
/* z */ { "...", "...", D_PRINT_DEFAULT },
|
|
|
|
};
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_type (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char peek;
|
|
|
|
struct d_comp *ret;
|
|
|
|
int can_subst;
|
|
|
|
|
|
|
|
/* The ABI specifies that when CV-qualifiers are used, the base type
|
|
|
|
is substitutable, and the fully qualified type is substitutable,
|
|
|
|
but the base type with a strict subset of the CV-qualifiers is
|
|
|
|
not substitutable. The natural recursive implementation of the
|
|
|
|
CV-qualifiers would cause subsets to be substitutable, so instead
|
|
|
|
we pull them all off now.
|
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
FIXME: The ABI says that order-insensitive vendor qualifiers
|
|
|
|
should be handled in the same way, but we have no way to tell
|
|
|
|
which vendor qualifiers are order-insensitive and which are
|
|
|
|
order-sensitive. So we just assume that they are all
|
|
|
|
order-sensitive. g++ 3.4 supports only one vendor qualifier,
|
|
|
|
__vector, and it treats it as order-sensitive when mangling
|
|
|
|
names. */
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
peek = d_peek_char (di);
|
|
|
|
if (peek == 'r' || peek == 'V' || peek == 'K')
|
|
|
|
{
|
|
|
|
struct d_comp **pret;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
pret = d_cv_qualifiers (di, &ret);
|
2003-11-27 00:33:05 +01:00
|
|
|
if (pret == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
*pret = d_type (di);
|
|
|
|
if (! d_add_substitution (di, ret))
|
|
|
|
return NULL;
|
|
|
|
return ret;
|
|
|
|
}
|
2000-09-06 00:37:17 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
can_subst = 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-08-28 07:23:40 +02:00
|
|
|
switch (peek)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
|
|
|
|
case 'h': case 'i': case 'j': case 'l': case 'm': case 'n':
|
|
|
|
case 'o': case 's': case 't':
|
|
|
|
case 'v': case 'w': case 'x': case 'y': case 'z':
|
|
|
|
ret = d_make_builtin_type (di, &d_builtin_types[peek - 'a']);
|
|
|
|
can_subst = 0;
|
|
|
|
d_advance (di, 1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'u':
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_make_comp (di, D_COMP_VENDOR_TYPE, d_source_name (di), NULL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'F':
|
|
|
|
ret = d_function_type (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case '0': case '1': case '2': case '3': case '4':
|
|
|
|
case '5': case '6': case '7': case '8': case '9':
|
|
|
|
case 'N':
|
2000-06-05 04:28:41 +02:00
|
|
|
case 'Z':
|
2003-11-21 04:27:58 +01:00
|
|
|
ret = d_class_enum_type (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'A':
|
|
|
|
ret = d_array_type (di);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'M':
|
|
|
|
ret = d_pointer_to_member_type (di);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'T':
|
|
|
|
ret = d_template_param (di);
|
|
|
|
if (d_peek_char (di) == 'I')
|
2000-06-30 17:25:33 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
/* This is <template-template-param> <template-args>. The
|
|
|
|
<template-template-param> part is a substitution
|
|
|
|
candidate. */
|
|
|
|
if (! d_add_substitution (di, ret))
|
|
|
|
return NULL;
|
|
|
|
ret = d_make_comp (di, D_COMP_TEMPLATE, ret, d_template_args (di));
|
2000-06-30 17:25:33 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'S':
|
|
|
|
/* If this is a special substitution, then it is the start of
|
|
|
|
<class-enum-type>. */
|
|
|
|
{
|
|
|
|
char peek_next;
|
2000-08-26 00:52:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
peek_next = d_peek_next_char (di);
|
|
|
|
if (IS_DIGIT (peek_next)
|
|
|
|
|| peek_next == '_'
|
|
|
|
|| (peek_next >= 'A' && peek_next <= 'Z'))
|
|
|
|
{
|
|
|
|
ret = d_substitution (di);
|
|
|
|
/* The substituted name may have been a template name and
|
|
|
|
may be followed by tepmlate args. */
|
|
|
|
if (d_peek_char (di) == 'I')
|
|
|
|
ret = d_make_comp (di, D_COMP_TEMPLATE, ret,
|
|
|
|
d_template_args (di));
|
|
|
|
else
|
|
|
|
can_subst = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ret = d_class_enum_type (di);
|
|
|
|
/* If the substitution was a complete type, then it is not
|
|
|
|
a new substitution candidate. However, if the
|
|
|
|
substitution was followed by template arguments, then
|
|
|
|
the whole thing is a substitution candidate. */
|
2003-11-27 00:33:05 +01:00
|
|
|
if (ret != NULL && ret->type == D_COMP_SUB_STD)
|
2003-11-21 04:27:58 +01:00
|
|
|
can_subst = 0;
|
|
|
|
}
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'P':
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_make_comp (di, D_COMP_POINTER, d_type (di), NULL);
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'R':
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_make_comp (di, D_COMP_REFERENCE, d_type (di), NULL);
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'C':
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_make_comp (di, D_COMP_COMPLEX, d_type (di), NULL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'G':
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_make_comp (di, D_COMP_IMAGINARY, d_type (di), NULL);
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'U':
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_source_name (di);
|
|
|
|
ret = d_make_comp (di, D_COMP_VENDOR_TYPE_QUAL, d_type (di), ret);
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
default:
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (can_subst)
|
|
|
|
{
|
|
|
|
if (! d_add_substitution (di, ret))
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return ret;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <CV-qualifiers> ::= [r] [V] [K] */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp **
|
|
|
|
d_cv_qualifiers (di, pret)
|
|
|
|
struct d_info *di;
|
|
|
|
struct d_comp **pret;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
char peek;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
peek = d_peek_char (di);
|
|
|
|
while (peek == 'r' || peek == 'V' || peek == 'K')
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
enum d_comp_type t;
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_advance (di, 1);
|
|
|
|
if (peek == 'r')
|
|
|
|
t = D_COMP_RESTRICT;
|
|
|
|
else if (peek == 'V')
|
|
|
|
t = D_COMP_VOLATILE;
|
|
|
|
else
|
|
|
|
t = D_COMP_CONST;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
*pret = d_make_comp (di, t, NULL, NULL);
|
|
|
|
if (*pret == NULL)
|
|
|
|
return NULL;
|
|
|
|
pret = &d_left (*pret);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
peek = d_peek_char (di);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return pret;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <function-type> ::= F [Y] <bare-function-type> E */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_function_type (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *ret;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'F')
|
|
|
|
return NULL;
|
|
|
|
if (d_peek_char (di) == 'Y')
|
|
|
|
{
|
|
|
|
/* Function has C linkage. We don't print this information.
|
|
|
|
FIXME: We should print it in verbose mode. */
|
|
|
|
d_advance (di, 1);
|
|
|
|
}
|
|
|
|
ret = d_bare_function_type (di, 1);
|
|
|
|
if (d_next_char (di) != 'E')
|
|
|
|
return NULL;
|
|
|
|
return ret;
|
|
|
|
}
|
2000-08-23 19:03:03 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <bare-function-type> ::= <type>+ */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_bare_function_type (di, has_return_type)
|
|
|
|
struct d_info *di;
|
|
|
|
int has_return_type;
|
|
|
|
{
|
|
|
|
struct d_comp *return_type;
|
|
|
|
struct d_comp *tl;
|
|
|
|
struct d_comp **ptl;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return_type = NULL;
|
|
|
|
tl = NULL;
|
|
|
|
ptl = &tl;
|
2000-06-05 04:28:41 +02:00
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
char peek;
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *type;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
peek = d_peek_char (di);
|
|
|
|
if (peek == '\0' || peek == 'E')
|
|
|
|
break;
|
|
|
|
type = d_type (di);
|
|
|
|
if (type == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (has_return_type)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
return_type = type;
|
|
|
|
has_return_type = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
*ptl = d_make_comp (di, D_COMP_ARGLIST, type, NULL);
|
2003-11-27 00:33:05 +01:00
|
|
|
if (*ptl == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
ptl = &d_right (*ptl);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* There should be at least one parameter type besides the optional
|
|
|
|
return type. A function which takes no arguments will have a
|
|
|
|
single parameter type void. */
|
|
|
|
if (tl == NULL)
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* If we have a single parameter type void, omit it. */
|
|
|
|
if (d_right (tl) == NULL
|
|
|
|
&& d_left (tl)->type == D_COMP_BUILTIN_TYPE
|
|
|
|
&& d_left (tl)->u.s_builtin.type->print == D_PRINT_VOID)
|
|
|
|
tl = NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return d_make_comp (di, D_COMP_FUNCTION_TYPE, return_type, tl);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <class-enum-type> ::= <name> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_class_enum_type (di)
|
|
|
|
struct d_info *di;
|
|
|
|
{
|
|
|
|
return d_name (di);
|
|
|
|
}
|
2000-09-06 00:37:17 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <array-type> ::= A <(positive dimension) number> _ <(element) type>
|
|
|
|
::= A [<(dimension) expression>] _ <(element) type>
|
|
|
|
*/
|
2000-09-06 00:37:17 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_array_type (di)
|
|
|
|
struct d_info *di;
|
|
|
|
{
|
|
|
|
char peek;
|
|
|
|
struct d_comp *dim;
|
2000-09-06 00:37:17 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'A')
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
peek = d_peek_char (di);
|
|
|
|
if (peek == '_')
|
|
|
|
dim = NULL;
|
|
|
|
else if (IS_DIGIT (peek))
|
2000-09-06 00:37:17 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
const char *s;
|
2000-09-06 00:37:17 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
s = d_str (di);
|
|
|
|
do
|
|
|
|
{
|
|
|
|
d_advance (di, 1);
|
|
|
|
peek = d_peek_char (di);
|
|
|
|
}
|
|
|
|
while (IS_DIGIT (peek));
|
|
|
|
dim = d_make_name (di, s, d_str (di) - s);
|
2003-11-27 00:33:05 +01:00
|
|
|
if (dim == NULL)
|
|
|
|
return NULL;
|
2000-09-06 00:37:17 +02:00
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
2003-11-21 04:27:58 +01:00
|
|
|
{
|
|
|
|
dim = d_expression (di);
|
|
|
|
if (dim == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != '_')
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return d_make_comp (di, D_COMP_ARRAY_TYPE, dim, d_type (di));
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <pointer-to-member-type> ::= M <(class) type> <(member) type> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_pointer_to_member_type (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *cl;
|
|
|
|
struct d_comp *mem;
|
|
|
|
struct d_comp **pmem;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'M')
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
cl = d_type (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* The ABI specifies that any type can be a substitution source, and
|
|
|
|
that M is followed by two types, and that when a CV-qualified
|
|
|
|
type is seen both the base type and the CV-qualified types are
|
|
|
|
substitution sources. The ABI also specifies that for a pointer
|
|
|
|
to a CV-qualified member function, the qualifiers are attached to
|
|
|
|
the second type. Given the grammar, a plain reading of the ABI
|
|
|
|
suggests that both the CV-qualified member function and the
|
|
|
|
non-qualified member function are substitution sources. However,
|
|
|
|
g++ does not work that way. g++ treats only the CV-qualified
|
|
|
|
member function as a substitution source. FIXME. So to work
|
|
|
|
with g++, we need to pull off the CV-qualifiers here, in order to
|
|
|
|
avoid calling add_substitution() in d_type(). */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
pmem = d_cv_qualifiers (di, &mem);
|
2003-11-27 00:33:05 +01:00
|
|
|
if (pmem == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
*pmem = d_type (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return d_make_comp (di, D_COMP_PTRMEM_TYPE, cl, mem);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <template-param> ::= T_
|
|
|
|
::= T <(parameter-2 non-negative) number> _
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_template_param (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
long param;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'T')
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_peek_char (di) == '_')
|
|
|
|
param = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
param = d_number (di);
|
|
|
|
if (param < 0)
|
|
|
|
return NULL;
|
|
|
|
param += 1;
|
|
|
|
}
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != '_')
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return d_make_template_param (di, param);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <template-args> ::= I <template-arg>+ E */
|
|
|
|
|
|
|
|
static struct d_comp *
|
|
|
|
d_template_args (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *hold_last_name;
|
|
|
|
struct d_comp *al;
|
|
|
|
struct d_comp **pal;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Preserve the last name we saw--don't let the template arguments
|
|
|
|
clobber it, as that would give us the wrong name for a subsequent
|
|
|
|
constructor or destructor. */
|
|
|
|
hold_last_name = di->last_name;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'I')
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
al = NULL;
|
|
|
|
pal = &al;
|
2000-06-05 04:28:41 +02:00
|
|
|
while (1)
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *a;
|
|
|
|
|
|
|
|
a = d_template_arg (di);
|
|
|
|
if (a == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
*pal = d_make_comp (di, D_COMP_TEMPLATE_ARGLIST, a, NULL);
|
2003-11-27 00:33:05 +01:00
|
|
|
if (*pal == NULL)
|
|
|
|
return NULL;
|
2003-11-21 04:27:58 +01:00
|
|
|
pal = &d_right (*pal);
|
|
|
|
|
|
|
|
if (d_peek_char (di) == 'E')
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
d_advance (di, 1);
|
|
|
|
break;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
di->last_name = hold_last_name;
|
|
|
|
|
|
|
|
return al;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <template-arg> ::= <type>
|
|
|
|
::= X <expression> E
|
|
|
|
::= <expr-primary>
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_template_arg (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *ret;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (d_peek_char (di))
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'X':
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_expression (di);
|
|
|
|
if (d_next_char (di) != 'E')
|
|
|
|
return NULL;
|
|
|
|
return ret;
|
2002-07-10 01:57:09 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case 'L':
|
|
|
|
return d_expr_primary (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
default:
|
|
|
|
return d_type (di);
|
2000-09-05 03:01:12 +02:00
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <expression> ::= <(unary) operator-name> <expression>
|
|
|
|
::= <(binary) operator-name> <expression> <expression>
|
|
|
|
::= <(trinary) operator-name> <expression> <expression> <expression>
|
|
|
|
::= st <type>
|
|
|
|
::= <template-param>
|
|
|
|
::= sr <type> <unqualified-name>
|
|
|
|
::= sr <type> <unqualified-name> <template-args>
|
|
|
|
::= <expr-primary>
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct d_comp *
|
|
|
|
d_expression (di)
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char peek;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
peek = d_peek_char (di);
|
|
|
|
if (peek == 'L')
|
|
|
|
return d_expr_primary (di);
|
|
|
|
else if (peek == 'T')
|
|
|
|
return d_template_param (di);
|
|
|
|
else if (peek == 's' && d_peek_next_char (di) == 'r')
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *type;
|
|
|
|
struct d_comp *name;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_advance (di, 2);
|
|
|
|
type = d_type (di);
|
|
|
|
name = d_unqualified_name (di);
|
|
|
|
if (d_peek_char (di) != 'I')
|
|
|
|
return d_make_comp (di, D_COMP_QUAL_NAME, type, name);
|
|
|
|
else
|
|
|
|
return d_make_comp (di, D_COMP_QUAL_NAME, type,
|
|
|
|
d_make_comp (di, D_COMP_TEMPLATE, name,
|
|
|
|
d_template_args (di)));
|
2002-07-02 05:19:22 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *op;
|
|
|
|
int args;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
op = d_operator_name (di);
|
|
|
|
if (op == NULL)
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (op->type == D_COMP_OPERATOR
|
|
|
|
&& strcmp (op->u.s_operator.op->code, "st") == 0)
|
|
|
|
return d_make_comp (di, D_COMP_UNARY, op, d_type (di));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (op->type)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
case D_COMP_OPERATOR:
|
|
|
|
args = op->u.s_operator.op->args;
|
|
|
|
break;
|
|
|
|
case D_COMP_EXTENDED_OPERATOR:
|
|
|
|
args = op->u.s_extended_operator.args;
|
|
|
|
break;
|
|
|
|
case D_COMP_CAST:
|
|
|
|
args = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (args)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
return d_make_comp (di, D_COMP_UNARY, op, d_expression (di));
|
|
|
|
case 2:
|
|
|
|
{
|
|
|
|
struct d_comp *left;
|
|
|
|
|
|
|
|
left = d_expression (di);
|
|
|
|
return d_make_comp (di, D_COMP_BINARY, op,
|
|
|
|
d_make_comp (di, D_COMP_BINARY_ARGS, left,
|
|
|
|
d_expression (di)));
|
|
|
|
}
|
|
|
|
case 3:
|
|
|
|
{
|
|
|
|
struct d_comp *first;
|
|
|
|
struct d_comp *second;
|
|
|
|
|
|
|
|
first = d_expression (di);
|
|
|
|
second = d_expression (di);
|
|
|
|
return d_make_comp (di, D_COMP_TRINARY, op,
|
|
|
|
d_make_comp (di, D_COMP_TRINARY_ARG1, first,
|
|
|
|
d_make_comp (di,
|
|
|
|
D_COMP_TRINARY_ARG2,
|
|
|
|
second,
|
|
|
|
d_expression (di))));
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <expr-primary> ::= L <type> <(value) number> E
|
|
|
|
::= L <type> <(value) float> E
|
|
|
|
::= L <mangled-name> E
|
|
|
|
*/
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_expr_primary (di)
|
|
|
|
struct d_info *di;
|
2000-09-05 05:07:14 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *ret;
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'L')
|
|
|
|
return NULL;
|
|
|
|
if (d_peek_char (di) == '_')
|
2003-11-27 00:33:05 +01:00
|
|
|
ret = d_mangled_name (di, 0);
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
2000-09-05 05:07:14 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *type;
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
type = d_type (di);
|
|
|
|
|
|
|
|
/* Rather than try to interpret the literal value, we just
|
|
|
|
collect it as a string. Note that it's possible to have a
|
|
|
|
floating point literal here. The ABI specifies that the
|
|
|
|
format of such literals is machine independent. That's fine,
|
|
|
|
but what's not fine is that versions of g++ up to 3.2 with
|
|
|
|
-fabi-version=1 used upper case letters in the hex constant,
|
|
|
|
and dumped out gcc's internal representation. That makes it
|
|
|
|
hard to tell where the constant ends, and hard to dump the
|
|
|
|
constant in any readable form anyhow. We don't attempt to
|
|
|
|
handle these cases. */
|
|
|
|
|
|
|
|
s = d_str (di);
|
|
|
|
while (d_peek_char (di) != 'E')
|
|
|
|
d_advance (di, 1);
|
|
|
|
ret = d_make_comp (di, D_COMP_LITERAL, type,
|
|
|
|
d_make_name (di, s, d_str (di) - s));
|
|
|
|
}
|
|
|
|
if (d_next_char (di) != 'E')
|
|
|
|
return NULL;
|
|
|
|
return ret;
|
2000-09-05 05:07:14 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <local-name> ::= Z <(function) encoding> E <(entity) name> [<discriminator>]
|
|
|
|
::= Z <(function) encoding> E s [<discriminator>]
|
|
|
|
*/
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_local_name (di)
|
|
|
|
struct d_info *di;
|
2000-09-05 05:07:14 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *function;
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'Z')
|
|
|
|
return NULL;
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-24 19:42:39 +01:00
|
|
|
function = d_encoding (di, 0);
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'E')
|
|
|
|
return NULL;
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_peek_char (di) == 's')
|
2000-09-05 05:07:14 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
d_advance (di, 1);
|
|
|
|
if (! d_discriminator (di))
|
|
|
|
return NULL;
|
|
|
|
return d_make_comp (di, D_COMP_QUAL_NAME, function,
|
|
|
|
d_make_name (di, "string literal",
|
|
|
|
sizeof "string literal" - 1));
|
2000-09-05 05:07:14 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
2000-09-05 05:07:14 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_comp *name;
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
name = d_name (di);
|
|
|
|
if (! d_discriminator (di))
|
|
|
|
return NULL;
|
|
|
|
return d_make_comp (di, D_COMP_QUAL_NAME, function, name);
|
2000-09-05 05:07:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* <discriminator> ::= _ <(non-negative) number>
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
We demangle the discriminator, but we don't print it out. FIXME:
|
|
|
|
We should print it out in verbose mode. */
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static int
|
|
|
|
d_discriminator (di)
|
|
|
|
struct d_info *di;
|
|
|
|
{
|
|
|
|
long discrim;
|
2000-09-05 05:07:14 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_peek_char (di) != '_')
|
|
|
|
return 1;
|
|
|
|
d_advance (di, 1);
|
|
|
|
discrim = d_number (di);
|
|
|
|
if (discrim < 0)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Add a new substitution. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static int
|
|
|
|
d_add_substitution (di, dc)
|
|
|
|
struct d_info *di;
|
|
|
|
struct d_comp *dc;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-27 00:33:05 +01:00
|
|
|
if (dc == NULL)
|
|
|
|
return 0;
|
2003-11-21 04:27:58 +01:00
|
|
|
if (di->next_sub >= di->num_subs)
|
|
|
|
return 0;
|
|
|
|
di->subs[di->next_sub] = dc;
|
|
|
|
++di->next_sub;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* <substitution> ::= S <seq-id> _
|
|
|
|
::= S_
|
|
|
|
::= St
|
|
|
|
::= Sa
|
|
|
|
::= Sb
|
|
|
|
::= Ss
|
|
|
|
::= Si
|
|
|
|
::= So
|
|
|
|
::= Sd
|
|
|
|
*/
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static struct d_comp *
|
|
|
|
d_substitution (di)
|
|
|
|
struct d_info *di;
|
|
|
|
{
|
|
|
|
char c;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_next_char (di) != 'S')
|
|
|
|
return NULL;
|
2001-08-07 18:15:04 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
c = d_next_char (di);
|
|
|
|
if (c == '_' || IS_DIGIT (c) || (c >= 'A' && c <= 'Z'))
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
int id;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
id = 0;
|
|
|
|
if (c != '_')
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
do
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (IS_DIGIT (c))
|
|
|
|
id = id * 36 + c - '0';
|
|
|
|
else if (c >= 'A' && c <= 'Z')
|
|
|
|
id = id * 36 + c - 'A' + 10;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
c = d_next_char (di);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
while (c != '_');
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
++id;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (id >= di->next_sub)
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return di->subs[id];
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (c)
|
2001-03-21 21:01:40 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
case 't':
|
|
|
|
return d_make_sub (di, "std");
|
|
|
|
case 'a':
|
|
|
|
di->last_name = d_make_sub (di, "allocator");
|
|
|
|
return d_make_sub (di, "std::allocator");
|
|
|
|
case 'b':
|
|
|
|
di->last_name = d_make_sub (di, "basic_string");
|
|
|
|
return d_make_sub (di, "std::basic_string");
|
|
|
|
case 's':
|
|
|
|
di->last_name = d_make_sub (di, "string");
|
|
|
|
return d_make_sub (di, "std::string");
|
|
|
|
case 'i':
|
|
|
|
di->last_name = d_make_sub (di, "istream");
|
|
|
|
return d_make_sub (di, "std::istream");
|
|
|
|
case 'o':
|
|
|
|
di->last_name = d_make_sub (di, "ostream");
|
|
|
|
return d_make_sub (di, "std::ostream");
|
|
|
|
case 'd':
|
|
|
|
di->last_name = d_make_sub (di, "iostream");
|
|
|
|
return d_make_sub (di, "std::iostream");
|
|
|
|
default:
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Resize the print buffer. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_resize (dpi, add)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
size_t add;
|
|
|
|
{
|
|
|
|
size_t need;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (dpi->buf == NULL)
|
|
|
|
return;
|
2003-11-21 04:27:58 +01:00
|
|
|
need = dpi->len + add;
|
|
|
|
while (need > dpi->alc)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
size_t newalc;
|
|
|
|
char *newbuf;
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
newalc = dpi->alc * 2;
|
|
|
|
newbuf = realloc (dpi->buf, newalc);
|
|
|
|
if (newbuf == NULL)
|
2003-11-19 05:06:50 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
free (dpi->buf);
|
|
|
|
dpi->buf = NULL;
|
|
|
|
dpi->allocation_failure = 1;
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->buf = newbuf;
|
|
|
|
dpi->alc = newalc;
|
2000-09-05 03:01:12 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
}
|
2003-11-19 05:06:50 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Append a character to the print buffer. */
|
2003-11-19 05:06:50 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_append_char (dpi, c)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
int c;
|
|
|
|
{
|
|
|
|
if (dpi->buf != NULL)
|
|
|
|
{
|
|
|
|
if (dpi->len >= dpi->alc)
|
|
|
|
{
|
|
|
|
d_print_resize (dpi, 1);
|
|
|
|
if (dpi->buf == NULL)
|
|
|
|
return;
|
|
|
|
}
|
2003-11-19 05:06:50 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->buf[dpi->len] = c;
|
|
|
|
++dpi->len;
|
2000-09-05 03:01:12 +02:00
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Append a buffer to the print buffer. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
d_print_append_buffer (dpi, s, l)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const char *s;
|
|
|
|
size_t l;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dpi->buf != NULL)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dpi->len + l > dpi->alc)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_resize (dpi, l);
|
|
|
|
if (dpi->buf == NULL)
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
memcpy (dpi->buf + dpi->len, s, l);
|
|
|
|
dpi->len += l;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Indicate that an error occurred during printing. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_error (dpi)
|
|
|
|
struct d_print_info *dpi;
|
2001-02-02 01:27:39 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
free (dpi->buf);
|
|
|
|
dpi->buf = NULL;
|
|
|
|
}
|
2001-02-02 01:27:39 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Turn components into a human readable string. Returns a string
|
|
|
|
allocated by malloc, or NULL on error. On success, this sets *PALC
|
|
|
|
to the size of the allocated buffer. On failure, this sets *PALC
|
|
|
|
to 0 for a bad parse, or to 1 for a memory allocation failure. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static char *
|
|
|
|
d_print (options, dc, palc)
|
|
|
|
int options;
|
|
|
|
const struct d_comp *dc;
|
|
|
|
size_t *palc;
|
|
|
|
{
|
|
|
|
struct d_print_info dpi;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi.options = options;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi.alc = 64;
|
|
|
|
dpi.buf = malloc (dpi.alc);
|
|
|
|
if (dpi.buf == NULL)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
*palc = 1;
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi.len = 0;
|
|
|
|
dpi.templates = NULL;
|
|
|
|
dpi.modifiers = NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi.allocation_failure = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_comp (&dpi, dc);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (&dpi, '\0');
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dpi.buf != NULL)
|
|
|
|
*palc = dpi.alc;
|
|
|
|
else
|
|
|
|
*palc = dpi.allocation_failure;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return dpi.buf;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Subroutine to handle components. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_comp (dpi, dc)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const struct d_comp *dc;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dc == NULL)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_print_saw_error (dpi))
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (dc->type)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_NAME:
|
|
|
|
d_print_identifier (dpi, dc->u.s_name.s, dc->u.s_name.len);
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_QUAL_NAME:
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
d_append_string (dpi, (dpi->options & DMGL_JAVA) == 0 ? "::" : ".");
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_TYPED_NAME:
|
|
|
|
{
|
|
|
|
const struct d_comp *typed_name;
|
|
|
|
struct d_print_mod dpm;
|
|
|
|
struct d_print_template dpt;
|
|
|
|
|
|
|
|
/* Pass the name down to the type so that it can be printed in
|
|
|
|
the right place for the type. If the name has
|
|
|
|
CV-qualifiers, they are really method qualifiers; pull them
|
|
|
|
off now and print them after everything else. Note that we
|
|
|
|
don't handle D_COMP_VENDOR_TYPE_QUAL here; it's not
|
|
|
|
accepted by d_cv_qualifiers() either. */
|
|
|
|
typed_name = d_left (dc);
|
|
|
|
while (typed_name != NULL
|
|
|
|
&& (typed_name->type == D_COMP_RESTRICT
|
|
|
|
|| typed_name->type == D_COMP_VOLATILE
|
|
|
|
|| typed_name->type == D_COMP_CONST))
|
|
|
|
typed_name = d_left (typed_name);
|
|
|
|
|
|
|
|
dpm.next = dpi->modifiers;
|
|
|
|
dpi->modifiers = &dpm;
|
|
|
|
dpm.mod = typed_name;
|
|
|
|
dpm.printed = 0;
|
2003-11-27 00:33:05 +01:00
|
|
|
dpm.templates = dpi->templates;
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
/* If typed_name is a template, then it applies to the
|
|
|
|
function type as well. */
|
|
|
|
if (typed_name->type == D_COMP_TEMPLATE)
|
|
|
|
{
|
|
|
|
dpt.next = dpi->templates;
|
|
|
|
dpi->templates = &dpt;
|
|
|
|
dpt.template = typed_name;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_comp (dpi, d_right (dc));
|
2000-09-06 00:37:17 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (typed_name->type == D_COMP_TEMPLATE)
|
|
|
|
dpi->templates = dpt.next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* If the modifier didn't get printed by the type, print it
|
|
|
|
now. */
|
|
|
|
if (! dpm.printed)
|
|
|
|
{
|
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
d_print_comp (dpi, typed_name);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->modifiers = dpm.next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Now print any CV-qualifiers on the type. */
|
|
|
|
typed_name = d_left (dc);
|
|
|
|
while (typed_name != NULL
|
|
|
|
&& (typed_name->type == D_COMP_RESTRICT
|
|
|
|
|| typed_name->type == D_COMP_VOLATILE
|
|
|
|
|| typed_name->type == D_COMP_CONST))
|
|
|
|
{
|
|
|
|
d_print_mod (dpi, typed_name);
|
|
|
|
typed_name = d_left (typed_name);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_TEMPLATE:
|
2003-11-27 00:33:05 +01:00
|
|
|
{
|
|
|
|
struct d_print_mod *hold_dpm;
|
|
|
|
|
|
|
|
/* Don't push modifiers into a template definition. Doing so
|
|
|
|
could give the wrong definition for a template argument.
|
|
|
|
Instead, treat the template essentially as a name. */
|
|
|
|
|
|
|
|
hold_dpm = dpi->modifiers;
|
|
|
|
dpi->modifiers = NULL;
|
|
|
|
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
d_append_char (dpi, '<');
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
/* Avoid generating two consecutive '>' characters, to avoid
|
|
|
|
the C++ syntactic ambiguity. */
|
|
|
|
if (dpi->buf != NULL && dpi->buf[dpi->len - 1] == '>')
|
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
d_append_char (dpi, '>');
|
|
|
|
|
|
|
|
dpi->modifiers = hold_dpm;
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
case D_COMP_TEMPLATE_PARAM:
|
|
|
|
{
|
|
|
|
long i;
|
|
|
|
struct d_comp *a;
|
|
|
|
struct d_print_template *hold_dpt;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dpi->templates == NULL)
|
|
|
|
{
|
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
i = dc->u.s_number.number;
|
|
|
|
for (a = d_right (dpi->templates->template);
|
|
|
|
a != NULL;
|
|
|
|
a = d_right (a))
|
|
|
|
{
|
|
|
|
if (a->type != D_COMP_TEMPLATE_ARGLIST)
|
|
|
|
{
|
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (i <= 0)
|
|
|
|
break;
|
|
|
|
--i;
|
|
|
|
}
|
|
|
|
if (i != 0 || a == NULL)
|
|
|
|
{
|
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
|
|
|
}
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* While processing this parameter, we need to pop the list of
|
|
|
|
templates. This is because the template parameter may
|
|
|
|
itself be a reference to a parameter of an outer
|
|
|
|
template. */
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
hold_dpt = dpi->templates;
|
|
|
|
dpi->templates = hold_dpt->next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_comp (dpi, d_left (a));
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->templates = hold_dpt;
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_CTOR:
|
|
|
|
d_print_comp (dpi, dc->u.s_ctor.name);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_DTOR:
|
|
|
|
d_append_char (dpi, '~');
|
|
|
|
d_print_comp (dpi, dc->u.s_dtor.name);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_VTABLE:
|
|
|
|
d_append_string (dpi, "vtable for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_VTT:
|
|
|
|
d_append_string (dpi, "VTT for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_CONSTRUCTION_VTABLE:
|
|
|
|
d_append_string (dpi, "construction vtable for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
d_append_string (dpi, "-in-");
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_TYPEINFO:
|
|
|
|
d_append_string (dpi, "typeinfo for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_TYPEINFO_NAME:
|
|
|
|
d_append_string (dpi, "typeinfo name for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_TYPEINFO_FN:
|
|
|
|
d_append_string (dpi, "typeinfo fn for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_THUNK:
|
|
|
|
d_append_string (dpi, "non-virtual thunk to ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_VIRTUAL_THUNK:
|
|
|
|
d_append_string (dpi, "virtual thunk to ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_COVARIANT_THUNK:
|
|
|
|
d_append_string (dpi, "covariant return thunk to ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_JAVA_CLASS:
|
|
|
|
d_append_string (dpi, "java Class for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_GUARD:
|
|
|
|
d_append_string (dpi, "guard variable for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_REFTEMP:
|
|
|
|
d_append_string (dpi, "reference temporary for ");
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_SUB_STD:
|
|
|
|
d_append_string (dpi, dc->u.s_string.string);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_RESTRICT:
|
|
|
|
case D_COMP_VOLATILE:
|
|
|
|
case D_COMP_CONST:
|
|
|
|
case D_COMP_VENDOR_TYPE_QUAL:
|
|
|
|
case D_COMP_POINTER:
|
|
|
|
case D_COMP_REFERENCE:
|
|
|
|
case D_COMP_COMPLEX:
|
|
|
|
case D_COMP_IMAGINARY:
|
|
|
|
{
|
|
|
|
/* We keep a list of modifiers on the stack. */
|
|
|
|
struct d_print_mod dpm;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpm.next = dpi->modifiers;
|
|
|
|
dpi->modifiers = &dpm;
|
|
|
|
dpm.mod = dc;
|
|
|
|
dpm.printed = 0;
|
2003-11-27 00:33:05 +01:00
|
|
|
dpm.templates = dpi->templates;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_comp (dpi, d_left (dc));
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* If the modifier didn't get printed by the type, print it
|
|
|
|
now. */
|
|
|
|
if (! dpm.printed)
|
|
|
|
d_print_mod (dpi, dc);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->modifiers = dpm.next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_BUILTIN_TYPE:
|
|
|
|
if ((dpi->options & DMGL_JAVA) == 0)
|
|
|
|
d_append_string (dpi, dc->u.s_builtin.type->name);
|
|
|
|
else
|
|
|
|
d_append_string (dpi, dc->u.s_builtin.type->java_name);
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_VENDOR_TYPE:
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_FUNCTION_TYPE:
|
|
|
|
{
|
|
|
|
if (d_left (dc) != NULL)
|
|
|
|
{
|
|
|
|
struct d_print_mod dpm;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* We must pass this type down as a modifier in order to
|
|
|
|
print it in the right location. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpm.next = dpi->modifiers;
|
|
|
|
dpi->modifiers = &dpm;
|
|
|
|
dpm.mod = dc;
|
|
|
|
dpm.printed = 0;
|
2003-11-27 00:33:05 +01:00
|
|
|
dpm.templates = dpi->templates;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_comp (dpi, d_left (dc));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->modifiers = dpm.next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dpm.printed)
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_function_type (dpi, dc, dpi->modifiers);
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_ARRAY_TYPE:
|
|
|
|
{
|
|
|
|
struct d_print_mod dpm;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* We must pass this type down as a modifier in order to print
|
|
|
|
multi-dimensional arrays correctly. */
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpm.next = dpi->modifiers;
|
|
|
|
dpi->modifiers = &dpm;
|
|
|
|
dpm.mod = dc;
|
|
|
|
dpm.printed = 0;
|
2003-11-27 00:33:05 +01:00
|
|
|
dpm.templates = dpi->templates;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_comp (dpi, d_right (dc));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->modifiers = dpm.next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dpm.printed)
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_array_type (dpi, dc, dpi->modifiers);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_PTRMEM_TYPE:
|
|
|
|
{
|
|
|
|
const struct d_comp *target_type;
|
|
|
|
struct d_print_mod dpm;
|
|
|
|
|
|
|
|
/* Pass the name down to the type so that it can be printed in
|
|
|
|
the right place for the type. If the type has
|
|
|
|
CV-qualifiers, they are really method qualifiers; pull them
|
|
|
|
off now and print them after everything else. */
|
|
|
|
target_type = d_right (dc);
|
|
|
|
while (target_type != NULL
|
|
|
|
&& (target_type->type == D_COMP_RESTRICT
|
|
|
|
|| target_type->type == D_COMP_VOLATILE
|
|
|
|
|| target_type->type == D_COMP_CONST))
|
|
|
|
target_type = d_left (target_type);
|
|
|
|
|
|
|
|
dpm.next = dpi->modifiers;
|
|
|
|
dpi->modifiers = &dpm;
|
|
|
|
dpm.mod = dc;
|
|
|
|
dpm.printed = 0;
|
2003-11-27 00:33:05 +01:00
|
|
|
dpm.templates = dpi->templates;
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
d_print_comp (dpi, target_type);
|
|
|
|
|
|
|
|
/* If the modifier didn't get printed by the type, print it
|
|
|
|
now. */
|
|
|
|
if (! dpm.printed)
|
|
|
|
{
|
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
d_append_string (dpi, "::*");
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->modifiers = dpm.next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Now print any CV-qualifiers on the type. */
|
|
|
|
target_type = d_right (dc);
|
|
|
|
while (target_type != NULL
|
|
|
|
&& (target_type->type == D_COMP_RESTRICT
|
|
|
|
|| target_type->type == D_COMP_VOLATILE
|
|
|
|
|| target_type->type == D_COMP_CONST))
|
|
|
|
{
|
|
|
|
d_print_mod (dpi, target_type);
|
|
|
|
target_type = d_left (target_type);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_ARGLIST:
|
|
|
|
case D_COMP_TEMPLATE_ARGLIST:
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
if (d_right (dc) != NULL)
|
|
|
|
{
|
|
|
|
d_append_string (dpi, ", ");
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
}
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_OPERATOR:
|
|
|
|
{
|
|
|
|
char c;
|
|
|
|
|
|
|
|
d_append_string (dpi, "operator");
|
|
|
|
c = dc->u.s_operator.op->name[0];
|
|
|
|
if (c >= 'a' && c <= 'z')
|
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
d_append_string (dpi, dc->u.s_operator.op->name);
|
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_EXTENDED_OPERATOR:
|
|
|
|
d_append_string (dpi, "operator ");
|
|
|
|
d_print_comp (dpi, dc->u.s_extended_operator.name);
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_CAST:
|
|
|
|
d_append_string (dpi, "operator ");
|
|
|
|
d_print_cast (dpi, dc);
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_COMP_UNARY:
|
|
|
|
if (d_left (dc)->type != D_COMP_CAST)
|
|
|
|
d_print_expr_op (dpi, d_left (dc));
|
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_string (dpi, "((");
|
|
|
|
d_print_cast (dpi, d_left (dc));
|
|
|
|
d_append_char (dpi, ')');
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, '(');
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
d_append_char (dpi, ')');
|
|
|
|
if (d_left (dc)->type == D_COMP_CAST)
|
|
|
|
d_append_char (dpi, ')');
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_BINARY:
|
|
|
|
if (d_right (dc)->type != D_COMP_BINARY_ARGS)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, '(');
|
|
|
|
d_print_comp (dpi, d_left (d_right (dc)));
|
|
|
|
d_append_string (dpi, ") ");
|
|
|
|
d_print_expr_op (dpi, d_left (dc));
|
|
|
|
d_append_string (dpi, " (");
|
|
|
|
d_print_comp (dpi, d_right (d_right (dc)));
|
|
|
|
d_append_char (dpi, ')');
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_BINARY_ARGS:
|
|
|
|
/* We should only see this as part of D_COMP_BINARY. */
|
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_TRINARY:
|
|
|
|
if (d_right (dc)->type != D_COMP_TRINARY_ARG1
|
|
|
|
|| d_right (d_right (dc))->type != D_COMP_TRINARY_ARG2)
|
|
|
|
{
|
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
d_append_char (dpi, '(');
|
|
|
|
d_print_comp (dpi, d_left (d_right (dc)));
|
|
|
|
d_append_string (dpi, ") ");
|
|
|
|
d_print_expr_op (dpi, d_left (dc));
|
|
|
|
d_append_string (dpi, " (");
|
|
|
|
d_print_comp (dpi, d_left (d_right (d_right (dc))));
|
|
|
|
d_append_string (dpi, ") : (");
|
|
|
|
d_print_comp (dpi, d_right (d_right (d_right (dc))));
|
|
|
|
d_append_char (dpi, ')');
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_TRINARY_ARG1:
|
|
|
|
case D_COMP_TRINARY_ARG2:
|
|
|
|
/* We should only see these are part of D_COMP_TRINARY. */
|
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case D_COMP_LITERAL:
|
|
|
|
/* For some builtin types, produce simpler output. */
|
|
|
|
if (d_left (dc)->type == D_COMP_BUILTIN_TYPE)
|
|
|
|
{
|
|
|
|
switch (d_left (dc)->u.s_builtin.type->print)
|
|
|
|
{
|
|
|
|
case D_PRINT_INT:
|
|
|
|
if (d_right (dc)->type == D_COMP_NAME)
|
|
|
|
{
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case D_PRINT_LONG:
|
|
|
|
if (d_right (dc)->type == D_COMP_NAME)
|
|
|
|
{
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
d_append_char (dpi, 'l');
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
case D_PRINT_BOOL:
|
|
|
|
if (d_right (dc)->type == D_COMP_NAME
|
|
|
|
&& d_right (dc)->u.s_name.len == 1)
|
|
|
|
{
|
|
|
|
switch (d_right (dc)->u.s_name.s[0])
|
|
|
|
{
|
|
|
|
case '0':
|
|
|
|
d_append_string (dpi, "false");
|
|
|
|
return;
|
|
|
|
case '1':
|
|
|
|
d_append_string (dpi, "true");
|
|
|
|
return;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, '(');
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
d_append_char (dpi, ')');
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
default:
|
|
|
|
d_print_error (dpi);
|
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Print an identifier. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_identifier (dpi, name, len)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const char *name;
|
|
|
|
int len;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if ((dpi->options & DMGL_JAVA) == 0)
|
|
|
|
d_append_buffer (dpi, name, len);
|
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
const char *p;
|
|
|
|
const char *end;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* For Java we try to handle encoded extended Unicode
|
|
|
|
characters. The C++ ABI doesn't mention Unicode encoding, so
|
|
|
|
we don't it for C++. Characters are encoded as
|
|
|
|
__U<hex-char>+_. */
|
|
|
|
end = name + len;
|
|
|
|
for (p = name; p < end; ++p)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (end - p > 3
|
|
|
|
&& p[0] == '_'
|
|
|
|
&& p[1] == '_'
|
|
|
|
&& p[2] == 'U')
|
|
|
|
{
|
|
|
|
unsigned long c;
|
|
|
|
const char *q;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
c = 0;
|
|
|
|
for (q = p + 3; q < end; ++q)
|
|
|
|
{
|
|
|
|
int dig;
|
|
|
|
|
|
|
|
if (*q >= '0' && *q <= '9')
|
|
|
|
dig = *q - '0';
|
|
|
|
else if (*q >= 'A' && *q <= 'F')
|
|
|
|
dig = *q - 'A' + 10;
|
|
|
|
else if (*q >= 'a' && *q <= 'f')
|
|
|
|
dig = *q - 'a' + 10;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
|
|
|
|
c = c * 16 + dig;
|
|
|
|
}
|
|
|
|
/* If the Unicode character is larger than 256, we don't
|
|
|
|
try to deal with it here. FIXME. */
|
|
|
|
if (q < end && *q == '_' && c < 256)
|
|
|
|
{
|
|
|
|
d_append_char (dpi, c);
|
|
|
|
p = q;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, *p);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Print a list of modifiers. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_mod_list (dpi, mods)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
struct d_print_mod *mods;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-27 00:33:05 +01:00
|
|
|
struct d_print_template *hold_dpt;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (mods == NULL || mods->printed || d_print_saw_error (dpi))
|
|
|
|
return;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
mods->printed = 1;
|
|
|
|
|
|
|
|
hold_dpt = dpi->templates;
|
|
|
|
dpi->templates = mods->templates;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (mods->mod->type == D_COMP_FUNCTION_TYPE)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_function_type (dpi, mods->mod, mods->next);
|
2003-11-27 00:33:05 +01:00
|
|
|
dpi->templates = hold_dpt;
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (mods->mod->type == D_COMP_ARRAY_TYPE)
|
|
|
|
{
|
|
|
|
d_print_array_type (dpi, mods->mod, mods->next);
|
2003-11-27 00:33:05 +01:00
|
|
|
dpi->templates = hold_dpt;
|
2003-11-21 04:27:58 +01:00
|
|
|
return;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_mod (dpi, mods->mod);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
dpi->templates = hold_dpt;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_mod_list (dpi, mods->next);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-27 00:33:05 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Print a modifier. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_mod (dpi, mod)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const struct d_comp *mod;
|
|
|
|
{
|
|
|
|
switch (mod->type)
|
|
|
|
{
|
|
|
|
case D_COMP_RESTRICT:
|
|
|
|
d_append_string (dpi, " restrict");
|
|
|
|
return;
|
|
|
|
case D_COMP_VOLATILE:
|
|
|
|
d_append_string (dpi, " volatile");
|
|
|
|
return;
|
|
|
|
case D_COMP_CONST:
|
|
|
|
d_append_string (dpi, " const");
|
|
|
|
return;
|
|
|
|
case D_COMP_VENDOR_TYPE_QUAL:
|
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
d_print_comp (dpi, d_right (mod));
|
|
|
|
return;
|
|
|
|
case D_COMP_POINTER:
|
|
|
|
/* There is no pointer symbol in Java. */
|
|
|
|
if ((dpi->options & DMGL_JAVA) == 0)
|
|
|
|
d_append_char (dpi, '*');
|
|
|
|
return;
|
|
|
|
case D_COMP_REFERENCE:
|
|
|
|
d_append_char (dpi, '&');
|
|
|
|
return;
|
|
|
|
case D_COMP_COMPLEX:
|
|
|
|
d_append_string (dpi, "complex ");
|
|
|
|
return;
|
|
|
|
case D_COMP_IMAGINARY:
|
|
|
|
d_append_string (dpi, "imaginary ");
|
|
|
|
return;
|
|
|
|
case D_COMP_PTRMEM_TYPE:
|
2003-11-27 00:33:05 +01:00
|
|
|
if (dpi->buf != NULL && dpi->buf[dpi->len - 1] != '(')
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
d_print_comp (dpi, d_left (mod));
|
|
|
|
d_append_string (dpi, "::*");
|
|
|
|
return;
|
|
|
|
case D_COMP_TYPED_NAME:
|
|
|
|
d_print_comp (dpi, d_left (mod));
|
|
|
|
return;
|
|
|
|
default:
|
|
|
|
/* Otherwise, we have something that won't go back on the
|
|
|
|
modifier stack, so we can just print it. */
|
|
|
|
d_print_comp (dpi, mod);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Print a function type, except for the return type. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_function_type (dpi, dc, mods)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const struct d_comp *dc;
|
|
|
|
struct d_print_mod *mods;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-27 00:33:05 +01:00
|
|
|
int need_paren;
|
|
|
|
int saw_mod;
|
|
|
|
struct d_print_mod *p;
|
|
|
|
|
|
|
|
need_paren = 0;
|
|
|
|
saw_mod = 0;
|
|
|
|
for (p = mods; p != NULL; p = p->next)
|
2003-11-21 04:27:58 +01:00
|
|
|
{
|
2003-11-27 00:33:05 +01:00
|
|
|
if (p->printed)
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
saw_mod = 1;
|
|
|
|
switch (p->mod->type)
|
2003-11-21 04:27:58 +01:00
|
|
|
{
|
2003-11-27 00:33:05 +01:00
|
|
|
case D_COMP_RESTRICT:
|
|
|
|
case D_COMP_VOLATILE:
|
|
|
|
case D_COMP_CONST:
|
|
|
|
case D_COMP_VENDOR_TYPE_QUAL:
|
|
|
|
case D_COMP_POINTER:
|
|
|
|
case D_COMP_REFERENCE:
|
|
|
|
case D_COMP_COMPLEX:
|
|
|
|
case D_COMP_IMAGINARY:
|
|
|
|
case D_COMP_PTRMEM_TYPE:
|
|
|
|
need_paren = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2003-11-21 04:27:58 +01:00
|
|
|
}
|
2003-11-27 00:33:05 +01:00
|
|
|
if (need_paren)
|
|
|
|
break;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (d_left (dc) != NULL && ! saw_mod)
|
|
|
|
need_paren = 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (need_paren)
|
|
|
|
d_append_char (dpi, '(');
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
d_print_mod_list (dpi, mods);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
if (need_paren)
|
|
|
|
d_append_char (dpi, ')');
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, '(');
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_right (dc) != NULL)
|
|
|
|
d_print_comp (dpi, d_right (dc));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, ')');
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Print an array type, except for the element type. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_array_type (dpi, dc, mods)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const struct d_comp *dc;
|
|
|
|
struct d_print_mod *mods;
|
|
|
|
{
|
|
|
|
int need_space;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
need_space = 1;
|
|
|
|
if (mods != NULL)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
int need_paren;
|
|
|
|
struct d_print_mod *p;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
need_paren = 0;
|
|
|
|
for (p = mods; p != NULL; p = p->next)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (p->printed)
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (p->mod->type == D_COMP_ARRAY_TYPE)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
need_space = 0;
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
need_paren = 1;
|
|
|
|
need_space = 1;
|
|
|
|
break;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (need_paren)
|
|
|
|
d_append_string (dpi, " (");
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_mod_list (dpi, mods);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (need_paren)
|
|
|
|
d_append_char (dpi, ')');
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (need_space)
|
|
|
|
d_append_char (dpi, ' ');
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, '[');
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_left (dc) != NULL)
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, ']');
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Print an operator in an expression. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_expr_op (dpi, dc)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const struct d_comp *dc;
|
|
|
|
{
|
|
|
|
if (dc->type == D_COMP_OPERATOR)
|
|
|
|
d_append_string (dpi, dc->u.s_operator.op->name);
|
|
|
|
else
|
|
|
|
d_print_comp (dpi, dc);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Print a cast. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static void
|
|
|
|
d_print_cast (dpi, dc)
|
|
|
|
struct d_print_info *dpi;
|
|
|
|
const struct d_comp *dc;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (d_left (dc)->type != D_COMP_TEMPLATE)
|
|
|
|
d_print_comp (dpi, d_left (dc));
|
|
|
|
else
|
|
|
|
{
|
2003-11-27 00:33:05 +01:00
|
|
|
struct d_print_mod *hold_dpm;
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_print_template dpt;
|
2003-11-19 05:06:50 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* It appears that for a templated cast operator, we need to put
|
|
|
|
the template parameters in scope for the operator name, but
|
|
|
|
not for the parameters. The effect is that we need to handle
|
|
|
|
the template printing here. FIXME: Verify this. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
hold_dpm = dpi->modifiers;
|
|
|
|
dpi->modifiers = NULL;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpt.next = dpi->templates;
|
|
|
|
dpi->templates = &dpt;
|
|
|
|
dpt.template = d_left (dc);
|
2003-11-19 05:06:50 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_print_comp (dpi, d_left (d_left (dc)));
|
2003-11-19 05:06:50 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
dpi->templates = dpt.next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, '<');
|
|
|
|
d_print_comp (dpi, d_right (d_left (dc)));
|
|
|
|
/* Avoid generating two consecutive '>' characters, to avoid
|
|
|
|
the C++ syntactic ambiguity. */
|
2003-11-27 00:33:05 +01:00
|
|
|
if (dpi->buf != NULL && dpi->buf[dpi->len - 1] == '>')
|
2003-11-21 04:27:58 +01:00
|
|
|
d_append_char (dpi, ' ');
|
|
|
|
d_append_char (dpi, '>');
|
2003-11-27 00:33:05 +01:00
|
|
|
|
|
|
|
dpi->modifiers = hold_dpm;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize the information structure we use to pass around
|
|
|
|
information. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
d_init_info (mangled, options, len, di)
|
|
|
|
const char *mangled;
|
|
|
|
int options;
|
|
|
|
size_t len;
|
|
|
|
struct d_info *di;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
di->s = mangled;
|
|
|
|
di->options = options;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
di->n = mangled;
|
|
|
|
|
|
|
|
/* We can not need more components than twice the number of chars in
|
|
|
|
the mangled string. Most components correspond directly to
|
|
|
|
chars, but the ARGLIST types are exceptions. */
|
|
|
|
di->num_comps = 2 * len;
|
|
|
|
di->comps = (struct d_comp *) malloc (di->num_comps
|
|
|
|
* sizeof (struct d_comp));
|
|
|
|
di->next_comp = 0;
|
|
|
|
|
|
|
|
/* Similarly, we can not need more substitutions than there are
|
2003-11-27 00:33:05 +01:00
|
|
|
chars in the mangled string. */
|
|
|
|
di->num_subs = len;
|
2003-11-21 04:27:58 +01:00
|
|
|
di->subs = (struct d_comp **) malloc (di->num_subs
|
|
|
|
* sizeof (struct d_comp *));
|
|
|
|
di->next_sub = 0;
|
|
|
|
|
|
|
|
di->last_name = NULL;
|
|
|
|
|
|
|
|
if (di->comps == NULL || di->subs == NULL)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (di->comps != NULL)
|
|
|
|
free (di->comps);
|
|
|
|
if (di->subs != NULL)
|
|
|
|
free (di->subs);
|
|
|
|
return 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Entry point for the demangler. If MANGLED is a g++ v3 ABI mangled
|
|
|
|
name, return a buffer allocated with malloc holding the demangled
|
|
|
|
name. OPTIONS is the usual libiberty demangler options. On
|
|
|
|
success, this sets *PALC to the allocated size of the returned
|
|
|
|
buffer. On failure, this sets *PALC to 0 for a bad name, or 1 for
|
|
|
|
a memory allocation failure. On failure, this returns NULL. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
static char *
|
|
|
|
d_demangle (mangled, options, palc)
|
|
|
|
const char* mangled;
|
|
|
|
int options;
|
|
|
|
size_t *palc;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
size_t len;
|
|
|
|
int type;
|
|
|
|
struct d_info di;
|
|
|
|
struct d_comp *dc;
|
|
|
|
char *ret;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
*palc = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
len = strlen (mangled);
|
|
|
|
|
|
|
|
if (mangled[0] == '_' && mangled[1] == 'Z')
|
|
|
|
type = 0;
|
|
|
|
else if (strncmp (mangled, "_GLOBAL_", 8) == 0
|
|
|
|
&& (mangled[8] == '.' || mangled[8] == '_' || mangled[8] == '$')
|
|
|
|
&& (mangled[9] == 'D' || mangled[9] == 'I')
|
|
|
|
&& mangled[10] == '_')
|
|
|
|
{
|
|
|
|
char *r;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
r = malloc (40 + len - 11);
|
|
|
|
if (r == NULL)
|
|
|
|
*palc = 1;
|
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (mangled[9] == 'I')
|
|
|
|
strcpy (r, "global constructors keyed to ");
|
|
|
|
else
|
|
|
|
strcpy (r, "global destructors keyed to ");
|
|
|
|
strcat (r, mangled + 11);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
return r;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if ((options & DMGL_TYPES) == 0)
|
|
|
|
return NULL;
|
|
|
|
type = 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (! d_init_info (mangled, options, len, &di))
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
*palc = 1;
|
|
|
|
return NULL;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (! type)
|
2003-11-27 00:33:05 +01:00
|
|
|
dc = d_mangled_name (&di, 1);
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
|
|
|
dc = d_type (&di);
|
|
|
|
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
if (dc == NULL)
|
|
|
|
printf ("failed demangling\n");
|
|
|
|
else
|
|
|
|
d_dump (dc, 0);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
free (di.subs);
|
|
|
|
di.subs = NULL;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
ret = NULL;
|
|
|
|
if (dc != NULL)
|
|
|
|
ret = d_print (options, dc, palc);
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
free (di.comps);
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return ret;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2002-04-01 23:55:12 +02:00
|
|
|
#if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3)
|
2003-11-21 04:27:58 +01:00
|
|
|
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
extern char *__cxa_demangle PARAMS ((const char *, char *, size_t *, int *));
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* ia64 ABI-mandated entry point in the C++ runtime library for
|
|
|
|
performing demangling. MANGLED_NAME is a NUL-terminated character
|
|
|
|
string containing the name to be demangled.
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
|
|
|
OUTPUT_BUFFER is a region of memory, allocated with malloc, of
|
|
|
|
*LENGTH bytes, into which the demangled name is stored. If
|
|
|
|
OUTPUT_BUFFER is not long enough, it is expanded using realloc.
|
|
|
|
OUTPUT_BUFFER may instead be NULL; in that case, the demangled name
|
2003-11-21 04:27:58 +01:00
|
|
|
is placed in a region of memory allocated with malloc.
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
|
|
|
If LENGTH is non-NULL, the length of the buffer conaining the
|
2003-11-21 04:27:58 +01:00
|
|
|
demangled name, is placed in *LENGTH.
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
|
|
|
The return value is a pointer to the start of the NUL-terminated
|
|
|
|
demangled name, or NULL if the demangling fails. The caller is
|
2003-11-21 04:27:58 +01:00
|
|
|
responsible for deallocating this memory using free.
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
|
|
|
*STATUS is set to one of the following values:
|
|
|
|
0: The demangling operation succeeded.
|
2003-11-21 04:27:58 +01:00
|
|
|
-1: A memory allocation failure occurred.
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
-2: MANGLED_NAME is not a valid name under the C++ ABI mangling rules.
|
|
|
|
-3: One of the arguments is invalid.
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
The demangling is performed using the C++ ABI mangling rules, with
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
GNU extensions. */
|
|
|
|
|
|
|
|
char *
|
|
|
|
__cxa_demangle (mangled_name, output_buffer, length, status)
|
|
|
|
const char *mangled_name;
|
|
|
|
char *output_buffer;
|
|
|
|
size_t *length;
|
|
|
|
int *status;
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char *demangled;
|
|
|
|
size_t alc;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
|
|
|
if (status == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (mangled_name == NULL)
|
|
|
|
{
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
*status = -3;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (output_buffer != NULL && length == NULL)
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
*status = -3;
|
|
|
|
return NULL;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
demangled = d_demangle (mangled_name, DMGL_TYPES, &alc);
|
|
|
|
|
|
|
|
if (demangled == NULL)
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (alc == 1)
|
|
|
|
*status = -1;
|
|
|
|
else
|
|
|
|
*status = -2;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
if (output_buffer == NULL)
|
|
|
|
{
|
|
|
|
if (length != NULL)
|
|
|
|
*length = alc;
|
|
|
|
}
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
else
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (strlen (demangled) < *length)
|
|
|
|
{
|
|
|
|
strcpy (output_buffer, demangled);
|
|
|
|
free (demangled);
|
|
|
|
demangled = output_buffer;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
free (output_buffer);
|
|
|
|
*length = alc;
|
|
|
|
}
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
*status = 0;
|
|
|
|
|
|
|
|
return demangled;
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
|
|
|
|
2002-04-01 23:55:12 +02:00
|
|
|
#else /* ! (IN_LIBGCC2 || IN_GLIBCPP_V3) */
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Entry point for libiberty demangler. If MANGLED is a g++ v3 ABI
|
|
|
|
mangled name, return a buffer allocated with malloc holding the
|
|
|
|
demangled name. Otherwise, return NULL. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
char *
|
2002-02-05 17:33:31 +01:00
|
|
|
cplus_demangle_v3 (mangled, options)
|
2000-06-05 04:28:41 +02:00
|
|
|
const char* mangled;
|
2002-02-05 17:33:31 +01:00
|
|
|
int options;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
size_t alc;
|
2000-12-05 18:29:12 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return d_demangle (mangled, options, &alc);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2001-02-02 01:27:39 +01:00
|
|
|
/* Demangle a Java symbol. Java uses a subset of the V3 ABI C++ mangling
|
|
|
|
conventions, but the output formatting is a little different.
|
|
|
|
This instructs the C++ demangler not to emit pointer characters ("*"), and
|
|
|
|
to use Java's namespace separator symbol ("." instead of "::"). It then
|
|
|
|
does an additional pass over the demangled output to replace instances
|
|
|
|
of JArray<TYPE> with TYPE[]. */
|
|
|
|
|
|
|
|
char *
|
|
|
|
java_demangle_v3 (mangled)
|
|
|
|
const char* mangled;
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
size_t alc;
|
|
|
|
char *demangled;
|
|
|
|
int nesting;
|
|
|
|
char *from;
|
|
|
|
char *to;
|
|
|
|
|
2003-11-25 22:04:41 +01:00
|
|
|
demangled = d_demangle (mangled, DMGL_JAVA | DMGL_PARAMS, &alc);
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
if (demangled == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
nesting = 0;
|
|
|
|
from = demangled;
|
|
|
|
to = from;
|
|
|
|
while (*from != '\0')
|
2001-02-02 01:27:39 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
if (strncmp (from, "JArray<", 7) == 0)
|
|
|
|
{
|
|
|
|
from += 7;
|
2001-02-02 01:27:39 +01:00
|
|
|
++nesting;
|
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else if (nesting > 0 && *from == '>')
|
|
|
|
{
|
|
|
|
while (to > demangled && to[-1] == ' ')
|
|
|
|
--to;
|
|
|
|
*to++ = '[';
|
|
|
|
*to++ = ']';
|
2001-02-02 01:27:39 +01:00
|
|
|
--nesting;
|
2003-11-21 04:27:58 +01:00
|
|
|
++from;
|
2001-02-02 01:27:39 +01:00
|
|
|
}
|
|
|
|
else
|
2003-11-21 04:27:58 +01:00
|
|
|
*to++ = *from++;
|
2001-02-02 01:27:39 +01:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
*to = '\0';
|
2002-03-30 04:30:36 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
return demangled;
|
2001-02-02 01:27:39 +01:00
|
|
|
}
|
|
|
|
|
2002-04-01 23:55:12 +02:00
|
|
|
#endif /* IN_LIBGCC2 || IN_GLIBCPP_V3 */
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
|
2002-07-09 02:32:22 +02:00
|
|
|
#ifndef IN_GLIBCPP_V3
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
/* Demangle a string in order to find out whether it is a constructor
|
|
|
|
or destructor. Return non-zero on success. Set *CTOR_KIND and
|
|
|
|
*DTOR_KIND appropriately. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
is_ctor_or_dtor (mangled, ctor_kind, dtor_kind)
|
|
|
|
const char *mangled;
|
|
|
|
enum gnu_v3_ctor_kinds *ctor_kind;
|
|
|
|
enum gnu_v3_dtor_kinds *dtor_kind;
|
2001-03-21 21:01:40 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
struct d_info di;
|
|
|
|
struct d_comp *dc;
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
*ctor_kind = (enum gnu_v3_ctor_kinds) 0;
|
|
|
|
*dtor_kind = (enum gnu_v3_dtor_kinds) 0;
|
|
|
|
|
|
|
|
if (! d_init_info (mangled, DMGL_GNU_V3, strlen (mangled), &di))
|
2001-03-21 21:01:40 +01:00
|
|
|
return 0;
|
|
|
|
|
2003-11-27 00:33:05 +01:00
|
|
|
dc = d_mangled_name (&di, 1);
|
2003-11-21 04:27:58 +01:00
|
|
|
|
|
|
|
if (dc == NULL)
|
|
|
|
return 0;
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
while (dc != NULL)
|
2001-03-21 21:01:40 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
switch (dc->type)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
case D_COMP_TYPED_NAME:
|
|
|
|
case D_COMP_TEMPLATE:
|
|
|
|
case D_COMP_RESTRICT:
|
|
|
|
case D_COMP_VOLATILE:
|
|
|
|
case D_COMP_CONST:
|
|
|
|
case D_COMP_VENDOR_TYPE_QUAL:
|
|
|
|
dc = d_left (dc);
|
|
|
|
break;
|
|
|
|
case D_COMP_QUAL_NAME:
|
|
|
|
dc = d_right (dc);
|
|
|
|
break;
|
|
|
|
case D_COMP_CTOR:
|
|
|
|
*ctor_kind = dc->u.s_ctor.kind;
|
|
|
|
return 1;
|
|
|
|
case D_COMP_DTOR:
|
|
|
|
*dtor_kind = dc->u.s_dtor.kind;
|
|
|
|
return 1;
|
|
|
|
}
|
2001-03-21 21:01:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Return whether NAME is the mangled form of a g++ V3 ABI constructor
|
|
|
|
name. A non-zero return indicates the type of constructor. */
|
2001-03-21 21:01:40 +01:00
|
|
|
|
|
|
|
enum gnu_v3_ctor_kinds
|
2001-05-08 08:13:58 +02:00
|
|
|
is_gnu_v3_mangled_ctor (name)
|
|
|
|
const char *name;
|
2001-03-21 21:01:40 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
enum gnu_v3_ctor_kinds ctor_kind;
|
|
|
|
enum gnu_v3_dtor_kinds dtor_kind;
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (! is_ctor_or_dtor (name, &ctor_kind, &dtor_kind))
|
cp-demangle.c (demangling_new): Cast 0 to enum.
* cp-demangle.c (demangling_new): Cast 0 to enum.
(demangle_char): Cast return of strdup to char *.
(is_gnu_v3_mangled_ctor): Cast 0 to enum.
(is_gnu_v3_mangled_dtor): Likewise.
* cplus-dem.c (grow_vect): Cast return of xrealloc to void *.
(work_stuff_copy_to_from): Cast return of xmalloc to char **.
* fibheap.c (fibnode_new): Cast return of xcalloc to fibnode_t.
* md5.c (md5_process_bytes): Cast results back to const void *.
(md5_process_block): Add cast to const md5_uint32 *.
* regex.c (re_compile_fastmap): Cast enum to UCHAR_T.
* safe-ctype.c (L, XL, U, XU, D, P, _, C, Z, M, V, T, S): Add cast to
unsigned short.
* splay-tree.c (splay_tree_xmalloc_allocate): Cast return of xmalloc
to void *.
* vasprintf.c (int_vasprintf): Cast return of malloc to char *.
From-SVN: r57330
2002-09-20 04:40:51 +02:00
|
|
|
return (enum gnu_v3_ctor_kinds) 0;
|
2003-11-21 04:27:58 +01:00
|
|
|
return ctor_kind;
|
2001-03-21 21:01:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
/* Return whether NAME is the mangled form of a g++ V3 ABI destructor
|
|
|
|
name. A non-zero return indicates the type of destructor. */
|
|
|
|
|
2001-03-21 21:01:40 +01:00
|
|
|
enum gnu_v3_dtor_kinds
|
2001-05-08 08:13:58 +02:00
|
|
|
is_gnu_v3_mangled_dtor (name)
|
|
|
|
const char *name;
|
2001-03-21 21:01:40 +01:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
enum gnu_v3_ctor_kinds ctor_kind;
|
|
|
|
enum gnu_v3_dtor_kinds dtor_kind;
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (! is_ctor_or_dtor (name, &ctor_kind, &dtor_kind))
|
cp-demangle.c (demangling_new): Cast 0 to enum.
* cp-demangle.c (demangling_new): Cast 0 to enum.
(demangle_char): Cast return of strdup to char *.
(is_gnu_v3_mangled_ctor): Cast 0 to enum.
(is_gnu_v3_mangled_dtor): Likewise.
* cplus-dem.c (grow_vect): Cast return of xrealloc to void *.
(work_stuff_copy_to_from): Cast return of xmalloc to char **.
* fibheap.c (fibnode_new): Cast return of xcalloc to fibnode_t.
* md5.c (md5_process_bytes): Cast results back to const void *.
(md5_process_block): Add cast to const md5_uint32 *.
* regex.c (re_compile_fastmap): Cast enum to UCHAR_T.
* safe-ctype.c (L, XL, U, XU, D, P, _, C, Z, M, V, T, S): Add cast to
unsigned short.
* splay-tree.c (splay_tree_xmalloc_allocate): Cast return of xmalloc
to void *.
* vasprintf.c (int_vasprintf): Cast return of malloc to char *.
From-SVN: r57330
2002-09-20 04:40:51 +02:00
|
|
|
return (enum gnu_v3_dtor_kinds) 0;
|
2003-11-21 04:27:58 +01:00
|
|
|
return dtor_kind;
|
2001-03-21 21:01:40 +01:00
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#endif /* IN_GLIBCPP_V3 */
|
2001-03-21 21:01:40 +01:00
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
#ifdef STANDALONE_DEMANGLER
|
|
|
|
|
|
|
|
#include "getopt.h"
|
2003-11-21 04:27:58 +01:00
|
|
|
#include "dyn-string.h"
|
|
|
|
|
|
|
|
static void print_usage PARAMS ((FILE* fp, int exit_value));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
#define IS_ALPHA(CHAR) \
|
|
|
|
(((CHAR) >= 'a' && (CHAR) <= 'z') \
|
|
|
|
|| ((CHAR) >= 'A' && (CHAR) <= 'Z'))
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Non-zero if CHAR is a character than can occur in a mangled name. */
|
2000-06-05 20:24:07 +02:00
|
|
|
#define is_mangled_char(CHAR) \
|
2000-09-05 03:01:12 +02:00
|
|
|
(IS_ALPHA (CHAR) || IS_DIGIT (CHAR) \
|
|
|
|
|| (CHAR) == '_' || (CHAR) == '.' || (CHAR) == '$')
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* The name of this program, as invoked. */
|
|
|
|
const char* program_name;
|
|
|
|
|
|
|
|
/* Prints usage summary to FP and then exits with EXIT_VALUE. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_usage (fp, exit_value)
|
|
|
|
FILE* fp;
|
|
|
|
int exit_value;
|
|
|
|
{
|
|
|
|
fprintf (fp, "Usage: %s [options] [names ...]\n", program_name);
|
2000-08-26 00:52:25 +02:00
|
|
|
fprintf (fp, "Options:\n");
|
2000-06-05 04:28:41 +02:00
|
|
|
fprintf (fp, " -h,--help Display this message.\n");
|
2003-11-24 19:42:39 +01:00
|
|
|
fprintf (fp, " -p,--no-params Don't display function parameters\n");
|
2000-06-05 04:28:41 +02:00
|
|
|
fprintf (fp, " -v,--verbose Produce verbose demanglings.\n");
|
|
|
|
fprintf (fp, "If names are provided, they are demangled. Otherwise filters standard input.\n");
|
|
|
|
|
|
|
|
exit (exit_value);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Option specification for getopt_long. */
|
2002-01-03 00:18:59 +01:00
|
|
|
static const struct option long_options[] =
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2003-11-24 19:42:39 +01:00
|
|
|
{ "help", no_argument, NULL, 'h' },
|
|
|
|
{ "no-params", no_argument, NULL, 'p' },
|
|
|
|
{ "verbose", no_argument, NULL, 'v' },
|
|
|
|
{ NULL, no_argument, NULL, 0 },
|
2000-06-05 04:28:41 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Main entry for a demangling filter executable. It will demangle
|
|
|
|
its command line arguments, if any. If none are provided, it will
|
|
|
|
filter stdin to stdout, replacing any recognized mangled C++ names
|
|
|
|
with their demangled equivalents. */
|
|
|
|
|
|
|
|
int
|
|
|
|
main (argc, argv)
|
|
|
|
int argc;
|
|
|
|
char *argv[];
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int opt_char;
|
2003-11-21 04:27:58 +01:00
|
|
|
int options = DMGL_PARAMS | DMGL_ANSI | DMGL_TYPES;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Use the program name of this program, as invoked. */
|
|
|
|
program_name = argv[0];
|
|
|
|
|
|
|
|
/* Parse options. */
|
|
|
|
do
|
|
|
|
{
|
2003-11-24 19:42:39 +01:00
|
|
|
opt_char = getopt_long (argc, argv, "hpv", long_options, NULL);
|
2000-06-05 04:28:41 +02:00
|
|
|
switch (opt_char)
|
|
|
|
{
|
|
|
|
case '?': /* Unrecognized option. */
|
|
|
|
print_usage (stderr, 1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'h':
|
|
|
|
print_usage (stdout, 0);
|
|
|
|
break;
|
|
|
|
|
2003-11-24 19:42:39 +01:00
|
|
|
case 'p':
|
|
|
|
options &= ~ DMGL_PARAMS;
|
|
|
|
break;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
case 'v':
|
2003-11-21 04:27:58 +01:00
|
|
|
options |= DMGL_VERBOSE;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (opt_char != -1);
|
|
|
|
|
|
|
|
if (optind == argc)
|
|
|
|
/* No command line arguments were provided. Filter stdin. */
|
|
|
|
{
|
|
|
|
dyn_string_t mangled = dyn_string_new (3);
|
2003-11-21 04:27:58 +01:00
|
|
|
char *s;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Read all of input. */
|
|
|
|
while (!feof (stdin))
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char c;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Pile characters into mangled until we hit one that can't
|
|
|
|
occur in a mangled name. */
|
|
|
|
c = getchar ();
|
|
|
|
while (!feof (stdin) && is_mangled_char (c))
|
|
|
|
{
|
|
|
|
dyn_string_append_char (mangled, c);
|
|
|
|
if (feof (stdin))
|
|
|
|
break;
|
|
|
|
c = getchar ();
|
|
|
|
}
|
|
|
|
|
2003-11-21 04:27:58 +01:00
|
|
|
if (dyn_string_length (mangled) > 0)
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
s = cplus_demangle_v3 (dyn_string_buf (mangled), options);
|
|
|
|
|
|
|
|
if (s != NULL)
|
|
|
|
{
|
|
|
|
fputs (s, stdout);
|
|
|
|
free (s);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* It might not have been a mangled name. Print the
|
|
|
|
original text. */
|
|
|
|
fputs (dyn_string_buf (mangled), stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
dyn_string_clear (mangled);
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If we haven't hit EOF yet, we've read one character that
|
|
|
|
can't occur in a mangled name, so print it out. */
|
|
|
|
if (!feof (stdin))
|
|
|
|
putchar (c);
|
|
|
|
}
|
|
|
|
|
|
|
|
dyn_string_delete (mangled);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* Demangle command line arguments. */
|
|
|
|
{
|
|
|
|
/* Loop over command line arguments. */
|
|
|
|
for (i = optind; i < argc; ++i)
|
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
char *s;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Attempt to demangle. */
|
2003-11-21 04:27:58 +01:00
|
|
|
s = cplus_demangle_v3 (argv[i], options);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If it worked, print the demangled name. */
|
2003-11-21 04:27:58 +01:00
|
|
|
if (s != NULL)
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
{
|
2003-11-21 04:27:58 +01:00
|
|
|
printf ("%s\n", s);
|
|
|
|
free (s);
|
in include/ChangeLog:
* dyn-string.h (dyn_string_init, dyn_string_new,
dyn_string_delete, dyn_string_release, dyn_string_resize,
dyn_string_clear, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring_dyn_string_eq):
Define as same name with __cxa_ prepended, if IN_LIBGCC2.
(dyn_string_init, dyn_string_copy, dyn_string_copy_cstr,
dyn_string_prepend, dyn_string_prepend_cstr, dyn_string_insert,
dyn_string_insert_cstr, dyn_string_append, dyn_string_append_cstr,
dyn_string_append_char, dyn_string_substring): Change return type
to int.
in libiberty/ChangeLog:
* cp-demangle.c: Don't include ctype.h.
(IS_DIGIT): New macro.
(IS_ALPHA): Likewise. Use IS_DIGIT and IS_ALPHA throughout
instead of isdigit and isalpanum.
(demangling_def): Make name and next const pointers.
(STATUS_ALLOCATION_FAILED): New status code.
(dyn_string_append_space): Handle failure in
dyn_string_append_char.
(int_to_dyn_string): Likewise. Change return value to status_t.
(string_list_new): Handle failure of dyn_string_init.
(result_close_template_list): Change return type to status_t.
Handle failure in dyn_string_append.
(result_push): Change return value to status_t. Handle failure in
string_list_new. Handle failure of result_push throughout.
(substitution_add): Change return value to status_t. Handle
dyn_string failures. Handle failure of substitution_add
throughout.
(template_arg_list_new): Return NULL on allocation failure.
(result_append_string): Return STATUS_ALLOCATION_FAILED on error.
Handle error result throughout.
(result_append): Likewise.
(result_append_char): Likewise.
(result_append_space): Likewise.
(demangling_new): Make argument a const pointer. Handle
allocation failures.
(demangle_template_args): Handle failure in template_arg_list_new
and result_close_template_list.
(demangle_discriminator): Return if int_to_dyn_string fails.
(cp_demangle): Likewise.
(cp_demangle_type): New function.
(cplus_demangle_new_abi): Don't call dyn_string_delete. Abort on
memory allocation failure.
(main): Likewise.
* dyn-string.c (RETURN_ON_ALLOCATION_FAILURE): Define if
IN_LIBGCC2.
(dyn_string_init): Change return value to int. Handle
RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_new): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_release): Delete the dyn_string.
(dyn_string_resize): Handle RETURN_ON_ALLOCATION_FAILURE case.
(dyn_string_copy): Change return type to int.
(dyn_string_copy_cstr): Likewise.
(dyn_string_prepend): Likewise.
(dyn_string_prepend_cstr): Likewise.
(dyn_string_insert): Likewise.
(dyn_string_insert_cstr): Likewise.
(dyn_string_append): Likewise.
(dyn_string_append_cstr): Likewise.
(dyn_string_append_char): Likewise.
(dyn_string_substring): Likewise.
in gcc/cp/ChangeLog:
* Make-lang.in (CXX_LIB2FUNCS): Add cp-demangle.o and dyn-string.o.
(CXX_LIB2SRCS): Add cp-demangle.c and dyn-string.c.
(cp-demangle.o): New rule.
(dyn-string.o): Likewise.
* inc/cxxabi.h (__cxa_demangle): New declaration.
From-SVN: r34657
2000-06-23 05:58:44 +02:00
|
|
|
}
|
2003-11-21 04:27:58 +01:00
|
|
|
else
|
|
|
|
fprintf (stderr, "Failed: %s\n", argv[i]);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* STANDALONE_DEMANGLER */
|