2000-12-04 18:11:17 +01:00
|
|
|
/* Demangler for IA64 / g++ V3 ABI.
|
2001-02-02 01:27:39 +01:00
|
|
|
Copyright (C) 2000, 2001 Free Software Foundation, Inc.
|
2000-06-05 04:28:41 +02:00
|
|
|
Written by Alex Samuel <samuel@codesourcery.com>.
|
|
|
|
|
2000-09-08 19:50:54 +02:00
|
|
|
This file is part of GNU CC.
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
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.
|
|
|
|
|
|
|
|
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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* This file implements demangling of C++ names mangled according to
|
2000-12-04 18:11:17 +01:00
|
|
|
the IA64 / g++ V3 ABI. Use the cp_demangle function to
|
2000-06-05 04:28:41 +02:00
|
|
|
demangle a mangled name, or compile with the preprocessor macro
|
|
|
|
STANDALONE_DEMANGLER defined to create a demangling filter
|
2000-08-26 00:52:25 +02:00
|
|
|
executable (functionally similar to c++filt, but includes this
|
|
|
|
demangler only). */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2000-07-23 17:57:38 +02:00
|
|
|
#include <sys/types.h>
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "ansidecl.h"
|
|
|
|
#include "libiberty.h"
|
|
|
|
#include "dyn-string.h"
|
2000-06-07 22:35:43 +02:00
|
|
|
#include "demangle.h"
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If CP_DEMANGLE_DEBUG is defined, a trace of the grammar evaluation,
|
|
|
|
and other debugging output, will be generated. */
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
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
|
|
|
#define DEMANGLE_TRACE(PRODUCTION, DM) \
|
|
|
|
fprintf (stderr, " -> %-24s at position %3d\n", \
|
2000-06-05 04:28:41 +02:00
|
|
|
(PRODUCTION), current_position (DM));
|
|
|
|
#else
|
|
|
|
#define DEMANGLE_TRACE(PRODUCTION, DM)
|
|
|
|
#endif
|
|
|
|
|
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
|
|
|
/* Don't include <ctype.h>, to prevent additional unresolved symbols
|
|
|
|
from being dragged into the C++ runtime library. */
|
|
|
|
#define IS_DIGIT(CHAR) ((CHAR) >= '0' && (CHAR) <= '9')
|
|
|
|
#define IS_ALPHA(CHAR) \
|
|
|
|
(((CHAR) >= 'a' && (CHAR) <= 'z') \
|
|
|
|
|| ((CHAR) >= 'A' && (CHAR) <= 'Z'))
|
|
|
|
|
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_"
|
|
|
|
|
2001-02-02 01:27:39 +01:00
|
|
|
/* Character(s) to use for namespace separation in demangled output */
|
|
|
|
#define NAMESPACE_SEPARATOR (dm->style == DMGL_JAVA ? "." : "::")
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* If flag_verbose is zero, some simplifications will be made to the
|
|
|
|
output to make it easier to read and supress details that are
|
|
|
|
generally not of interest to the average C++ programmer.
|
|
|
|
Otherwise, the demangled representation will attempt to convey as
|
|
|
|
much information as the mangled form. */
|
|
|
|
static int flag_verbose;
|
|
|
|
|
|
|
|
/* If flag_strict is non-zero, demangle strictly according to the
|
|
|
|
specification -- don't demangle special g++ manglings. */
|
|
|
|
static int flag_strict;
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
/* String_list_t is an extended form of dyn_string_t which provides a
|
|
|
|
link field and a caret position for additions to the string. A
|
|
|
|
string_list_t may safely be cast to and used as a dyn_string_t. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
struct string_list_def
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
/* The dyn_string; must be first. */
|
2000-06-05 04:28:41 +02:00
|
|
|
struct dyn_string string;
|
2000-10-23 01:59:25 +02:00
|
|
|
|
|
|
|
/* The position at which additional text is added to this string
|
|
|
|
(using the result_add* macros). This value is an offset from the
|
|
|
|
end of the string, not the beginning (and should be
|
|
|
|
non-positive). */
|
|
|
|
int caret_position;
|
|
|
|
|
|
|
|
/* The next string in the list. */
|
2000-06-05 04:28:41 +02:00
|
|
|
struct string_list_def *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct string_list_def *string_list_t;
|
|
|
|
|
|
|
|
/* Data structure representing a potential substitution. */
|
|
|
|
|
|
|
|
struct substitution_def
|
|
|
|
{
|
|
|
|
/* The demangled text of the substitution. */
|
|
|
|
dyn_string_t text;
|
|
|
|
|
|
|
|
/* Whether this substitution represents a template item. */
|
|
|
|
int template_p : 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Data structure representing a template argument list. */
|
|
|
|
|
|
|
|
struct template_arg_list_def
|
|
|
|
{
|
|
|
|
/* The next (lower) template argument list in the stack of currently
|
|
|
|
active template arguments. */
|
|
|
|
struct template_arg_list_def *next;
|
|
|
|
|
|
|
|
/* The first element in the list of template arguments in
|
|
|
|
left-to-right order. */
|
|
|
|
string_list_t first_argument;
|
|
|
|
|
|
|
|
/* The last element in the arguments lists. */
|
|
|
|
string_list_t last_argument;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct template_arg_list_def *template_arg_list_t;
|
|
|
|
|
|
|
|
/* Data structure to maintain the state of the current demangling. */
|
|
|
|
|
|
|
|
struct demangling_def
|
|
|
|
{
|
|
|
|
/* The full mangled name being 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
|
|
|
const char *name;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Pointer into name at the current position. */
|
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
|
|
|
const char *next;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Stack for strings containing demangled result generated so far.
|
|
|
|
Text is emitted to the topmost (first) string. */
|
|
|
|
string_list_t result;
|
|
|
|
|
|
|
|
/* The number of presently available substitutions. */
|
|
|
|
int num_substitutions;
|
|
|
|
|
|
|
|
/* The allocated size of the substitutions array. */
|
|
|
|
int substitutions_allocated;
|
|
|
|
|
|
|
|
/* An array of available substitutions. The number of elements in
|
|
|
|
the array is given by num_substitions, and the allocated array
|
|
|
|
size in substitutions_size.
|
|
|
|
|
|
|
|
The most recent substition is at the end, so
|
|
|
|
|
|
|
|
- `S_' corresponds to substititutions[num_substitutions - 1]
|
|
|
|
- `S0_' corresponds to substititutions[num_substitutions - 2]
|
|
|
|
|
|
|
|
etc. */
|
|
|
|
struct substitution_def *substitutions;
|
|
|
|
|
|
|
|
/* The stack of template argument lists. */
|
|
|
|
template_arg_list_t template_arg_lists;
|
|
|
|
|
|
|
|
/* The most recently demangled source-name. */
|
|
|
|
dyn_string_t last_source_name;
|
2001-02-02 01:27:39 +01:00
|
|
|
|
|
|
|
/* Language style to use for demangled output. */
|
|
|
|
int style;
|
2001-03-21 21:01:40 +01:00
|
|
|
|
|
|
|
/* Set to non-zero iff this name is a constructor. The actual value
|
|
|
|
indicates what sort of constructor this is; see demangle.h. */
|
|
|
|
enum gnu_v3_ctor_kinds is_constructor;
|
|
|
|
|
|
|
|
/* Set to non-zero iff this name is a destructor. The actual value
|
|
|
|
indicates what sort of destructor this is; see demangle.h. */
|
|
|
|
enum gnu_v3_dtor_kinds is_destructor;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct demangling_def *demangling_t;
|
|
|
|
|
|
|
|
/* This type is the standard return code from most functions. Values
|
|
|
|
other than STATUS_OK contain descriptive messages. */
|
|
|
|
typedef const char *status_t;
|
|
|
|
|
|
|
|
/* Special values that can be used as a status_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
|
|
|
#define STATUS_OK NULL
|
|
|
|
#define STATUS_ERROR "Error."
|
|
|
|
#define STATUS_UNIMPLEMENTED "Unimplemented."
|
|
|
|
#define STATUS_INTERNAL_ERROR "Internal error."
|
|
|
|
|
|
|
|
/* This status code indicates a failure in malloc or realloc. */
|
2000-09-07 07:44:46 +02:00
|
|
|
static const char *const status_allocation_failed = "Allocation failed.";
|
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
|
|
|
#define STATUS_ALLOCATION_FAILED status_allocation_failed
|
|
|
|
|
|
|
|
/* Non-zero if STATUS indicates that no error has occurred. */
|
|
|
|
#define STATUS_NO_ERROR(STATUS) ((STATUS) == STATUS_OK)
|
|
|
|
|
|
|
|
/* Evaluate EXPR, which must produce a status_t. If the status code
|
|
|
|
indicates an error, return from the current function with that
|
|
|
|
status code. */
|
|
|
|
#define RETURN_IF_ERROR(EXPR) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
status_t s = EXPR; \
|
|
|
|
if (!STATUS_NO_ERROR (s)) \
|
|
|
|
return s; \
|
|
|
|
} \
|
|
|
|
while (0)
|
2000-06-05 04:28:41 +02: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
|
|
|
static status_t int_to_dyn_string
|
2000-06-05 04:28:41 +02:00
|
|
|
PARAMS ((int, dyn_string_t));
|
|
|
|
static string_list_t string_list_new
|
|
|
|
PARAMS ((int));
|
|
|
|
static void string_list_delete
|
|
|
|
PARAMS ((string_list_t));
|
2000-08-23 19:03:03 +02:00
|
|
|
static status_t result_add_separated_char
|
2000-08-26 00:52:25 +02:00
|
|
|
PARAMS ((demangling_t, int));
|
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
|
|
|
static status_t result_push
|
2000-06-05 04:28:41 +02:00
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static string_list_t result_pop
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static int substitution_start
|
|
|
|
PARAMS ((demangling_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
|
|
|
static status_t substitution_add
|
2000-09-05 03:01:12 +02:00
|
|
|
PARAMS ((demangling_t, int, int));
|
2000-06-05 04:28:41 +02:00
|
|
|
static dyn_string_t substitution_get
|
|
|
|
PARAMS ((demangling_t, int, int *));
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
static void substitutions_print
|
|
|
|
PARAMS ((demangling_t, FILE *));
|
|
|
|
#endif
|
|
|
|
static template_arg_list_t template_arg_list_new
|
|
|
|
PARAMS ((void));
|
|
|
|
static void template_arg_list_delete
|
|
|
|
PARAMS ((template_arg_list_t));
|
|
|
|
static void template_arg_list_add_arg
|
|
|
|
PARAMS ((template_arg_list_t, string_list_t));
|
|
|
|
static string_list_t template_arg_list_get_arg
|
|
|
|
PARAMS ((template_arg_list_t, int));
|
|
|
|
static void push_template_arg_list
|
|
|
|
PARAMS ((demangling_t, template_arg_list_t));
|
|
|
|
static void pop_to_template_arg_list
|
|
|
|
PARAMS ((demangling_t, template_arg_list_t));
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
static void template_arg_list_print
|
|
|
|
PARAMS ((template_arg_list_t, FILE *));
|
|
|
|
#endif
|
|
|
|
static template_arg_list_t current_template_arg_list
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static demangling_t demangling_new
|
2001-02-02 01:27:39 +01:00
|
|
|
PARAMS ((const char *, int));
|
2000-06-05 04:28:41 +02:00
|
|
|
static void demangling_delete
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
|
|
|
|
/* The last character of DS. Warning: DS is evaluated twice. */
|
|
|
|
#define dyn_string_last_char(DS) \
|
|
|
|
(dyn_string_buf (DS)[dyn_string_length (DS) - 1])
|
|
|
|
|
|
|
|
/* Append a space character (` ') to DS if it does not already end
|
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
|
|
|
with one. Evaluates to 1 on success, or 0 on allocation failure. */
|
2000-06-05 04:28:41 +02:00
|
|
|
#define dyn_string_append_space(DS) \
|
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
|
|
|
((dyn_string_length (DS) > 0 \
|
|
|
|
&& dyn_string_last_char (DS) != ' ') \
|
|
|
|
? dyn_string_append_char ((DS), ' ') \
|
|
|
|
: 1)
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Returns the index of the current position in the mangled name. */
|
|
|
|
#define current_position(DM) ((DM)->next - (DM)->name)
|
|
|
|
|
|
|
|
/* Returns the character at the current position of the mangled name. */
|
|
|
|
#define peek_char(DM) (*((DM)->next))
|
|
|
|
|
|
|
|
/* Returns the character one past the current position of the mangled
|
|
|
|
name. */
|
|
|
|
#define peek_char_next(DM) \
|
|
|
|
(peek_char (DM) == '\0' ? '\0' : (*((DM)->next + 1)))
|
|
|
|
|
|
|
|
/* Returns the character at the current position, and advances the
|
|
|
|
current position to the next character. */
|
|
|
|
#define next_char(DM) (*((DM)->next)++)
|
|
|
|
|
|
|
|
/* Returns non-zero if the current position is the end of the mangled
|
|
|
|
name, i.e. one past the last character. */
|
|
|
|
#define end_of_name_p(DM) (peek_char (DM) == '\0')
|
|
|
|
|
|
|
|
/* Advances the current position by one character. */
|
|
|
|
#define advance_char(DM) (++(DM)->next)
|
|
|
|
|
|
|
|
/* Returns the string containing the current demangled result. */
|
|
|
|
#define result_string(DM) (&(DM)->result->string)
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Returns the position at which new text is inserted into the
|
|
|
|
demangled result. */
|
|
|
|
#define result_caret_pos(DM) \
|
|
|
|
(result_length (DM) + \
|
|
|
|
((string_list_t) result_string (DM))->caret_position)
|
|
|
|
|
|
|
|
/* Adds a dyn_string_t to the demangled result. */
|
|
|
|
#define result_add_string(DM, STRING) \
|
|
|
|
(dyn_string_insert (&(DM)->result->string, \
|
|
|
|
result_caret_pos (DM), (STRING)) \
|
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_OK : STATUS_ALLOCATION_FAILED)
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Adds NUL-terminated string CSTR to the demangled result. */
|
|
|
|
#define result_add(DM, CSTR) \
|
|
|
|
(dyn_string_insert_cstr (&(DM)->result->string, \
|
|
|
|
result_caret_pos (DM), (CSTR)) \
|
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_OK : STATUS_ALLOCATION_FAILED)
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Adds character CHAR to the demangled result. */
|
|
|
|
#define result_add_char(DM, CHAR) \
|
|
|
|
(dyn_string_insert_char (&(DM)->result->string, \
|
|
|
|
result_caret_pos (DM), (CHAR)) \
|
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_OK : STATUS_ALLOCATION_FAILED)
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Inserts a dyn_string_t to the demangled result at position POS. */
|
|
|
|
#define result_insert_string(DM, POS, STRING) \
|
|
|
|
(dyn_string_insert (&(DM)->result->string, (POS), (STRING)) \
|
|
|
|
? STATUS_OK : STATUS_ALLOCATION_FAILED)
|
|
|
|
|
|
|
|
/* Inserts NUL-terminated string CSTR to the demangled result at
|
|
|
|
position POS. */
|
|
|
|
#define result_insert(DM, POS, CSTR) \
|
|
|
|
(dyn_string_insert_cstr (&(DM)->result->string, (POS), (CSTR)) \
|
|
|
|
? STATUS_OK : STATUS_ALLOCATION_FAILED)
|
|
|
|
|
|
|
|
/* Inserts character CHAR to the demangled result at position POS. */
|
|
|
|
#define result_insert_char(DM, POS, CHAR) \
|
|
|
|
(dyn_string_insert_char (&(DM)->result->string, (POS), (CHAR)) \
|
|
|
|
? STATUS_OK : STATUS_ALLOCATION_FAILED)
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* The length of the current demangled result. */
|
|
|
|
#define result_length(DM) \
|
|
|
|
dyn_string_length (&(DM)->result->string)
|
|
|
|
|
2000-08-23 19:03:03 +02:00
|
|
|
/* Appends a (less-than, greater-than) character to the result in DM
|
|
|
|
to (open, close) a template argument or parameter list. Appends a
|
|
|
|
space first if necessary to prevent spurious elision of angle
|
|
|
|
brackets with the previous character. */
|
|
|
|
#define result_open_template_list(DM) result_add_separated_char(DM, '<')
|
|
|
|
#define result_close_template_list(DM) result_add_separated_char(DM, '>')
|
|
|
|
|
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
|
|
|
/* Appends a base 10 representation of VALUE to DS. STATUS_OK on
|
|
|
|
success. On failure, deletes DS and returns an error code. */
|
2000-06-05 04:28:41 +02: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
|
|
|
static status_t
|
2000-06-05 04:28:41 +02:00
|
|
|
int_to_dyn_string (value, ds)
|
|
|
|
int value;
|
|
|
|
dyn_string_t ds;
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int mask = 1;
|
|
|
|
|
|
|
|
/* Handle zero up front. */
|
|
|
|
if (value == 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
|
|
|
if (!dyn_string_append_char (ds, '0'))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
return STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* For negative numbers, emit a minus sign. */
|
|
|
|
if (value < 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
|
|
|
if (!dyn_string_append_char (ds, '-'))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
value = -value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the power of 10 of the first digit. */
|
|
|
|
i = value;
|
|
|
|
while (i > 9)
|
|
|
|
{
|
|
|
|
mask *= 10;
|
|
|
|
i /= 10;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write the digits. */
|
|
|
|
while (mask > 0)
|
|
|
|
{
|
|
|
|
int digit = value / mask;
|
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 (!dyn_string_append_char (ds, '0' + digit))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
value -= digit * mask;
|
|
|
|
mask /= 10;
|
|
|
|
}
|
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 STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Creates a new string list node. The contents of the string are
|
|
|
|
empty, but the initial buffer allocation is LENGTH. The string
|
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
|
|
|
list node should be deleted with string_list_delete. Returns NULL
|
|
|
|
if allocation fails. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static string_list_t
|
|
|
|
string_list_new (length)
|
|
|
|
int 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
|
|
|
string_list_t s = (string_list_t) malloc (sizeof (struct string_list_def));
|
2000-10-23 01:59:25 +02:00
|
|
|
s->caret_position = 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
|
|
|
if (s == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (!dyn_string_init ((dyn_string_t) s, length))
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Deletes the entire string list starting at NODE. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
string_list_delete (node)
|
|
|
|
string_list_t node;
|
|
|
|
{
|
|
|
|
while (node != NULL)
|
|
|
|
{
|
|
|
|
string_list_t next = node->next;
|
2001-03-22 16:15:18 +01:00
|
|
|
dyn_string_delete ((dyn_string_t) node);
|
2000-06-05 04:28:41 +02:00
|
|
|
node = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-08-23 19:03:03 +02:00
|
|
|
/* Appends CHARACTER to the demangled result. If the current trailing
|
|
|
|
character of the result is CHARACTER, a space is inserted first. */
|
2000-06-05 04:28:41 +02: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
|
|
|
static status_t
|
2000-08-23 19:03:03 +02:00
|
|
|
result_add_separated_char (dm, character)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-08-26 00:52:25 +02:00
|
|
|
int character;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
char *result = dyn_string_buf (result_string (dm));
|
|
|
|
int caret_pos = result_caret_pos (dm);
|
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-10-23 01:59:25 +02:00
|
|
|
/* Add a space if the last character is already the character we
|
|
|
|
want to add. */
|
|
|
|
if (caret_pos > 0 && result[caret_pos - 1] == character)
|
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ' '));
|
|
|
|
/* Add the character. */
|
|
|
|
RETURN_IF_ERROR (result_add_char (dm, character));
|
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 STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocates and pushes a new string onto the demangled results stack
|
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
|
|
|
for DM. Subsequent demangling with DM will emit to the new string.
|
|
|
|
Returns STATUS_OK on success, STATUS_ALLOCATION_FAILED on
|
|
|
|
allocation failure. */
|
2000-06-05 04:28:41 +02: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
|
|
|
static status_t
|
2000-06-05 04:28:41 +02:00
|
|
|
result_push (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
string_list_t new_string = string_list_new (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
|
|
|
if (new_string == NULL)
|
|
|
|
/* Allocation failed. */
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
|
|
|
/* Link the new string to the front of the list of result strings. */
|
2000-06-05 04:28:41 +02:00
|
|
|
new_string->next = (string_list_t) dm->result;
|
|
|
|
dm->result = new_string;
|
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 STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Removes and returns the topmost element on the demangled results
|
|
|
|
stack for DM. The caller assumes ownership for the returned
|
|
|
|
string. */
|
|
|
|
|
|
|
|
static string_list_t
|
|
|
|
result_pop (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
string_list_t top = dm->result;
|
|
|
|
dm->result = top->next;
|
|
|
|
return top;
|
|
|
|
}
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Returns the current value of the caret for the result string. The
|
|
|
|
value is an offet from the end of the result string. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
result_get_caret (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
return ((string_list_t) result_string (dm))->caret_position;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sets the value of the caret for the result string, counted as an
|
|
|
|
offet from the end of the result string. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
result_set_caret (dm, position)
|
|
|
|
demangling_t dm;
|
|
|
|
int position;
|
|
|
|
{
|
|
|
|
((string_list_t) result_string (dm))->caret_position = position;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Shifts the position of the next addition to the result by
|
|
|
|
POSITION_OFFSET. A negative value shifts the caret to the left. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
result_shift_caret (dm, position_offset)
|
|
|
|
demangling_t dm;
|
|
|
|
int position_offset;
|
|
|
|
{
|
|
|
|
((string_list_t) result_string (dm))->caret_position += position_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns non-zero if the character that comes right before the place
|
|
|
|
where text will be added to the result is a space. In this case,
|
|
|
|
the caller should supress adding another space. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
result_previous_char_is_space (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
char *result = dyn_string_buf (result_string (dm));
|
|
|
|
int pos = result_caret_pos (dm);
|
|
|
|
return pos > 0 && result[pos - 1] == ' ';
|
|
|
|
}
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Returns the start position of a fragment of the demangled result
|
|
|
|
that will be a substitution candidate. Should be called at the
|
|
|
|
start of productions that can add substitutions. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
substitution_start (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
return result_caret_pos (dm);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Adds the suffix of the current demangled result of DM starting at
|
|
|
|
START_POSITION as a potential substitution. If TEMPLATE_P is
|
2000-09-05 03:01:12 +02:00
|
|
|
non-zero, this potential substitution is a template-id. */
|
2000-06-05 04:28:41 +02: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
|
|
|
static status_t
|
2000-09-05 03:01:12 +02:00
|
|
|
substitution_add (dm, start_position, template_p)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
|
|
|
int start_position;
|
|
|
|
int template_p;
|
|
|
|
{
|
|
|
|
dyn_string_t result = result_string (dm);
|
|
|
|
dyn_string_t substitution = dyn_string_new (0);
|
|
|
|
int 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
|
|
|
if (substitution == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
|
|
|
/* Extract the substring of the current demangling result that
|
|
|
|
represents the subsitution candidate. */
|
|
|
|
if (!dyn_string_substring (substitution,
|
2000-10-23 01:59:25 +02:00
|
|
|
result, start_position, result_caret_pos (dm)))
|
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
|
|
|
{
|
|
|
|
dyn_string_delete (substitution);
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If there's no room for the new entry, grow the array. */
|
|
|
|
if (dm->substitutions_allocated == dm->num_substitutions)
|
|
|
|
{
|
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
|
|
|
size_t new_array_size;
|
2000-08-26 00:52:25 +02:00
|
|
|
if (dm->substitutions_allocated > 0)
|
|
|
|
dm->substitutions_allocated *= 2;
|
|
|
|
else
|
|
|
|
dm->substitutions_allocated = 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
|
|
|
new_array_size =
|
|
|
|
sizeof (struct substitution_def) * dm->substitutions_allocated;
|
|
|
|
|
|
|
|
dm->substitutions = (struct substitution_def *)
|
|
|
|
realloc (dm->substitutions, new_array_size);
|
|
|
|
if (dm->substitutions == NULL)
|
|
|
|
/* Realloc failed. */
|
|
|
|
{
|
|
|
|
dyn_string_delete (substitution);
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the substitution to the array. */
|
2000-08-26 00:52:25 +02:00
|
|
|
i = dm->num_substitutions++;
|
2000-06-05 04:28:41 +02:00
|
|
|
dm->substitutions[i].text = substitution;
|
|
|
|
dm->substitutions[i].template_p = template_p;
|
|
|
|
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
substitutions_print (dm, stderr);
|
|
|
|
#endif
|
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 STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the Nth-most-recent substitution. Sets *TEMPLATE_P to
|
|
|
|
non-zero if the substitution is a template-id, zero otherwise.
|
|
|
|
N is numbered from zero. DM retains ownership of the returned
|
|
|
|
string. If N is negative, or equal to or greater than the current
|
|
|
|
number of substitution candidates, returns NULL. */
|
|
|
|
|
|
|
|
static dyn_string_t
|
|
|
|
substitution_get (dm, n, template_p)
|
|
|
|
demangling_t dm;
|
|
|
|
int n;
|
|
|
|
int *template_p;
|
|
|
|
{
|
|
|
|
struct substitution_def *sub;
|
|
|
|
|
|
|
|
/* Make sure N is in the valid range. */
|
|
|
|
if (n < 0 || n >= dm->num_substitutions)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
sub = &(dm->substitutions[n]);
|
|
|
|
*template_p = sub->template_p;
|
|
|
|
return sub->text;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
/* Debugging routine to print the current substitutions to FP. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
substitutions_print (dm, fp)
|
|
|
|
demangling_t dm;
|
|
|
|
FILE *fp;
|
|
|
|
{
|
|
|
|
int seq_id;
|
|
|
|
int num = dm->num_substitutions;
|
|
|
|
|
|
|
|
fprintf (fp, "SUBSTITUTIONS:\n");
|
|
|
|
for (seq_id = -1; seq_id < num - 1; ++seq_id)
|
|
|
|
{
|
|
|
|
int template_p;
|
|
|
|
dyn_string_t text = substitution_get (dm, seq_id + 1, &template_p);
|
|
|
|
|
|
|
|
if (seq_id == -1)
|
|
|
|
fprintf (fp, " S_ ");
|
|
|
|
else
|
|
|
|
fprintf (fp, " S%d_", seq_id);
|
|
|
|
fprintf (fp, " %c: %s\n", template_p ? '*' : ' ', dyn_string_buf (text));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CP_DEMANGLE_DEBUG */
|
|
|
|
|
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
|
|
|
/* Creates a new template argument list. Returns NULL if allocation
|
|
|
|
fails. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static template_arg_list_t
|
2000-06-08 18:51:44 +02:00
|
|
|
template_arg_list_new ()
|
2000-06-05 04:28:41 +02: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
|
|
|
template_arg_list_t new_list =
|
|
|
|
(template_arg_list_t) malloc (sizeof (struct template_arg_list_def));
|
|
|
|
if (new_list == NULL)
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Initialize the new list to have no arguments. */
|
|
|
|
new_list->first_argument = NULL;
|
|
|
|
new_list->last_argument = NULL;
|
|
|
|
/* Return the new list. */
|
|
|
|
return new_list;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Deletes a template argument list and the template arguments it
|
|
|
|
contains. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
template_arg_list_delete (list)
|
|
|
|
template_arg_list_t list;
|
|
|
|
{
|
|
|
|
/* If there are any arguments on LIST, delete them. */
|
|
|
|
if (list->first_argument != NULL)
|
|
|
|
string_list_delete (list->first_argument);
|
|
|
|
/* Delete LIST. */
|
|
|
|
free (list);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Adds ARG to the template argument list ARG_LIST. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
template_arg_list_add_arg (arg_list, arg)
|
|
|
|
template_arg_list_t arg_list;
|
|
|
|
string_list_t arg;
|
|
|
|
{
|
|
|
|
if (arg_list->first_argument == NULL)
|
|
|
|
/* If there were no arguments before, ARG is the first one. */
|
|
|
|
arg_list->first_argument = arg;
|
|
|
|
else
|
|
|
|
/* Make ARG the last argument on the list. */
|
|
|
|
arg_list->last_argument->next = arg;
|
|
|
|
/* Make ARG the last on the list. */
|
|
|
|
arg_list->last_argument = arg;
|
|
|
|
arg->next = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the template arugment at position INDEX in template
|
|
|
|
argument list ARG_LIST. */
|
|
|
|
|
|
|
|
static string_list_t
|
|
|
|
template_arg_list_get_arg (arg_list, index)
|
|
|
|
template_arg_list_t arg_list;
|
|
|
|
int index;
|
|
|
|
{
|
|
|
|
string_list_t arg = arg_list->first_argument;
|
|
|
|
/* Scan down the list of arguments to find the one at position
|
|
|
|
INDEX. */
|
|
|
|
while (index--)
|
|
|
|
{
|
|
|
|
arg = arg->next;
|
|
|
|
if (arg == NULL)
|
|
|
|
/* Ran out of arguments before INDEX hit zero. That's an
|
|
|
|
error. */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Return the argument at position INDEX. */
|
|
|
|
return arg;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Pushes ARG_LIST onto the top of the template argument list stack. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
push_template_arg_list (dm, arg_list)
|
|
|
|
demangling_t dm;
|
|
|
|
template_arg_list_t arg_list;
|
|
|
|
{
|
|
|
|
arg_list->next = dm->template_arg_lists;
|
|
|
|
dm->template_arg_lists = arg_list;
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
fprintf (stderr, " ** pushing template arg list\n");
|
|
|
|
template_arg_list_print (arg_list, stderr);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Pops and deletes elements on the template argument list stack until
|
|
|
|
arg_list is the topmost element. If arg_list is NULL, all elements
|
|
|
|
are popped and deleted. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
pop_to_template_arg_list (dm, arg_list)
|
|
|
|
demangling_t dm;
|
|
|
|
template_arg_list_t arg_list;
|
|
|
|
{
|
|
|
|
while (dm->template_arg_lists != arg_list)
|
|
|
|
{
|
|
|
|
template_arg_list_t top = dm->template_arg_lists;
|
|
|
|
/* Disconnect the topmost element from the list. */
|
|
|
|
dm->template_arg_lists = top->next;
|
|
|
|
/* Delete the popped element. */
|
|
|
|
template_arg_list_delete (top);
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
fprintf (stderr, " ** removing template arg list\n");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CP_DEMANGLE_DEBUG
|
|
|
|
|
|
|
|
/* Prints the contents of ARG_LIST to FP. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
template_arg_list_print (arg_list, fp)
|
|
|
|
template_arg_list_t arg_list;
|
|
|
|
FILE *fp;
|
|
|
|
{
|
|
|
|
string_list_t arg;
|
|
|
|
int index = -1;
|
|
|
|
|
|
|
|
fprintf (fp, "TEMPLATE ARGUMENT LIST:\n");
|
|
|
|
for (arg = arg_list->first_argument; arg != NULL; arg = arg->next)
|
|
|
|
{
|
|
|
|
if (index == -1)
|
|
|
|
fprintf (fp, " T_ : ");
|
|
|
|
else
|
|
|
|
fprintf (fp, " T%d_ : ", index);
|
|
|
|
++index;
|
|
|
|
fprintf (fp, "%s\n", dyn_string_buf ((dyn_string_t) arg));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CP_DEMANGLE_DEBUG */
|
|
|
|
|
|
|
|
/* Returns the topmost element on the stack of template argument
|
|
|
|
lists. If there is no list of template arguments, returns NULL. */
|
|
|
|
|
|
|
|
static template_arg_list_t
|
|
|
|
current_template_arg_list (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
return dm->template_arg_lists;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocates a demangling_t object for demangling mangled NAME. A new
|
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
|
|
|
result must be pushed before the returned object can be used.
|
|
|
|
Returns NULL if allocation fails. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static demangling_t
|
2001-02-02 01:27:39 +01:00
|
|
|
demangling_new (name, style)
|
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
|
|
|
const char *name;
|
2001-02-02 01:27:39 +01:00
|
|
|
int style;
|
2000-06-05 04:28:41 +02: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
|
|
|
demangling_t dm;
|
|
|
|
dm = (demangling_t) malloc (sizeof (struct demangling_def));
|
|
|
|
if (dm == NULL)
|
|
|
|
return NULL;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
dm->name = name;
|
|
|
|
dm->next = name;
|
|
|
|
dm->result = NULL;
|
|
|
|
dm->num_substitutions = 0;
|
|
|
|
dm->substitutions_allocated = 10;
|
|
|
|
dm->template_arg_lists = 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
|
|
|
dm->last_source_name = dyn_string_new (0);
|
|
|
|
if (dm->last_source_name == NULL)
|
|
|
|
return NULL;
|
|
|
|
dm->substitutions = (struct substitution_def *)
|
|
|
|
malloc (dm->substitutions_allocated * sizeof (struct substitution_def));
|
|
|
|
if (dm->substitutions == NULL)
|
|
|
|
{
|
|
|
|
dyn_string_delete (dm->last_source_name);
|
|
|
|
return NULL;
|
|
|
|
}
|
2001-02-02 01:27:39 +01:00
|
|
|
dm->style = style;
|
2001-03-21 21:01:40 +01:00
|
|
|
dm->is_constructor = 0;
|
|
|
|
dm->is_destructor = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
return dm;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Deallocates a demangling_t object and all memory associated with
|
|
|
|
it. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
demangling_delete (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
template_arg_list_t arg_list = dm->template_arg_lists;
|
|
|
|
|
|
|
|
/* Delete the stack of template argument lists. */
|
|
|
|
while (arg_list != NULL)
|
|
|
|
{
|
|
|
|
template_arg_list_t next = arg_list->next;
|
|
|
|
template_arg_list_delete (arg_list);
|
|
|
|
arg_list = next;
|
|
|
|
}
|
|
|
|
/* Delete the list of substitutions. */
|
|
|
|
for (i = dm->num_substitutions; --i >= 0; )
|
|
|
|
dyn_string_delete (dm->substitutions[i].text);
|
|
|
|
free (dm->substitutions);
|
|
|
|
/* Delete the demangled result. */
|
|
|
|
string_list_delete (dm->result);
|
|
|
|
/* Delete the stored identifier name. */
|
|
|
|
dyn_string_delete (dm->last_source_name);
|
|
|
|
/* Delete the context object itself. */
|
|
|
|
free (dm);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* These functions demangle an alternative of the corresponding
|
|
|
|
production in the mangling spec. The first argument of each is a
|
|
|
|
demangling context structure for the current demangling
|
|
|
|
operation. Most emit demangled text directly to the topmost result
|
|
|
|
string on the result string stack in the demangling context
|
|
|
|
structure. */
|
|
|
|
|
|
|
|
static status_t demangle_char
|
2000-06-07 23:13:14 +02:00
|
|
|
PARAMS ((demangling_t, int));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_mangled_name
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_encoding
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_name
|
|
|
|
PARAMS ((demangling_t, int *));
|
|
|
|
static status_t demangle_nested_name
|
|
|
|
PARAMS ((demangling_t, int *));
|
|
|
|
static status_t demangle_prefix
|
|
|
|
PARAMS ((demangling_t, int *));
|
|
|
|
static status_t demangle_unqualified_name
|
2000-09-06 00:37:17 +02:00
|
|
|
PARAMS ((demangling_t, int *));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_source_name
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_number
|
|
|
|
PARAMS ((demangling_t, int *, int, int));
|
|
|
|
static status_t demangle_number_literally
|
|
|
|
PARAMS ((demangling_t, dyn_string_t, int, int));
|
|
|
|
static status_t demangle_identifier
|
|
|
|
PARAMS ((demangling_t, int, dyn_string_t));
|
|
|
|
static status_t demangle_operator_name
|
|
|
|
PARAMS ((demangling_t, int, int *));
|
2000-09-05 05:07:14 +02:00
|
|
|
static status_t demangle_nv_offset
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_v_offset
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_call_offset
|
|
|
|
PARAMS ((demangling_t));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_special_name
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_ctor_dtor_name
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_type_ptr
|
2000-09-05 03:01:12 +02:00
|
|
|
PARAMS ((demangling_t, int *, int));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_type
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_CV_qualifiers
|
|
|
|
PARAMS ((demangling_t, dyn_string_t));
|
|
|
|
static status_t demangle_builtin_type
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_function_type
|
2000-09-05 03:01:12 +02:00
|
|
|
PARAMS ((demangling_t, int *));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_bare_function_type
|
2000-09-05 03:01:12 +02:00
|
|
|
PARAMS ((demangling_t, int *));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_class_enum_type
|
|
|
|
PARAMS ((demangling_t, int *));
|
|
|
|
static status_t demangle_array_type
|
2000-10-23 01:59:25 +02:00
|
|
|
PARAMS ((demangling_t, int *));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_template_param
|
2000-09-05 03:01:12 +02:00
|
|
|
PARAMS ((demangling_t));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_template_args
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_literal
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_template_arg
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_expression
|
2000-06-07 23:13:14 +02:00
|
|
|
PARAMS ((demangling_t));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_scope_expression
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_expr_primary
|
2000-06-07 23:13:14 +02:00
|
|
|
PARAMS ((demangling_t));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_substitution
|
2000-08-26 00:52:25 +02:00
|
|
|
PARAMS ((demangling_t, int *));
|
2000-06-05 04:28:41 +02:00
|
|
|
static status_t demangle_local_name
|
|
|
|
PARAMS ((demangling_t));
|
|
|
|
static status_t demangle_discriminator
|
|
|
|
PARAMS ((demangling_t, int));
|
2000-06-07 22:35:43 +02:00
|
|
|
static status_t cp_demangle
|
2001-02-02 01:27:39 +01:00
|
|
|
PARAMS ((const char *, dyn_string_t, int));
|
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
|
|
|
static status_t cp_demangle_type
|
|
|
|
PARAMS ((const char*, dyn_string_t));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* When passed to demangle_bare_function_type, indicates that the
|
|
|
|
function's return type is not encoded before its parameter types. */
|
2000-09-05 03:01:12 +02:00
|
|
|
#define BFT_NO_RETURN_TYPE NULL
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Check that the next character is C. If so, consume it. If not,
|
|
|
|
return an error. */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_char (dm, c)
|
|
|
|
demangling_t dm;
|
2000-06-07 23:13:14 +02:00
|
|
|
int c;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
static char *error_message = NULL;
|
|
|
|
|
|
|
|
if (peek_char (dm) == c)
|
|
|
|
{
|
|
|
|
advance_char (dm);
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (error_message == NULL)
|
|
|
|
error_message = strdup ("Expected ?");
|
|
|
|
error_message[9] = c;
|
|
|
|
return error_message;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <mangled-name>.
|
|
|
|
|
|
|
|
<mangled-name> ::= _Z <encoding> */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_mangled_name (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("mangled-name", dm);
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'Z'));
|
|
|
|
RETURN_IF_ERROR (demangle_encoding (dm));
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits an <encoding>.
|
|
|
|
|
|
|
|
<encoding> ::= <function name> <bare-function-type>
|
|
|
|
::= <data name>
|
2000-06-30 17:25:33 +02:00
|
|
|
::= <special-name> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_encoding (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
2000-09-06 00:37:17 +02:00
|
|
|
int encode_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
int start_position;
|
|
|
|
template_arg_list_t old_arg_list = current_template_arg_list (dm);
|
|
|
|
char peek = peek_char (dm);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("encoding", dm);
|
|
|
|
|
|
|
|
/* Remember where the name starts. If it turns out to be a template
|
|
|
|
function, we'll have to insert the return type here. */
|
2000-10-23 01:59:25 +02:00
|
|
|
start_position = result_caret_pos (dm);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-06-30 17:25:33 +02:00
|
|
|
if (peek == 'G' || peek == 'T')
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_special_name (dm));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Now demangle the name. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_name (dm, &encode_return_type));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If there's anything left, the name was a function name, with
|
2000-10-23 01:59:25 +02:00
|
|
|
maybe its return type, and its parameter types, following. */
|
2000-06-05 04:28:41 +02:00
|
|
|
if (!end_of_name_p (dm)
|
|
|
|
&& peek_char (dm) != 'E')
|
|
|
|
{
|
2000-09-06 00:37:17 +02:00
|
|
|
if (encode_return_type)
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Template functions have their return type encoded. The
|
|
|
|
return type should be inserted at start_position. */
|
|
|
|
RETURN_IF_ERROR
|
2000-09-05 03:01:12 +02:00
|
|
|
(demangle_bare_function_type (dm, &start_position));
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
|
|
|
/* Non-template functions don't have their return type
|
|
|
|
encoded. */
|
|
|
|
RETURN_IF_ERROR
|
|
|
|
(demangle_bare_function_type (dm, BFT_NO_RETURN_TYPE));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Pop off template argument lists that were built during the
|
|
|
|
mangling of this name, to restore the old template context. */
|
|
|
|
pop_to_template_arg_list (dm, old_arg_list);
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <name>.
|
|
|
|
|
|
|
|
<name> ::= <unscoped-name>
|
|
|
|
::= <unscoped-template-name> <template-args>
|
|
|
|
::= <nested-name>
|
|
|
|
::= <local-name>
|
|
|
|
|
|
|
|
<unscoped-name> ::= <unqualified-name>
|
|
|
|
::= St <unqualified-name> # ::std::
|
|
|
|
|
|
|
|
<unscoped-template-name>
|
|
|
|
::= <unscoped-name>
|
|
|
|
::= <substitution> */
|
|
|
|
|
|
|
|
static status_t
|
2000-09-06 00:37:17 +02:00
|
|
|
demangle_name (dm, encode_return_type)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-09-06 00:37:17 +02:00
|
|
|
int *encode_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
int start = substitution_start (dm);
|
2000-08-28 07:23:40 +02:00
|
|
|
char peek = peek_char (dm);
|
2000-09-05 03:01:12 +02:00
|
|
|
int is_std_substitution = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* Generally, the return type is encoded if the function is a
|
|
|
|
template-id, and suppressed otherwise. There are a few cases,
|
|
|
|
though, in which the return type is not encoded even for a
|
|
|
|
templated function. In these cases, this flag is set. */
|
|
|
|
int suppress_return_type = 0;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
DEMANGLE_TRACE ("name", dm);
|
|
|
|
|
2000-08-28 07:23:40 +02:00
|
|
|
switch (peek)
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
case 'N':
|
|
|
|
/* This is a <nested-name>. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_nested_name (dm, encode_return_type));
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'Z':
|
|
|
|
RETURN_IF_ERROR (demangle_local_name (dm));
|
2000-09-06 00:37:17 +02:00
|
|
|
*encode_return_type = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'S':
|
|
|
|
/* The `St' substitution allows a name nested in std:: to appear
|
2000-06-30 17:25:33 +02:00
|
|
|
without being enclosed in a nested name. */
|
2000-06-05 04:28:41 +02:00
|
|
|
if (peek_char_next (dm) == 't')
|
|
|
|
{
|
|
|
|
(void) next_char (dm);
|
|
|
|
(void) next_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::"));
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR
|
|
|
|
(demangle_unqualified_name (dm, &suppress_return_type));
|
2000-09-05 03:01:12 +02:00
|
|
|
is_std_substitution = 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_substitution (dm, encode_return_type));
|
2000-06-30 17:25:33 +02:00
|
|
|
/* Check if a template argument list immediately follows.
|
|
|
|
If so, then we just demangled an <unqualified-template-name>. */
|
|
|
|
if (peek_char (dm) == 'I')
|
|
|
|
{
|
2000-09-05 03:01:12 +02:00
|
|
|
/* A template name of the form std::<unqualified-name> is a
|
|
|
|
substitution candidate. */
|
|
|
|
if (is_std_substitution)
|
|
|
|
RETURN_IF_ERROR (substitution_add (dm, start, 0));
|
|
|
|
/* Demangle the <template-args> here. */
|
2000-06-30 17:25:33 +02:00
|
|
|
RETURN_IF_ERROR (demangle_template_args (dm));
|
2000-09-06 00:37:17 +02:00
|
|
|
*encode_return_type = !suppress_return_type;
|
2000-06-30 17:25:33 +02:00
|
|
|
}
|
2000-08-26 00:52:25 +02:00
|
|
|
else
|
2000-09-06 00:37:17 +02:00
|
|
|
*encode_return_type = 0;
|
2000-08-26 00:52:25 +02:00
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* This is an <unscoped-name> or <unscoped-template-name>. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_unqualified_name (dm, &suppress_return_type));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If the <unqualified-name> is followed by template args, this
|
|
|
|
is an <unscoped-template-name>. */
|
|
|
|
if (peek_char (dm) == 'I')
|
|
|
|
{
|
|
|
|
/* Add a substitution for the unqualified template name. */
|
2000-09-05 03:01:12 +02:00
|
|
|
RETURN_IF_ERROR (substitution_add (dm, start, 0));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_template_args (dm));
|
2000-09-06 00:37:17 +02:00
|
|
|
*encode_return_type = !suppress_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
2000-09-06 00:37:17 +02:00
|
|
|
*encode_return_type = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <nested-name>.
|
|
|
|
|
2000-08-28 07:23:40 +02:00
|
|
|
<nested-name> ::= N [<CV-qualifiers>] <prefix> <unqulified-name> E */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static status_t
|
2000-09-06 00:37:17 +02:00
|
|
|
demangle_nested_name (dm, encode_return_type)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-09-06 00:37:17 +02:00
|
|
|
int *encode_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
char peek;
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("nested-name", dm);
|
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'N'));
|
|
|
|
|
|
|
|
peek = peek_char (dm);
|
|
|
|
if (peek == 'r' || peek == 'V' || peek == 'K')
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
dyn_string_t cv_qualifiers;
|
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_t status;
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Snarf up CV qualifiers. */
|
|
|
|
cv_qualifiers = dyn_string_new (24);
|
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 (cv_qualifiers == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
demangle_CV_qualifiers (dm, cv_qualifiers);
|
2000-10-23 01:59:25 +02:00
|
|
|
|
|
|
|
/* Emit them, preceded by a space. */
|
|
|
|
status = result_add_char (dm, ' ');
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
status = result_add_string (dm, cv_qualifiers);
|
|
|
|
/* The CV qualifiers that occur in a <nested-name> will be
|
|
|
|
qualifiers for member functions. These are placed at the end
|
|
|
|
of the function. Therefore, shift the caret to the left by
|
|
|
|
the length of the qualifiers, so other text is inserted
|
|
|
|
before them and they stay at the end. */
|
|
|
|
result_shift_caret (dm, -dyn_string_length (cv_qualifiers) - 1);
|
|
|
|
/* Clean up. */
|
2000-06-05 04:28:41 +02:00
|
|
|
dyn_string_delete (cv_qualifiers);
|
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_IF_ERROR (status);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2000-10-23 01:59:25 +02:00
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_prefix (dm, encode_return_type));
|
2000-08-28 07:23:40 +02:00
|
|
|
/* No need to demangle the final <unqualified-name>; demangle_prefix
|
|
|
|
will handle it. */
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'E'));
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <prefix>.
|
|
|
|
|
2000-08-28 07:23:40 +02:00
|
|
|
<prefix> ::= <prefix> <unqualified-name>
|
2000-06-05 04:28:41 +02:00
|
|
|
::= <template-prefix> <template-args>
|
|
|
|
::= # empty
|
|
|
|
::= <substitution>
|
|
|
|
|
|
|
|
<template-prefix> ::= <prefix>
|
2000-08-28 07:23:40 +02:00
|
|
|
::= <substitution> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static status_t
|
2000-09-06 00:37:17 +02:00
|
|
|
demangle_prefix (dm, encode_return_type)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-09-06 00:37:17 +02:00
|
|
|
int *encode_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
int start = substitution_start (dm);
|
|
|
|
int nested = 0;
|
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* ENCODE_RETURN_TYPE is updated as we decend the nesting chain.
|
|
|
|
After <template-args>, it is set to non-zero; after everything
|
|
|
|
else it is set to zero. */
|
2000-08-23 19:03:03 +02:00
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* Generally, the return type is encoded if the function is a
|
|
|
|
template-id, and suppressed otherwise. There are a few cases,
|
|
|
|
though, in which the return type is not encoded even for a
|
|
|
|
templated function. In these cases, this flag is set. */
|
|
|
|
int suppress_return_type = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
DEMANGLE_TRACE ("prefix", dm);
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
char peek;
|
|
|
|
|
|
|
|
if (end_of_name_p (dm))
|
|
|
|
return "Unexpected end of name in <compound-name>.";
|
|
|
|
|
|
|
|
peek = peek_char (dm);
|
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* We'll initialize suppress_return_type to false, and set it to true
|
2000-08-23 19:03:03 +02:00
|
|
|
if we end up demangling a constructor name. However, make
|
|
|
|
sure we're not actually about to demangle template arguments
|
|
|
|
-- if so, this is the <template-args> following a
|
|
|
|
<template-prefix>, so we'll want the previous flag value
|
|
|
|
around. */
|
|
|
|
if (peek != 'I')
|
2000-09-06 00:37:17 +02:00
|
|
|
suppress_return_type = 0;
|
2000-08-23 19:03:03 +02: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
|
|
|
if (IS_DIGIT ((unsigned char) peek)
|
2000-06-05 04:28:41 +02:00
|
|
|
|| (peek >= 'a' && peek <= 'z')
|
|
|
|
|| peek == 'C' || peek == 'D'
|
|
|
|
|| peek == 'S')
|
|
|
|
{
|
|
|
|
/* We have another level of scope qualification. */
|
|
|
|
if (nested)
|
2001-02-02 01:27:39 +01:00
|
|
|
RETURN_IF_ERROR (result_add (dm, NAMESPACE_SEPARATOR));
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
|
|
|
nested = 1;
|
|
|
|
|
|
|
|
if (peek == 'S')
|
|
|
|
/* The substitution determines whether this is a
|
2000-08-23 19:03:03 +02:00
|
|
|
template-id. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_substitution (dm, encode_return_type));
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
|
|
|
{
|
2000-08-28 07:23:40 +02:00
|
|
|
/* It's just a name. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR
|
|
|
|
(demangle_unqualified_name (dm, &suppress_return_type));
|
|
|
|
*encode_return_type = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (peek == 'Z')
|
|
|
|
RETURN_IF_ERROR (demangle_local_name (dm));
|
|
|
|
else if (peek == 'I')
|
|
|
|
{
|
|
|
|
RETURN_IF_ERROR (demangle_template_args (dm));
|
2000-08-23 19:03:03 +02:00
|
|
|
|
|
|
|
/* Now we want to indicate to the caller that we've
|
|
|
|
demangled template arguments, thus the prefix was a
|
|
|
|
<template-prefix>. That's so that the caller knows to
|
|
|
|
demangle the function's return type, if this turns out to
|
2000-09-06 00:37:17 +02:00
|
|
|
be a function name. But, if it's a member template
|
|
|
|
constructor or a templated conversion operator, report it
|
|
|
|
as untemplated. Those never get encoded return types. */
|
|
|
|
*encode_return_type = !suppress_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else if (peek == 'E')
|
|
|
|
/* All done. */
|
|
|
|
return STATUS_OK;
|
|
|
|
else
|
|
|
|
return "Unexpected character in <compound-name>.";
|
|
|
|
|
2000-08-28 07:23:40 +02:00
|
|
|
if (peek != 'S'
|
|
|
|
&& peek_char (dm) != 'E')
|
|
|
|
/* Add a new substitution for the prefix thus far. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (substitution_add (dm, start, *encode_return_type));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* Demangles and emits an <unqualified-name>. If this
|
|
|
|
<unqualified-name> is for a special function type that should never
|
|
|
|
have its return type encoded (particularly, a constructor or
|
|
|
|
conversion operator), *SUPPRESS_RETURN_TYPE is set to 1; otherwise,
|
|
|
|
it is set to zero.
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
<unqualified-name> ::= <operator-name>
|
|
|
|
::= <special-name>
|
|
|
|
::= <source-name> */
|
|
|
|
|
|
|
|
static status_t
|
2000-09-06 00:37:17 +02:00
|
|
|
demangle_unqualified_name (dm, suppress_return_type)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-09-06 00:37:17 +02:00
|
|
|
int *suppress_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
char peek = peek_char (dm);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("unqualified-name", dm);
|
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* By default, don't force suppression of the return type (though
|
|
|
|
non-template functions still don't get a return type encoded). */
|
|
|
|
*suppress_return_type = 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
|
|
|
if (IS_DIGIT ((unsigned char) peek))
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_source_name (dm));
|
|
|
|
else if (peek >= 'a' && peek <= 'z')
|
|
|
|
{
|
|
|
|
int num_args;
|
2000-09-06 00:37:17 +02:00
|
|
|
|
|
|
|
/* Conversion operators never have a return type encoded. */
|
|
|
|
if (peek == 'c' && peek_char_next (dm) == 'v')
|
|
|
|
*suppress_return_type = 1;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_operator_name (dm, 0, &num_args));
|
|
|
|
}
|
|
|
|
else if (peek == 'C' || peek == 'D')
|
2000-09-06 00:37:17 +02:00
|
|
|
{
|
|
|
|
/* Constructors never have a return type encoded. */
|
|
|
|
if (peek == 'C')
|
|
|
|
*suppress_return_type = 1;
|
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_ctor_dtor_name (dm));
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
|
|
|
return "Unexpected character in <unqualified-name>.";
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits <source-name>.
|
|
|
|
|
|
|
|
<source-name> ::= <length number> <identifier> */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_source_name (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
int length;
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("source-name", dm);
|
|
|
|
|
|
|
|
/* Decode the length of the identifier. */
|
|
|
|
RETURN_IF_ERROR (demangle_number (dm, &length, 10, 0));
|
|
|
|
if (length == 0)
|
|
|
|
return "Zero length in <source-name>.";
|
|
|
|
|
|
|
|
/* Now the identifier itself. It's placed into last_source_name,
|
|
|
|
where it can be used to build a constructor or destructor name. */
|
|
|
|
RETURN_IF_ERROR (demangle_identifier (dm, length,
|
|
|
|
dm->last_source_name));
|
|
|
|
|
|
|
|
/* Emit it. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_string (dm, dm->last_source_name));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles a number, either a <number> or a <positive-number> at the
|
|
|
|
current position, consuming all consecutive digit characters. Sets
|
|
|
|
*VALUE to the resulting numberand returns STATUS_OK. The number is
|
|
|
|
interpreted as BASE, which must be either 10 or 36. If IS_SIGNED
|
|
|
|
is non-zero, negative numbers -- prefixed with `n' -- are accepted.
|
|
|
|
|
|
|
|
<number> ::= [n] <positive-number>
|
|
|
|
|
|
|
|
<positive-number> ::= <decimal integer> */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_number (dm, value, base, is_signed)
|
|
|
|
demangling_t dm;
|
|
|
|
int *value;
|
|
|
|
int base;
|
|
|
|
int is_signed;
|
|
|
|
{
|
|
|
|
dyn_string_t number = dyn_string_new (10);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("number", dm);
|
|
|
|
|
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 (number == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
demangle_number_literally (dm, number, base, is_signed);
|
|
|
|
*value = strtol (dyn_string_buf (number), NULL, base);
|
|
|
|
dyn_string_delete (number);
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles a number at the current position. The digits (and minus
|
|
|
|
sign, if present) that make up the number are appended to STR.
|
|
|
|
Only base-BASE digits are accepted; BASE must be either 10 or 36.
|
|
|
|
If IS_SIGNED, negative numbers -- prefixed with `n' -- are
|
|
|
|
accepted. Does not consume a trailing underscore or other
|
|
|
|
terminating character. */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_number_literally (dm, str, base, is_signed)
|
|
|
|
demangling_t dm;
|
|
|
|
dyn_string_t str;
|
|
|
|
int base;
|
|
|
|
int is_signed;
|
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("number*", dm);
|
|
|
|
|
|
|
|
if (base != 10 && base != 36)
|
|
|
|
return STATUS_INTERNAL_ERROR;
|
|
|
|
|
|
|
|
/* An `n' denotes a negative number. */
|
|
|
|
if (is_signed && peek_char (dm) == 'n')
|
|
|
|
{
|
|
|
|
/* Skip past the n. */
|
|
|
|
advance_char (dm);
|
|
|
|
/* The normal way to write a negative number is with a minus
|
|
|
|
sign. */
|
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 (!dyn_string_append_char (str, '-'))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Loop until we hit a non-digit. */
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
char peek = peek_char (dm);
|
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 (IS_DIGIT ((unsigned char) peek)
|
2000-06-05 04:28:41 +02:00
|
|
|
|| (base == 36 && peek >= 'A' && peek <= 'Z'))
|
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
|
|
|
{
|
|
|
|
/* Accumulate digits. */
|
|
|
|
if (!dyn_string_append_char (str, next_char (dm)))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
|
|
|
/* Not a digit? All done. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles an identifier at the current position of LENGTH
|
|
|
|
characters and places it in IDENTIFIER. */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_identifier (dm, length, identifier)
|
|
|
|
demangling_t dm;
|
|
|
|
int length;
|
|
|
|
dyn_string_t identifier;
|
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("identifier", dm);
|
|
|
|
|
|
|
|
dyn_string_clear (identifier);
|
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 (!dyn_string_resize (identifier, length))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
while (length-- > 0)
|
|
|
|
{
|
|
|
|
if (end_of_name_p (dm))
|
|
|
|
return "Unexpected end of name in <identifier>.";
|
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 (!dyn_string_append_char (identifier, next_char (dm)))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* GCC encodes anonymous namespaces using a `_GLOBAL_[_.$]N.'
|
|
|
|
followed by the source file name and some random characters.
|
|
|
|
Unless we're in strict mode, decipher these names appropriately. */
|
|
|
|
if (!flag_strict)
|
|
|
|
{
|
|
|
|
char *name = dyn_string_buf (identifier);
|
|
|
|
int prefix_length = strlen (ANONYMOUS_NAMESPACE_PREFIX);
|
|
|
|
|
|
|
|
/* Compare the first, fixed part. */
|
|
|
|
if (strncmp (name, ANONYMOUS_NAMESPACE_PREFIX, prefix_length) == 0)
|
|
|
|
{
|
|
|
|
name += prefix_length;
|
|
|
|
/* The next character might be a period, an underscore, or
|
|
|
|
dollar sign, depending on the target architecture's
|
|
|
|
assembler's capabilities. After that comes an `N'. */
|
|
|
|
if ((*name == '.' || *name == '_' || *name == '$')
|
|
|
|
&& *(name + 1) == 'N')
|
|
|
|
/* This looks like the anonymous namespace identifier.
|
|
|
|
Replace it with something comprehensible. */
|
|
|
|
dyn_string_copy_cstr (identifier, "(anonymous namespace)");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits an <operator-name>. If SHORT_NAME is non-zero,
|
|
|
|
the short form is emitted; otherwise the full source form
|
|
|
|
(`operator +' etc.) is emitted. *NUM_ARGS is set to the number of
|
|
|
|
operands that the operator takes.
|
|
|
|
|
|
|
|
<operator-name>
|
|
|
|
::= nw # new
|
|
|
|
::= na # new[]
|
|
|
|
::= dl # delete
|
|
|
|
::= da # delete[]
|
|
|
|
::= ps # + (unary)
|
|
|
|
::= ng # - (unary)
|
|
|
|
::= ad # & (unary)
|
|
|
|
::= de # * (unary)
|
|
|
|
::= co # ~
|
|
|
|
::= pl # +
|
|
|
|
::= mi # -
|
|
|
|
::= ml # *
|
|
|
|
::= dv # /
|
|
|
|
::= rm # %
|
|
|
|
::= an # &
|
|
|
|
::= or # |
|
|
|
|
::= eo # ^
|
|
|
|
::= aS # =
|
|
|
|
::= pL # +=
|
|
|
|
::= mI # -=
|
|
|
|
::= mL # *=
|
|
|
|
::= dV # /=
|
|
|
|
::= rM # %=
|
|
|
|
::= aN # &=
|
|
|
|
::= oR # |=
|
|
|
|
::= eO # ^=
|
|
|
|
::= ls # <<
|
|
|
|
::= rs # >>
|
|
|
|
::= lS # <<=
|
|
|
|
::= rS # >>=
|
|
|
|
::= eq # ==
|
|
|
|
::= ne # !=
|
|
|
|
::= lt # <
|
|
|
|
::= gt # >
|
|
|
|
::= le # <=
|
|
|
|
::= ge # >=
|
|
|
|
::= nt # !
|
|
|
|
::= aa # &&
|
|
|
|
::= oo # ||
|
|
|
|
::= pp # ++
|
|
|
|
::= mm # --
|
|
|
|
::= cm # ,
|
|
|
|
::= pm # ->*
|
|
|
|
::= pt # ->
|
|
|
|
::= cl # ()
|
|
|
|
::= ix # []
|
|
|
|
::= qu # ?
|
|
|
|
::= sz # sizeof
|
|
|
|
::= cv <type> # cast
|
2000-09-05 03:01:12 +02:00
|
|
|
::= v [0-9] <source-name> # vendor extended operator */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_operator_name (dm, short_name, num_args)
|
|
|
|
demangling_t dm;
|
|
|
|
int short_name;
|
|
|
|
int *num_args;
|
|
|
|
{
|
|
|
|
struct operator_code
|
|
|
|
{
|
|
|
|
/* The mangled code for this operator. */
|
2001-10-07 16:45:04 +02:00
|
|
|
const char *const code;
|
2000-06-05 04:28:41 +02:00
|
|
|
/* The source name of this operator. */
|
2001-10-07 16:45:04 +02:00
|
|
|
const char *const name;
|
2000-06-05 04:28:41 +02:00
|
|
|
/* The number of arguments this operator takes. */
|
2001-10-07 16:45:04 +02:00
|
|
|
const int num_args;
|
2000-06-05 04:28:41 +02:00
|
|
|
};
|
|
|
|
|
2000-06-07 22:35:43 +02:00
|
|
|
static const struct operator_code operators[] =
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
{ "aN", "&=" , 2 },
|
|
|
|
{ "aS", "=" , 2 },
|
|
|
|
{ "aa", "&&" , 2 },
|
|
|
|
{ "ad", "&" , 1 },
|
|
|
|
{ "an", "&" , 2 },
|
|
|
|
{ "cl", "()" , 0 },
|
|
|
|
{ "cm", "," , 2 },
|
|
|
|
{ "co", "~" , 1 },
|
|
|
|
{ "dV", "/=" , 2 },
|
2000-06-09 20:55:36 +02:00
|
|
|
{ "da", " delete[]", 1 },
|
2000-06-05 04:28:41 +02:00
|
|
|
{ "de", "*" , 1 },
|
2000-06-09 20:55:36 +02:00
|
|
|
{ "dl", " delete" , 1 },
|
2000-06-05 04:28:41 +02:00
|
|
|
{ "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 },
|
2000-06-09 20:55:36 +02:00
|
|
|
{ "na", " new[]" , 1 },
|
2000-06-05 04:28:41 +02:00
|
|
|
{ "ne", "!=" , 2 },
|
|
|
|
{ "ng", "-" , 1 },
|
|
|
|
{ "nt", "!" , 1 },
|
2000-06-09 20:55:36 +02:00
|
|
|
{ "nw", " new" , 1 },
|
2000-06-05 04:28:41 +02:00
|
|
|
{ "oR", "|=" , 2 },
|
|
|
|
{ "oo", "||" , 2 },
|
|
|
|
{ "or", "|" , 2 },
|
|
|
|
{ "pL", "+=" , 2 },
|
|
|
|
{ "pl", "+" , 2 },
|
|
|
|
{ "pm", "->*" , 2 },
|
|
|
|
{ "pp", "++" , 1 },
|
|
|
|
{ "ps", "+" , 1 },
|
2000-08-26 00:52:25 +02:00
|
|
|
{ "pt", "->" , 2 },
|
2000-06-05 04:28:41 +02:00
|
|
|
{ "qu", "?" , 3 },
|
|
|
|
{ "rM", "%=" , 2 },
|
|
|
|
{ "rS", ">>=" , 2 },
|
|
|
|
{ "rm", "%" , 2 },
|
|
|
|
{ "rs", ">>" , 2 },
|
2000-06-09 20:55:36 +02:00
|
|
|
{ "sz", " sizeof" , 1 }
|
2000-06-05 04:28:41 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
const int num_operators =
|
|
|
|
sizeof (operators) / sizeof (struct operator_code);
|
|
|
|
|
|
|
|
int c0 = next_char (dm);
|
|
|
|
int c1 = next_char (dm);
|
2000-06-07 22:35:43 +02:00
|
|
|
const struct operator_code* p1 = operators;
|
|
|
|
const struct operator_code* p2 = operators + num_operators;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
DEMANGLE_TRACE ("operator-name", dm);
|
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Is this a vendor-extended operator? */
|
|
|
|
if (c0 == 'v' && IS_DIGIT (c1))
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "operator "));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_source_name (dm));
|
|
|
|
*num_args = 0;
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Is this a conversion operator? */
|
|
|
|
if (c0 == 'c' && c1 == 'v')
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "operator "));
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangle the converted-to type. */
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
*num_args = 0;
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Perform a binary search for the operator code. */
|
|
|
|
while (1)
|
|
|
|
{
|
2000-06-07 22:35:43 +02:00
|
|
|
const struct operator_code* p = p1 + (p2 - p1) / 2;
|
2000-06-05 04:28:41 +02:00
|
|
|
char match0 = p->code[0];
|
|
|
|
char match1 = p->code[1];
|
|
|
|
|
|
|
|
if (c0 == match0 && c1 == match1)
|
|
|
|
/* Found it. */
|
|
|
|
{
|
|
|
|
if (!short_name)
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "operator"));
|
|
|
|
RETURN_IF_ERROR (result_add (dm, p->name));
|
2000-06-05 04:28:41 +02:00
|
|
|
*num_args = p->num_args;
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p == p1)
|
|
|
|
/* Couldn't find it. */
|
|
|
|
return "Unknown code in <operator-name>.";
|
|
|
|
|
|
|
|
/* Try again. */
|
|
|
|
if (c0 < match0 || (c0 == match0 && c1 < match1))
|
|
|
|
p2 = p;
|
|
|
|
else
|
|
|
|
p1 = p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-05 05:07:14 +02:00
|
|
|
/* Demangles and omits an <nv-offset>.
|
|
|
|
|
|
|
|
<nv-offset> ::= <offset number> # non-virtual base override */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_nv_offset (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
dyn_string_t number;
|
|
|
|
status_t status = STATUS_OK;
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("h-offset", dm);
|
|
|
|
|
|
|
|
/* Demangle the offset. */
|
|
|
|
number = dyn_string_new (4);
|
|
|
|
if (number == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
demangle_number_literally (dm, number, 10, 1);
|
|
|
|
|
|
|
|
/* Don't display the offset unless in verbose mode. */
|
|
|
|
if (flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add (dm, " [nv:");
|
2000-09-05 05:07:14 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, number);
|
2000-09-05 05:07:14 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, ']');
|
2000-09-05 05:07:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up. */
|
|
|
|
dyn_string_delete (number);
|
|
|
|
RETURN_IF_ERROR (status);
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <v-offset>.
|
|
|
|
|
|
|
|
<v-offset> ::= <offset number> _ <virtual offset number>
|
|
|
|
# virtual base override, with vcall offset */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_v_offset (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
dyn_string_t number;
|
|
|
|
status_t status = STATUS_OK;
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("v-offset", dm);
|
|
|
|
|
|
|
|
/* Demangle the offset. */
|
|
|
|
number = dyn_string_new (4);
|
|
|
|
if (number == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
demangle_number_literally (dm, number, 10, 1);
|
|
|
|
|
|
|
|
/* Don't display the offset unless in verbose mode. */
|
|
|
|
if (flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add (dm, " [v:");
|
2000-09-05 05:07:14 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, number);
|
2000-09-05 05:07:14 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
result_add_char (dm, ',');
|
2000-09-05 05:07:14 +02:00
|
|
|
}
|
|
|
|
dyn_string_delete (number);
|
|
|
|
RETURN_IF_ERROR (status);
|
|
|
|
|
|
|
|
/* Demangle the separator. */
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
|
|
|
|
/* Demangle the vcall offset. */
|
|
|
|
number = dyn_string_new (4);
|
|
|
|
if (number == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
demangle_number_literally (dm, number, 10, 1);
|
|
|
|
|
|
|
|
/* Don't display the vcall offset unless in verbose mode. */
|
|
|
|
if (flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, number);
|
2000-09-05 05:07:14 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, ']');
|
2000-09-05 05:07:14 +02:00
|
|
|
}
|
|
|
|
dyn_string_delete (number);
|
|
|
|
RETURN_IF_ERROR (status);
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <call-offset>.
|
|
|
|
|
|
|
|
<call-offset> ::= h <nv-offset> _
|
|
|
|
::= v <v-offset> _ */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_call_offset (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("call-offset", dm);
|
|
|
|
|
|
|
|
switch (peek_char (dm))
|
|
|
|
{
|
|
|
|
case 'h':
|
|
|
|
advance_char (dm);
|
|
|
|
/* Demangle the offset. */
|
|
|
|
RETURN_IF_ERROR (demangle_nv_offset (dm));
|
|
|
|
/* Demangle the separator. */
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'v':
|
|
|
|
advance_char (dm);
|
|
|
|
/* Demangle the offset. */
|
|
|
|
RETURN_IF_ERROR (demangle_v_offset (dm));
|
|
|
|
/* Demangle the separator. */
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return "Unrecognized <call-offset>.";
|
|
|
|
}
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangles and emits a <special-name>.
|
|
|
|
|
|
|
|
<special-name> ::= GV <object name> # Guard variable
|
|
|
|
::= TV <type> # virtual table
|
|
|
|
::= TT <type> # VTT
|
|
|
|
::= TI <type> # typeinfo structure
|
|
|
|
::= TS <type> # typeinfo name
|
|
|
|
|
2000-09-05 05:07:14 +02:00
|
|
|
Other relevant productions include thunks:
|
|
|
|
|
|
|
|
<special-name> ::= T <call-offset> <base encoding>
|
|
|
|
# base is the nominal target function of thunk
|
|
|
|
|
|
|
|
<special-name> ::= Tc <call-offset> <call-offset> <base encoding>
|
|
|
|
# base is the nominal target function of thunk
|
|
|
|
# first call-offset is 'this' adjustment
|
|
|
|
# second call-offset is result adjustment
|
|
|
|
|
|
|
|
where
|
|
|
|
|
|
|
|
<call-offset> ::= h <nv-offset> _
|
|
|
|
::= v <v-offset> _
|
|
|
|
|
2000-06-09 20:55:36 +02:00
|
|
|
Also demangles the special g++ manglings,
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
<special-name> ::= TC <type> <offset number> _ <base type>
|
2000-06-09 20:55:36 +02:00
|
|
|
# construction vtable
|
|
|
|
::= TF <type> # typeinfo function (old ABI only)
|
|
|
|
::= TJ <type> # java Class structure */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_special_name (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
dyn_string_t number;
|
|
|
|
int unused;
|
|
|
|
char peek = peek_char (dm);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("special-name", dm);
|
|
|
|
|
|
|
|
if (peek == 'G')
|
|
|
|
{
|
2001-08-07 18:15:04 +02:00
|
|
|
/* Consume the G. */
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
2001-08-07 18:15:04 +02:00
|
|
|
switch (peek_char (dm))
|
|
|
|
{
|
|
|
|
case 'V':
|
|
|
|
/* A guard variable name. */
|
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (result_add (dm, "guard variable for "));
|
|
|
|
RETURN_IF_ERROR (demangle_name (dm, &unused));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'R':
|
|
|
|
/* A reference temporary. */
|
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (result_add (dm, "reference temporary for "));
|
|
|
|
RETURN_IF_ERROR (demangle_name (dm, &unused));
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return "Unrecognized <special-name>.";
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else if (peek == '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
|
|
|
status_t status = STATUS_OK;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Other C++ implementation miscellania. Consume the T. */
|
|
|
|
advance_char (dm);
|
|
|
|
|
|
|
|
switch (peek_char (dm))
|
|
|
|
{
|
|
|
|
case 'V':
|
|
|
|
/* Virtual table. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "vtable for "));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'T':
|
|
|
|
/* VTT structure. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "VTT for "));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'I':
|
|
|
|
/* Typeinfo structure. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "typeinfo for "));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
2000-06-09 20:55:36 +02:00
|
|
|
case 'F':
|
|
|
|
/* Typeinfo function. Used only in old ABI with new mangling. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "typeinfo fn for "));
|
2000-06-09 20:55:36 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
case 'S':
|
|
|
|
/* Character string containing type name, used in typeinfo. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "typeinfo name for "));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
2000-06-09 20:55:36 +02:00
|
|
|
case 'J':
|
|
|
|
/* The java Class variable corresponding to a C++ class. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "java Class for "));
|
2000-06-09 20:55:36 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
case 'h':
|
|
|
|
/* Non-virtual thunk. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "non-virtual thunk"));
|
2000-09-05 05:07:14 +02:00
|
|
|
RETURN_IF_ERROR (demangle_nv_offset (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangle the separator. */
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
/* Demangle and emit the target name and function type. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, " to "));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_encoding (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'v':
|
|
|
|
/* Virtual thunk. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "virtual thunk"));
|
2000-09-05 05:07:14 +02:00
|
|
|
RETURN_IF_ERROR (demangle_v_offset (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangle the separator. */
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
/* Demangle and emit the target function. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, " to "));
|
2000-09-05 05:07:14 +02:00
|
|
|
RETURN_IF_ERROR (demangle_encoding (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'c':
|
|
|
|
/* Covariant return thunk. */
|
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "covariant return thunk"));
|
2000-09-05 05:07:14 +02:00
|
|
|
RETURN_IF_ERROR (demangle_call_offset (dm));
|
|
|
|
RETURN_IF_ERROR (demangle_call_offset (dm));
|
|
|
|
/* Demangle and emit the target function. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, " to "));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_encoding (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'C':
|
|
|
|
/* TC is a special g++ mangling for a construction vtable. */
|
|
|
|
if (!flag_strict)
|
|
|
|
{
|
2000-06-28 08:08:27 +02:00
|
|
|
dyn_string_t derived_type;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "construction vtable for "));
|
2000-06-28 08:08:27 +02:00
|
|
|
|
|
|
|
/* Demangle the derived type off to the side. */
|
|
|
|
RETURN_IF_ERROR (result_push (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
2000-06-28 08:08:27 +02:00
|
|
|
derived_type = (dyn_string_t) result_pop (dm);
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangle the offset. */
|
|
|
|
number = dyn_string_new (4);
|
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 (number == NULL)
|
2000-06-28 08:08:27 +02:00
|
|
|
{
|
|
|
|
dyn_string_delete (derived_type);
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
demangle_number_literally (dm, number, 10, 1);
|
|
|
|
/* Demangle the underscore separator. */
|
2000-06-28 08:08:27 +02:00
|
|
|
status = demangle_char (dm, '_');
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangle the base type. */
|
2000-06-28 08:08:27 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
status = demangle_type (dm);
|
|
|
|
|
|
|
|
/* Emit the derived type. */
|
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add (dm, "-in-");
|
2000-06-28 08:08:27 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, derived_type);
|
2000-06-28 08:08:27 +02:00
|
|
|
dyn_string_delete (derived_type);
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Don't display the offset unless in verbose mode. */
|
|
|
|
if (flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, ' ');
|
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_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
result_add_string (dm, number);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
dyn_string_delete (number);
|
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_IF_ERROR (status);
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* If flag_strict, fall through. */
|
|
|
|
|
|
|
|
default:
|
|
|
|
return "Unrecognized <special-name>.";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return STATUS_ERROR;
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <ctor-dtor-name>.
|
|
|
|
|
|
|
|
<ctor-dtor-name>
|
|
|
|
::= C1 # complete object (in-charge) ctor
|
|
|
|
::= C2 # base object (not-in-charge) ctor
|
|
|
|
::= C3 # complete object (in-charge) allocating ctor
|
|
|
|
::= D0 # deleting (in-charge) dtor
|
|
|
|
::= D1 # complete object (in-charge) dtor
|
|
|
|
::= D2 # base object (not-in-charge) dtor */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_ctor_dtor_name (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
static const char *const ctor_flavors[] =
|
|
|
|
{
|
|
|
|
"in-charge",
|
|
|
|
"not-in-charge",
|
2000-07-23 19:55:13 +02:00
|
|
|
"allocating"
|
2000-06-05 04:28:41 +02:00
|
|
|
};
|
|
|
|
static const char *const dtor_flavors[] =
|
|
|
|
{
|
|
|
|
"in-charge deleting",
|
|
|
|
"in-charge",
|
|
|
|
"not-in-charge"
|
|
|
|
};
|
|
|
|
|
|
|
|
int flavor;
|
|
|
|
char peek = peek_char (dm);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("ctor-dtor-name", dm);
|
|
|
|
|
|
|
|
if (peek == 'C')
|
|
|
|
{
|
|
|
|
/* A constructor name. Consume the C. */
|
|
|
|
advance_char (dm);
|
2001-03-21 21:01:40 +01:00
|
|
|
flavor = next_char (dm);
|
|
|
|
if (flavor < '1' || flavor > '3')
|
2000-06-05 04:28:41 +02:00
|
|
|
return "Unrecognized constructor.";
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_string (dm, dm->last_source_name));
|
2001-03-21 21:01:40 +01:00
|
|
|
switch (flavor)
|
|
|
|
{
|
|
|
|
case '1': dm->is_constructor = gnu_v3_complete_object_ctor;
|
|
|
|
break;
|
|
|
|
case '2': dm->is_constructor = gnu_v3_base_object_ctor;
|
|
|
|
break;
|
|
|
|
case '3': dm->is_constructor = gnu_v3_complete_object_allocating_ctor;
|
|
|
|
break;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Print the flavor of the constructor if in verbose mode. */
|
|
|
|
if (flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "["));
|
2001-03-21 21:01:40 +01:00
|
|
|
RETURN_IF_ERROR (result_add (dm, ctor_flavors[flavor - '1']));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ']'));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (peek == 'D')
|
|
|
|
{
|
|
|
|
/* A destructor name. Consume the D. */
|
|
|
|
advance_char (dm);
|
2001-03-21 21:01:40 +01:00
|
|
|
flavor = next_char (dm);
|
|
|
|
if (flavor < '0' || flavor > '2')
|
2000-06-05 04:28:41 +02:00
|
|
|
return "Unrecognized destructor.";
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, '~'));
|
|
|
|
RETURN_IF_ERROR (result_add_string (dm, dm->last_source_name));
|
2001-03-21 21:01:40 +01:00
|
|
|
switch (flavor)
|
|
|
|
{
|
|
|
|
case '0': dm->is_destructor = gnu_v3_deleting_dtor;
|
|
|
|
break;
|
|
|
|
case '1': dm->is_destructor = gnu_v3_complete_object_dtor;
|
|
|
|
break;
|
|
|
|
case '2': dm->is_destructor = gnu_v3_base_object_dtor;
|
|
|
|
break;
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Print the flavor of the destructor if in verbose mode. */
|
|
|
|
if (flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, " ["));
|
2001-03-21 21:01:40 +01:00
|
|
|
RETURN_IF_ERROR (result_add (dm, dtor_flavors[flavor - '0']));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ']'));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return STATUS_ERROR;
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle pointer, reference, and pointer-to-member cases for
|
|
|
|
demangle_type. All consecutive `P's, `R's, and 'M's are joined to
|
|
|
|
build a pointer/reference type. We snarf all these, plus the
|
|
|
|
following <type>, all at once since we need to know whether we have
|
|
|
|
a pointer to data or pointer to function to construct the right
|
|
|
|
output syntax. C++'s pointer syntax is hairy.
|
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
This function adds substitution candidates for every nested
|
|
|
|
pointer/reference type it processes, including the outermost, final
|
|
|
|
type, assuming the substitution starts at SUBSTITUTION_START in the
|
|
|
|
demangling result. For example, if this function demangles
|
|
|
|
`PP3Foo', it will add a substitution for `Foo', `Foo*', and
|
|
|
|
`Foo**', in that order.
|
|
|
|
|
|
|
|
*INSERT_POS is a quantity used internally, when this function calls
|
|
|
|
itself recursively, to figure out where to insert pointer
|
|
|
|
punctuation on the way up. On entry to this function, INSERT_POS
|
|
|
|
should point to a temporary value, but that value need not be
|
|
|
|
initialized.
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
<type> ::= P <type>
|
|
|
|
::= R <type>
|
|
|
|
::= <pointer-to-member-type>
|
|
|
|
|
|
|
|
<pointer-to-member-type> ::= M </class/ type> </member/ type> */
|
|
|
|
|
|
|
|
static status_t
|
2000-09-05 03:01:12 +02:00
|
|
|
demangle_type_ptr (dm, insert_pos, substitution_start)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-09-05 03:01:12 +02:00
|
|
|
int *insert_pos;
|
|
|
|
int substitution_start;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
status_t status;
|
2000-09-05 03:01:12 +02:00
|
|
|
int is_substitution_candidate = 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
DEMANGLE_TRACE ("type*", dm);
|
|
|
|
|
|
|
|
/* Scan forward, collecting pointers and references into symbols,
|
|
|
|
until we hit something else. Then emit the type. */
|
2000-10-23 01:59:25 +02:00
|
|
|
switch (peek_char (dm))
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
case 'P':
|
2000-09-05 03:01:12 +02:00
|
|
|
/* A pointer. Snarf the `P'. */
|
|
|
|
advance_char (dm);
|
|
|
|
/* Demangle the underlying type. */
|
|
|
|
RETURN_IF_ERROR (demangle_type_ptr (dm, insert_pos,
|
|
|
|
substitution_start));
|
|
|
|
/* Insert an asterisk where we're told to; it doesn't
|
2001-02-02 01:27:39 +01:00
|
|
|
necessarily go at the end. If we're doing Java style output,
|
|
|
|
there is no pointer symbol. */
|
|
|
|
if (dm->style != DMGL_JAVA)
|
|
|
|
RETURN_IF_ERROR (result_insert_char (dm, *insert_pos, '*'));
|
2000-09-05 05:46:56 +02:00
|
|
|
/* The next (outermost) pointer or reference character should go
|
|
|
|
after this one. */
|
|
|
|
++(*insert_pos);
|
2000-10-23 01:59:25 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'R':
|
2000-09-05 03:01:12 +02:00
|
|
|
/* A reference. Snarf the `R'. */
|
|
|
|
advance_char (dm);
|
|
|
|
/* Demangle the underlying type. */
|
|
|
|
RETURN_IF_ERROR (demangle_type_ptr (dm, insert_pos,
|
|
|
|
substitution_start));
|
|
|
|
/* Insert an ampersand where we're told to; it doesn't
|
|
|
|
necessarily go at the end. */
|
|
|
|
RETURN_IF_ERROR (result_insert_char (dm, *insert_pos, '&'));
|
2000-09-05 05:46:56 +02:00
|
|
|
/* The next (outermost) pointer or reference character should go
|
|
|
|
after this one. */
|
|
|
|
++(*insert_pos);
|
2000-10-23 01:59:25 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'M':
|
2000-09-05 03:01:12 +02:00
|
|
|
{
|
|
|
|
/* A pointer-to-member. */
|
|
|
|
dyn_string_t class_type;
|
|
|
|
|
|
|
|
/* Eat the 'M'. */
|
|
|
|
advance_char (dm);
|
|
|
|
|
|
|
|
/* Capture the type of which this is a pointer-to-member. */
|
|
|
|
RETURN_IF_ERROR (result_push (dm));
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
class_type = (dyn_string_t) result_pop (dm);
|
|
|
|
|
|
|
|
if (peek_char (dm) == 'F')
|
|
|
|
/* A pointer-to-member function. We want output along the
|
|
|
|
lines of `void (C::*) (int, int)'. Demangle the function
|
|
|
|
type, which would in this case give `void () (int, int)'
|
|
|
|
and set *insert_pos to the spot between the first
|
|
|
|
parentheses. */
|
|
|
|
status = demangle_type_ptr (dm, insert_pos, substitution_start);
|
2000-10-23 01:59:25 +02:00
|
|
|
else if (peek_char (dm) == 'A')
|
|
|
|
/* A pointer-to-member array variable. We want output that
|
|
|
|
looks like `int (Klass::*) [10]'. Demangle the array type
|
|
|
|
as `int () [10]', and set *insert_pos to the spot between
|
|
|
|
the parentheses. */
|
|
|
|
status = demangle_array_type (dm, insert_pos);
|
2000-09-05 03:01:12 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* A pointer-to-member variable. Demangle the type of the
|
|
|
|
pointed-to member. */
|
2000-06-05 04:28:41 +02:00
|
|
|
status = demangle_type (dm);
|
|
|
|
/* Make it pretty. */
|
2000-10-23 01:59:25 +02:00
|
|
|
if (STATUS_NO_ERROR (status)
|
|
|
|
&& !result_previous_char_is_space (dm))
|
|
|
|
status = result_add_char (dm, ' ');
|
2000-09-05 03:01:12 +02:00
|
|
|
/* The pointer-to-member notation (e.g. `C::*') follows the
|
|
|
|
member's type. */
|
2000-10-23 01:59:25 +02:00
|
|
|
*insert_pos = result_caret_pos (dm);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Build the pointer-to-member notation. */
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
status = result_insert (dm, *insert_pos, "::*");
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
status = result_insert_string (dm, *insert_pos, class_type);
|
|
|
|
/* There may be additional levels of (pointer or reference)
|
|
|
|
indirection in this type. If so, the `*' and `&' should be
|
|
|
|
added after the pointer-to-member notation (e.g. `C::*&' for
|
|
|
|
a reference to a pointer-to-member of class C). */
|
|
|
|
*insert_pos += dyn_string_length (class_type) + 3;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Clean up. */
|
|
|
|
dyn_string_delete (class_type);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
RETURN_IF_ERROR (status);
|
|
|
|
}
|
2000-10-23 01:59:25 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'F':
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Ooh, tricky, a pointer-to-function. When we demangle the
|
|
|
|
function type, the return type should go at the very
|
|
|
|
beginning. */
|
2000-10-23 01:59:25 +02:00
|
|
|
*insert_pos = result_caret_pos (dm);
|
2000-09-05 03:01:12 +02:00
|
|
|
/* The parentheses indicate this is a function pointer or
|
|
|
|
reference type. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "()"));
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Now demangle the function type. The return type will be
|
|
|
|
inserted before the `()', and the argument list will go after
|
|
|
|
it. */
|
|
|
|
RETURN_IF_ERROR (demangle_function_type (dm, insert_pos));
|
|
|
|
/* We should now have something along the lines of
|
|
|
|
`void () (int, int)'. The pointer or reference characters
|
|
|
|
have to inside the first set of parentheses. *insert_pos has
|
|
|
|
already been updated to point past the end of the return
|
|
|
|
type. Move it one character over so it points inside the
|
|
|
|
`()'. */
|
|
|
|
++(*insert_pos);
|
2000-10-23 01:59:25 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'A':
|
|
|
|
/* An array pointer or reference. demangle_array_type will figure
|
|
|
|
out where the asterisks and ampersands go. */
|
|
|
|
RETURN_IF_ERROR (demangle_array_type (dm, insert_pos));
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2000-09-05 03:01:12 +02:00
|
|
|
/* No more pointer or reference tokens; this is therefore a
|
|
|
|
pointer to data. Finish up by demangling the underlying
|
|
|
|
type. */
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
/* The pointer or reference characters follow the underlying
|
|
|
|
type, as in `int*&'. */
|
2000-10-23 01:59:25 +02:00
|
|
|
*insert_pos = result_caret_pos (dm);
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Because of the production <type> ::= <substitution>,
|
|
|
|
demangle_type will already have added the underlying type as
|
|
|
|
a substitution candidate. Don't do it again. */
|
|
|
|
is_substitution_candidate = 0;
|
2000-10-23 01:59:25 +02:00
|
|
|
break;
|
2000-09-05 03:01:12 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (is_substitution_candidate)
|
|
|
|
RETURN_IF_ERROR (substitution_add (dm, substitution_start, 0));
|
|
|
|
|
|
|
|
return STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <type>.
|
|
|
|
|
|
|
|
<type> ::= <builtin-type>
|
|
|
|
::= <function-type>
|
|
|
|
::= <class-enum-type>
|
|
|
|
::= <array-type>
|
|
|
|
::= <pointer-to-member-type>
|
|
|
|
::= <template-param>
|
2000-08-26 00:52:25 +02:00
|
|
|
::= <template-template-param> <template-args>
|
2000-06-05 04:28:41 +02:00
|
|
|
::= <CV-qualifiers> <type>
|
|
|
|
::= P <type> # pointer-to
|
|
|
|
::= R <type> # reference-to
|
|
|
|
::= C <type> # complex pair (C 2000)
|
|
|
|
::= G <type> # imaginary (C 2000)
|
|
|
|
::= U <source-name> <type> # vendor extended type qualifier
|
|
|
|
::= <substitution> */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_type (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
int start = substitution_start (dm);
|
|
|
|
char peek = peek_char (dm);
|
2000-06-30 17:25:33 +02:00
|
|
|
char peek_next;
|
2000-09-06 00:37:17 +02:00
|
|
|
int encode_return_type = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
template_arg_list_t old_arg_list = current_template_arg_list (dm);
|
2000-09-05 03:01:12 +02:00
|
|
|
int insert_pos;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-08-26 00:52:25 +02:00
|
|
|
/* A <type> can be a <substitution>; therefore, this <type> is a
|
|
|
|
substitution candidate unless a special condition holds (see
|
|
|
|
below). */
|
|
|
|
int is_substitution_candidate = 1;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
DEMANGLE_TRACE ("type", dm);
|
|
|
|
|
|
|
|
/* A <class-enum-type> can start with a digit (a <source-name>), an
|
|
|
|
N (a <nested-name>), or a Z (a <local-name>). */
|
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 (IS_DIGIT ((unsigned char) peek) || peek == 'N' || peek == 'Z')
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_class_enum_type (dm, &encode_return_type));
|
2000-08-26 00:52:25 +02:00
|
|
|
/* Lower-case letters begin <builtin-type>s, except for `r', which
|
|
|
|
denotes restrict. */
|
|
|
|
else if (peek >= 'a' && peek <= 'z' && peek != 'r')
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
RETURN_IF_ERROR (demangle_builtin_type (dm));
|
2000-08-26 00:52:25 +02:00
|
|
|
/* Built-in types are not substitution candidates. */
|
|
|
|
is_substitution_candidate = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
switch (peek)
|
|
|
|
{
|
|
|
|
case 'r':
|
|
|
|
case 'V':
|
|
|
|
case 'K':
|
2000-08-26 00:52:25 +02:00
|
|
|
/* CV-qualifiers (including restrict). We have to demangle
|
|
|
|
them off to the side, since C++ syntax puts them in a funny
|
|
|
|
place for qualified pointer and reference types. */
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
status_t status;
|
|
|
|
dyn_string_t cv_qualifiers = dyn_string_new (24);
|
2000-10-23 01:59:25 +02:00
|
|
|
int old_caret_position = result_get_caret (dm);
|
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 (cv_qualifiers == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Decode all adjacent CV qualifiers. */
|
2000-06-05 04:28:41 +02:00
|
|
|
demangle_CV_qualifiers (dm, cv_qualifiers);
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Emit them, and shift the caret left so that the
|
|
|
|
underlying type will be emitted before the qualifiers. */
|
|
|
|
status = result_add_string (dm, cv_qualifiers);
|
|
|
|
result_shift_caret (dm, -dyn_string_length (cv_qualifiers));
|
|
|
|
/* Clean up. */
|
2000-06-05 04:28:41 +02:00
|
|
|
dyn_string_delete (cv_qualifiers);
|
|
|
|
RETURN_IF_ERROR (status);
|
2000-10-23 01:59:25 +02:00
|
|
|
/* Also prepend a blank, if needed. */
|
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ' '));
|
|
|
|
result_shift_caret (dm, -1);
|
|
|
|
|
|
|
|
/* Demangle the underlying type. It will be emitted before
|
|
|
|
the CV qualifiers, since we moved the caret. */
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
|
|
|
|
/* Put the caret back where it was previously. */
|
|
|
|
result_set_caret (dm, old_caret_position);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'F':
|
|
|
|
return "Non-pointer or -reference function type.";
|
|
|
|
|
|
|
|
case 'A':
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (demangle_array_type (dm, NULL));
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'T':
|
2000-08-26 00:52:25 +02:00
|
|
|
/* It's either a <template-param> or a
|
|
|
|
<template-template-param>. In either case, demangle the
|
|
|
|
`T' token first. */
|
2000-09-05 03:01:12 +02:00
|
|
|
RETURN_IF_ERROR (demangle_template_param (dm));
|
2000-08-26 00:52:25 +02:00
|
|
|
|
|
|
|
/* Check for a template argument list; if one is found, it's a
|
|
|
|
<template-template-param> ::= <template-param>
|
|
|
|
::= <substitution> */
|
|
|
|
if (peek_char (dm) == 'I')
|
|
|
|
{
|
|
|
|
/* Add a substitution candidate. The template parameter
|
|
|
|
`T' token is a substitution candidate by itself,
|
|
|
|
without the template argument list. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (substitution_add (dm, start, encode_return_type));
|
2000-08-26 00:52:25 +02:00
|
|
|
|
|
|
|
/* Now demangle the template argument list. */
|
|
|
|
RETURN_IF_ERROR (demangle_template_args (dm));
|
|
|
|
/* The entire type, including the template template
|
|
|
|
parameter and its argument list, will be added as a
|
|
|
|
substitution candidate below. */
|
|
|
|
}
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'S':
|
2000-06-30 17:25:33 +02:00
|
|
|
/* First check if this is a special substitution. If it is,
|
|
|
|
this is a <class-enum-type>. Special substitutions have a
|
|
|
|
letter following the `S'; other substitutions have a digit
|
|
|
|
or underscore. */
|
|
|
|
peek_next = peek_char_next (dm);
|
|
|
|
if (IS_DIGIT (peek_next) || peek_next == '_')
|
2000-08-23 19:03:03 +02:00
|
|
|
{
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_substitution (dm, &encode_return_type));
|
2000-08-23 19:03:03 +02:00
|
|
|
|
|
|
|
/* The substituted name may have been a template name.
|
|
|
|
Check if template arguments follow, and if so, demangle
|
|
|
|
them. */
|
|
|
|
if (peek_char (dm) == 'I')
|
|
|
|
RETURN_IF_ERROR (demangle_template_args (dm));
|
2000-09-05 03:01:12 +02:00
|
|
|
else
|
|
|
|
/* A substitution token is not itself a substitution
|
|
|
|
candidate. (However, if the substituted template is
|
|
|
|
instantiated, the resulting type is.) */
|
|
|
|
is_substitution_candidate = 0;
|
2000-08-23 19:03:03 +02:00
|
|
|
}
|
2000-06-30 17:25:33 +02:00
|
|
|
else
|
2000-09-07 07:44:46 +02:00
|
|
|
{
|
|
|
|
/* Now some trickiness. We have a special substitution
|
|
|
|
here. Often, the special substitution provides the
|
|
|
|
name of a template that's subsequently instantiated,
|
|
|
|
for instance `SaIcE' => std::allocator<char>. In these
|
|
|
|
cases we need to add a substitution candidate for the
|
|
|
|
entire <class-enum-type> and thus don't want to clear
|
|
|
|
the is_substitution_candidate flag.
|
|
|
|
|
|
|
|
However, it's possible that what we have here is a
|
|
|
|
substitution token representing an entire type, such as
|
|
|
|
`Ss' => std::string. In this case, we mustn't add a
|
|
|
|
new substitution candidate for this substitution token.
|
|
|
|
To detect this case, remember where the start of the
|
|
|
|
substitution token is. */
|
|
|
|
const char *next = dm->next;
|
|
|
|
/* Now demangle the <class-enum-type>. */
|
|
|
|
RETURN_IF_ERROR
|
|
|
|
(demangle_class_enum_type (dm, &encode_return_type));
|
|
|
|
/* If all that was just demangled is the two-character
|
|
|
|
special substitution token, supress the addition of a
|
|
|
|
new candidate for it. */
|
|
|
|
if (dm->next == next + 2)
|
|
|
|
is_substitution_candidate = 0;
|
|
|
|
}
|
2000-08-26 00:52:25 +02:00
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'P':
|
|
|
|
case 'R':
|
|
|
|
case 'M':
|
2000-09-05 03:01:12 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type_ptr (dm, &insert_pos, start));
|
|
|
|
/* demangle_type_ptr adds all applicable substitution
|
|
|
|
candidates. */
|
|
|
|
is_substitution_candidate = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'C':
|
|
|
|
/* A C99 complex type. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "complex "));
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'G':
|
|
|
|
/* A C99 imaginary type. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "imaginary "));
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'U':
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Vendor-extended type qualifier. */
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (demangle_source_name (dm));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ' '));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return "Unexpected character in <type>.";
|
|
|
|
}
|
|
|
|
|
2000-08-26 00:52:25 +02:00
|
|
|
if (is_substitution_candidate)
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Add a new substitution for the type. If this type was a
|
|
|
|
<template-param>, pass its index since from the point of
|
2000-08-26 00:52:25 +02:00
|
|
|
substitutions; a <template-param> token is a substitution
|
2000-06-05 04:28:41 +02:00
|
|
|
candidate distinct from the type that is substituted for it. */
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (substitution_add (dm, start, encode_return_type));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Pop off template argument lists added during mangling of this
|
|
|
|
type. */
|
|
|
|
pop_to_template_arg_list (dm, old_arg_list);
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* C++ source names of builtin types, indexed by the mangled code
|
|
|
|
letter's position in the alphabet ('a' -> 0, 'b' -> 1, etc). */
|
|
|
|
static const char *const builtin_type_names[26] =
|
|
|
|
{
|
|
|
|
"signed char", /* a */
|
|
|
|
"bool", /* b */
|
|
|
|
"char", /* c */
|
|
|
|
"double", /* d */
|
|
|
|
"long double", /* e */
|
|
|
|
"float", /* f */
|
|
|
|
"__float128", /* g */
|
|
|
|
"unsigned char", /* h */
|
|
|
|
"int", /* i */
|
|
|
|
"unsigned", /* j */
|
|
|
|
NULL, /* k */
|
|
|
|
"long", /* l */
|
|
|
|
"unsigned long", /* m */
|
|
|
|
"__int128", /* n */
|
|
|
|
"unsigned __int128", /* o */
|
|
|
|
NULL, /* p */
|
|
|
|
NULL, /* q */
|
|
|
|
NULL, /* r */
|
|
|
|
"short", /* s */
|
|
|
|
"unsigned short", /* t */
|
|
|
|
NULL, /* u */
|
|
|
|
"void", /* v */
|
|
|
|
"wchar_t", /* w */
|
|
|
|
"long long", /* x */
|
|
|
|
"unsigned long long", /* y */
|
|
|
|
"..." /* z */
|
|
|
|
};
|
|
|
|
|
2001-02-02 01:27:39 +01:00
|
|
|
/* Java source names of builtin types. Types that arn't valid in Java
|
|
|
|
are also included here - we don't fail if someone attempts to demangle a
|
|
|
|
C++ symbol in Java style. */
|
|
|
|
static const char *const java_builtin_type_names[26] =
|
|
|
|
{
|
|
|
|
"signed char", /* a */
|
|
|
|
"boolean", /* C++ "bool" */ /* b */
|
|
|
|
"byte", /* C++ "char" */ /* c */
|
|
|
|
"double", /* d */
|
|
|
|
"long double", /* e */
|
|
|
|
"float", /* f */
|
|
|
|
"__float128", /* g */
|
|
|
|
"unsigned char", /* h */
|
|
|
|
"int", /* i */
|
|
|
|
"unsigned", /* j */
|
|
|
|
NULL, /* k */
|
|
|
|
"long", /* l */
|
|
|
|
"unsigned long", /* m */
|
|
|
|
"__int128", /* n */
|
|
|
|
"unsigned __int128", /* o */
|
|
|
|
NULL, /* p */
|
|
|
|
NULL, /* q */
|
|
|
|
NULL, /* r */
|
|
|
|
"short", /* s */
|
|
|
|
"unsigned short", /* t */
|
|
|
|
NULL, /* u */
|
|
|
|
"void", /* v */
|
|
|
|
"char", /* C++ "wchar_t" */ /* w */
|
|
|
|
"long", /* C++ "long long" */ /* x */
|
|
|
|
"unsigned long long", /* y */
|
|
|
|
"..." /* z */
|
|
|
|
};
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangles and emits a <builtin-type>.
|
|
|
|
|
|
|
|
<builtin-type> ::= v # void
|
|
|
|
::= w # wchar_t
|
|
|
|
::= b # bool
|
|
|
|
::= c # char
|
|
|
|
::= a # signed char
|
|
|
|
::= h # unsigned char
|
|
|
|
::= s # short
|
|
|
|
::= t # unsigned short
|
|
|
|
::= i # int
|
|
|
|
::= j # unsigned int
|
|
|
|
::= l # long
|
|
|
|
::= m # unsigned long
|
|
|
|
::= x # long long, __int64
|
|
|
|
::= y # unsigned long long, __int64
|
|
|
|
::= n # __int128
|
|
|
|
::= o # unsigned __int128
|
|
|
|
::= f # float
|
|
|
|
::= d # double
|
|
|
|
::= e # long double, __float80
|
|
|
|
::= g # __float128
|
|
|
|
::= z # ellipsis
|
|
|
|
::= u <source-name> # vendor extended type */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_builtin_type (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
|
|
|
|
char code = peek_char (dm);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("builtin-type", dm);
|
|
|
|
|
|
|
|
if (code == 'u')
|
|
|
|
{
|
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (demangle_source_name (dm));
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
else if (code >= 'a' && code <= 'z')
|
|
|
|
{
|
2001-02-02 01:27:39 +01:00
|
|
|
const char *type_name;
|
|
|
|
/* Java uses different names for some built-in types. */
|
|
|
|
if (dm->style == DMGL_JAVA)
|
|
|
|
type_name = java_builtin_type_names[code - 'a'];
|
|
|
|
else
|
|
|
|
type_name = builtin_type_names[code - 'a'];
|
2000-06-05 04:28:41 +02:00
|
|
|
if (type_name == NULL)
|
|
|
|
return "Unrecognized <builtin-type> code.";
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, type_name));
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return "Non-alphabetic <builtin-type> code.";
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles all consecutive CV-qualifiers (const, volatile, and
|
|
|
|
restrict) at the current position. The qualifiers are appended to
|
|
|
|
QUALIFIERS. Returns STATUS_OK. */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_CV_qualifiers (dm, qualifiers)
|
|
|
|
demangling_t dm;
|
|
|
|
dyn_string_t qualifiers;
|
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("CV-qualifiers", dm);
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
switch (peek_char (dm))
|
|
|
|
{
|
|
|
|
case 'r':
|
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 (!dyn_string_append_space (qualifiers))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
if (!dyn_string_append_cstr (qualifiers, "restrict"))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'V':
|
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 (!dyn_string_append_space (qualifiers))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
if (!dyn_string_append_cstr (qualifiers, "volatile"))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'K':
|
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 (!dyn_string_append_space (qualifiers))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
if (!dyn_string_append_cstr (qualifiers, "const"))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
advance_char (dm);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Demangles and emits a <function-type>. *FUNCTION_NAME_POS is the
|
2000-06-05 04:28:41 +02:00
|
|
|
position in the result string of the start of the function
|
2000-09-05 03:01:12 +02:00
|
|
|
identifier, at which the function's return type will be inserted;
|
|
|
|
*FUNCTION_NAME_POS is updated to position past the end of the
|
|
|
|
function's return type.
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
<function-type> ::= F [Y] <bare-function-type> E */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_function_type (dm, function_name_pos)
|
|
|
|
demangling_t dm;
|
2000-09-05 03:01:12 +02:00
|
|
|
int *function_name_pos;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("function-type", dm);
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'F'));
|
|
|
|
if (peek_char (dm) == 'Y')
|
|
|
|
{
|
|
|
|
/* Indicate this function has C linkage if in verbose mode. */
|
|
|
|
if (flag_verbose)
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, " [extern \"C\"] "));
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
|
|
|
}
|
|
|
|
RETURN_IF_ERROR (demangle_bare_function_type (dm, function_name_pos));
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'E'));
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <bare-function-type>. RETURN_TYPE_POS is the
|
|
|
|
position in the result string at which the function return type
|
|
|
|
should be inserted. If RETURN_TYPE_POS is BFT_NO_RETURN_TYPE, the
|
|
|
|
function's return type is assumed not to be encoded.
|
|
|
|
|
|
|
|
<bare-function-type> ::= <signature type>+ */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_bare_function_type (dm, return_type_pos)
|
|
|
|
demangling_t dm;
|
2000-09-05 03:01:12 +02:00
|
|
|
int *return_type_pos;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
/* Sequence is the index of the current function parameter, counting
|
|
|
|
from zero. The value -1 denotes the return type. */
|
|
|
|
int sequence =
|
|
|
|
(return_type_pos == BFT_NO_RETURN_TYPE ? 0 : -1);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("bare-function-type", dm);
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, '('));
|
2000-06-05 04:28:41 +02:00
|
|
|
while (!end_of_name_p (dm) && peek_char (dm) != 'E')
|
|
|
|
{
|
|
|
|
if (sequence == -1)
|
|
|
|
/* We're decoding the function's return type. */
|
|
|
|
{
|
|
|
|
dyn_string_t return_type;
|
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_t status = STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Decode the return type off to the side. */
|
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_IF_ERROR (result_push (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
return_type = (dyn_string_t) result_pop (dm);
|
|
|
|
|
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
|
|
|
/* Add a space to the end of the type. Insert the return
|
|
|
|
type where we've been asked to. */
|
2000-09-05 03:01:12 +02:00
|
|
|
if (!dyn_string_append_space (return_type))
|
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 = STATUS_ALLOCATION_FAILED;
|
2000-09-05 03:01:12 +02:00
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
{
|
|
|
|
if (!dyn_string_insert (result_string (dm), *return_type_pos,
|
|
|
|
return_type))
|
|
|
|
status = STATUS_ALLOCATION_FAILED;
|
|
|
|
else
|
|
|
|
*return_type_pos += dyn_string_length (return_type);
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
dyn_string_delete (return_type);
|
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_IF_ERROR (status);
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Skip `void' parameter types. One should only occur as
|
|
|
|
the only type in a parameter list; in that case, we want
|
|
|
|
to print `foo ()' instead of `foo (void)'. */
|
|
|
|
if (peek_char (dm) == 'v')
|
2000-09-06 00:37:17 +02:00
|
|
|
/* Consume the v. */
|
|
|
|
advance_char (dm);
|
|
|
|
else
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2000-09-06 00:37:17 +02:00
|
|
|
/* Separate parameter types by commas. */
|
|
|
|
if (sequence > 0)
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, ", "));
|
2000-09-06 00:37:17 +02:00
|
|
|
/* Demangle the type. */
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
++sequence;
|
|
|
|
}
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ')'));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* We should have demangled at least one parameter type (which would
|
|
|
|
be void, for a function that takes no parameters), plus the
|
|
|
|
return type, if we were supposed to demangle that. */
|
|
|
|
if (sequence == -1)
|
|
|
|
return "Missing function return type.";
|
|
|
|
else if (sequence == 0)
|
|
|
|
return "Missing function parameter.";
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
/* Demangles and emits a <class-enum-type>. *ENCODE_RETURN_TYPE is set to
|
2000-06-05 04:28:41 +02:00
|
|
|
non-zero if the type is a template-id, zero otherwise.
|
|
|
|
|
|
|
|
<class-enum-type> ::= <name> */
|
|
|
|
|
|
|
|
static status_t
|
2000-09-06 00:37:17 +02:00
|
|
|
demangle_class_enum_type (dm, encode_return_type)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-09-06 00:37:17 +02:00
|
|
|
int *encode_return_type;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("class-enum-type", dm);
|
|
|
|
|
2000-09-06 00:37:17 +02:00
|
|
|
RETURN_IF_ERROR (demangle_name (dm, encode_return_type));
|
2000-06-05 04:28:41 +02:00
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits an <array-type>.
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
If PTR_INSERT_POS is not NULL, the array type is formatted as a
|
|
|
|
pointer or reference to an array, except that asterisk and
|
|
|
|
ampersand punctuation is omitted (since it's not know at this
|
|
|
|
point). *PTR_INSERT_POS is set to the position in the demangled
|
|
|
|
name at which this punctuation should be inserted. For example,
|
|
|
|
`A10_i' is demangled to `int () [10]' and *PTR_INSERT_POS points
|
|
|
|
between the parentheses.
|
|
|
|
|
|
|
|
If PTR_INSERT_POS is NULL, the array type is assumed not to be
|
|
|
|
pointer- or reference-qualified. Then, for example, `A10_i' is
|
|
|
|
demangled simply as `int[10]'.
|
|
|
|
|
2000-07-23 19:55:13 +02:00
|
|
|
<array-type> ::= A [<dimension number>] _ <element type>
|
|
|
|
::= A <dimension expression> _ <element type> */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
static status_t
|
2000-10-23 01:59:25 +02:00
|
|
|
demangle_array_type (dm, ptr_insert_pos)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
2000-10-23 01:59:25 +02:00
|
|
|
int *ptr_insert_pos;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
2000-07-23 19:55:13 +02:00
|
|
|
status_t status = STATUS_OK;
|
|
|
|
dyn_string_t array_size = NULL;
|
|
|
|
char peek;
|
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-10-23 01:59:25 +02:00
|
|
|
DEMANGLE_TRACE ("array-type", dm);
|
|
|
|
|
2000-07-23 19:55:13 +02:00
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'A'));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Demangle the array size into array_size. */
|
2000-07-23 19:55:13 +02:00
|
|
|
peek = peek_char (dm);
|
|
|
|
if (peek == '_')
|
|
|
|
/* Array bound is omitted. This is a C99-style VLA. */
|
|
|
|
;
|
|
|
|
else if (IS_DIGIT (peek_char (dm)))
|
|
|
|
{
|
|
|
|
/* It looks like a constant array bound. */
|
|
|
|
array_size = dyn_string_new (10);
|
|
|
|
if (array_size == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
status = demangle_number_literally (dm, array_size, 10, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Anything is must be an expression for a nont-constant array
|
|
|
|
bound. This happens if the array type occurs in a template
|
|
|
|
and the array bound references a template parameter. */
|
|
|
|
RETURN_IF_ERROR (result_push (dm));
|
|
|
|
RETURN_IF_ERROR (demangle_expression (dm));
|
|
|
|
array_size = (dyn_string_t) result_pop (dm);
|
|
|
|
}
|
|
|
|
/* array_size may have been allocated by now, so we can't use
|
|
|
|
RETURN_IF_ERROR until it's been deallocated. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Demangle the base type of the array. */
|
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_NO_ERROR (status))
|
|
|
|
status = demangle_char (dm, '_');
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
status = demangle_type (dm);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
if (ptr_insert_pos != NULL)
|
|
|
|
{
|
|
|
|
/* This array is actually part of an pointer- or
|
|
|
|
reference-to-array type. Format appropriately, except we
|
|
|
|
don't know which and how much punctuation to use. */
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
status = result_add (dm, " () ");
|
|
|
|
/* Let the caller know where to insert the punctuation. */
|
|
|
|
*ptr_insert_pos = result_caret_pos (dm) - 2;
|
|
|
|
}
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Emit the array dimension syntax. */
|
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_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, '[');
|
2000-07-23 19:55:13 +02:00
|
|
|
if (STATUS_NO_ERROR (status) && array_size != NULL)
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, array_size);
|
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_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, ']');
|
2000-07-23 19:55:13 +02:00
|
|
|
if (array_size != NULL)
|
|
|
|
dyn_string_delete (array_size);
|
2000-06-05 04:28:41 +02: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
|
|
|
RETURN_IF_ERROR (status);
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
2000-09-05 03:01:12 +02:00
|
|
|
/* Demangles and emits a <template-param>.
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
<template-param> ::= T_ # first template parameter
|
|
|
|
::= T <parameter-2 number> _ */
|
|
|
|
|
|
|
|
static status_t
|
2000-09-05 03:01:12 +02:00
|
|
|
demangle_template_param (dm)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
int parm_number;
|
|
|
|
template_arg_list_t current_arg_list = current_template_arg_list (dm);
|
|
|
|
string_list_t arg;
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("template-param", dm);
|
|
|
|
|
|
|
|
/* Make sure there is a template argmust list in which to look up
|
|
|
|
this parameter reference. */
|
|
|
|
if (current_arg_list == NULL)
|
|
|
|
return "Template parameter outside of template.";
|
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'T'));
|
|
|
|
if (peek_char (dm) == '_')
|
|
|
|
parm_number = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
RETURN_IF_ERROR (demangle_number (dm, &parm_number, 10, 0));
|
|
|
|
++parm_number;
|
|
|
|
}
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
|
|
|
|
arg = template_arg_list_get_arg (current_arg_list, parm_number);
|
|
|
|
if (arg == NULL)
|
|
|
|
/* parm_number exceeded the number of arguments in the current
|
|
|
|
template argument list. */
|
|
|
|
return "Template parameter number out of bounds.";
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_string (dm, (dyn_string_t) arg));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <template-args>.
|
|
|
|
|
|
|
|
<template-args> ::= I <template-arg>+ E */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_template_args (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
int first = 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
|
|
|
dyn_string_t old_last_source_name;
|
2000-06-05 04:28:41 +02:00
|
|
|
template_arg_list_t arg_list = template_arg_list_new ();
|
|
|
|
|
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 (arg_list == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Preserve the most recently demangled source name. */
|
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
|
|
|
old_last_source_name = dm->last_source_name;
|
2000-06-05 04:28:41 +02:00
|
|
|
dm->last_source_name = dyn_string_new (0);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("template-args", dm);
|
|
|
|
|
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 (dm->last_source_name == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'I'));
|
2000-08-23 19:03:03 +02:00
|
|
|
RETURN_IF_ERROR (result_open_template_list (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
do
|
|
|
|
{
|
|
|
|
string_list_t arg;
|
|
|
|
|
|
|
|
if (first)
|
|
|
|
first = 0;
|
|
|
|
else
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, ", "));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Capture the template arg. */
|
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_IF_ERROR (result_push (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_template_arg (dm));
|
|
|
|
arg = result_pop (dm);
|
|
|
|
|
|
|
|
/* Emit it in the demangled name. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_string (dm, (dyn_string_t) arg));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Save it for use in expanding <template-param>s. */
|
|
|
|
template_arg_list_add_arg (arg_list, arg);
|
|
|
|
}
|
|
|
|
while (peek_char (dm) != 'E');
|
|
|
|
/* Append the '>'. */
|
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_IF_ERROR (result_close_template_list (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* Consume the 'E'. */
|
|
|
|
advance_char (dm);
|
|
|
|
|
|
|
|
/* Restore the most recent demangled source name. */
|
|
|
|
dyn_string_delete (dm->last_source_name);
|
|
|
|
dm->last_source_name = old_last_source_name;
|
|
|
|
|
|
|
|
/* Push the list onto the top of the stack of template argument
|
|
|
|
lists, so that arguments from it are used from now on when
|
|
|
|
expanding <template-param>s. */
|
|
|
|
push_template_arg_list (dm, arg_list);
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This function, which does not correspond to a production in the
|
|
|
|
mangling spec, handles the `literal' production for both
|
|
|
|
<template-arg> and <expr-primary>. It does not expect or consume
|
|
|
|
the initial `L' or final `E'. The demangling is given by:
|
|
|
|
|
|
|
|
<literal> ::= <type> </value/ number>
|
|
|
|
|
|
|
|
and the emitted output is `(type)number'. */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_literal (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
char peek = peek_char (dm);
|
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
|
|
|
dyn_string_t value_string;
|
|
|
|
status_t status;
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
DEMANGLE_TRACE ("literal", dm);
|
|
|
|
|
|
|
|
if (!flag_verbose && peek >= 'a' && peek <= 'z')
|
|
|
|
{
|
|
|
|
/* If not in verbose mode and this is a builtin type, see if we
|
|
|
|
can produce simpler numerical output. In particular, for
|
|
|
|
integer types shorter than `long', just write the number
|
|
|
|
without type information; for bools, write `true' or `false'.
|
|
|
|
Other refinements could be made here too. */
|
|
|
|
|
|
|
|
/* This constant string is used to map from <builtin-type> codes
|
|
|
|
(26 letters of the alphabet) to codes that determine how the
|
|
|
|
value will be displayed. The codes are:
|
|
|
|
b: display as bool
|
|
|
|
i: display as int
|
|
|
|
l: display as long
|
|
|
|
A space means the value will be represented using cast
|
|
|
|
notation. */
|
|
|
|
static const char *const code_map = "ibi iii ll ii i ";
|
|
|
|
|
|
|
|
char code = code_map[peek - 'a'];
|
|
|
|
/* FIXME: Implement demangling of floats and doubles. */
|
|
|
|
if (code == 'u')
|
|
|
|
return STATUS_UNIMPLEMENTED;
|
|
|
|
if (code == 'b')
|
|
|
|
{
|
|
|
|
/* It's a boolean. */
|
|
|
|
char value;
|
|
|
|
|
|
|
|
/* Consume the b. */
|
|
|
|
advance_char (dm);
|
|
|
|
/* Look at the next character. It should be 0 or 1,
|
|
|
|
corresponding to false or true, respectively. */
|
|
|
|
value = peek_char (dm);
|
|
|
|
if (value == '0')
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "false"));
|
2000-06-05 04:28:41 +02:00
|
|
|
else if (value == '1')
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "true"));
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
|
|
|
return "Unrecognized bool constant.";
|
|
|
|
/* Consume the 0 or 1. */
|
|
|
|
advance_char (dm);
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
else if (code == 'i' || code == 'l')
|
|
|
|
{
|
|
|
|
/* It's an integer or long. */
|
|
|
|
|
|
|
|
/* Consume the type character. */
|
|
|
|
advance_char (dm);
|
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
|
|
|
/* Demangle the number and write it out. */
|
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
|
|
|
value_string = dyn_string_new (0);
|
|
|
|
status = demangle_number_literally (dm, value_string, 10, 1);
|
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, value_string);
|
2000-06-05 04:28:41 +02:00
|
|
|
/* For long integers, append an l. */
|
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 (code == 'l' && STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, code);
|
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
|
|
|
dyn_string_delete (value_string);
|
|
|
|
|
|
|
|
RETURN_IF_ERROR (status);
|
2000-06-05 04:28:41 +02:00
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
/* ...else code == ' ', so fall through to represent this
|
|
|
|
literal's type explicitly using cast syntax. */
|
|
|
|
}
|
|
|
|
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, '('));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ')'));
|
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
|
|
|
|
|
|
|
value_string = dyn_string_new (0);
|
|
|
|
if (value_string == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02: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
|
|
|
status = demangle_number_literally (dm, value_string, 10, 1);
|
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, value_string);
|
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
|
|
|
dyn_string_delete (value_string);
|
|
|
|
RETURN_IF_ERROR (status);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <template-arg>.
|
|
|
|
|
|
|
|
<template-arg> ::= <type> # type
|
|
|
|
::= L <type> <value number> E # literal
|
|
|
|
::= LZ <encoding> E # external name
|
|
|
|
::= X <expression> E # expression */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_template_arg (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("template-arg", dm);
|
|
|
|
|
|
|
|
switch (peek_char (dm))
|
|
|
|
{
|
|
|
|
case 'L':
|
|
|
|
advance_char (dm);
|
|
|
|
|
|
|
|
if (peek_char (dm) == 'Z')
|
|
|
|
{
|
|
|
|
/* External name. */
|
|
|
|
advance_char (dm);
|
|
|
|
/* FIXME: Standard is contradictory here. */
|
|
|
|
RETURN_IF_ERROR (demangle_encoding (dm));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
RETURN_IF_ERROR (demangle_literal (dm));
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'E'));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'X':
|
|
|
|
/* Expression. */
|
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (demangle_expression (dm));
|
2000-09-05 07:48:59 +02:00
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'E'));
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits an <expression>.
|
|
|
|
|
|
|
|
<expression> ::= <unary operator-name> <expression>
|
|
|
|
::= <binary operator-name> <expression> <expression>
|
|
|
|
::= <expr-primary>
|
|
|
|
::= <scope-expression> */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_expression (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
char peek = peek_char (dm);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("expression", dm);
|
|
|
|
|
|
|
|
if (peek == 'L' || peek == 'T')
|
|
|
|
RETURN_IF_ERROR (demangle_expr_primary (dm));
|
|
|
|
else if (peek == 's' && peek_char_next (dm) == 'r')
|
|
|
|
RETURN_IF_ERROR (demangle_scope_expression (dm));
|
|
|
|
else
|
|
|
|
/* An operator expression. */
|
|
|
|
{
|
|
|
|
int num_args;
|
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_t status = STATUS_OK;
|
2000-06-05 04:28:41 +02:00
|
|
|
dyn_string_t operator_name;
|
|
|
|
|
|
|
|
/* We have an operator name. Since we want to output binary
|
|
|
|
operations in infix notation, capture the operator name
|
|
|
|
first. */
|
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_IF_ERROR (result_push (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_operator_name (dm, 1, &num_args));
|
|
|
|
operator_name = (dyn_string_t) result_pop (dm);
|
|
|
|
|
|
|
|
/* If it's binary, do an operand first. */
|
|
|
|
if (num_args > 1)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, '(');
|
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_NO_ERROR (status))
|
|
|
|
status = demangle_expression (dm);
|
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_char (dm, ')');
|
2000-06-05 04:28:41 +02: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
|
|
|
/* Emit the operator. */
|
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-10-23 01:59:25 +02:00
|
|
|
status = result_add_string (dm, operator_name);
|
2000-06-05 04:28:41 +02:00
|
|
|
dyn_string_delete (operator_name);
|
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_IF_ERROR (status);
|
|
|
|
|
|
|
|
/* Emit its second (if binary) or only (if unary) operand. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, '('));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_expression (dm));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ')'));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* The ternary operator takes a third operand. */
|
|
|
|
if (num_args == 3)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, ":("));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_expression (dm));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ')'));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <scope-expression>.
|
|
|
|
|
|
|
|
<scope-expression> ::= sr <qualifying type> <source-name>
|
|
|
|
::= sr <qualifying type> <encoding> */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_scope_expression (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 's'));
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'r'));
|
|
|
|
RETURN_IF_ERROR (demangle_type (dm));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "::"));
|
2000-06-05 04:28:41 +02:00
|
|
|
RETURN_IF_ERROR (demangle_encoding (dm));
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits an <expr-primary>.
|
|
|
|
|
|
|
|
<expr-primary> ::= <template-param>
|
|
|
|
::= L <type> <value number> E # literal
|
|
|
|
::= L <mangled-name> E # external name */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_expr_primary (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
char peek = peek_char (dm);
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("expr-primary", dm);
|
|
|
|
|
|
|
|
if (peek == 'T')
|
2000-09-05 03:01:12 +02:00
|
|
|
RETURN_IF_ERROR (demangle_template_param (dm));
|
2000-06-05 04:28:41 +02:00
|
|
|
else if (peek == 'L')
|
|
|
|
{
|
|
|
|
/* Consume the `L'. */
|
|
|
|
advance_char (dm);
|
|
|
|
peek = peek_char (dm);
|
|
|
|
|
|
|
|
if (peek == '_')
|
|
|
|
RETURN_IF_ERROR (demangle_mangled_name (dm));
|
|
|
|
else
|
|
|
|
RETURN_IF_ERROR (demangle_literal (dm));
|
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'E'));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return STATUS_ERROR;
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <substitution>. Sets *TEMPLATE_P to non-zero
|
2000-08-26 00:52:25 +02:00
|
|
|
if the substitution is the name of a template, zero otherwise.
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
<substitution> ::= S <seq-id> _
|
|
|
|
::= S_
|
|
|
|
|
|
|
|
::= St # ::std::
|
|
|
|
::= Sa # ::std::allocator
|
|
|
|
::= Sb # ::std::basic_string
|
|
|
|
::= Ss # ::std::basic_string<char,
|
|
|
|
::std::char_traits<char>,
|
|
|
|
::std::allocator<char> >
|
|
|
|
::= Si # ::std::basic_istream<char,
|
|
|
|
std::char_traits<char> >
|
|
|
|
::= So # ::std::basic_ostream<char,
|
|
|
|
std::char_traits<char> >
|
|
|
|
::= Sd # ::std::basic_iostream<char,
|
2000-09-05 03:01:12 +02:00
|
|
|
std::char_traits<char> >
|
2000-06-05 04:28:41 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
static status_t
|
2000-08-26 00:52:25 +02:00
|
|
|
demangle_substitution (dm, template_p)
|
2000-06-05 04:28:41 +02:00
|
|
|
demangling_t dm;
|
|
|
|
int *template_p;
|
|
|
|
{
|
|
|
|
int seq_id;
|
|
|
|
int peek;
|
|
|
|
dyn_string_t text;
|
|
|
|
|
|
|
|
DEMANGLE_TRACE ("substitution", dm);
|
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'S'));
|
|
|
|
|
|
|
|
/* Scan the substitution sequence index. A missing number denotes
|
|
|
|
the first index. */
|
|
|
|
peek = peek_char (dm);
|
|
|
|
if (peek == '_')
|
|
|
|
seq_id = -1;
|
|
|
|
/* If the following character is 0-9 or a capital letter, interpret
|
|
|
|
the sequence up to the next underscore as a base-36 substitution
|
|
|
|
index. */
|
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 if (IS_DIGIT ((unsigned char) peek)
|
2000-06-05 04:28:41 +02:00
|
|
|
|| (peek >= 'A' && peek <= 'Z'))
|
|
|
|
RETURN_IF_ERROR (demangle_number (dm, &seq_id, 36, 0));
|
|
|
|
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
|
|
|
const char *new_last_source_name = NULL;
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
switch (peek)
|
|
|
|
{
|
|
|
|
case 't':
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std"));
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'a':
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::allocator"));
|
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
|
|
|
new_last_source_name = "allocator";
|
2000-06-30 17:25:33 +02:00
|
|
|
*template_p = 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'b':
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::basic_string"));
|
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
|
|
|
new_last_source_name = "basic_string";
|
2000-06-30 17:25:33 +02:00
|
|
|
*template_p = 1;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
if (!flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::string"));
|
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
|
|
|
new_last_source_name = "string";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::basic_string<char, std::char_traits<char>, std::allocator<char> >"));
|
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
|
|
|
new_last_source_name = "basic_string";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2000-06-30 17:25:33 +02:00
|
|
|
*template_p = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'i':
|
|
|
|
if (!flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::istream"));
|
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
|
|
|
new_last_source_name = "istream";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::basic_istream<char, std::char_traints<char> >"));
|
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
|
|
|
new_last_source_name = "basic_istream";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2000-06-30 17:25:33 +02:00
|
|
|
*template_p = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'o':
|
|
|
|
if (!flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::ostream"));
|
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
|
|
|
new_last_source_name = "ostream";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::basic_ostream<char, std::char_traits<char> >"));
|
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
|
|
|
new_last_source_name = "basic_ostream";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2000-06-30 17:25:33 +02:00
|
|
|
*template_p = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'd':
|
|
|
|
if (!flag_verbose)
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::iostream"));
|
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
|
|
|
new_last_source_name = "iostream";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "std::basic_iostream<char, std::char_traits<char> >"));
|
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
|
|
|
new_last_source_name = "basic_iostream";
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
2000-06-30 17:25:33 +02:00
|
|
|
*template_p = 0;
|
2000-06-05 04:28:41 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return "Unrecognized <substitution>.";
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/* Consume the character we just processed. */
|
2000-06-05 04:28:41 +02:00
|
|
|
advance_char (dm);
|
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 (new_last_source_name != NULL)
|
|
|
|
{
|
|
|
|
if (!dyn_string_copy_cstr (dm->last_source_name,
|
|
|
|
new_last_source_name))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
}
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look up the substitution text. Since `S_' is the most recent
|
|
|
|
substitution, `S0_' is the second-most-recent, etc., shift the
|
|
|
|
numbering by one. */
|
|
|
|
text = substitution_get (dm, seq_id + 1, template_p);
|
2000-06-30 17:25:33 +02:00
|
|
|
if (text == NULL)
|
2000-06-05 04:28:41 +02:00
|
|
|
return "Substitution number out of range.";
|
|
|
|
|
|
|
|
/* Emit the substitution text. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_string (dm, text));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, '_'));
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangles and emits a <local-name>.
|
|
|
|
|
|
|
|
<local-name> := Z <function encoding> E <entity name> [<discriminator>]
|
|
|
|
:= Z <function encoding> E s [<discriminator>] */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_local_name (dm)
|
|
|
|
demangling_t dm;
|
|
|
|
{
|
|
|
|
DEMANGLE_TRACE ("local-name", dm);
|
|
|
|
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'Z'));
|
|
|
|
RETURN_IF_ERROR (demangle_encoding (dm));
|
|
|
|
RETURN_IF_ERROR (demangle_char (dm, 'E'));
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "::"));
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
if (peek_char (dm) == 's')
|
|
|
|
{
|
|
|
|
/* Local character string literal. */
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, "string literal"));
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Consume the s. */
|
|
|
|
advance_char (dm);
|
|
|
|
RETURN_IF_ERROR (demangle_discriminator (dm, 0));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int unused;
|
|
|
|
/* Local name for some other entity. Demangle its name. */
|
|
|
|
RETURN_IF_ERROR (demangle_name (dm, &unused));
|
|
|
|
RETURN_IF_ERROR (demangle_discriminator (dm, 1));
|
|
|
|
}
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Optimonally demangles and emits a <discriminator>. If there is no
|
|
|
|
<discriminator> at the current position in the mangled string, the
|
|
|
|
descriminator is assumed to be zero. Emit the discriminator number
|
|
|
|
in parentheses, unless SUPPRESS_FIRST is non-zero and the
|
|
|
|
discriminator is zero.
|
|
|
|
|
|
|
|
<discriminator> ::= _ <number> */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
demangle_discriminator (dm, suppress_first)
|
|
|
|
demangling_t dm;
|
|
|
|
int suppress_first;
|
|
|
|
{
|
|
|
|
/* Output for <discriminator>s to the demangled name is completely
|
2000-09-06 00:37:17 +02:00
|
|
|
suppressed if not in verbose mode. */
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
if (peek_char (dm) == '_')
|
|
|
|
{
|
|
|
|
/* Consume the underscore. */
|
|
|
|
advance_char (dm);
|
|
|
|
if (flag_verbose)
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, " [#"));
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Check if there's a number following the underscore. */
|
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 (IS_DIGIT ((unsigned char) peek_char (dm)))
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
int discriminator;
|
|
|
|
/* Demangle the number. */
|
|
|
|
RETURN_IF_ERROR (demangle_number (dm, &discriminator, 10, 0));
|
|
|
|
if (flag_verbose)
|
|
|
|
/* Write the discriminator. The mangled number is two
|
|
|
|
less than the discriminator ordinal, counting from
|
|
|
|
zero. */
|
2001-03-23 23:12:55 +01:00
|
|
|
RETURN_IF_ERROR (int_to_dyn_string (discriminator + 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
|
|
|
(dyn_string_t) dm->result));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else
|
2001-03-23 23:12:55 +01:00
|
|
|
return STATUS_ERROR;
|
2000-06-05 04:28:41 +02:00
|
|
|
if (flag_verbose)
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add_char (dm, ']'));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
else if (!suppress_first)
|
|
|
|
{
|
|
|
|
if (flag_verbose)
|
2000-10-23 01:59:25 +02:00
|
|
|
RETURN_IF_ERROR (result_add (dm, " [#0]"));
|
2000-06-05 04:28:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return STATUS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangle NAME into RESULT, which must be an initialized
|
|
|
|
dyn_string_t. On success, returns STATUS_OK. On failure, returns
|
|
|
|
an error message, and the contents of RESULT are unchanged. */
|
|
|
|
|
2000-06-07 22:35:43 +02:00
|
|
|
static status_t
|
2001-02-02 01:27:39 +01:00
|
|
|
cp_demangle (name, result, style)
|
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
|
|
|
const char *name;
|
2000-06-05 04:28:41 +02:00
|
|
|
dyn_string_t result;
|
2001-02-02 01:27:39 +01:00
|
|
|
int style;
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
status_t status;
|
|
|
|
int length = strlen (name);
|
|
|
|
|
|
|
|
if (length > 2 && name[0] == '_' && name[1] == 'Z')
|
|
|
|
{
|
2001-02-02 01:27:39 +01:00
|
|
|
demangling_t dm = demangling_new (name, style);
|
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 (dm == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02: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
|
|
|
status = result_push (dm);
|
|
|
|
if (status != STATUS_OK)
|
|
|
|
{
|
|
|
|
demangling_delete (dm);
|
|
|
|
return status;
|
|
|
|
}
|
2000-06-05 04:28:41 +02: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
|
|
|
status = demangle_mangled_name (dm);
|
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-06-05 04:28:41 +02:00
|
|
|
{
|
|
|
|
dyn_string_t demangled = (dyn_string_t) result_pop (dm);
|
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 (!dyn_string_copy (result, demangled))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
dyn_string_delete (demangled);
|
|
|
|
}
|
|
|
|
|
|
|
|
demangling_delete (dm);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* It's evidently not a mangled C++ name. It could be the name
|
|
|
|
of something with C linkage, though, so just copy NAME into
|
|
|
|
RESULT. */
|
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 (!dyn_string_copy_cstr (result, name))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
2000-06-05 04:28:41 +02:00
|
|
|
status = STATUS_OK;
|
|
|
|
}
|
|
|
|
|
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 status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangle TYPE_NAME into RESULT, which must be an initialized
|
|
|
|
dyn_string_t. On success, returns STATUS_OK. On failiure, returns
|
|
|
|
an error message, and the contents of RESULT are unchanged. */
|
|
|
|
|
|
|
|
static status_t
|
|
|
|
cp_demangle_type (type_name, result)
|
|
|
|
const char* type_name;
|
|
|
|
dyn_string_t result;
|
|
|
|
{
|
|
|
|
status_t status;
|
2002-02-01 21:37:13 +01:00
|
|
|
demangling_t dm = demangling_new (type_name, DMGL_GNU_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
|
|
|
|
|
|
|
if (dm == NULL)
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
|
|
|
|
/* Demangle the type name. The demangled name is stored in dm. */
|
|
|
|
status = result_push (dm);
|
|
|
|
if (status != STATUS_OK)
|
|
|
|
{
|
|
|
|
demangling_delete (dm);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
status = demangle_type (dm);
|
|
|
|
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
{
|
|
|
|
/* The demangling succeeded. Pop the result out of dm and copy
|
|
|
|
it into RESULT. */
|
|
|
|
dyn_string_t demangled = (dyn_string_t) result_pop (dm);
|
|
|
|
if (!dyn_string_copy (result, demangled))
|
|
|
|
return STATUS_ALLOCATION_FAILED;
|
|
|
|
dyn_string_delete (demangled);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up. */
|
|
|
|
demangling_delete (dm);
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2002-02-03 05:00:36 +01:00
|
|
|
#ifdef IN_LIBGCC2
|
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 *));
|
|
|
|
|
2000-12-04 18:11:17 +01:00
|
|
|
/* ia64 ABI-mandated entry point in the C++ runtime library for performing
|
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
|
|
|
demangling. MANGLED_NAME is a NUL-terminated character string
|
|
|
|
containing the name to be demangled.
|
|
|
|
|
|
|
|
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
|
|
|
|
is placed in a region of memory allocated with malloc.
|
|
|
|
|
|
|
|
If LENGTH is non-NULL, the length of the buffer conaining the
|
|
|
|
demangled name, is placed in *LENGTH.
|
|
|
|
|
|
|
|
The return value is a pointer to the start of the NUL-terminated
|
|
|
|
demangled name, or NULL if the demangling fails. The caller is
|
|
|
|
responsible for deallocating this memory using free.
|
|
|
|
|
|
|
|
*STATUS is set to one of the following values:
|
|
|
|
0: The demangling operation succeeded.
|
|
|
|
-1: A memory allocation failiure occurred.
|
|
|
|
-2: MANGLED_NAME is not a valid name under the C++ ABI mangling rules.
|
|
|
|
-3: One of the arguments is invalid.
|
|
|
|
|
|
|
|
The demagling is performed using the C++ ABI mangling rules, with
|
|
|
|
GNU extensions. */
|
|
|
|
|
|
|
|
char *
|
|
|
|
__cxa_demangle (mangled_name, output_buffer, length, status)
|
|
|
|
const char *mangled_name;
|
|
|
|
char *output_buffer;
|
|
|
|
size_t *length;
|
|
|
|
int *status;
|
|
|
|
{
|
|
|
|
struct dyn_string demangled_name;
|
|
|
|
status_t result;
|
|
|
|
|
|
|
|
if (status == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (mangled_name == NULL) {
|
|
|
|
*status = -3;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Did the caller provide a buffer for the demangled name? */
|
|
|
|
if (output_buffer == NULL) {
|
|
|
|
/* No; dyn_string will malloc a buffer for us. */
|
|
|
|
if (!dyn_string_init (&demangled_name, 0))
|
|
|
|
{
|
|
|
|
*status = -1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Yes. Check that the length was provided. */
|
|
|
|
if (length == NULL) {
|
|
|
|
*status = -3;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Install the buffer into a dyn_string. */
|
|
|
|
demangled_name.allocated = *length;
|
|
|
|
demangled_name.length = 0;
|
|
|
|
demangled_name.s = output_buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mangled_name[0] == '_' && mangled_name[1] == 'Z')
|
|
|
|
/* MANGLED_NAME apprears to be a function or variable name.
|
|
|
|
Demangle it accordingly. */
|
2001-02-02 01:27:39 +01:00
|
|
|
result = cp_demangle (mangled_name, &demangled_name, 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
|
|
|
else
|
|
|
|
/* Try to demangled MANGLED_NAME as the name of a type. */
|
|
|
|
result = cp_demangle_type (mangled_name, &demangled_name);
|
|
|
|
|
|
|
|
if (result == STATUS_OK)
|
|
|
|
/* The demangling succeeded. */
|
|
|
|
{
|
|
|
|
/* If LENGTH isn't NULL, store the allocated buffer length
|
|
|
|
there; the buffer may have been realloced by dyn_string
|
|
|
|
functions. */
|
|
|
|
if (length != NULL)
|
|
|
|
*length = demangled_name.allocated;
|
|
|
|
/* The operation was a success. */
|
|
|
|
*status = 0;
|
|
|
|
return dyn_string_buf (&demangled_name);
|
|
|
|
}
|
|
|
|
else if (result == STATUS_ALLOCATION_FAILED)
|
|
|
|
/* A call to malloc or realloc failed during the demangling
|
|
|
|
operation. */
|
|
|
|
{
|
|
|
|
*status = -1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* The demangling failed for another reason, most probably because
|
|
|
|
MANGLED_NAME isn't a valid mangled name. */
|
|
|
|
{
|
|
|
|
/* If the buffer containing the demangled name wasn't provided
|
|
|
|
by the caller, free it. */
|
|
|
|
if (output_buffer == NULL)
|
|
|
|
free (dyn_string_buf (&demangled_name));
|
|
|
|
*status = -2;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* !IN_LIBGCC2 */
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Variant entry point for integration with the existing cplus-dem
|
|
|
|
demangler. Attempts to demangle MANGLED. If the demangling
|
|
|
|
succeeds, returns a buffer, allocated with malloc, containing the
|
|
|
|
demangled name. The caller must deallocate the buffer using free.
|
|
|
|
If the demangling failes, returns NULL. */
|
|
|
|
|
|
|
|
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
|
|
|
{
|
2000-12-05 18:29:12 +01:00
|
|
|
dyn_string_t demangled;
|
|
|
|
status_t status;
|
2002-02-05 17:33:31 +01:00
|
|
|
int type = !!(options & DMGL_TYPES);
|
2000-12-05 18:29:12 +01:00
|
|
|
|
2002-02-03 05:00:36 +01:00
|
|
|
if (mangled[0] == '_' && mangled[1] == 'Z')
|
|
|
|
/* It is not a type. */
|
|
|
|
type = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* It is a type. Stop if we don't want to demangle types. */
|
|
|
|
if (!type)
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-02-01 02:27:21 +01:00
|
|
|
|
2002-02-05 17:33:31 +01:00
|
|
|
flag_verbose = !!(options & DMGL_VERBOSE);
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Create a dyn_string to hold the demangled name. */
|
2000-12-05 18:29:12 +01:00
|
|
|
demangled = dyn_string_new (0);
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Attempt the demangling. */
|
2002-02-03 05:00:36 +01:00
|
|
|
if (!type)
|
|
|
|
/* Appears to be a function or variable name. */
|
|
|
|
status = cp_demangle (mangled, demangled, 0);
|
|
|
|
else
|
|
|
|
/* Try to demangle it as the name of a type. */
|
|
|
|
status = cp_demangle_type (mangled, demangled);
|
2000-12-05 18:29:12 +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
|
|
|
if (STATUS_NO_ERROR (status))
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Demangling succeeded. */
|
|
|
|
{
|
|
|
|
/* Grab the demangled result from the dyn_string. It was
|
|
|
|
allocated with malloc, so we can return it directly. */
|
|
|
|
char *return_value = dyn_string_release (demangled);
|
|
|
|
/* Hand back the demangled name. */
|
|
|
|
return return_value;
|
|
|
|
}
|
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 if (status == STATUS_ALLOCATION_FAILED)
|
|
|
|
{
|
|
|
|
fprintf (stderr, "Memory allocation failed.\n");
|
|
|
|
abort ();
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
else
|
|
|
|
/* Demangling failed. */
|
|
|
|
{
|
|
|
|
dyn_string_delete (demangled);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
{
|
|
|
|
dyn_string_t demangled;
|
|
|
|
char *next;
|
|
|
|
char *end;
|
|
|
|
int len;
|
|
|
|
status_t status;
|
|
|
|
int nesting = 0;
|
|
|
|
char *cplus_demangled;
|
|
|
|
char *return_value;
|
|
|
|
|
|
|
|
/* Create a dyn_string to hold the demangled name. */
|
|
|
|
demangled = dyn_string_new (0);
|
|
|
|
|
|
|
|
/* Attempt the demangling. */
|
|
|
|
status = cp_demangle ((char *) mangled, demangled, DMGL_JAVA);
|
|
|
|
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
/* Demangling succeeded. */
|
|
|
|
{
|
|
|
|
/* Grab the demangled result from the dyn_string. */
|
|
|
|
cplus_demangled = dyn_string_release (demangled);
|
|
|
|
}
|
|
|
|
else if (status == STATUS_ALLOCATION_FAILED)
|
|
|
|
{
|
|
|
|
fprintf (stderr, "Memory allocation failed.\n");
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* Demangling failed. */
|
|
|
|
{
|
|
|
|
dyn_string_delete (demangled);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
len = strlen (cplus_demangled);
|
|
|
|
next = cplus_demangled;
|
|
|
|
end = next + len;
|
|
|
|
demangled = NULL;
|
|
|
|
|
|
|
|
/* Replace occurances of JArray<TYPE> with TYPE[]. */
|
|
|
|
while (next < end)
|
|
|
|
{
|
|
|
|
char *open_str = strstr (next, "JArray<");
|
|
|
|
char *close_str = NULL;
|
|
|
|
if (nesting > 0)
|
|
|
|
close_str = strchr (next, '>');
|
|
|
|
|
|
|
|
if (open_str != NULL && (close_str == NULL || close_str > open_str))
|
|
|
|
{
|
|
|
|
++nesting;
|
|
|
|
|
|
|
|
if (!demangled)
|
|
|
|
demangled = dyn_string_new(len);
|
|
|
|
|
|
|
|
/* Copy prepending symbols, if any. */
|
|
|
|
if (open_str > next)
|
|
|
|
{
|
|
|
|
open_str[0] = 0;
|
|
|
|
dyn_string_append_cstr (demangled, next);
|
|
|
|
}
|
|
|
|
next = open_str + 7;
|
|
|
|
}
|
|
|
|
else if (close_str != NULL)
|
|
|
|
{
|
|
|
|
--nesting;
|
|
|
|
|
|
|
|
/* Copy prepending type symbol, if any. Squash any spurious
|
|
|
|
whitespace. */
|
|
|
|
if (close_str > next && next[0] != ' ')
|
|
|
|
{
|
|
|
|
close_str[0] = 0;
|
|
|
|
dyn_string_append_cstr (demangled, next);
|
|
|
|
}
|
|
|
|
dyn_string_append_cstr (demangled, "[]");
|
|
|
|
next = close_str + 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* There are no more arrays. Copy the rest of the symbol, or
|
|
|
|
simply return the original symbol if no changes were made. */
|
|
|
|
if (next == cplus_demangled)
|
|
|
|
return cplus_demangled;
|
|
|
|
|
|
|
|
dyn_string_append_cstr (demangled, next);
|
|
|
|
next = end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free (cplus_demangled);
|
|
|
|
|
|
|
|
return_value = dyn_string_release (demangled);
|
|
|
|
return return_value;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
#endif /* IN_LIBGCC2 */
|
|
|
|
|
2001-03-21 21:01:40 +01:00
|
|
|
|
|
|
|
/* Demangle NAME in the G++ V3 ABI demangling style, and return either
|
|
|
|
zero, indicating that some error occurred, or a demangling_t
|
|
|
|
holding the results. */
|
|
|
|
static demangling_t
|
2001-05-08 08:13:58 +02:00
|
|
|
demangle_v3_with_details (name)
|
|
|
|
const char *name;
|
2001-03-21 21:01:40 +01:00
|
|
|
{
|
|
|
|
demangling_t dm;
|
|
|
|
status_t status;
|
|
|
|
|
|
|
|
if (strncmp (name, "_Z", 2))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dm = demangling_new (name, DMGL_GNU_V3);
|
|
|
|
if (dm == NULL)
|
|
|
|
{
|
|
|
|
fprintf (stderr, "Memory allocation failed.\n");
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
|
|
|
|
status = result_push (dm);
|
|
|
|
if (! STATUS_NO_ERROR (status))
|
|
|
|
{
|
|
|
|
demangling_delete (dm);
|
|
|
|
fprintf (stderr, "%s\n", status);
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
|
|
|
|
status = demangle_mangled_name (dm);
|
|
|
|
if (STATUS_NO_ERROR (status))
|
|
|
|
return dm;
|
|
|
|
|
|
|
|
demangling_delete (dm);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return non-zero iff NAME is the mangled form of a constructor name
|
|
|
|
in the G++ V3 ABI demangling style. Specifically, return:
|
|
|
|
- '1' if NAME is a complete object constructor,
|
|
|
|
- '2' if NAME is a base object constructor, or
|
|
|
|
- '3' if NAME is a complete object allocating constructor. */
|
|
|
|
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
|
|
|
{
|
|
|
|
demangling_t dm = demangle_v3_with_details (name);
|
|
|
|
|
|
|
|
if (dm)
|
|
|
|
{
|
|
|
|
enum gnu_v3_ctor_kinds result = dm->is_constructor;
|
|
|
|
demangling_delete (dm);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return non-zero iff NAME is the mangled form of a destructor name
|
|
|
|
in the G++ V3 ABI demangling style. Specifically, return:
|
|
|
|
- '0' if NAME is a deleting destructor,
|
|
|
|
- '1' if NAME is a complete object destructor, or
|
|
|
|
- '2' if NAME is a base object destructor. */
|
|
|
|
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
|
|
|
{
|
|
|
|
demangling_t dm = demangle_v3_with_details (name);
|
|
|
|
|
|
|
|
if (dm)
|
|
|
|
{
|
|
|
|
enum gnu_v3_dtor_kinds result = dm->is_destructor;
|
|
|
|
demangling_delete (dm);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-06-05 04:28:41 +02:00
|
|
|
#ifdef STANDALONE_DEMANGLER
|
|
|
|
|
|
|
|
#include "getopt.h"
|
|
|
|
|
|
|
|
static void print_usage
|
|
|
|
PARAMS ((FILE* fp, int exit_value));
|
|
|
|
|
|
|
|
/* 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");
|
|
|
|
fprintf (fp, " -s,--strict Demangle standard names only.\n");
|
|
|
|
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
|
|
|
{
|
|
|
|
{ "help", no_argument, NULL, 'h' },
|
|
|
|
{ "strict", no_argument, NULL, 's' },
|
|
|
|
{ "verbose", no_argument, NULL, 'v' },
|
|
|
|
{ NULL, no_argument, NULL, 0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 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[];
|
|
|
|
{
|
|
|
|
status_t status;
|
|
|
|
int i;
|
|
|
|
int opt_char;
|
|
|
|
|
|
|
|
/* Use the program name of this program, as invoked. */
|
|
|
|
program_name = argv[0];
|
|
|
|
|
|
|
|
/* Parse options. */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
opt_char = getopt_long (argc, argv, "hsv", long_options, NULL);
|
|
|
|
switch (opt_char)
|
|
|
|
{
|
|
|
|
case '?': /* Unrecognized option. */
|
|
|
|
print_usage (stderr, 1);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'h':
|
|
|
|
print_usage (stdout, 0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
flag_strict = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'v':
|
|
|
|
flag_verbose = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (opt_char != -1);
|
|
|
|
|
|
|
|
if (optind == argc)
|
|
|
|
/* No command line arguments were provided. Filter stdin. */
|
|
|
|
{
|
|
|
|
dyn_string_t mangled = dyn_string_new (3);
|
|
|
|
dyn_string_t demangled = dyn_string_new (0);
|
|
|
|
status_t status;
|
|
|
|
|
|
|
|
/* Read all of input. */
|
|
|
|
while (!feof (stdin))
|
|
|
|
{
|
|
|
|
char c = getchar ();
|
|
|
|
|
|
|
|
/* The first character of a mangled name is an underscore. */
|
|
|
|
if (feof (stdin))
|
|
|
|
break;
|
|
|
|
if (c != '_')
|
|
|
|
{
|
|
|
|
/* It's not a mangled name. Print the character and go
|
|
|
|
on. */
|
|
|
|
putchar (c);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
c = getchar ();
|
|
|
|
|
|
|
|
/* The second character of a mangled name is a capital `Z'. */
|
|
|
|
if (feof (stdin))
|
|
|
|
break;
|
|
|
|
if (c != 'Z')
|
|
|
|
{
|
|
|
|
/* It's not a mangled name. Print the previous
|
|
|
|
underscore, the `Z', and go on. */
|
|
|
|
putchar ('_');
|
|
|
|
putchar (c);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Start keeping track of the candidate mangled name. */
|
|
|
|
dyn_string_append_char (mangled, '_');
|
|
|
|
dyn_string_append_char (mangled, 'Z');
|
|
|
|
|
|
|
|
/* 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 ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Attempt to demangle the name. */
|
2001-02-02 01:27:39 +01:00
|
|
|
status = cp_demangle (dyn_string_buf (mangled), demangled, 0);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If the demangling succeeded, great! Print out the
|
|
|
|
demangled version. */
|
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_NO_ERROR (status))
|
2000-06-05 04:28:41 +02:00
|
|
|
fputs (dyn_string_buf (demangled), stdout);
|
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
|
|
|
/* Abort on allocation failures. */
|
|
|
|
else if (status == STATUS_ALLOCATION_FAILED)
|
|
|
|
{
|
|
|
|
fprintf (stderr, "Memory allocation failed.\n");
|
|
|
|
abort ();
|
|
|
|
}
|
2000-06-05 04:28:41 +02:00
|
|
|
/* Otherwise, it might not have been a mangled name. Just
|
|
|
|
print out the original text. */
|
|
|
|
else
|
|
|
|
fputs (dyn_string_buf (mangled), stdout);
|
|
|
|
|
|
|
|
/* 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);
|
|
|
|
|
|
|
|
/* Clear the candidate mangled name, to start afresh next
|
|
|
|
time we hit a `_Z'. */
|
|
|
|
dyn_string_clear (mangled);
|
|
|
|
}
|
|
|
|
|
|
|
|
dyn_string_delete (mangled);
|
|
|
|
dyn_string_delete (demangled);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* Demangle command line arguments. */
|
|
|
|
{
|
|
|
|
dyn_string_t result = dyn_string_new (0);
|
|
|
|
|
|
|
|
/* Loop over command line arguments. */
|
|
|
|
for (i = optind; i < argc; ++i)
|
|
|
|
{
|
|
|
|
/* Attempt to demangle. */
|
2001-02-02 01:27:39 +01:00
|
|
|
status = cp_demangle (argv[i], result, 0);
|
2000-06-05 04:28:41 +02:00
|
|
|
|
|
|
|
/* If it worked, print the demangled name. */
|
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_NO_ERROR (status))
|
2000-06-05 04:28:41 +02:00
|
|
|
printf ("%s\n", dyn_string_buf (result));
|
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
|
|
|
/* Abort on allocaiton failures. */
|
2000-06-30 17:25:33 +02:00
|
|
|
else if (status == STATUS_ALLOCATION_FAILED)
|
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
|
|
|
{
|
2001-02-02 01:27:39 +01:00
|
|
|
fprintf (stderr, "Memory allocation failed.\n");
|
2000-06-30 17:25:33 +02:00
|
|
|
abort ();
|
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 not, print the error message to stderr instead. */
|
|
|
|
else
|
|
|
|
fprintf (stderr, "%s\n", status);
|
|
|
|
}
|
|
|
|
dyn_string_delete (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* STANDALONE_DEMANGLER */
|