From 2e4964adfc1fe8192c7b44012c84f0544cc4b911 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Wed, 23 Dec 1992 06:34:57 +0000 Subject: * defs.h (STRCMP, STREQ, STREQN): New macros. * defs.h (demangle_and_match): Remove prototype. * dwarfread.c (STREQ, STREQN): Remove macros, replaced with STREQ and STREQN defined in defs.h. * dwarfread.c (set_cu_language): For completely unknown languages, try to deduce the language from the filename. Retain behavior that for known languages we don't know how to handle, we use language_unknown. * dwarfread.c (enum_type, symthesize_typedef): Initialize language and demangled name fields in symbol. * dwarfread.c, mipsread.c, partial-stab.h: For all usages of ADD_PSYMBOL_TO_LIST, add language and objfile parameters. * dwarfread.c (new_symbol): Attempt to demangle C++ symbol names and cache the results in SYMBOL_DEMANGLED_NAME for the symbol. * elfread.c (STREQ): Remove macro, use STREQ defined in defs.h. Replace usages throughout. * elfread.c (demangle.h): Include. * elfread.c (record_minimal_symbol): Remove prototype and function. * gdbtypes.h, symtab.h (B_SET, B_CLR, B_TST, B_TYPE, B_BYTES, B_CLRALL): Moved from symtab.h to gdbtypes.h. * infcmd.c (jump_command): Remove code to demangle name and add it to a cleanup list. Now just use SYMBOL_DEMANGLED_NAME. * minsyms.c (demangle.h): Include. * minsyms.c (lookup_minimal_symbol): Indent comment to match code. * minsyms.c (install_minimal_symbols): Attempt to demangle symbol names as C++ names, and cache them in SYMBOL_DEMANGLED_NAME. * mipsread.c (psymtab_language): Add static variable. * stabsread.c (demangle.h): Include. * stabsread.c (define_symbol): Attempt to demangle C++ symbol names and cache them in the SYMBOL_DEMANGLED_NAME field. * stack.c (return_command): Remove explicit demangling of name and use of cleanups. Just use SYMBOL_DEMANGLED_NAME. * symfile.c (demangle.h): Include. * symfile.c (add_psymbol_to_list, add_psymbol_addr_to_list): Fix to match macros in symfile.h and allow them to be compiled if INLINE_ADD_PSYMBOL is not true. * symfile.h (INLINE_ADD_PSYMBOL): Default to true if not set. * symfile.h (ADD_PSYMBOL_*): Add language and objfile parameters. Add code to demangle and cache C++ symbol names. Use macro form if INLINE_ADD_PSYMBOL is true, otherwise use C function form. * symmisc.c (add_psymbol_to_list, add_psymbol_addr_to_list): Remove, also defined in symfile.c, which we already fixed. * symtab.c (expensive_mangler): Remove prototype and function. * symtab.c (find_methods): Remove physnames parameter and fix prototype to match. * symtab.c (completion_list_add_symbol): Name changed to completion_list_add_name. * symtab.c (COMPLETION_LIST_ADD_SYMBOL): New macro, adds both the normal symbol name and the cached C++ demangled name. * symtab.c (lookup_demangled_partial_symbol, lookup_demangled_block_symbol): Remove prototypes and functions. * symtab.c (lookup_symbol): Remove use of expensive_mangler, use lookup_block_symbol instead of lookup_demangled_block_symbol. Remove code to try demangling names and matching them. * symtab.c (lookup_partial_symbol, lookup_block_symbol): Fix to try matching the cached demangled name if no match is found using the regular symbol name. * symtab.c (find_methods): Remove unused physnames array. * symtab.c (name_match, NAME_MATCH): Remove function and macro, replaced with SYMBOL_MATCHES_REGEXP from symtab.h. * symtab.c (completion_list_add_symbol): Rewrite to use cached C++ demangled symbol names. * symtab.h: Much reformatting of structures and such to add whitespace to make them more readable, and make them more consistent with other gdb structure definitions. * symtab.h (general_symbol_info): New struct containing fields common to all symbols. * symtab.h (SYMBOL_LANGUAGE, SYMBOL_DEMANGLED_NAME, SYMBOL_SOURCE_NAME, SYMBOL_LINKAGE_NAME, SYMBOL_MATCHES_NAME, SYMBOL_MATCHES_REGEXP, MSYMBOL_INFO, MSYMBOL_TYPE): New macros. * symtab. (struct minimal_symbol, struct partial_symbol, struct symbol): Use general_symbol_info struct. * utils.c (demangle_and_match): Remove, no longer used. * valops.c (demangle.h): Include. * xcoffexec.c (eq): Remove macro, replace usages with STREQ. * blockframe.c, breakpoint.c, c-exp.y, c-valprint.c, dbxread.c, infcmd.c, m2-exp.y, minsyms.c, objfiles.h, solib.c, stack.c, symmisc.c, symtab.c, valops.c: Replace references to minimal symbol fields with appropriate macros. * breakpoint.c, buildsym.c, c-exp.y, c-typeprint.c, c-valprint.c, coffread.c, command.c, convex-tdep.c, cp-valprint.c, dbxread.c, demangle.c, elfread.c, energize.c, environ.c, exec.c, gdbtypes.c, i960-tdep.c, infrun.c, infrun-hacked.c, language.c, main.c, minsyms.c, mipsread.c, partial-stab.h, remote-es1800.c, remote-nindy.c, remote-udi.c, rs6000-tdep.c, solib.c, source.c, sparc-pinsn.c, stabsread.c, standalone.c, state.c, stuff.c, symfile.c, symmisc.c, symtab.c, symtab.h, tm-sysv4.h, tm-ultra3.h, values.c, xcoffexec.c, xcoffread.c: Replace strcmp and strncmp usages with STREQ, STREQN, or STRCMP as appropriate. * breakpoint.c, buildsym.c, c-typeprint.c, expprint.c, findvar.c, mipsread.c, printcmd.c, source.c, stabsread.c, stack.c, symmisc.c, tm-29k.h, valops.c, values.c: Replace SYMBOL_NAME references with SYMBOL_SOURCE_NAME or SYMBOL_LINKAGE_NAME as appropriate. * buildsym.c (start_subfile, patch_subfile_names): Default the source language to what can be deduced from the filename. * buildsym.c (end_symtab): Update the source language in the allocated symtab to match what we have been using. * buildsym.h (struct subfile): Add a language field. * c-typeprint.c (c_print_type): Remove code to do explicit demangling. * dbxread.c (psymtab_language): Add static variable. * dbxread.c (start_psymtab): Initialize psymtab_language using deduce_language_from_filename. --- gdb/symfile.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 91 insertions(+), 21 deletions(-) (limited to 'gdb/symfile.c') diff --git a/gdb/symfile.c b/gdb/symfile.c index f01ae36..1c8fe1d 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -31,6 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "breakpoint.h" #include "language.h" #include "complaints.h" +#include "demangle.h" #include #include @@ -131,7 +132,7 @@ compare_symbols (s1p, s2p) if (namediff != 0) return namediff; /* If they match, compare the rest of the names. */ - namediff = strcmp (SYMBOL_NAME (*s1), SYMBOL_NAME (*s2)); + namediff = STRCMP (SYMBOL_NAME (*s1), SYMBOL_NAME (*s2)); if (namediff != 0) return namediff; /* For symbols of the same name, registers should come first. */ @@ -179,7 +180,7 @@ compare_psymbols (s1p, s2p) } else { - return (strcmp (st1 + 2, st2 + 2)); + return (STRCMP (st1 + 2, st2 + 2)); } } @@ -428,7 +429,7 @@ syms_from_objfile (objfile, addr, mainline, verbo) warning ("no loadable sections found in added symbol-file %s", objfile->name); else if (0 == bfd_get_section_name (objfile->obfd, lowest_sect) - || 0 != strcmp(".text", + || !STREQ (".text", bfd_get_section_name (objfile->obfd, lowest_sect))) warning ("Lowest section in %s is %s at 0x%x", objfile->name, @@ -670,11 +671,11 @@ symbol_file_command (args, from_tty) cleanups = make_cleanup (freeargv, (char *) argv); while (*argv != NULL) { - if (strcmp (*argv, "-mapped") == 0) + if (STREQ (*argv, "-mapped")) { mapped = 1; } - else if (strcmp (*argv, "-readnow") == 0) + else if (STREQ (*argv, "-readnow")) { readnow = 1; } @@ -872,11 +873,11 @@ add_symbol_file_command (args, from_tty) { name = arg; } - else if (strcmp (arg, "-mapped") == 0) + else if (STREQ (arg, "-mapped")) { mapped = 1; } - else if (strcmp (arg, "-readnow") == 0) + else if (STREQ (arg, "-readnow")) { readnow = 1; } @@ -969,14 +970,14 @@ deduce_language_from_filename (filename) char *c = strrchr (filename, '.'); if (!c) ; /* Get default. */ - else if(!strcmp(c,".mod")) + else if(STREQ(c,".mod")) return language_m2; - else if(!strcmp(c,".c")) + else if(STREQ(c,".c")) return language_c; - else if(!strcmp(c,".cc") || !strcmp(c,".C")) + else if(STREQ(c,".cc") || STREQ(c,".C")) return language_cplus; /* start-sanitize-chill */ - else if(!strcmp(c,".chill") || !strcmp(c,".c186") || !strcmp(c,".c286")) + else if(STREQ(c,".ch") || STREQ(c,".c186") || STREQ(c,".c286")) return language_chill; /* end-sanitize-chill */ @@ -1193,7 +1194,7 @@ free_named_symtabs (name) again2: for (ps = partial_symtab_list; ps; ps = ps->next) { - if (!strcmp (name, ps->filename)) { + if (STREQ (name, ps->filename)) { cashier_psymtab (ps); /* Blow it away...and its little dog, too. */ goto again2; /* Must restart, chain has been munged */ } @@ -1203,7 +1204,7 @@ again2: for (s = symtab_list; s; s = s->next) { - if (!strcmp (name, s->filename)) + if (STREQ (name, s->filename)) break; prev = s; } @@ -1291,40 +1292,109 @@ start_psymtab_common (objfile, section_offsets, /* Debugging versions of functions that are usually inline macros (see symfile.h). */ -#if 0 /* Don't quite work nowadays... */ +#if !INLINE_ADD_PSYMBOL /* Add a symbol with a long value to a psymtab. Since one arg is a struct, we pass in a ptr and deref it (sigh). */ void -add_psymbol_to_list (name, namelength, namespace, class, list, val) +add_psymbol_to_list (name, namelength, namespace, class, list, val, language, + objfile) char *name; int namelength; enum namespace namespace; enum address_class class; struct psymbol_allocation_list *list; long val; + enum language language; + struct objfile *objfile; { - ADD_PSYMBOL_VT_TO_LIST (name, namelength, namespace, class, (*list), val, - SYMBOL_VALUE); + register struct partial_symbol *psym; + register char *demangled_name; + + if (list->next >= list->list + list->size) + { + extend_psymbol_list (list,objfile); + } + psym = list->next++; + + SYMBOL_NAME (psym) = + (char *) obstack_alloc (&objfile->psymbol_obstack, namelength + 1); + memcpy (SYMBOL_NAME (psym), name, namelength); + SYMBOL_NAME (psym)[namelength] = '\0'; + SYMBOL_VALUE (psym) = val; + SYMBOL_LANGUAGE (psym) = language; + PSYMBOL_NAMESPACE (psym) = namespace; + PSYMBOL_CLASS (psym) = class; + if (language == language_cplus) + { + demangled_name = + cplus_demangle (SYMBOL_NAME (psym), DMGL_PARAMS | DMGL_ANSI); + if (demangled_name == NULL) + { + SYMBOL_DEMANGLED_NAME (psym) = NULL; + } + else + { + SYMBOL_DEMANGLED_NAME (psym) = + obsavestring (demangled_name, strlen (demangled_name), + &objfile->psymbol_obstack); + free (demangled_name); + } + } } /* Add a symbol with a CORE_ADDR value to a psymtab. */ void -add_psymbol_addr_to_list (name, namelength, namespace, class, list, val) +add_psymbol_addr_to_list (name, namelength, namespace, class, list, val, + language, objfile) char *name; int namelength; enum namespace namespace; enum address_class class; struct psymbol_allocation_list *list; CORE_ADDR val; + enum language language; + struct objfile *objfile; { - ADD_PSYMBOL_VT_TO_LIST (name, namelength, namespace, class, (*list), val, - SYMBOL_VALUE_ADDRESS); + register struct partial_symbol *psym; + register char *demangled_name; + + if (list->next >= list->list + list->size) + { + extend_psymbol_list (list,objfile); + } + psym = list->next++; + + SYMBOL_NAME (psym) = + (char *) obstack_alloc (&objfile->psymbol_obstack, namelength + 1); + memcpy (SYMBOL_NAME (psym), name, namelength); + SYMBOL_NAME (psym)[namelength] = '\0'; + SYMBOL_VALUE_ADDRESS (psym) = val; + SYMBOL_LANGUAGE (psym) = language; + PSYMBOL_NAMESPACE (psym) = namespace; + PSYMBOL_CLASS (psym) = class; + if (language == language_cplus) + { + demangled_name = + cplus_demangle (SYMBOL_NAME (psym), DMGL_PARAMS | DMGL_ANSI); + if (demangled_name == NULL) + { + SYMBOL_DEMANGLED_NAME (psym) = NULL; + } + else + { + SYMBOL_DEMANGLED_NAME (psym) = + obsavestring (demangled_name, strlen (demangled_name), + &objfile->psymbol_obstack); + free (demangled_name); + } + } } -#endif /* 0 */ +#endif /* !INLINE_ADD_PSYMBOL */ + void _initialize_symfile () -- cgit v1.1