* 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.
This commit is contained in:
parent
eeece52d14
commit
2e4964adfc
52 changed files with 1355 additions and 1125 deletions
|
@ -52,8 +52,6 @@ exec_close PARAMS ((int));
|
|||
|
||||
struct section_table *exec_sections, *exec_sections_end;
|
||||
|
||||
#define eq(s0, s1) !strcmp(s0, s1)
|
||||
|
||||
/* Whether to open exec and core files read-only or read-write. */
|
||||
|
||||
int write_files = 0;
|
||||
|
@ -293,7 +291,7 @@ sex_to_vmap(bfd *bf, sec_ptr sex, struct vmap_and_bfd *vmap_bfd)
|
|||
if ((bfd_get_section_flags(bf, sex) & SEC_LOAD) == 0)
|
||||
return;
|
||||
|
||||
if (!strcmp(bfd_section_name(bf, sex), ".text")) {
|
||||
if (STREQ(bfd_section_name(bf, sex), ".text")) {
|
||||
vp->tstart = 0;
|
||||
vp->tend = vp->tstart + bfd_section_size(bf, sex);
|
||||
|
||||
|
@ -305,12 +303,12 @@ sex_to_vmap(bfd *bf, sec_ptr sex, struct vmap_and_bfd *vmap_bfd)
|
|||
vp->tadj = sex->filepos - bfd_section_vma(bf, sex);
|
||||
}
|
||||
|
||||
else if (!strcmp(bfd_section_name(bf, sex), ".data")) {
|
||||
else if (STREQ(bfd_section_name(bf, sex), ".data")) {
|
||||
vp->dstart = 0;
|
||||
vp->dend = vp->dstart + bfd_section_size(bf, sex);
|
||||
}
|
||||
|
||||
else if (!strcmp(bfd_section_name(bf, sex), ".bss")) /* FIXMEmgo */
|
||||
else if (STREQ(bfd_section_name(bf, sex), ".bss")) /* FIXMEmgo */
|
||||
printf ("bss section in exec! Don't know what the heck to do!\n");
|
||||
}
|
||||
|
||||
|
@ -579,7 +577,7 @@ register struct ld_info *ldi; {
|
|||
* FIXME??? am I tossing BFDs? bfd?
|
||||
*/
|
||||
while (last = bfd_openr_next_archived_file(bfd, last))
|
||||
if (eq(mem, last->filename))
|
||||
if (STREQ(mem, last->filename))
|
||||
break;
|
||||
|
||||
if (!last) {
|
||||
|
@ -631,12 +629,12 @@ vmap_exec ()
|
|||
|
||||
for (i=0; &exec_ops.to_sections[i] < exec_ops.to_sections_end; i++)
|
||||
{
|
||||
if (strcmp(".text", exec_ops.to_sections[i].sec_ptr->name) == 0)
|
||||
if (STREQ(".text", exec_ops.to_sections[i].sec_ptr->name))
|
||||
{
|
||||
exec_ops.to_sections[i].addr += vmap->tstart;
|
||||
exec_ops.to_sections[i].endaddr += vmap->tstart;
|
||||
}
|
||||
else if (strcmp(".data", exec_ops.to_sections[i].sec_ptr->name) == 0)
|
||||
else if (STREQ(".data", exec_ops.to_sections[i].sec_ptr->name))
|
||||
{
|
||||
exec_ops.to_sections[i].addr += vmap->dstart;
|
||||
exec_ops.to_sections[i].endaddr += vmap->dstart;
|
||||
|
@ -707,8 +705,8 @@ retry:
|
|||
|
||||
/* The filenames are not always sufficient to match on. */
|
||||
|
||||
if ((name[0] == "/" && !eq(name, vp->name))
|
||||
|| (memb[0] && !eq(memb, vp->member)))
|
||||
if ((name[0] == "/" && !STREQ(name, vp->name))
|
||||
|| (memb[0] && !STREQ(memb, vp->member)))
|
||||
continue;
|
||||
|
||||
io = bfd_cache_lookup(vp->bfd); /* totally opaque! */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue