1999-05-03 15:29:11 +08:00
|
|
|
/* Demangler for GNU C++
|
2022-01-02 06:30:17 +08:00
|
|
|
Copyright (C) 1989-2022 Free Software Foundation, Inc.
|
1999-05-03 15:29:11 +08:00
|
|
|
Written by James Clark (jjc@jclark.uucp)
|
|
|
|
Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling
|
|
|
|
Modified by Satish Pai (pai@apollo.hp.com) for HP demangling
|
|
|
|
|
|
|
|
This file is part of the libiberty library.
|
|
|
|
Libiberty is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
2003-03-04 11:02:50 +08:00
|
|
|
In addition to the permissions in the GNU Library General Public
|
|
|
|
License, the Free Software Foundation gives you unlimited permission
|
|
|
|
to link the compiled version of this file into combinations with other
|
|
|
|
programs, and to distribute those combinations without any restriction
|
|
|
|
coming from the use of this file. (The Library Public License
|
|
|
|
restrictions do apply in other respects; for example, they cover
|
|
|
|
modification of the file, and distribution when not linked into a
|
|
|
|
combined executable.)
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
Libiberty is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with libiberty; see the file COPYING.LIB. If
|
2005-05-10 23:33:34 +08:00
|
|
|
not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
/* This file lives in both GCC and libiberty. When making changes, please
|
|
|
|
try not to break either. */
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2000-12-09 00:37:01 +08:00
|
|
|
#include "safe-ctype.h"
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#else
|
2008-03-14 03:13:36 +08:00
|
|
|
void * malloc ();
|
|
|
|
void * realloc ();
|
1999-05-03 15:29:11 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <demangle.h>
|
|
|
|
#undef CURRENT_DEMANGLING_STYLE
|
Sync libiberty sources with gcc master versions.
. * libiberty: Sync with gcc. Bring in:
2019-01-09 Sandra Loosemore <sandra@codesourcery.com>
PR other/16615
* cp-demangle.c: Mechanically replace "can not" with "cannot".
* floatformat.c: Likewise.
* strerror.c: Likewise.
2018-12-22 Jason Merrill <jason@redhat.com>
Remove support for demangling GCC 2.x era mangling schemes.
* cplus-dem.c: Remove cplus_mangle_opname, cplus_demangle_opname,
internal_cplus_demangle, and all subroutines.
(libiberty_demanglers): Remove entries for ancient GNU (pre-3.0),
Lucid, ARM, HP, and EDG demangling styles.
(cplus_demangle): Remove 'work' variable. Don't call
internal_cplus_demangle.
include * Merge from GCC:
2018-12-22 Jason Merrill <jason@redhat.com>
* demangle.h: Remove support for ancient GNU (pre-3.0), Lucid,
ARM, HP, and EDG demangling styles.
2019-01-10 17:44:13 +08:00
|
|
|
#define CURRENT_DEMANGLING_STYLE options
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
#include "libiberty.h"
|
|
|
|
|
2000-12-06 00:51:29 +08:00
|
|
|
enum demangling_styles current_demangling_style = auto_demangling;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2001-10-08 01:24:36 +08:00
|
|
|
const struct demangler_engine libiberty_demanglers[] =
|
2000-06-16 04:56:25 +08:00
|
|
|
{
|
2001-12-07 05:57:28 +08:00
|
|
|
{
|
|
|
|
NO_DEMANGLING_STYLE_STRING,
|
|
|
|
no_demangling,
|
|
|
|
"Demangling disabled"
|
|
|
|
}
|
|
|
|
,
|
2000-06-16 04:56:25 +08:00
|
|
|
{
|
|
|
|
AUTO_DEMANGLING_STYLE_STRING,
|
|
|
|
auto_demangling,
|
|
|
|
"Automatic selection based on executable"
|
|
|
|
}
|
|
|
|
,
|
|
|
|
{
|
2000-12-06 00:51:29 +08:00
|
|
|
GNU_V3_DEMANGLING_STYLE_STRING,
|
|
|
|
gnu_v3_demangling,
|
Sync libiberty sources with gcc master versions.
. * libiberty: Sync with gcc. Bring in:
2019-01-09 Sandra Loosemore <sandra@codesourcery.com>
PR other/16615
* cp-demangle.c: Mechanically replace "can not" with "cannot".
* floatformat.c: Likewise.
* strerror.c: Likewise.
2018-12-22 Jason Merrill <jason@redhat.com>
Remove support for demangling GCC 2.x era mangling schemes.
* cplus-dem.c: Remove cplus_mangle_opname, cplus_demangle_opname,
internal_cplus_demangle, and all subroutines.
(libiberty_demanglers): Remove entries for ancient GNU (pre-3.0),
Lucid, ARM, HP, and EDG demangling styles.
(cplus_demangle): Remove 'work' variable. Don't call
internal_cplus_demangle.
include * Merge from GCC:
2018-12-22 Jason Merrill <jason@redhat.com>
* demangle.h: Remove support for ancient GNU (pre-3.0), Lucid,
ARM, HP, and EDG demangling styles.
2019-01-10 17:44:13 +08:00
|
|
|
"GNU (g++) V3 (Itanium C++ ABI) style demangling"
|
2000-06-16 04:56:25 +08:00
|
|
|
}
|
|
|
|
,
|
2000-11-15 19:50:21 +08:00
|
|
|
{
|
|
|
|
JAVA_DEMANGLING_STYLE_STRING,
|
|
|
|
java_demangling,
|
|
|
|
"Java style demangling"
|
|
|
|
}
|
|
|
|
,
|
|
|
|
{
|
|
|
|
GNAT_DEMANGLING_STYLE_STRING,
|
|
|
|
gnat_demangling,
|
|
|
|
"GNAT style demangling"
|
|
|
|
}
|
|
|
|
,
|
2014-10-11 17:29:10 +08:00
|
|
|
{
|
|
|
|
DLANG_DEMANGLING_STYLE_STRING,
|
|
|
|
dlang_demangling,
|
|
|
|
"DLANG style demangling"
|
|
|
|
}
|
|
|
|
,
|
2016-11-17 07:09:27 +08:00
|
|
|
{
|
|
|
|
RUST_DEMANGLING_STYLE_STRING,
|
|
|
|
rust_demangling,
|
|
|
|
"Rust style demangling"
|
|
|
|
}
|
|
|
|
,
|
2000-06-16 04:56:25 +08:00
|
|
|
{
|
|
|
|
NULL, unknown_demangling, NULL
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Add a routine to set the demangling style to be sure it is valid and
|
|
|
|
allow for any demangler initialization that maybe necessary. */
|
|
|
|
|
|
|
|
enum demangling_styles
|
2005-03-27 13:28:42 +08:00
|
|
|
cplus_demangle_set_style (enum demangling_styles style)
|
2000-06-16 04:56:25 +08:00
|
|
|
{
|
2001-10-08 01:24:36 +08:00
|
|
|
const struct demangler_engine *demangler = libiberty_demanglers;
|
2000-06-16 04:56:25 +08:00
|
|
|
|
|
|
|
for (; demangler->demangling_style != unknown_demangling; ++demangler)
|
|
|
|
if (style == demangler->demangling_style)
|
|
|
|
{
|
|
|
|
current_demangling_style = style;
|
|
|
|
return current_demangling_style;
|
|
|
|
}
|
|
|
|
|
|
|
|
return unknown_demangling;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Do string name to style translation */
|
|
|
|
|
|
|
|
enum demangling_styles
|
2005-03-27 13:28:42 +08:00
|
|
|
cplus_demangle_name_to_style (const char *name)
|
2000-06-16 04:56:25 +08:00
|
|
|
{
|
2001-10-08 01:24:36 +08:00
|
|
|
const struct demangler_engine *demangler = libiberty_demanglers;
|
2000-06-16 04:56:25 +08:00
|
|
|
|
|
|
|
for (; demangler->demangling_style != unknown_demangling; ++demangler)
|
|
|
|
if (strcmp (name, demangler->demangling_style_name) == 0)
|
|
|
|
return demangler->demangling_style;
|
|
|
|
|
|
|
|
return unknown_demangling;
|
|
|
|
}
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
/* char *cplus_demangle (const char *mangled, int options)
|
|
|
|
|
|
|
|
If MANGLED is a mangled function name produced by GNU C++, then
|
2001-10-18 06:35:28 +08:00
|
|
|
a pointer to a @code{malloc}ed string giving a C++ representation
|
1999-05-03 15:29:11 +08:00
|
|
|
of the name will be returned; otherwise NULL will be returned.
|
|
|
|
It is the caller's responsibility to free the string which
|
|
|
|
is returned.
|
|
|
|
|
|
|
|
Note that any leading underscores, or other such characters prepended by
|
|
|
|
the compilation system, are presumed to have already been stripped from
|
|
|
|
MANGLED. */
|
|
|
|
|
|
|
|
char *
|
2005-03-27 13:28:42 +08:00
|
|
|
cplus_demangle (const char *mangled, int options)
|
1999-05-03 15:29:11 +08:00
|
|
|
{
|
|
|
|
char *ret;
|
2001-12-07 05:57:28 +08:00
|
|
|
|
|
|
|
if (current_demangling_style == no_demangling)
|
|
|
|
return xstrdup (mangled);
|
|
|
|
|
Sync libiberty sources with gcc master versions.
. * libiberty: Sync with gcc. Bring in:
2019-01-09 Sandra Loosemore <sandra@codesourcery.com>
PR other/16615
* cp-demangle.c: Mechanically replace "can not" with "cannot".
* floatformat.c: Likewise.
* strerror.c: Likewise.
2018-12-22 Jason Merrill <jason@redhat.com>
Remove support for demangling GCC 2.x era mangling schemes.
* cplus-dem.c: Remove cplus_mangle_opname, cplus_demangle_opname,
internal_cplus_demangle, and all subroutines.
(libiberty_demanglers): Remove entries for ancient GNU (pre-3.0),
Lucid, ARM, HP, and EDG demangling styles.
(cplus_demangle): Remove 'work' variable. Don't call
internal_cplus_demangle.
include * Merge from GCC:
2018-12-22 Jason Merrill <jason@redhat.com>
* demangle.h: Remove support for ancient GNU (pre-3.0), Lucid,
ARM, HP, and EDG demangling styles.
2019-01-10 17:44:13 +08:00
|
|
|
if ((options & DMGL_STYLE_MASK) == 0)
|
|
|
|
options |= (int) current_demangling_style & DMGL_STYLE_MASK;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
Update libiberty sources with changes in the gcc mainline.
+2020-01-01 Jakub Jelinek <jakub@redhat.com>
+
+ Update copyright years.
+
+2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * make-relative-prefix.c (split_directories):
+ Return early on empty 'name'
+
+2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * cp-demangle.c (d_print_init): Remove const from 4th param.
+ (cplus_demangle_fill_name): Initialize d->d_counting.
+ (cplus_demangle_fill_extended_operator): Likewise.
+ (cplus_demangle_fill_ctor): Likewise.
+ (cplus_demangle_fill_dtor): Likewise.
+ (d_make_empty): Likewise.
+ (d_count_templates_scopes): Remobe const from 3rd param,
+ Return on dc->d_counting > 1,
+ Increment dc->d_counting.
+ * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting.
+ (cplus_demangle_fill_builtin_type): Likewise.
+ (cplus_demangle_fill_operator): Likewise.
+
+2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * cplus-dem.c (cplus_demangle): Use rust_demangle directly.
+ (rust_demangle): Remove.
+ * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash.
+ (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble.
+ (parse_legacy_escape): Rename to decode_legacy_escape.
+ (rust_is_mangled): Remove.
+ (struct rust_demangler): Add.
+ (peek): Add.
+ (next): Add.
+ (struct rust_mangled_ident): Add.
+ (parse_ident): Add.
+ (rust_demangle_sym): Remove.
+ (print_str): Add.
+ (PRINT): Add.
+ (print_ident): Add.
+ (rust_demangle_callback): Add.
+ (struct str_buf): Add.
+ (str_buf_reserve): Add.
+ (str_buf_append): Add.
+ (str_buf_demangle_callback): Add.
+ (rust_demangle): Add.
+ * rust-demangle.h: Remove.
+
+2019-11-15 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * testsuite/demangle-expected: Fix test.
+
+2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com>
+
+ * cp-demangle.c (d_expr_primary): Handle
+ nullptr demangling.
+ * testsuite/demangle-expected: Added test.
+
+2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * cp-demangle.c (d_number): Avoid signed int overflow.
+
+2019-10-28 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+ and `imaginary`, as opposed to after.
+ * testsuite/demangle-expected: Adjust test.
+
+2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (looks_like_rust): Remove.
+ (rust_is_mangled): Don't check escapes.
+ (is_prefixed_hash): Allow 0-9a-f permutations.
+ (rust_demangle_sym): Don't bail on unknown escapes.
+ * testsuite/rust-demangle-expected: Update 'main::$99$' test.
+
+2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (unescape): Remove.
+ (parse_lower_hex_nibble): New function.
+ (parse_legacy_escape): New function.
+ (is_prefixed_hash): Use parse_lower_hex_nibble.
+ (looks_like_rust): Use parse_legacy_escape.
+ (rust_demangle_sym): Use parse_legacy_escape.
+ * testsuite/rust-demangle-expected: Add 'llv$u6d$' test.
+
+2019-08-27 Martin Liska <mliska@suse.cz>
+
+ PR lto/91478
+ * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections):
+ First find a WEAK HIDDEN symbol in symbol table that will be
+ preserved. Later, use the symbol name for all removed symbols.
+
+2019-08-12 Martin Liska <mliska@suse.cz>
+
+ * Makefile.in: Add filedescriptor.c.
+ * filedescriptor.c: New file.
+ * lrealpath.c (is_valid_fd): Remove.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0be45b4ae8..fe738d0db4 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the libiberty library.
# Originally written by K. Richard Pixley <rich@cygnus.com>.
#
-# Copyright (C) 1990-2019 Free Software Foundation, Inc.
+# Copyright (C) 1990-2020 Free Software Foundation, Inc.
#
# This file is part of the libiberty library.
# Libiberty is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
d-demangle.c dwarfnames.c dyn-string.c \
- fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
+ fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
gettimeofday.c \
@@ -171,6 +171,7 @@ REQUIRED_OFILES = \
./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
+ ./filedescriptor.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
./fnmatch.$(objext) ./fopen_unlocked.$(objext) \
./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \
@@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION)
+
+
./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
$(INCDIR)/safe-ctype.h
diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c
index d44dc415ed..a739f4304f 100644
--- a/libiberty/_doprnt.c
+++ b/libiberty/_doprnt.c
@@ -1,5 +1,5 @@
/* Provide a version of _doprnt in terms of fprintf.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98
This program is free software; you can redistribute it and/or modify it
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 6444896f99..8c9794db6a 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -1,5 +1,5 @@
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 5718682f69..6e38e2234d 100644
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller.
- Copyright (C) 1997-2019 Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the libiberty library.
diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 72c1b710bd..49a2faaa51 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix.
- Copyright (C) 1996-2019 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
diff --git a/libiberty/clock.c b/libiberty/clock.c
index a3730714bd..0de74657d0 100644
--- a/libiberty/clock.c
+++ b/libiberty/clock.c
@@ -1,5 +1,5 @@
/* ANSI-compatible clock function.
- Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free
software; you can redistribute it and/or modify it under the
diff --git
2020-01-17 22:13:22 +08:00
|
|
|
/* The Rust demangling is implemented elsewhere.
|
|
|
|
Legacy Rust symbols overlap with GNU_V3, so try Rust first. */
|
|
|
|
if (RUST_DEMANGLING || AUTO_DEMANGLING)
|
|
|
|
{
|
|
|
|
ret = rust_demangle (mangled, options);
|
|
|
|
if (ret || RUST_DEMANGLING)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-12-06 00:51:29 +08:00
|
|
|
/* The V3 ABI demangling is implemented elsewhere. */
|
Update libiberty sources with changes in the gcc mainline.
+2020-01-01 Jakub Jelinek <jakub@redhat.com>
+
+ Update copyright years.
+
+2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * make-relative-prefix.c (split_directories):
+ Return early on empty 'name'
+
+2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * cp-demangle.c (d_print_init): Remove const from 4th param.
+ (cplus_demangle_fill_name): Initialize d->d_counting.
+ (cplus_demangle_fill_extended_operator): Likewise.
+ (cplus_demangle_fill_ctor): Likewise.
+ (cplus_demangle_fill_dtor): Likewise.
+ (d_make_empty): Likewise.
+ (d_count_templates_scopes): Remobe const from 3rd param,
+ Return on dc->d_counting > 1,
+ Increment dc->d_counting.
+ * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting.
+ (cplus_demangle_fill_builtin_type): Likewise.
+ (cplus_demangle_fill_operator): Likewise.
+
+2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * cplus-dem.c (cplus_demangle): Use rust_demangle directly.
+ (rust_demangle): Remove.
+ * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash.
+ (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble.
+ (parse_legacy_escape): Rename to decode_legacy_escape.
+ (rust_is_mangled): Remove.
+ (struct rust_demangler): Add.
+ (peek): Add.
+ (next): Add.
+ (struct rust_mangled_ident): Add.
+ (parse_ident): Add.
+ (rust_demangle_sym): Remove.
+ (print_str): Add.
+ (PRINT): Add.
+ (print_ident): Add.
+ (rust_demangle_callback): Add.
+ (struct str_buf): Add.
+ (str_buf_reserve): Add.
+ (str_buf_append): Add.
+ (str_buf_demangle_callback): Add.
+ (rust_demangle): Add.
+ * rust-demangle.h: Remove.
+
+2019-11-15 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * testsuite/demangle-expected: Fix test.
+
+2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com>
+
+ * cp-demangle.c (d_expr_primary): Handle
+ nullptr demangling.
+ * testsuite/demangle-expected: Added test.
+
+2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * cp-demangle.c (d_number): Avoid signed int overflow.
+
+2019-10-28 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+ and `imaginary`, as opposed to after.
+ * testsuite/demangle-expected: Adjust test.
+
+2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (looks_like_rust): Remove.
+ (rust_is_mangled): Don't check escapes.
+ (is_prefixed_hash): Allow 0-9a-f permutations.
+ (rust_demangle_sym): Don't bail on unknown escapes.
+ * testsuite/rust-demangle-expected: Update 'main::$99$' test.
+
+2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (unescape): Remove.
+ (parse_lower_hex_nibble): New function.
+ (parse_legacy_escape): New function.
+ (is_prefixed_hash): Use parse_lower_hex_nibble.
+ (looks_like_rust): Use parse_legacy_escape.
+ (rust_demangle_sym): Use parse_legacy_escape.
+ * testsuite/rust-demangle-expected: Add 'llv$u6d$' test.
+
+2019-08-27 Martin Liska <mliska@suse.cz>
+
+ PR lto/91478
+ * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections):
+ First find a WEAK HIDDEN symbol in symbol table that will be
+ preserved. Later, use the symbol name for all removed symbols.
+
+2019-08-12 Martin Liska <mliska@suse.cz>
+
+ * Makefile.in: Add filedescriptor.c.
+ * filedescriptor.c: New file.
+ * lrealpath.c (is_valid_fd): Remove.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0be45b4ae8..fe738d0db4 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the libiberty library.
# Originally written by K. Richard Pixley <rich@cygnus.com>.
#
-# Copyright (C) 1990-2019 Free Software Foundation, Inc.
+# Copyright (C) 1990-2020 Free Software Foundation, Inc.
#
# This file is part of the libiberty library.
# Libiberty is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
d-demangle.c dwarfnames.c dyn-string.c \
- fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
+ fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
gettimeofday.c \
@@ -171,6 +171,7 @@ REQUIRED_OFILES = \
./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
+ ./filedescriptor.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
./fnmatch.$(objext) ./fopen_unlocked.$(objext) \
./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \
@@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION)
+
+
./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
$(INCDIR)/safe-ctype.h
diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c
index d44dc415ed..a739f4304f 100644
--- a/libiberty/_doprnt.c
+++ b/libiberty/_doprnt.c
@@ -1,5 +1,5 @@
/* Provide a version of _doprnt in terms of fprintf.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98
This program is free software; you can redistribute it and/or modify it
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 6444896f99..8c9794db6a 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -1,5 +1,5 @@
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 5718682f69..6e38e2234d 100644
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller.
- Copyright (C) 1997-2019 Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the libiberty library.
diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 72c1b710bd..49a2faaa51 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix.
- Copyright (C) 1996-2019 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
diff --git a/libiberty/clock.c b/libiberty/clock.c
index a3730714bd..0de74657d0 100644
--- a/libiberty/clock.c
+++ b/libiberty/clock.c
@@ -1,5 +1,5 @@
/* ANSI-compatible clock function.
- Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free
software; you can redistribute it and/or modify it under the
diff --git
2020-01-17 22:13:22 +08:00
|
|
|
if (GNU_V3_DEMANGLING || AUTO_DEMANGLING)
|
2000-12-06 00:51:29 +08:00
|
|
|
{
|
Sync libiberty sources with gcc master versions.
. * libiberty: Sync with gcc. Bring in:
2019-01-09 Sandra Loosemore <sandra@codesourcery.com>
PR other/16615
* cp-demangle.c: Mechanically replace "can not" with "cannot".
* floatformat.c: Likewise.
* strerror.c: Likewise.
2018-12-22 Jason Merrill <jason@redhat.com>
Remove support for demangling GCC 2.x era mangling schemes.
* cplus-dem.c: Remove cplus_mangle_opname, cplus_demangle_opname,
internal_cplus_demangle, and all subroutines.
(libiberty_demanglers): Remove entries for ancient GNU (pre-3.0),
Lucid, ARM, HP, and EDG demangling styles.
(cplus_demangle): Remove 'work' variable. Don't call
internal_cplus_demangle.
include * Merge from GCC:
2018-12-22 Jason Merrill <jason@redhat.com>
* demangle.h: Remove support for ancient GNU (pre-3.0), Lucid,
ARM, HP, and EDG demangling styles.
2019-01-10 17:44:13 +08:00
|
|
|
ret = cplus_demangle_v3 (mangled, options);
|
Update libiberty sources with changes in the gcc mainline.
+2020-01-01 Jakub Jelinek <jakub@redhat.com>
+
+ Update copyright years.
+
+2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * make-relative-prefix.c (split_directories):
+ Return early on empty 'name'
+
+2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * cp-demangle.c (d_print_init): Remove const from 4th param.
+ (cplus_demangle_fill_name): Initialize d->d_counting.
+ (cplus_demangle_fill_extended_operator): Likewise.
+ (cplus_demangle_fill_ctor): Likewise.
+ (cplus_demangle_fill_dtor): Likewise.
+ (d_make_empty): Likewise.
+ (d_count_templates_scopes): Remobe const from 3rd param,
+ Return on dc->d_counting > 1,
+ Increment dc->d_counting.
+ * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting.
+ (cplus_demangle_fill_builtin_type): Likewise.
+ (cplus_demangle_fill_operator): Likewise.
+
+2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * cplus-dem.c (cplus_demangle): Use rust_demangle directly.
+ (rust_demangle): Remove.
+ * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash.
+ (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble.
+ (parse_legacy_escape): Rename to decode_legacy_escape.
+ (rust_is_mangled): Remove.
+ (struct rust_demangler): Add.
+ (peek): Add.
+ (next): Add.
+ (struct rust_mangled_ident): Add.
+ (parse_ident): Add.
+ (rust_demangle_sym): Remove.
+ (print_str): Add.
+ (PRINT): Add.
+ (print_ident): Add.
+ (rust_demangle_callback): Add.
+ (struct str_buf): Add.
+ (str_buf_reserve): Add.
+ (str_buf_append): Add.
+ (str_buf_demangle_callback): Add.
+ (rust_demangle): Add.
+ * rust-demangle.h: Remove.
+
+2019-11-15 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * testsuite/demangle-expected: Fix test.
+
+2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com>
+
+ * cp-demangle.c (d_expr_primary): Handle
+ nullptr demangling.
+ * testsuite/demangle-expected: Added test.
+
+2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * cp-demangle.c (d_number): Avoid signed int overflow.
+
+2019-10-28 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+ and `imaginary`, as opposed to after.
+ * testsuite/demangle-expected: Adjust test.
+
+2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (looks_like_rust): Remove.
+ (rust_is_mangled): Don't check escapes.
+ (is_prefixed_hash): Allow 0-9a-f permutations.
+ (rust_demangle_sym): Don't bail on unknown escapes.
+ * testsuite/rust-demangle-expected: Update 'main::$99$' test.
+
+2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (unescape): Remove.
+ (parse_lower_hex_nibble): New function.
+ (parse_legacy_escape): New function.
+ (is_prefixed_hash): Use parse_lower_hex_nibble.
+ (looks_like_rust): Use parse_legacy_escape.
+ (rust_demangle_sym): Use parse_legacy_escape.
+ * testsuite/rust-demangle-expected: Add 'llv$u6d$' test.
+
+2019-08-27 Martin Liska <mliska@suse.cz>
+
+ PR lto/91478
+ * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections):
+ First find a WEAK HIDDEN symbol in symbol table that will be
+ preserved. Later, use the symbol name for all removed symbols.
+
+2019-08-12 Martin Liska <mliska@suse.cz>
+
+ * Makefile.in: Add filedescriptor.c.
+ * filedescriptor.c: New file.
+ * lrealpath.c (is_valid_fd): Remove.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0be45b4ae8..fe738d0db4 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the libiberty library.
# Originally written by K. Richard Pixley <rich@cygnus.com>.
#
-# Copyright (C) 1990-2019 Free Software Foundation, Inc.
+# Copyright (C) 1990-2020 Free Software Foundation, Inc.
#
# This file is part of the libiberty library.
# Libiberty is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
d-demangle.c dwarfnames.c dyn-string.c \
- fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
+ fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
gettimeofday.c \
@@ -171,6 +171,7 @@ REQUIRED_OFILES = \
./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
+ ./filedescriptor.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
./fnmatch.$(objext) ./fopen_unlocked.$(objext) \
./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \
@@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION)
+
+
./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
$(INCDIR)/safe-ctype.h
diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c
index d44dc415ed..a739f4304f 100644
--- a/libiberty/_doprnt.c
+++ b/libiberty/_doprnt.c
@@ -1,5 +1,5 @@
/* Provide a version of _doprnt in terms of fprintf.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98
This program is free software; you can redistribute it and/or modify it
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 6444896f99..8c9794db6a 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -1,5 +1,5 @@
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 5718682f69..6e38e2234d 100644
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller.
- Copyright (C) 1997-2019 Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the libiberty library.
diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 72c1b710bd..49a2faaa51 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix.
- Copyright (C) 1996-2019 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
diff --git a/libiberty/clock.c b/libiberty/clock.c
index a3730714bd..0de74657d0 100644
--- a/libiberty/clock.c
+++ b/libiberty/clock.c
@@ -1,5 +1,5 @@
/* ANSI-compatible clock function.
- Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free
software; you can redistribute it and/or modify it under the
diff --git
2020-01-17 22:13:22 +08:00
|
|
|
if (ret || GNU_V3_DEMANGLING)
|
2000-12-06 00:51:29 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2000-06-16 04:56:25 +08:00
|
|
|
|
2001-02-03 02:58:51 +08:00
|
|
|
if (JAVA_DEMANGLING)
|
|
|
|
{
|
|
|
|
ret = java_demangle_v3 (mangled);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-11-15 19:50:21 +08:00
|
|
|
if (GNAT_DEMANGLING)
|
2010-01-12 03:12:47 +08:00
|
|
|
return ada_demangle (mangled, options);
|
2000-11-15 19:50:21 +08:00
|
|
|
|
2014-10-11 17:29:10 +08:00
|
|
|
if (DLANG_DEMANGLING)
|
|
|
|
{
|
|
|
|
ret = dlang_demangle (mangled, options);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
2010-01-12 03:12:47 +08:00
|
|
|
/* Demangle ada names. The encoding is documented in gcc/ada/exp_dbug.ads. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2010-01-12 03:12:47 +08:00
|
|
|
char *
|
2005-03-27 13:28:42 +08:00
|
|
|
ada_demangle (const char *mangled, int option ATTRIBUTE_UNUSED)
|
2000-11-15 19:50:21 +08:00
|
|
|
{
|
|
|
|
int len0;
|
|
|
|
const char* p;
|
2010-01-12 03:12:47 +08:00
|
|
|
char *d;
|
2016-11-02 07:13:10 +08:00
|
|
|
char *demangled = NULL;
|
2000-11-15 19:50:21 +08:00
|
|
|
|
2010-01-12 03:12:47 +08:00
|
|
|
/* Discard leading _ada_, which is used for library level subprograms. */
|
2000-11-15 19:50:21 +08:00
|
|
|
if (strncmp (mangled, "_ada_", 5) == 0)
|
2010-01-12 03:12:47 +08:00
|
|
|
mangled += 5;
|
|
|
|
|
|
|
|
/* All ada unit names are lower-case. */
|
|
|
|
if (!ISLOWER (mangled[0]))
|
|
|
|
goto unknown;
|
|
|
|
|
|
|
|
/* Most of the demangling will trivially remove chars. Operator names
|
|
|
|
may add one char but because they are always preceeded by '__' which is
|
2010-09-28 05:01:18 +08:00
|
|
|
replaced by '.', they eventually never expand the size.
|
|
|
|
A few special names such as '___elabs' add a few chars (at most 7), but
|
|
|
|
they occur only once. */
|
|
|
|
len0 = strlen (mangled) + 7 + 1;
|
2010-01-12 03:12:47 +08:00
|
|
|
demangled = XNEWVEC (char, len0);
|
2000-11-15 19:50:21 +08:00
|
|
|
|
2010-01-12 03:12:47 +08:00
|
|
|
d = demangled;
|
|
|
|
p = mangled;
|
|
|
|
while (1)
|
2000-11-15 19:50:21 +08:00
|
|
|
{
|
2010-09-28 05:01:18 +08:00
|
|
|
/* An entity names is expected. */
|
2010-01-12 03:12:47 +08:00
|
|
|
if (ISLOWER (*p))
|
|
|
|
{
|
2010-09-28 05:01:18 +08:00
|
|
|
/* An identifier, which is always lower case. */
|
2010-01-12 03:12:47 +08:00
|
|
|
do
|
|
|
|
*d++ = *p++;
|
|
|
|
while (ISLOWER(*p) || ISDIGIT (*p)
|
|
|
|
|| (p[0] == '_' && (ISLOWER (p[1]) || ISDIGIT (p[1]))));
|
|
|
|
}
|
|
|
|
else if (p[0] == 'O')
|
|
|
|
{
|
2010-09-28 05:01:18 +08:00
|
|
|
/* An operator name. */
|
2010-01-12 03:12:47 +08:00
|
|
|
static const char * const operators[][2] =
|
|
|
|
{{"Oabs", "abs"}, {"Oand", "and"}, {"Omod", "mod"},
|
|
|
|
{"Onot", "not"}, {"Oor", "or"}, {"Orem", "rem"},
|
|
|
|
{"Oxor", "xor"}, {"Oeq", "="}, {"One", "/="},
|
|
|
|
{"Olt", "<"}, {"Ole", "<="}, {"Ogt", ">"},
|
|
|
|
{"Oge", ">="}, {"Oadd", "+"}, {"Osubtract", "-"},
|
|
|
|
{"Oconcat", "&"}, {"Omultiply", "*"}, {"Odivide", "/"},
|
|
|
|
{"Oexpon", "**"}, {NULL, NULL}};
|
|
|
|
int k;
|
|
|
|
|
2010-09-28 05:01:18 +08:00
|
|
|
for (k = 0; operators[k][0] != NULL; k++)
|
2010-01-12 03:12:47 +08:00
|
|
|
{
|
2010-09-28 05:01:18 +08:00
|
|
|
size_t slen = strlen (operators[k][0]);
|
|
|
|
if (strncmp (p, operators[k][0], slen) == 0)
|
2010-01-12 03:12:47 +08:00
|
|
|
{
|
2010-09-28 05:01:18 +08:00
|
|
|
p += slen;
|
|
|
|
slen = strlen (operators[k][1]);
|
2010-01-12 03:12:47 +08:00
|
|
|
*d++ = '"';
|
2010-09-28 05:01:18 +08:00
|
|
|
memcpy (d, operators[k][1], slen);
|
|
|
|
d += slen;
|
2010-01-12 03:12:47 +08:00
|
|
|
*d++ = '"';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Operator not found. */
|
2010-09-28 05:01:18 +08:00
|
|
|
if (operators[k][0] == NULL)
|
2010-01-12 03:12:47 +08:00
|
|
|
goto unknown;
|
|
|
|
}
|
2000-11-15 19:50:21 +08:00
|
|
|
else
|
2010-01-12 03:12:47 +08:00
|
|
|
{
|
|
|
|
/* Not a GNAT encoding. */
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
|
2010-09-28 05:01:18 +08:00
|
|
|
/* The name can be directly followed by some uppercase letters. */
|
|
|
|
if (p[0] == 'T' && p[1] == 'K')
|
|
|
|
{
|
|
|
|
/* Task stuff. */
|
|
|
|
if (p[2] == 'B' && p[3] == 0)
|
|
|
|
{
|
|
|
|
/* Subprogram for task body. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (p[2] == '_' && p[3] == '_')
|
|
|
|
{
|
|
|
|
/* Inner declarations in a task. */
|
|
|
|
p += 4;
|
|
|
|
*d++ = '.';
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
if (p[0] == 'E' && p[1] == 0)
|
|
|
|
{
|
|
|
|
/* Exception name. */
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
if ((p[0] == 'P' || p[0] == 'N') && p[1] == 0)
|
|
|
|
{
|
|
|
|
/* Protected type subprogram. */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if ((*p == 'N' || *p == 'S') && p[1] == 0)
|
|
|
|
{
|
|
|
|
/* Enumerated type name table. */
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
if (p[0] == 'X')
|
|
|
|
{
|
|
|
|
/* Body nested. */
|
|
|
|
p++;
|
|
|
|
while (p[0] == 'n' || p[0] == 'b')
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (p[0] == 'S' && p[1] != 0 && (p[2] == '_' || p[2] == 0))
|
|
|
|
{
|
|
|
|
/* Stream operations. */
|
|
|
|
const char *name;
|
|
|
|
switch (p[1])
|
|
|
|
{
|
|
|
|
case 'R':
|
|
|
|
name = "'Read";
|
|
|
|
break;
|
|
|
|
case 'W':
|
|
|
|
name = "'Write";
|
|
|
|
break;
|
|
|
|
case 'I':
|
|
|
|
name = "'Input";
|
|
|
|
break;
|
|
|
|
case 'O':
|
|
|
|
name = "'Output";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
p += 2;
|
|
|
|
strcpy (d, name);
|
|
|
|
d += strlen (name);
|
|
|
|
}
|
|
|
|
else if (p[0] == 'D')
|
|
|
|
{
|
|
|
|
/* Controlled type operation. */
|
|
|
|
const char *name;
|
|
|
|
switch (p[1])
|
|
|
|
{
|
|
|
|
case 'F':
|
|
|
|
name = ".Finalize";
|
|
|
|
break;
|
|
|
|
case 'A':
|
|
|
|
name = ".Adjust";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
strcpy (d, name);
|
|
|
|
d += strlen (name);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-01-12 03:12:47 +08:00
|
|
|
if (p[0] == '_')
|
|
|
|
{
|
|
|
|
/* Separator. */
|
|
|
|
if (p[1] == '_')
|
|
|
|
{
|
|
|
|
/* Standard separator. Handled first. */
|
|
|
|
p += 2;
|
2010-09-28 05:01:18 +08:00
|
|
|
|
2010-01-12 03:12:47 +08:00
|
|
|
if (ISDIGIT (*p))
|
|
|
|
{
|
2010-09-28 05:01:18 +08:00
|
|
|
/* Overloading number. */
|
2010-01-12 03:12:47 +08:00
|
|
|
do
|
|
|
|
p++;
|
|
|
|
while (ISDIGIT (*p) || (p[0] == '_' && ISDIGIT (p[1])));
|
2010-09-28 05:01:18 +08:00
|
|
|
if (*p == 'X')
|
|
|
|
{
|
|
|
|
p++;
|
|
|
|
while (p[0] == 'n' || p[0] == 'b')
|
|
|
|
p++;
|
|
|
|
}
|
2010-01-12 03:12:47 +08:00
|
|
|
}
|
2010-09-28 05:01:18 +08:00
|
|
|
else if (p[0] == '_' && p[1] != '_')
|
2010-01-12 03:12:47 +08:00
|
|
|
{
|
2010-09-28 05:01:18 +08:00
|
|
|
/* Special names. */
|
|
|
|
static const char * const special[][2] = {
|
|
|
|
{ "_elabb", "'Elab_Body" },
|
|
|
|
{ "_elabs", "'Elab_Spec" },
|
|
|
|
{ "_size", "'Size" },
|
|
|
|
{ "_alignment", "'Alignment" },
|
|
|
|
{ "_assign", ".\":=\"" },
|
|
|
|
{ NULL, NULL }
|
|
|
|
};
|
|
|
|
int k;
|
|
|
|
|
|
|
|
for (k = 0; special[k][0] != NULL; k++)
|
|
|
|
{
|
|
|
|
size_t slen = strlen (special[k][0]);
|
|
|
|
if (strncmp (p, special[k][0], slen) == 0)
|
|
|
|
{
|
|
|
|
p += slen;
|
|
|
|
slen = strlen (special[k][1]);
|
|
|
|
memcpy (d, special[k][1], slen);
|
|
|
|
d += slen;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (special[k][0] != NULL)
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
goto unknown;
|
2010-01-12 03:12:47 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*d++ = '.';
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (p[1] == 'B' || p[1] == 'E')
|
|
|
|
{
|
|
|
|
/* Entry Body or barrier Evaluation. */
|
|
|
|
p += 2;
|
|
|
|
while (ISDIGIT (*p))
|
|
|
|
p++;
|
|
|
|
if (p[0] == 's' && p[1] == 0)
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
goto unknown;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p[0] == '.' && ISDIGIT (p[1]))
|
|
|
|
{
|
|
|
|
/* Nested subprogram. */
|
|
|
|
p += 2;
|
|
|
|
while (ISDIGIT (*p))
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
if (*p == 0)
|
|
|
|
{
|
|
|
|
/* End of mangled name. */
|
|
|
|
break;
|
|
|
|
}
|
2000-11-15 19:50:21 +08:00
|
|
|
else
|
2010-01-12 03:12:47 +08:00
|
|
|
goto unknown;
|
2000-11-15 19:50:21 +08:00
|
|
|
}
|
2010-01-12 03:12:47 +08:00
|
|
|
*d = 0;
|
|
|
|
return demangled;
|
2000-11-15 19:50:21 +08:00
|
|
|
|
2010-01-12 03:12:47 +08:00
|
|
|
unknown:
|
2016-11-02 07:13:10 +08:00
|
|
|
XDELETEVEC (demangled);
|
2010-01-12 03:12:47 +08:00
|
|
|
len0 = strlen (mangled);
|
|
|
|
demangled = XNEWVEC (char, len0 + 3);
|
2002-10-07 04:21:01 +08:00
|
|
|
|
2000-11-15 19:50:21 +08:00
|
|
|
if (mangled[0] == '<')
|
2011-03-26 00:38:27 +08:00
|
|
|
strcpy (demangled, mangled);
|
2000-11-15 19:50:21 +08:00
|
|
|
else
|
|
|
|
sprintf (demangled, "<%s>", mangled);
|
|
|
|
|
|
|
|
return demangled;
|
|
|
|
}
|