From f989ed67ff0a648714f13bb11194d0dbcce39fbe Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Tue, 17 Sep 2002 07:09:50 +0000 Subject: [PATCH] Makefile.am (CFILES): Add cxxfilt.c. binutils: * Makefile.am (CFILES): Add cxxfilt.c. (cxxfilt_SOURCES): Now just cxxfilt.c $(BULIBS). (cxxfilt_LDADD): Delete. Remove all references to underscore.c. Regen dependencies. * configure.in: Define TARGET_PREPENDS_UNDERSCORE in config.h from $UNDERSCORE, rather than AC_SUBSTing it. * binutils/cxxfilt.c: Moved here from gcc/cp, minor adjustments to fit into binutils framework. * configure, config.in, Makefile.in, doc/Makefile.in: Regenerate. gcc/cp: * Make-lang.in: Remove all references to the demangler. * cxxfilt.c: Moved to binutils. From-SVN: r57235 --- gcc/cp/ChangeLog | 19 ++- gcc/cp/Make-lang.in | 32 +---- gcc/cp/cxxfilt.c | 302 -------------------------------------------- 3 files changed, 15 insertions(+), 338 deletions(-) delete mode 100644 gcc/cp/cxxfilt.c diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9b6bcdcbd88..ddf62612514 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2002-09-17 Zack Weinberg + + * Make-lang.in: Remove all references to the demangler. + * cxxfilt.c: Moved to binutils. + 2002-09-16 Nathan Sidwell PR c++/7718 @@ -123,7 +128,7 @@ * class.c (layout_virtual_bases): Warn about bugs in G++ that result in incorrect object layouts. (layout_class_type): Likewise. - + 2002-08-24 Matt Austern * tree.c (lvalue_p_1): Add argument for whether casts of lvalues @@ -132,7 +137,7 @@ (lvalue_p): Ditto. (non_cast_lvalue_or_else): New. * tree.h: Declare it. - * typeck.c (build_unary_op): Use non_cast_lvalue_or_else. + * typeck.c (build_unary_op): Use non_cast_lvalue_or_else. 2002-08-22 Mark Mitchell @@ -221,7 +226,7 @@ * search.c (adjust_result_of_qualified_name_lookup): New function. * typeck.c (qualify_type_recursive): Use TYPE_PTRMEM_* rather than accessing OFFSET_TYPEs directly. - + 2002-08-08 Mike Stump * call.c (add_builtin_candidate): legal -> valid, illegal -> invalid. @@ -541,8 +546,8 @@ * call.c (build_over_call): Likewise. (cp_convert_parm_for_inlining): New fn. - (convert_for_arg_passing): New fn. - (convert_default_arg, build_over_call): Use it. + (convert_for_arg_passing): New fn. + (convert_default_arg, build_over_call): Use it. (type_passed_as): New fn. * pt.c (tsubst_decl): Use it. * decl2.c (cp_build_parm_decl): New fn. @@ -944,8 +949,8 @@ 2002-06-20 Richard Henderson PR c++/6747 - * typeck.c (mark_addressable): Don't test TREE_ADDRESSABLE early. - Call put_var_into_stack. + * typeck.c (mark_addressable): Don't test TREE_ADDRESSABLE early. + Call put_var_into_stack. 2002-06-20 Kaveh R. Ghazi diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index a189b410485..0ec886d5a19 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -40,17 +40,12 @@ # Actual names to use when installing a native compiler. CXX_INSTALL_NAME = `echo c++|sed '$(program_transform_name)'` GXX_INSTALL_NAME = `echo g++|sed '$(program_transform_name)'` -DEMANGLER_INSTALL_NAME = `echo c++filt|sed '$(program_transform_name)'` CXX_TARGET_INSTALL_NAME = $(target_alias)-`echo c++|sed '$(program_transform_name)'` GXX_TARGET_INSTALL_NAME = $(target_alias)-`echo g++|sed '$(program_transform_name)'` # Actual names to use when installing a cross-compiler. CXX_CROSS_NAME = `echo c++|sed '$(program_transform_cross_name)'` GXX_CROSS_NAME = `echo g++|sed '$(program_transform_cross_name)'` -DEMANGLER_CROSS_NAME = `echo c++filt|sed '$(program_transform_cross_name)'` - -# The name to use for the demangler program. -DEMANGLER_PROG = c++filt$(exeext) # # Define the names for selecting c++ in LANGUAGES. @@ -81,14 +76,6 @@ g++-cross$(exeext): g++$(exeext) -rm -f g++-cross$(exeext) cp g++$(exeext) g++-cross$(exeext) -# The demangler. -cp/cxxfilt.o: cp/cxxfilt.c $(DEMANGLE_H) $(CONFIG_H) $(SYSTEM_H) version.h - -# Apparently OpenVM needs the -o to be at the beginning of the link line. -$(DEMANGLER_PROG): cp/cxxfilt.o version.o $(LIBDEPS) - $(CC) -o $@ $(ALL_CFLAGS) $(LDFLAGS) \ - cp/cxxfilt.o version.o $(LIBS) - # The compiler itself. # Shared with C front end: CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \ @@ -135,9 +122,9 @@ gt-cp-tree.h : s-gtype; @true # Build hooks: c++.all.build: g++$(exeext) -c++.all.cross: g++-cross$(exeext) $(DEMANGLER_PROG) +c++.all.cross: g++-cross$(exeext) c++.start.encap: g++$(exeext) -c++.rest.encap: $(DEMANGLER_PROG) +c++.rest.encap: c++.info: c++.dvi: @@ -177,17 +164,6 @@ c++.install-common: installdirs rm -f $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \ $(LN) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \ fi ; \ - if [ x$(DEMANGLER_PROG) != x ] && [ -x "$(DEMANGLER_PROG)" ]; then \ - if [ -f g++-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \ - chmod a+x $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \ - else \ - rm -f $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \ - chmod a+x $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \ - fi ; \ - fi ; \ fi c++.install-info: @@ -210,8 +186,6 @@ c++.uninstall: -rm -rf $(bindir)/$(CXX_CROSS_NAME)$(exeext) -rm -rf $(bindir)/$(GXX_INSTALL_NAME)$(exeext) -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext) - -rm -rf $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext) -rm -rf $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext) -rm -rf $(man1dir)/$(GXX_CROSS_NAME)$(man1ext) # @@ -220,7 +194,7 @@ c++.uninstall: # We just have to delete files specific to us. c++.mostlyclean: - -rm -f cp/*$(objext) $(DEMANGLER_PROG) + -rm -f cp/*$(objext) -rm -f cp/*$(coverageexts) c++.clean: c++.distclean: diff --git a/gcc/cp/cxxfilt.c b/gcc/cp/cxxfilt.c deleted file mode 100644 index c9ae0e49025..00000000000 --- a/gcc/cp/cxxfilt.c +++ /dev/null @@ -1,302 +0,0 @@ -/* Demangler for GNU C++ - main program - Copyright 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002 Free Software Foundation, Inc. - 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 GCC. - -GCC 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, or (at your option) any later -version. - -GCC 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 GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ - -#include "config.h" -#include "system.h" -#include "demangle.h" -#include "getopt.h" -#include "version.h" - -static const char *program_name; -static int flags = DMGL_PARAMS | DMGL_ANSI | DMGL_VERBOSE; - -static void demangle_it PARAMS ((char *)); -static void usage PARAMS ((FILE *, int)) ATTRIBUTE_NORETURN; -static void fatal PARAMS ((const char *)) ATTRIBUTE_NORETURN; -static void print_demangler_list PARAMS ((FILE *)); - -static void -demangle_it (mangled_name) - char *mangled_name; -{ - char *result; - - /* For command line args, also try to demangle type encodings. */ - result = cplus_demangle (mangled_name, flags | DMGL_TYPES); - if (result == NULL) - { - printf ("%s\n", mangled_name); - } - else - { - printf ("%s\n", result); - free (result); - } -} - -static void -print_demangler_list (stream) - FILE *stream; -{ - const struct demangler_engine *demangler; - - fprintf (stream, "{%s", libiberty_demanglers->demangling_style_name); - - for (demangler = libiberty_demanglers + 1; - demangler->demangling_style != unknown_demangling; - ++demangler) - fprintf (stream, ",%s", demangler->demangling_style_name); - - fprintf (stream, "}"); -} - -static void -usage (stream, status) - FILE *stream; - int status; -{ - fprintf (stream, "\ -Usage: %s [-_] [-n] [--strip-underscores] [--no-strip-underscores] \n", - program_name); - - fprintf (stream, "\ - [-s "); - print_demangler_list (stream); - fprintf (stream, "]\n"); - - fprintf (stream, "\ - [--format "); - print_demangler_list (stream); - fprintf (stream, "]\n"); - - fprintf (stream, "\ - [--help] [--version] [arg...]\n"); - exit (status); -} - -#define MBUF_SIZE 32767 -char mbuffer[MBUF_SIZE]; - -int strip_underscore = 0; - -static const struct option long_options[] = { - {"strip-underscores", no_argument, 0, '_'}, - {"format", required_argument, 0, 's'}, - {"help", no_argument, 0, 'h'}, - {"no-strip-underscores", no_argument, 0, 'n'}, - {"version", no_argument, 0, 'v'}, - {0, no_argument, 0, 0} -}; - -static const char * -standard_symbol_characters PARAMS ((void)); - -static const char * -hp_symbol_characters PARAMS ((void)); - -/* Return the string of non-alnum characters that may occur - as a valid symbol component, in the standard assembler symbol - syntax. */ - -static const char * -standard_symbol_characters () -{ - return "_$."; -} - - -/* Return the string of non-alnum characters that may occur - as a valid symbol name component in an HP object file. - - Note that, since HP's compiler generates object code straight from - C++ source, without going through an assembler, its mangled - identifiers can use all sorts of characters that no assembler would - tolerate, so the alphabet this function creates is a little odd. - Here are some sample mangled identifiers offered by HP: - - typeid*__XT24AddressIndExpClassMember_ - [Vftptr]key:__dt__32OrdinaryCompareIndExpClassMemberFv - __ct__Q2_9Elf64_Dyn18{unnamed.union.#1}Fv - - This still seems really weird to me, since nowhere else in this - file is there anything to recognize curly brackets, parens, etc. - I've talked with Srikanth , and he assures me - this is right, but I still strongly suspect that there's a - misunderstanding here. - - If we decide it's better for c++filt to use HP's assembler syntax - to scrape identifiers out of its input, here's the definition of - the symbol name syntax from the HP assembler manual: - - Symbols are composed of uppercase and lowercase letters, decimal - digits, dollar symbol, period (.), ampersand (&), pound sign(#) and - underscore (_). A symbol can begin with a letter, digit underscore or - dollar sign. If a symbol begins with a digit, it must contain a - non-digit character. - - So have fun. */ -static const char * -hp_symbol_characters () -{ - return "_$.<>#,*&[]:(){}"; -} - -extern int main PARAMS ((int, char **)); - -int -main (argc, argv) - int argc; - char **argv; -{ - char *result; - int c; - const char *valid_symbols; - enum demangling_styles style = auto_demangling; - - program_name = argv[0]; - - strip_underscore = (USER_LABEL_PREFIX[0] == '_'); - - while ((c = getopt_long (argc, argv, "_ns:", long_options, (int *) 0)) != EOF) - { - switch (c) - { - case '?': - usage (stderr, 1); - break; - case 'h': - usage (stdout, 0); - case 'n': - strip_underscore = 0; - break; - case 'v': - printf ("GNU %s (C++ demangler), version %s\n", - program_name, version_string); - return (0); - case '_': - strip_underscore = 1; - break; - case 's': - { - style = cplus_demangle_name_to_style (optarg); - if (style == unknown_demangling) - { - fprintf (stderr, "%s: unknown demangling style `%s'\n", - program_name, optarg); - return (1); - } - else - cplus_demangle_set_style (style); - } - break; - } - } - - if (optind < argc) - { - for ( ; optind < argc; optind++) - { - demangle_it (argv[optind]); - } - } - else - { - switch (current_demangling_style) - { - case gnu_demangling: - case lucid_demangling: - case arm_demangling: - case java_demangling: - case edg_demangling: - case gnat_demangling: - case gnu_v3_demangling: - case auto_demangling: - valid_symbols = standard_symbol_characters (); - break; - case hp_demangling: - valid_symbols = hp_symbol_characters (); - break; - default: - /* Folks should explicitly indicate the appropriate alphabet for - each demangling. Providing a default would allow the - question to go unconsidered. */ - fatal ("Internal error: no symbol alphabet for current style"); - } - - for (;;) - { - int i = 0; - c = getchar (); - /* Try to read a label. */ - while (c != EOF && (ISALNUM (c) || strchr (valid_symbols, c))) - { - if (i >= MBUF_SIZE-1) - break; - mbuffer[i++] = c; - c = getchar (); - } - if (i > 0) - { - int skip_first = 0; - - mbuffer[i] = 0; - if (mbuffer[0] == '.' || mbuffer[0] == '$') - ++skip_first; - if (strip_underscore && mbuffer[skip_first] == '_') - ++skip_first; - - if (skip_first > i) - skip_first = i; - - flags |= (int) style; - result = cplus_demangle (mbuffer + skip_first, flags); - if (result) - { - if (mbuffer[0] == '.') - putc ('.', stdout); - fputs (result, stdout); - free (result); - } - else - fputs (mbuffer, stdout); - - fflush (stdout); - } - if (c == EOF) - break; - putchar (c); - fflush (stdout); - } - } - - return (0); -} - -static void -fatal (str) - const char *str; -{ - fprintf (stderr, "%s: %s\n", program_name, str); - exit (1); -} -- 2.30.2