1992-07-28 12:22:18 +08:00
|
|
|
|
/* Support routines for building symbol tables in GDB's internal format.
|
1992-06-13 10:18:44 +08:00
|
|
|
|
Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992
|
|
|
|
|
Free Software Foundation, Inc.
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
|
|
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., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
|
|
|
|
|
|
/* This module provides subroutines used for creating and adding to
|
|
|
|
|
the symbol table. These routines are called from various symbol-
|
1992-07-28 12:22:18 +08:00
|
|
|
|
file-reading routines.
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
Routines to support specific debugging information formats (stabs,
|
|
|
|
|
DWARF, etc) belong somewhere else. */
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
1992-07-28 12:22:18 +08:00
|
|
|
|
#include "bfd.h"
|
1991-10-26 15:21:30 +08:00
|
|
|
|
#include "obstack.h"
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "symfile.h" /* Needed for "struct complaint" */
|
1992-03-21 09:56:01 +08:00
|
|
|
|
#include "objfiles.h"
|
* complaints.c: New file, code moved from utils.c.
* complaints.c (complain): Made into a varargs function.
* complaints.h: New file, code moved from symfile.h.
* Makefile.in (SFILES_MAINDIR): Add complaints.c.
* Makefile.in (HFILES): Add complaints.h.
* Makefile.in (OBS): Add complaints.o.
* symfile.c (complaint_root, stop_whining, complaint_series,
complain, clear_complaints, add_show_from_set for stop_whining):
Moved to complaints.c.
* symfile.h (struct complaint, complaint_root decl, complain
prototype, clear_complaints prototype): Moved to complaints.h.
* buildsym.c, coffread.c, dbxread.c, dwarfread.c, elfread.c,
gdbtypes.c, mipsread.c, stbsread.c, symfile.c: Include
complaints.h. Remove casts from arguments to complain(),
which is now a varargs function, and remove unnecessary
placeholder zero args.
* defs.h (begin_line): Add prototype.
* defs.h (vprintf_filtered): Add prototype.
* dwarfread.c (varargs.h): Remove, no longer needed.
* dwarfread.c (dwarfwarn): Remove prototype and function.
* dwarfread.c (complaints): Define a bunch of complaints.
* dwarfread.c (SQUAWK): Remove macro defs, convert all
usages to standard complain() calls.
* utils.c (begin_line): New function that ensures that
whatever gets filter-printed next starts on its own line.
* utils.c (vprintf_filtered): New func, like vfprintf_filtered,
but to stdout (calls vfprintf_filtered internally).
1992-12-15 20:18:53 +08:00
|
|
|
|
#include "complaints.h"
|
1991-10-26 15:21:30 +08:00
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
/* Ask buildsym.h to define the vars it normally declares `extern'. */
|
|
|
|
|
#define EXTERN /**/
|
|
|
|
|
#include "buildsym.h" /* Our own declarations */
|
|
|
|
|
#undef EXTERN
|
|
|
|
|
|
1992-02-22 09:46:16 +08:00
|
|
|
|
static int
|
|
|
|
|
compare_line_numbers PARAMS ((const void *, const void *));
|
|
|
|
|
|
|
|
|
|
static struct blockvector *
|
|
|
|
|
make_blockvector PARAMS ((struct objfile *));
|
|
|
|
|
|
|
|
|
|
|
1991-10-28 06:26:02 +08:00
|
|
|
|
/* Initial sizes of data structures. These are realloc'd larger if needed,
|
|
|
|
|
and realloc'd down to the size actually used, when completed. */
|
|
|
|
|
|
|
|
|
|
#define INITIAL_CONTEXT_STACK_SIZE 10
|
|
|
|
|
#define INITIAL_LINE_VECTOR_LENGTH 1000
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* Complaints about the symbols we have encountered. */
|
|
|
|
|
|
|
|
|
|
struct complaint innerblock_complaint =
|
|
|
|
|
{"inner block not inside outer block in %s", 0, 0};
|
|
|
|
|
|
1992-07-04 20:23:23 +08:00
|
|
|
|
struct complaint innerblock_anon_complaint =
|
|
|
|
|
{"inner block not inside outer block", 0, 0};
|
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
struct complaint blockvector_complaint =
|
1992-07-04 20:23:23 +08:00
|
|
|
|
{"block at 0x%x out of order", 0, 0};
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* maintain the lists of symbols and blocks */
|
|
|
|
|
|
|
|
|
|
/* Add a symbol to one of the lists of symbols. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
void
|
|
|
|
|
add_symbol_to_list (symbol, listhead)
|
|
|
|
|
struct symbol *symbol;
|
|
|
|
|
struct pending **listhead;
|
|
|
|
|
{
|
1992-07-28 12:22:18 +08:00
|
|
|
|
register struct pending *link;
|
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
/* We keep PENDINGSIZE symbols in each link of the list.
|
|
|
|
|
If we don't have a link with room in it, add a new link. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
if (*listhead == NULL || (*listhead)->nsyms == PENDINGSIZE)
|
1991-10-26 15:21:30 +08:00
|
|
|
|
{
|
|
|
|
|
if (free_pendings)
|
|
|
|
|
{
|
|
|
|
|
link = free_pendings;
|
|
|
|
|
free_pendings = link->next;
|
|
|
|
|
}
|
|
|
|
|
else
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
|
|
|
|
link = (struct pending *) xmalloc (sizeof (struct pending));
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
link->next = *listhead;
|
|
|
|
|
*listhead = link;
|
|
|
|
|
link->nsyms = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
(*listhead)->symbol[(*listhead)->nsyms++] = symbol;
|
|
|
|
|
}
|
|
|
|
|
|
1991-11-09 18:50:07 +08:00
|
|
|
|
/* Find a symbol on a pending list. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
1991-11-09 18:50:07 +08:00
|
|
|
|
struct symbol *
|
|
|
|
|
find_symbol_in_list (list, name, length)
|
|
|
|
|
struct pending *list;
|
|
|
|
|
char *name;
|
|
|
|
|
int length;
|
|
|
|
|
{
|
|
|
|
|
int j;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
char *pp;
|
1991-11-09 18:50:07 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
while (list != NULL)
|
|
|
|
|
{
|
|
|
|
|
for (j = list->nsyms; --j >= 0; )
|
|
|
|
|
{
|
|
|
|
|
pp = SYMBOL_NAME (list->symbol[j]);
|
|
|
|
|
if (*pp == *name && strncmp (pp, name, length) == 0 &&
|
|
|
|
|
pp[length] == '\0')
|
|
|
|
|
{
|
|
|
|
|
return (list->symbol[j]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
list = list->next;
|
1991-11-09 18:50:07 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
return (NULL);
|
1991-11-09 18:50:07 +08:00
|
|
|
|
}
|
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
/* At end of reading syms, or in case of quit,
|
1992-07-28 12:22:18 +08:00
|
|
|
|
really free as many `struct pending's as we can easily find. */
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* ARGSUSED */
|
|
|
|
|
void
|
|
|
|
|
really_free_pendings (foo)
|
|
|
|
|
int foo;
|
|
|
|
|
{
|
|
|
|
|
struct pending *next, *next1;
|
|
|
|
|
#if 0
|
|
|
|
|
struct pending_block *bnext, *bnext1;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
for (next = free_pendings; next; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
Create and use macros for iterating on symtabs, psymtabs, msymbols.
* minsyms.c (iterate_over_msymbols): Remove; clunky and slow.
* symfile.h, symtab.h (iterate_over_msymbols): Remove prototype
* coffread.c (coff_symfile_read): iterate_over_symtabs => ALL_SYMTABS.
(patch_opaque_types): Avoid dummy args and result.
* objfiles.c (have_partial_symbols, have_full_symbols,
have_minimal_symbols): explicit iteration => ALL_OBJFILES; simplify.
(iterate_over_objfiles, iterate_over_symtabs,
iterate_over_psymtabs): Remove, clunky and slow.
* objfiles.h: Replace iterate_over_* prototypes with ALL_SYMTABS,
ALL_PSYMTABS, and ALL_MSYMBOLS macros.
* symmisc.c (dump_symtab, dump_psymtab, dump_msymbols,
dump_objfile): Remove dummy args and results. Move filename
comparisons to callers.
(printsyms_command, printpsyms_command, printmsyms_command,
printobjfiles_command): iterate_over_* => ALL_*. Compare filenames.
* symtab.c (lookup_symtab_1, lookup_symtab, lookup_partial_symtab,
lookup_symbol, find_main_psymtab, find_pc_symtab, sources_info,
list_symbols, make_symbol_completion_list): Replace explicit
iteration with ALL_SYMTABS, ALL_PSYMTABS, or ALL_MSYMBOLS.
Eliminate Dijkstra flag crap, break out of loops with gotos.
(lookup_symtab_1): Protect '/' tests from short filenames.
(cplus_mangled_symbol): Move inline into lookup_symbol.
* xcoffexec.c (relocate_objfile_msymbols): Remove poor hack.
(relocate_minimal_symbol): Move inline to vmap_symtab.
(vmap_symtab): Replace iteration with ALL_OBJFILES,
iterate_over_msymbols with ALL_MSYMBOLS.
Misc cleanup prior to release.
* dwarfread.c (dwarf_build_psymtabs): Remove mainline test.
* mipsread.c (compare_symtabs, compare_psymtabs): Remove, unused.
* mipsread.c: Add prototypes for all static functions.
* symmisc.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove, unused.
* xcoffread.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove 2nd
unused copy!
* buildsym.c (define_symbol): Handle global register variables
(from Pierre Willard). Complain if register numbers are too large.
1992-03-30 07:17:36 +08:00
|
|
|
|
free ((PTR)next);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
free_pendings = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
#if 0 /* Now we make the links in the symbol_obstack, so don't free them. */
|
|
|
|
|
for (bnext = pending_blocks; bnext; bnext = bnext1)
|
|
|
|
|
{
|
|
|
|
|
bnext1 = bnext->next;
|
Create and use macros for iterating on symtabs, psymtabs, msymbols.
* minsyms.c (iterate_over_msymbols): Remove; clunky and slow.
* symfile.h, symtab.h (iterate_over_msymbols): Remove prototype
* coffread.c (coff_symfile_read): iterate_over_symtabs => ALL_SYMTABS.
(patch_opaque_types): Avoid dummy args and result.
* objfiles.c (have_partial_symbols, have_full_symbols,
have_minimal_symbols): explicit iteration => ALL_OBJFILES; simplify.
(iterate_over_objfiles, iterate_over_symtabs,
iterate_over_psymtabs): Remove, clunky and slow.
* objfiles.h: Replace iterate_over_* prototypes with ALL_SYMTABS,
ALL_PSYMTABS, and ALL_MSYMBOLS macros.
* symmisc.c (dump_symtab, dump_psymtab, dump_msymbols,
dump_objfile): Remove dummy args and results. Move filename
comparisons to callers.
(printsyms_command, printpsyms_command, printmsyms_command,
printobjfiles_command): iterate_over_* => ALL_*. Compare filenames.
* symtab.c (lookup_symtab_1, lookup_symtab, lookup_partial_symtab,
lookup_symbol, find_main_psymtab, find_pc_symtab, sources_info,
list_symbols, make_symbol_completion_list): Replace explicit
iteration with ALL_SYMTABS, ALL_PSYMTABS, or ALL_MSYMBOLS.
Eliminate Dijkstra flag crap, break out of loops with gotos.
(lookup_symtab_1): Protect '/' tests from short filenames.
(cplus_mangled_symbol): Move inline into lookup_symbol.
* xcoffexec.c (relocate_objfile_msymbols): Remove poor hack.
(relocate_minimal_symbol): Move inline to vmap_symtab.
(vmap_symtab): Replace iteration with ALL_OBJFILES,
iterate_over_msymbols with ALL_MSYMBOLS.
Misc cleanup prior to release.
* dwarfread.c (dwarf_build_psymtabs): Remove mainline test.
* mipsread.c (compare_symtabs, compare_psymtabs): Remove, unused.
* mipsread.c: Add prototypes for all static functions.
* symmisc.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove, unused.
* xcoffread.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove 2nd
unused copy!
* buildsym.c (define_symbol): Handle global register variables
(from Pierre Willard). Complain if register numbers are too large.
1992-03-30 07:17:36 +08:00
|
|
|
|
free ((PTR)bnext);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
#endif
|
1992-07-28 12:22:18 +08:00
|
|
|
|
pending_blocks = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
for (next = file_symbols; next != NULL; next = next1)
|
1991-10-26 15:21:30 +08:00
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
Create and use macros for iterating on symtabs, psymtabs, msymbols.
* minsyms.c (iterate_over_msymbols): Remove; clunky and slow.
* symfile.h, symtab.h (iterate_over_msymbols): Remove prototype
* coffread.c (coff_symfile_read): iterate_over_symtabs => ALL_SYMTABS.
(patch_opaque_types): Avoid dummy args and result.
* objfiles.c (have_partial_symbols, have_full_symbols,
have_minimal_symbols): explicit iteration => ALL_OBJFILES; simplify.
(iterate_over_objfiles, iterate_over_symtabs,
iterate_over_psymtabs): Remove, clunky and slow.
* objfiles.h: Replace iterate_over_* prototypes with ALL_SYMTABS,
ALL_PSYMTABS, and ALL_MSYMBOLS macros.
* symmisc.c (dump_symtab, dump_psymtab, dump_msymbols,
dump_objfile): Remove dummy args and results. Move filename
comparisons to callers.
(printsyms_command, printpsyms_command, printmsyms_command,
printobjfiles_command): iterate_over_* => ALL_*. Compare filenames.
* symtab.c (lookup_symtab_1, lookup_symtab, lookup_partial_symtab,
lookup_symbol, find_main_psymtab, find_pc_symtab, sources_info,
list_symbols, make_symbol_completion_list): Replace explicit
iteration with ALL_SYMTABS, ALL_PSYMTABS, or ALL_MSYMBOLS.
Eliminate Dijkstra flag crap, break out of loops with gotos.
(lookup_symtab_1): Protect '/' tests from short filenames.
(cplus_mangled_symbol): Move inline into lookup_symbol.
* xcoffexec.c (relocate_objfile_msymbols): Remove poor hack.
(relocate_minimal_symbol): Move inline to vmap_symtab.
(vmap_symtab): Replace iteration with ALL_OBJFILES,
iterate_over_msymbols with ALL_MSYMBOLS.
Misc cleanup prior to release.
* dwarfread.c (dwarf_build_psymtabs): Remove mainline test.
* mipsread.c (compare_symtabs, compare_psymtabs): Remove, unused.
* mipsread.c: Add prototypes for all static functions.
* symmisc.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove, unused.
* xcoffread.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove 2nd
unused copy!
* buildsym.c (define_symbol): Handle global register variables
(from Pierre Willard). Complain if register numbers are too large.
1992-03-30 07:17:36 +08:00
|
|
|
|
free ((PTR)next);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
file_symbols = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
for (next = global_symbols; next != NULL; next = next1)
|
1991-10-26 15:21:30 +08:00
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
Create and use macros for iterating on symtabs, psymtabs, msymbols.
* minsyms.c (iterate_over_msymbols): Remove; clunky and slow.
* symfile.h, symtab.h (iterate_over_msymbols): Remove prototype
* coffread.c (coff_symfile_read): iterate_over_symtabs => ALL_SYMTABS.
(patch_opaque_types): Avoid dummy args and result.
* objfiles.c (have_partial_symbols, have_full_symbols,
have_minimal_symbols): explicit iteration => ALL_OBJFILES; simplify.
(iterate_over_objfiles, iterate_over_symtabs,
iterate_over_psymtabs): Remove, clunky and slow.
* objfiles.h: Replace iterate_over_* prototypes with ALL_SYMTABS,
ALL_PSYMTABS, and ALL_MSYMBOLS macros.
* symmisc.c (dump_symtab, dump_psymtab, dump_msymbols,
dump_objfile): Remove dummy args and results. Move filename
comparisons to callers.
(printsyms_command, printpsyms_command, printmsyms_command,
printobjfiles_command): iterate_over_* => ALL_*. Compare filenames.
* symtab.c (lookup_symtab_1, lookup_symtab, lookup_partial_symtab,
lookup_symbol, find_main_psymtab, find_pc_symtab, sources_info,
list_symbols, make_symbol_completion_list): Replace explicit
iteration with ALL_SYMTABS, ALL_PSYMTABS, or ALL_MSYMBOLS.
Eliminate Dijkstra flag crap, break out of loops with gotos.
(lookup_symtab_1): Protect '/' tests from short filenames.
(cplus_mangled_symbol): Move inline into lookup_symbol.
* xcoffexec.c (relocate_objfile_msymbols): Remove poor hack.
(relocate_minimal_symbol): Move inline to vmap_symtab.
(vmap_symtab): Replace iteration with ALL_OBJFILES,
iterate_over_msymbols with ALL_MSYMBOLS.
Misc cleanup prior to release.
* dwarfread.c (dwarf_build_psymtabs): Remove mainline test.
* mipsread.c (compare_symtabs, compare_psymtabs): Remove, unused.
* mipsread.c: Add prototypes for all static functions.
* symmisc.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove, unused.
* xcoffread.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove 2nd
unused copy!
* buildsym.c (define_symbol): Handle global register variables
(from Pierre Willard). Complain if register numbers are too large.
1992-03-30 07:17:36 +08:00
|
|
|
|
free ((PTR)next);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
global_symbols = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Take one of the lists of symbols and make a block from it.
|
|
|
|
|
Keep the order the symbols have in the list (reversed from the input file).
|
|
|
|
|
Put the block on the list of pending blocks. */
|
|
|
|
|
|
|
|
|
|
void
|
1992-02-22 09:46:16 +08:00
|
|
|
|
finish_block (symbol, listhead, old_blocks, start, end, objfile)
|
1991-10-26 15:21:30 +08:00
|
|
|
|
struct symbol *symbol;
|
|
|
|
|
struct pending **listhead;
|
|
|
|
|
struct pending_block *old_blocks;
|
|
|
|
|
CORE_ADDR start, end;
|
1992-02-22 09:46:16 +08:00
|
|
|
|
struct objfile *objfile;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
{
|
|
|
|
|
register struct pending *next, *next1;
|
|
|
|
|
register struct block *block;
|
|
|
|
|
register struct pending_block *pblock;
|
|
|
|
|
struct pending_block *opblock;
|
|
|
|
|
register int i;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
register int j;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* Count the length of the list of symbols. */
|
|
|
|
|
|
1992-08-02 04:40:59 +08:00
|
|
|
|
for (next = *listhead, i = 0;
|
|
|
|
|
next;
|
|
|
|
|
i += next->nsyms, next = next->next)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
|
|
|
|
/*EMPTY*/;
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1992-02-22 09:46:16 +08:00
|
|
|
|
block = (struct block *) obstack_alloc (&objfile -> symbol_obstack,
|
1991-11-09 18:50:07 +08:00
|
|
|
|
(sizeof (struct block) + ((i - 1) * sizeof (struct symbol *))));
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* Copy the symbols into the block. */
|
|
|
|
|
|
|
|
|
|
BLOCK_NSYMS (block) = i;
|
|
|
|
|
for (next = *listhead; next; next = next->next)
|
|
|
|
|
{
|
|
|
|
|
for (j = next->nsyms - 1; j >= 0; j--)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
|
|
|
|
BLOCK_SYM (block, --i) = next->symbol[j];
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BLOCK_START (block) = start;
|
|
|
|
|
BLOCK_END (block) = end;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
/* Superblock filled in when containing block is made */
|
|
|
|
|
BLOCK_SUPERBLOCK (block) = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
BLOCK_GCC_COMPILED (block) = processing_gcc_compilation;
|
|
|
|
|
|
|
|
|
|
/* Put the block in as the value of the symbol that names it. */
|
|
|
|
|
|
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
|
|
|
|
SYMBOL_BLOCK_VALUE (symbol) = block;
|
|
|
|
|
BLOCK_FUNCTION (block) = symbol;
|
|
|
|
|
}
|
|
|
|
|
else
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
|
|
|
|
BLOCK_FUNCTION (block) = NULL;
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* Now "free" the links of the list, and empty the list. */
|
|
|
|
|
|
|
|
|
|
for (next = *listhead; next; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
|
|
|
|
next->next = free_pendings;
|
|
|
|
|
free_pendings = next;
|
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
*listhead = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* Install this block as the superblock
|
|
|
|
|
of all blocks made since the start of this scope
|
|
|
|
|
that don't have superblocks yet. */
|
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
opblock = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
for (pblock = pending_blocks; pblock != old_blocks; pblock = pblock->next)
|
|
|
|
|
{
|
1992-07-28 12:22:18 +08:00
|
|
|
|
if (BLOCK_SUPERBLOCK (pblock->block) == NULL)
|
|
|
|
|
{
|
1991-10-26 15:21:30 +08:00
|
|
|
|
#if 1
|
1992-07-28 12:22:18 +08:00
|
|
|
|
/* Check to be sure the blocks are nested as we receive them.
|
|
|
|
|
If the compiler/assembler/linker work, this just burns a small
|
|
|
|
|
amount of time. */
|
|
|
|
|
if (BLOCK_START (pblock->block) < BLOCK_START (block) ||
|
|
|
|
|
BLOCK_END (pblock->block) > BLOCK_END (block))
|
|
|
|
|
{
|
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
* 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.
1992-12-23 14:34:57 +08:00
|
|
|
|
complain (&innerblock_complaint,
|
|
|
|
|
SYMBOL_SOURCE_NAME (symbol));
|
1992-07-28 12:22:18 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
* complaints.c: New file, code moved from utils.c.
* complaints.c (complain): Made into a varargs function.
* complaints.h: New file, code moved from symfile.h.
* Makefile.in (SFILES_MAINDIR): Add complaints.c.
* Makefile.in (HFILES): Add complaints.h.
* Makefile.in (OBS): Add complaints.o.
* symfile.c (complaint_root, stop_whining, complaint_series,
complain, clear_complaints, add_show_from_set for stop_whining):
Moved to complaints.c.
* symfile.h (struct complaint, complaint_root decl, complain
prototype, clear_complaints prototype): Moved to complaints.h.
* buildsym.c, coffread.c, dbxread.c, dwarfread.c, elfread.c,
gdbtypes.c, mipsread.c, stbsread.c, symfile.c: Include
complaints.h. Remove casts from arguments to complain(),
which is now a varargs function, and remove unnecessary
placeholder zero args.
* defs.h (begin_line): Add prototype.
* defs.h (vprintf_filtered): Add prototype.
* dwarfread.c (varargs.h): Remove, no longer needed.
* dwarfread.c (dwarfwarn): Remove prototype and function.
* dwarfread.c (complaints): Define a bunch of complaints.
* dwarfread.c (SQUAWK): Remove macro defs, convert all
usages to standard complain() calls.
* utils.c (begin_line): New function that ensures that
whatever gets filter-printed next starts on its own line.
* utils.c (vprintf_filtered): New func, like vfprintf_filtered,
but to stdout (calls vfprintf_filtered internally).
1992-12-15 20:18:53 +08:00
|
|
|
|
complain (&innerblock_anon_complaint);
|
1992-07-28 12:22:18 +08:00
|
|
|
|
}
|
|
|
|
|
BLOCK_START (pblock->block) = BLOCK_START (block);
|
|
|
|
|
BLOCK_END (pblock->block) = BLOCK_END (block);
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
#endif
|
1992-07-28 12:22:18 +08:00
|
|
|
|
BLOCK_SUPERBLOCK (pblock->block) = block;
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
opblock = pblock;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Record this block on the list of all blocks in the file.
|
|
|
|
|
Put it after opblock, or at the beginning if opblock is 0.
|
|
|
|
|
This puts the block in the list after all its subblocks. */
|
|
|
|
|
|
|
|
|
|
/* Allocate in the symbol_obstack to save time.
|
|
|
|
|
It wastes a little space. */
|
|
|
|
|
pblock = (struct pending_block *)
|
1992-02-22 09:46:16 +08:00
|
|
|
|
obstack_alloc (&objfile -> symbol_obstack,
|
1991-10-26 15:21:30 +08:00
|
|
|
|
sizeof (struct pending_block));
|
|
|
|
|
pblock->block = block;
|
|
|
|
|
if (opblock)
|
|
|
|
|
{
|
|
|
|
|
pblock->next = opblock->next;
|
|
|
|
|
opblock->next = pblock;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
pblock->next = pending_blocks;
|
|
|
|
|
pending_blocks = pblock;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1992-02-22 09:46:16 +08:00
|
|
|
|
static struct blockvector *
|
|
|
|
|
make_blockvector (objfile)
|
|
|
|
|
struct objfile *objfile;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
{
|
|
|
|
|
register struct pending_block *next;
|
|
|
|
|
register struct blockvector *blockvector;
|
|
|
|
|
register int i;
|
|
|
|
|
|
|
|
|
|
/* Count the length of the list of blocks. */
|
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
for (next = pending_blocks, i = 0; next; next = next->next, i++) {;}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
blockvector = (struct blockvector *)
|
1992-02-22 09:46:16 +08:00
|
|
|
|
obstack_alloc (&objfile -> symbol_obstack,
|
1991-10-26 15:21:30 +08:00
|
|
|
|
(sizeof (struct blockvector)
|
|
|
|
|
+ (i - 1) * sizeof (struct block *)));
|
|
|
|
|
|
|
|
|
|
/* Copy the blocks into the blockvector.
|
|
|
|
|
This is done in reverse order, which happens to put
|
|
|
|
|
the blocks into the proper order (ascending starting address).
|
|
|
|
|
finish_block has hair to insert each block into the list
|
|
|
|
|
after its subblocks in order to make sure this is true. */
|
|
|
|
|
|
|
|
|
|
BLOCKVECTOR_NBLOCKS (blockvector) = i;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
for (next = pending_blocks; next; next = next->next)
|
|
|
|
|
{
|
|
|
|
|
BLOCKVECTOR_BLOCK (blockvector, --i) = next->block;
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
#if 0 /* Now we make the links in the obstack, so don't free them. */
|
|
|
|
|
/* Now free the links of the list, and empty the list. */
|
|
|
|
|
|
|
|
|
|
for (next = pending_blocks; next; next = next1)
|
|
|
|
|
{
|
|
|
|
|
next1 = next->next;
|
|
|
|
|
free (next);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1992-07-28 12:22:18 +08:00
|
|
|
|
pending_blocks = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
#if 1 /* FIXME, shut this off after a while to speed up symbol reading. */
|
|
|
|
|
/* Some compilers output blocks in the wrong order, but we depend
|
|
|
|
|
on their being in the right order so we can binary search.
|
|
|
|
|
Check the order and moan about it. FIXME. */
|
|
|
|
|
if (BLOCKVECTOR_NBLOCKS (blockvector) > 1)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
|
|
|
|
for (i = 1; i < BLOCKVECTOR_NBLOCKS (blockvector); i++)
|
|
|
|
|
{
|
|
|
|
|
if (BLOCK_START(BLOCKVECTOR_BLOCK (blockvector, i-1))
|
|
|
|
|
> BLOCK_START(BLOCKVECTOR_BLOCK (blockvector, i)))
|
|
|
|
|
{
|
|
|
|
|
complain (&blockvector_complaint,
|
* complaints.c: New file, code moved from utils.c.
* complaints.c (complain): Made into a varargs function.
* complaints.h: New file, code moved from symfile.h.
* Makefile.in (SFILES_MAINDIR): Add complaints.c.
* Makefile.in (HFILES): Add complaints.h.
* Makefile.in (OBS): Add complaints.o.
* symfile.c (complaint_root, stop_whining, complaint_series,
complain, clear_complaints, add_show_from_set for stop_whining):
Moved to complaints.c.
* symfile.h (struct complaint, complaint_root decl, complain
prototype, clear_complaints prototype): Moved to complaints.h.
* buildsym.c, coffread.c, dbxread.c, dwarfread.c, elfread.c,
gdbtypes.c, mipsread.c, stbsread.c, symfile.c: Include
complaints.h. Remove casts from arguments to complain(),
which is now a varargs function, and remove unnecessary
placeholder zero args.
* defs.h (begin_line): Add prototype.
* defs.h (vprintf_filtered): Add prototype.
* dwarfread.c (varargs.h): Remove, no longer needed.
* dwarfread.c (dwarfwarn): Remove prototype and function.
* dwarfread.c (complaints): Define a bunch of complaints.
* dwarfread.c (SQUAWK): Remove macro defs, convert all
usages to standard complain() calls.
* utils.c (begin_line): New function that ensures that
whatever gets filter-printed next starts on its own line.
* utils.c (vprintf_filtered): New func, like vfprintf_filtered,
but to stdout (calls vfprintf_filtered internally).
1992-12-15 20:18:53 +08:00
|
|
|
|
BLOCK_START(BLOCKVECTOR_BLOCK (blockvector, i)));
|
1992-07-28 12:22:18 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
return (blockvector);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1991-10-28 06:26:02 +08:00
|
|
|
|
/* Start recording information about source code that came from an included
|
|
|
|
|
(or otherwise merged-in) source file with a different name. */
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
void
|
1991-10-28 06:26:02 +08:00
|
|
|
|
start_subfile (name, dirname)
|
|
|
|
|
char *name;
|
|
|
|
|
char *dirname;
|
|
|
|
|
{
|
|
|
|
|
register struct subfile *subfile;
|
|
|
|
|
|
|
|
|
|
/* See if this subfile is already known as a subfile of the
|
|
|
|
|
current main source file. */
|
|
|
|
|
|
|
|
|
|
for (subfile = subfiles; subfile; subfile = subfile->next)
|
|
|
|
|
{
|
* 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.
1992-12-23 14:34:57 +08:00
|
|
|
|
if (STREQ (subfile->name, name))
|
1991-10-28 06:26:02 +08:00
|
|
|
|
{
|
|
|
|
|
current_subfile = subfile;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This subfile is not known. Add an entry for it.
|
|
|
|
|
Make an entry for this subfile in the list of all subfiles
|
|
|
|
|
of the current main source file. */
|
|
|
|
|
|
|
|
|
|
subfile = (struct subfile *) xmalloc (sizeof (struct subfile));
|
|
|
|
|
subfile->next = subfiles;
|
|
|
|
|
subfiles = subfile;
|
|
|
|
|
current_subfile = subfile;
|
|
|
|
|
|
|
|
|
|
/* Save its name and compilation directory name */
|
1993-02-16 13:16:55 +08:00
|
|
|
|
subfile->name = (name == NULL)? NULL : strdup (name);
|
1992-08-07 03:59:46 +08:00
|
|
|
|
subfile->dirname = (dirname == NULL) ? NULL : strdup (dirname);
|
1991-10-28 06:26:02 +08:00
|
|
|
|
|
|
|
|
|
/* Initialize line-number recording for this subfile. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
subfile->line_vector = NULL;
|
* 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.
1992-12-23 14:34:57 +08:00
|
|
|
|
|
|
|
|
|
/* Default the source language to whatever can be deduced from
|
|
|
|
|
the filename. If nothing can be deduced (such as for a C/C++
|
|
|
|
|
include file with a ".h" extension), then inherit whatever
|
|
|
|
|
language the previous subfile had. This kludgery is necessary
|
|
|
|
|
because there is no standard way in some object formats to
|
|
|
|
|
record the source language. Also, when symtabs are allocated
|
|
|
|
|
we try to deduce a language then as well, but it is too late
|
|
|
|
|
for us to use that information while reading symbols, since
|
|
|
|
|
symtabs aren't allocated until after all the symbols have
|
|
|
|
|
been processed for a given source file. */
|
|
|
|
|
|
|
|
|
|
subfile->language = deduce_language_from_filename (subfile->name);
|
|
|
|
|
if (subfile->language == language_unknown &&
|
|
|
|
|
subfile->next != NULL)
|
|
|
|
|
{
|
|
|
|
|
subfile->language = subfile->next->language;
|
|
|
|
|
}
|
1993-07-28 08:22:08 +08:00
|
|
|
|
|
|
|
|
|
/* cfront output is a C program, so in most ways it looks like a C
|
|
|
|
|
program. But to demangle we need to set the language to C++. We
|
|
|
|
|
can distinguish cfront code by the fact that it has #line
|
|
|
|
|
directives which specify a file name ending in .C.
|
|
|
|
|
|
|
|
|
|
So if the filename of this subfile ends in .C, then change the language
|
|
|
|
|
of any pending subfiles from C to C++. .cc is also accepted, even
|
|
|
|
|
though I don't think cfront allows it. */
|
|
|
|
|
|
|
|
|
|
if (subfile->name)
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
struct subfile *s;
|
|
|
|
|
|
|
|
|
|
p = strrchr (subfile->name, '.');
|
|
|
|
|
if (p != NULL
|
|
|
|
|
&& (p[1] == 'C' && p[2] == '\0'
|
|
|
|
|
|| p[1] == 'c' && p[2] == 'c' && p[3] == '\0'))
|
|
|
|
|
for (s = subfiles; s != NULL; s = s->next)
|
|
|
|
|
if (s->language == language_c)
|
|
|
|
|
s->language = language_cplus;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* And patch up this file if necessary. */
|
|
|
|
|
if (subfile->language == language_c
|
|
|
|
|
&& subfile->next != NULL
|
|
|
|
|
&& subfile->next->language == language_cplus)
|
|
|
|
|
{
|
|
|
|
|
subfile->language = language_cplus;
|
|
|
|
|
}
|
1991-10-28 06:26:02 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
1992-08-07 03:59:46 +08:00
|
|
|
|
/* For stabs readers, the first N_SO symbol is assumed to be the source
|
|
|
|
|
file name, and the subfile struct is initialized using that assumption.
|
|
|
|
|
If another N_SO symbol is later seen, immediately following the first
|
|
|
|
|
one, then the first one is assumed to be the directory name and the
|
|
|
|
|
second one is really the source file name.
|
|
|
|
|
|
|
|
|
|
So we have to patch up the subfile struct by moving the old name value to
|
|
|
|
|
dirname and remembering the new name. Some sanity checking is performed
|
|
|
|
|
to ensure that the state of the subfile struct is reasonable and that the
|
|
|
|
|
old name we are assuming to be a directory name actually is (by checking
|
|
|
|
|
for a trailing '/'). */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
patch_subfile_names (subfile, name)
|
|
|
|
|
struct subfile *subfile;
|
|
|
|
|
char *name;
|
|
|
|
|
{
|
|
|
|
|
if (subfile != NULL && subfile->dirname == NULL && subfile->name != NULL
|
|
|
|
|
&& subfile->name[strlen(subfile->name)-1] == '/')
|
|
|
|
|
{
|
|
|
|
|
subfile->dirname = subfile->name;
|
|
|
|
|
subfile->name = strdup (name);
|
* 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.
1992-12-23 14:34:57 +08:00
|
|
|
|
|
|
|
|
|
/* Default the source language to whatever can be deduced from
|
|
|
|
|
the filename. If nothing can be deduced (such as for a C/C++
|
|
|
|
|
include file with a ".h" extension), then inherit whatever
|
|
|
|
|
language the previous subfile had. This kludgery is necessary
|
|
|
|
|
because there is no standard way in some object formats to
|
|
|
|
|
record the source language. Also, when symtabs are allocated
|
|
|
|
|
we try to deduce a language then as well, but it is too late
|
|
|
|
|
for us to use that information while reading symbols, since
|
|
|
|
|
symtabs aren't allocated until after all the symbols have
|
|
|
|
|
been processed for a given source file. */
|
|
|
|
|
|
|
|
|
|
subfile->language = deduce_language_from_filename (subfile->name);
|
|
|
|
|
if (subfile->language == language_unknown &&
|
|
|
|
|
subfile->next != NULL)
|
|
|
|
|
{
|
|
|
|
|
subfile->language = subfile->next->language;
|
|
|
|
|
}
|
1992-08-07 03:59:46 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1991-10-28 06:26:02 +08:00
|
|
|
|
|
1991-11-09 18:50:07 +08:00
|
|
|
|
/* Handle the N_BINCL and N_EINCL symbol types
|
|
|
|
|
that act like N_SOL for switching source files
|
|
|
|
|
(different subfiles, as we call them) within one object file,
|
|
|
|
|
but using a stack rather than in an arbitrary order. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
push_subfile ()
|
|
|
|
|
{
|
|
|
|
|
register struct subfile_stack *tem
|
|
|
|
|
= (struct subfile_stack *) xmalloc (sizeof (struct subfile_stack));
|
|
|
|
|
|
|
|
|
|
tem->next = subfile_stack;
|
|
|
|
|
subfile_stack = tem;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
if (current_subfile == NULL || current_subfile->name == NULL)
|
|
|
|
|
{
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
1991-11-09 18:50:07 +08:00
|
|
|
|
tem->name = current_subfile->name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
pop_subfile ()
|
|
|
|
|
{
|
|
|
|
|
register char *name;
|
|
|
|
|
register struct subfile_stack *link = subfile_stack;
|
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
if (link == NULL)
|
|
|
|
|
{
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
1991-11-09 18:50:07 +08:00
|
|
|
|
name = link->name;
|
|
|
|
|
subfile_stack = link->next;
|
Create and use macros for iterating on symtabs, psymtabs, msymbols.
* minsyms.c (iterate_over_msymbols): Remove; clunky and slow.
* symfile.h, symtab.h (iterate_over_msymbols): Remove prototype
* coffread.c (coff_symfile_read): iterate_over_symtabs => ALL_SYMTABS.
(patch_opaque_types): Avoid dummy args and result.
* objfiles.c (have_partial_symbols, have_full_symbols,
have_minimal_symbols): explicit iteration => ALL_OBJFILES; simplify.
(iterate_over_objfiles, iterate_over_symtabs,
iterate_over_psymtabs): Remove, clunky and slow.
* objfiles.h: Replace iterate_over_* prototypes with ALL_SYMTABS,
ALL_PSYMTABS, and ALL_MSYMBOLS macros.
* symmisc.c (dump_symtab, dump_psymtab, dump_msymbols,
dump_objfile): Remove dummy args and results. Move filename
comparisons to callers.
(printsyms_command, printpsyms_command, printmsyms_command,
printobjfiles_command): iterate_over_* => ALL_*. Compare filenames.
* symtab.c (lookup_symtab_1, lookup_symtab, lookup_partial_symtab,
lookup_symbol, find_main_psymtab, find_pc_symtab, sources_info,
list_symbols, make_symbol_completion_list): Replace explicit
iteration with ALL_SYMTABS, ALL_PSYMTABS, or ALL_MSYMBOLS.
Eliminate Dijkstra flag crap, break out of loops with gotos.
(lookup_symtab_1): Protect '/' tests from short filenames.
(cplus_mangled_symbol): Move inline into lookup_symbol.
* xcoffexec.c (relocate_objfile_msymbols): Remove poor hack.
(relocate_minimal_symbol): Move inline to vmap_symtab.
(vmap_symtab): Replace iteration with ALL_OBJFILES,
iterate_over_msymbols with ALL_MSYMBOLS.
Misc cleanup prior to release.
* dwarfread.c (dwarf_build_psymtabs): Remove mainline test.
* mipsread.c (compare_symtabs, compare_psymtabs): Remove, unused.
* mipsread.c: Add prototypes for all static functions.
* symmisc.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove, unused.
* xcoffread.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove 2nd
unused copy!
* buildsym.c (define_symbol): Handle global register variables
(from Pierre Willard). Complain if register numbers are too large.
1992-03-30 07:17:36 +08:00
|
|
|
|
free ((PTR)link);
|
1992-07-28 12:22:18 +08:00
|
|
|
|
return (name);
|
1991-11-09 18:50:07 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
1991-11-09 18:50:07 +08:00
|
|
|
|
|
1991-10-28 06:26:02 +08:00
|
|
|
|
/* Manage the vector of line numbers for each subfile. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
record_line (subfile, line, pc)
|
|
|
|
|
register struct subfile *subfile;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
int line;
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
{
|
|
|
|
|
struct linetable_entry *e;
|
|
|
|
|
/* Ignore the dummy line number in libg.o */
|
|
|
|
|
|
|
|
|
|
if (line == 0xffff)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1991-10-28 06:26:02 +08:00
|
|
|
|
/* Make sure line vector exists and is big enough. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
if (!subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
subfile->line_vector_length = INITIAL_LINE_VECTOR_LENGTH;
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
1991-10-28 06:26:02 +08:00
|
|
|
|
xmalloc (sizeof (struct linetable)
|
|
|
|
|
+ subfile->line_vector_length * sizeof (struct linetable_entry));
|
1992-07-28 12:22:18 +08:00
|
|
|
|
subfile->line_vector->nitems = 0;
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1991-10-28 06:26:02 +08:00
|
|
|
|
if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length)
|
1991-10-26 15:21:30 +08:00
|
|
|
|
{
|
1991-10-28 06:26:02 +08:00
|
|
|
|
subfile->line_vector_length *= 2;
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
1992-02-22 09:46:16 +08:00
|
|
|
|
xrealloc ((char *) subfile->line_vector, (sizeof (struct linetable)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
+ subfile->line_vector_length * sizeof (struct linetable_entry)));
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
1991-10-28 06:26:02 +08:00
|
|
|
|
e = subfile->line_vector->item + subfile->line_vector->nitems++;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
e->line = line; e->pc = pc;
|
|
|
|
|
}
|
1991-10-28 06:26:02 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Needed in order to sort line tables from IBM xcoff files. Sigh! */
|
|
|
|
|
|
1992-02-22 09:46:16 +08:00
|
|
|
|
static int
|
|
|
|
|
compare_line_numbers (ln1p, ln2p)
|
|
|
|
|
const PTR ln1p;
|
|
|
|
|
const PTR ln2p;
|
1991-10-28 06:26:02 +08:00
|
|
|
|
{
|
1992-02-22 09:46:16 +08:00
|
|
|
|
return (((struct linetable_entry *) ln1p) -> line -
|
|
|
|
|
((struct linetable_entry *) ln2p) -> line);
|
1991-10-28 06:26:02 +08:00
|
|
|
|
}
|
1992-02-22 09:46:16 +08:00
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* Start a new symtab for a new source file.
|
1992-07-28 12:22:18 +08:00
|
|
|
|
Called, for example, when a stabs symbol of type N_SO is seen, or when
|
|
|
|
|
a DWARF TAG_compile_unit DIE is seen.
|
|
|
|
|
It indicates the start of data for one original source file. */
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
start_symtab (name, dirname, start_addr)
|
|
|
|
|
char *name;
|
|
|
|
|
char *dirname;
|
|
|
|
|
CORE_ADDR start_addr;
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
last_source_file = name;
|
|
|
|
|
last_source_start_addr = start_addr;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
file_symbols = NULL;
|
|
|
|
|
global_symbols = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
within_function = 0;
|
|
|
|
|
|
1991-11-09 18:50:07 +08:00
|
|
|
|
/* Context stack is initially empty. Allocate first one with room for
|
|
|
|
|
10 levels; reuse it forever afterward. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
if (context_stack == NULL)
|
|
|
|
|
{
|
|
|
|
|
context_stack_size = INITIAL_CONTEXT_STACK_SIZE;
|
|
|
|
|
context_stack = (struct context_stack *)
|
|
|
|
|
xmalloc (context_stack_size * sizeof (struct context_stack));
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
context_stack_depth = 0;
|
|
|
|
|
|
|
|
|
|
/* Initialize the list of sub source files with one entry
|
|
|
|
|
for this file (the top-level source file). */
|
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
subfiles = NULL;
|
|
|
|
|
current_subfile = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
start_subfile (name, dirname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Finish the symbol definitions for one main source file,
|
|
|
|
|
close off all the lexical contexts for that file
|
|
|
|
|
(creating struct block's for them), then make the struct symtab
|
|
|
|
|
for that file and put it in the list of all such.
|
|
|
|
|
|
1992-08-13 02:17:48 +08:00
|
|
|
|
END_ADDR is the address of the end of the file's text.
|
1993-03-26 22:59:43 +08:00
|
|
|
|
SECTION is the section number (in objfile->section_offsets) of
|
|
|
|
|
the blockvector and linetable.
|
1992-08-13 02:17:48 +08:00
|
|
|
|
|
|
|
|
|
Note that it is possible for end_symtab() to return NULL. In particular,
|
|
|
|
|
for the DWARF case at least, it will return NULL when it finds a
|
|
|
|
|
compilation unit that has exactly one DIE, a TAG_compile_unit DIE. This
|
|
|
|
|
can happen when we link in an object file that was compiled from an empty
|
|
|
|
|
source file. Returning NULL is probably not the correct thing to do,
|
|
|
|
|
because then gdb will never know about this empty file (FIXME). */
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
struct symtab *
|
1993-03-26 22:59:43 +08:00
|
|
|
|
end_symtab (end_addr, sort_pending, sort_linevec, objfile, section)
|
1991-10-26 15:21:30 +08:00
|
|
|
|
CORE_ADDR end_addr;
|
1991-10-28 06:26:02 +08:00
|
|
|
|
int sort_pending;
|
|
|
|
|
int sort_linevec;
|
1991-11-09 18:50:07 +08:00
|
|
|
|
struct objfile *objfile;
|
1993-03-26 22:59:43 +08:00
|
|
|
|
int section;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
{
|
|
|
|
|
register struct symtab *symtab;
|
|
|
|
|
register struct blockvector *blockvector;
|
|
|
|
|
register struct subfile *subfile;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
register struct context_stack *cstk;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
struct subfile *nextsub;
|
|
|
|
|
|
|
|
|
|
/* Finish the lexical context of the last function in the file;
|
|
|
|
|
pop the context stack. */
|
|
|
|
|
|
|
|
|
|
if (context_stack_depth > 0)
|
|
|
|
|
{
|
|
|
|
|
context_stack_depth--;
|
|
|
|
|
cstk = &context_stack[context_stack_depth];
|
|
|
|
|
/* Make a block for the local symbols within. */
|
|
|
|
|
finish_block (cstk->name, &local_symbols, cstk->old_blocks,
|
1992-02-22 09:46:16 +08:00
|
|
|
|
cstk->start_addr, end_addr, objfile);
|
1991-11-09 18:50:07 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
/* Debug: if context stack still has something in it,
|
|
|
|
|
we are in trouble. */
|
1991-11-09 18:50:07 +08:00
|
|
|
|
if (context_stack_depth > 0)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
/* It is unfortunate that in xcoff, pending blocks might not be ordered
|
1991-10-28 06:26:02 +08:00
|
|
|
|
in this stage. Especially, blocks for static functions will show up at
|
|
|
|
|
the end. We need to sort them, so tools like `find_pc_function' and
|
|
|
|
|
`find_pc_block' can work reliably. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
|
|
|
|
if (sort_pending && pending_blocks)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME! Remove this horrid bubble sort and use qsort!!! */
|
|
|
|
|
int swapped;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
struct pending_block *pb, *pbnext;
|
|
|
|
|
|
|
|
|
|
pb = pending_blocks;
|
|
|
|
|
pbnext = pb->next;
|
|
|
|
|
swapped = 0;
|
|
|
|
|
|
|
|
|
|
while (pbnext)
|
|
|
|
|
{
|
|
|
|
|
/* swap blocks if unordered! */
|
|
|
|
|
|
|
|
|
|
if (BLOCK_START(pb->block) < BLOCK_START(pbnext->block))
|
|
|
|
|
{
|
|
|
|
|
struct block *tmp = pb->block;
|
|
|
|
|
pb->block = pbnext->block;
|
|
|
|
|
pbnext->block = tmp;
|
|
|
|
|
swapped = 1;
|
|
|
|
|
}
|
|
|
|
|
pb = pbnext;
|
|
|
|
|
pbnext = pbnext->next;
|
|
|
|
|
}
|
|
|
|
|
} while (swapped);
|
|
|
|
|
}
|
1991-10-28 06:26:02 +08:00
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
/* Cleanup any undefined types that have been left hanging around
|
|
|
|
|
(this needs to be done before the finish_blocks so that
|
1992-07-28 12:22:18 +08:00
|
|
|
|
file_symbols is still good).
|
|
|
|
|
FIXME: Stabs specific. */
|
1991-10-26 15:21:30 +08:00
|
|
|
|
cleanup_undefined_types ();
|
1992-07-28 12:22:18 +08:00
|
|
|
|
finish_global_stabs (objfile);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
if (pending_blocks == NULL
|
|
|
|
|
&& file_symbols == NULL
|
|
|
|
|
&& global_symbols == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Ignore symtabs that have no functions with real debugging info */
|
|
|
|
|
blockvector = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Define the STATIC_BLOCK & GLOBAL_BLOCK, and build the blockvector. */
|
|
|
|
|
finish_block (0, &file_symbols, 0, last_source_start_addr, end_addr,
|
|
|
|
|
objfile);
|
|
|
|
|
finish_block (0, &global_symbols, 0, last_source_start_addr, end_addr,
|
|
|
|
|
objfile);
|
|
|
|
|
blockvector = make_blockvector (objfile);
|
|
|
|
|
}
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
1992-02-29 14:03:43 +08:00
|
|
|
|
#ifdef PROCESS_LINENUMBER_HOOK
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
PROCESS_LINENUMBER_HOOK (); /* Needed for xcoff. */
|
1992-02-29 14:03:43 +08:00
|
|
|
|
#endif
|
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
/* Now create the symtab objects proper, one for each subfile. */
|
|
|
|
|
/* (The main file is the last one on the chain.) */
|
|
|
|
|
|
|
|
|
|
for (subfile = subfiles; subfile; subfile = nextsub)
|
|
|
|
|
{
|
1992-02-22 09:46:16 +08:00
|
|
|
|
int linetablesize;
|
1991-11-09 18:50:07 +08:00
|
|
|
|
/* If we have blocks of symbols, make a symtab.
|
|
|
|
|
Otherwise, just ignore this file and any line number info in it. */
|
1992-07-28 12:22:18 +08:00
|
|
|
|
symtab = NULL;
|
|
|
|
|
if (blockvector)
|
|
|
|
|
{
|
|
|
|
|
if (subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
/* First, shrink the linetable to make more memory. */
|
|
|
|
|
linetablesize = sizeof (struct linetable) +
|
|
|
|
|
subfile->line_vector->nitems * sizeof (struct linetable_entry);
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
|
|
|
|
xrealloc ((char *) subfile->line_vector, linetablesize);
|
|
|
|
|
|
|
|
|
|
if (sort_linevec)
|
|
|
|
|
qsort (subfile->line_vector->item,
|
|
|
|
|
subfile->line_vector->nitems,
|
|
|
|
|
sizeof (struct linetable_entry), compare_line_numbers);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now, allocate a symbol table. */
|
|
|
|
|
symtab = allocate_symtab (subfile->name, objfile);
|
1991-10-28 06:26:02 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
/* Fill in its components. */
|
|
|
|
|
symtab->blockvector = blockvector;
|
|
|
|
|
if (subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
/* Reallocate the line table on the symbol obstack */
|
|
|
|
|
symtab->linetable = (struct linetable *)
|
|
|
|
|
obstack_alloc (&objfile -> symbol_obstack, linetablesize);
|
|
|
|
|
memcpy (symtab->linetable, subfile->line_vector, linetablesize);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
symtab->linetable = NULL;
|
|
|
|
|
}
|
1993-03-26 22:59:43 +08:00
|
|
|
|
symtab->block_line_section = section;
|
1992-08-07 01:58:26 +08:00
|
|
|
|
if (subfile->dirname)
|
|
|
|
|
{
|
|
|
|
|
/* Reallocate the dirname on the symbol obstack */
|
|
|
|
|
symtab->dirname = (char *)
|
|
|
|
|
obstack_alloc (&objfile -> symbol_obstack,
|
|
|
|
|
strlen (subfile -> dirname) + 1);
|
|
|
|
|
strcpy (symtab->dirname, subfile->dirname);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
symtab->dirname = NULL;
|
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
symtab->free_code = free_linetable;
|
|
|
|
|
symtab->free_ptr = NULL;
|
1992-03-01 09:04:13 +08:00
|
|
|
|
|
* 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.
1992-12-23 14:34:57 +08:00
|
|
|
|
/* Use whatever language we have been using for this subfile,
|
|
|
|
|
not the one that was deduced in allocate_symtab from the
|
|
|
|
|
filename. We already did our own deducing when we created
|
|
|
|
|
the subfile, and we may have altered our opinion of what
|
|
|
|
|
language it is from things we found in the symbols. */
|
|
|
|
|
symtab->language = subfile->language;
|
|
|
|
|
|
1993-03-26 22:59:43 +08:00
|
|
|
|
/* All symtabs for the main file and the subfiles share a
|
|
|
|
|
blockvector, so we need to clear primary for everything but
|
|
|
|
|
the main file. */
|
1992-03-01 09:04:13 +08:00
|
|
|
|
|
1993-03-26 22:59:43 +08:00
|
|
|
|
symtab->primary = 0;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
}
|
1992-08-07 03:59:46 +08:00
|
|
|
|
if (subfile->name != NULL)
|
|
|
|
|
{
|
|
|
|
|
free ((PTR) subfile->name);
|
|
|
|
|
}
|
|
|
|
|
if (subfile->dirname != NULL)
|
|
|
|
|
{
|
|
|
|
|
free ((PTR) subfile->dirname);
|
|
|
|
|
}
|
|
|
|
|
if (subfile->line_vector != NULL)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
1992-08-07 03:59:46 +08:00
|
|
|
|
free ((PTR) subfile->line_vector);
|
1992-07-28 12:22:18 +08:00
|
|
|
|
}
|
1991-10-28 06:26:02 +08:00
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
nextsub = subfile->next;
|
Create and use macros for iterating on symtabs, psymtabs, msymbols.
* minsyms.c (iterate_over_msymbols): Remove; clunky and slow.
* symfile.h, symtab.h (iterate_over_msymbols): Remove prototype
* coffread.c (coff_symfile_read): iterate_over_symtabs => ALL_SYMTABS.
(patch_opaque_types): Avoid dummy args and result.
* objfiles.c (have_partial_symbols, have_full_symbols,
have_minimal_symbols): explicit iteration => ALL_OBJFILES; simplify.
(iterate_over_objfiles, iterate_over_symtabs,
iterate_over_psymtabs): Remove, clunky and slow.
* objfiles.h: Replace iterate_over_* prototypes with ALL_SYMTABS,
ALL_PSYMTABS, and ALL_MSYMBOLS macros.
* symmisc.c (dump_symtab, dump_psymtab, dump_msymbols,
dump_objfile): Remove dummy args and results. Move filename
comparisons to callers.
(printsyms_command, printpsyms_command, printmsyms_command,
printobjfiles_command): iterate_over_* => ALL_*. Compare filenames.
* symtab.c (lookup_symtab_1, lookup_symtab, lookup_partial_symtab,
lookup_symbol, find_main_psymtab, find_pc_symtab, sources_info,
list_symbols, make_symbol_completion_list): Replace explicit
iteration with ALL_SYMTABS, ALL_PSYMTABS, or ALL_MSYMBOLS.
Eliminate Dijkstra flag crap, break out of loops with gotos.
(lookup_symtab_1): Protect '/' tests from short filenames.
(cplus_mangled_symbol): Move inline into lookup_symbol.
* xcoffexec.c (relocate_objfile_msymbols): Remove poor hack.
(relocate_minimal_symbol): Move inline to vmap_symtab.
(vmap_symtab): Replace iteration with ALL_OBJFILES,
iterate_over_msymbols with ALL_MSYMBOLS.
Misc cleanup prior to release.
* dwarfread.c (dwarf_build_psymtabs): Remove mainline test.
* mipsread.c (compare_symtabs, compare_psymtabs): Remove, unused.
* mipsread.c: Add prototypes for all static functions.
* symmisc.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove, unused.
* xcoffread.c (dump_symtab_lines, dump_symtabs, dump_last_symtab,
dump_blockvector, dump_block, dump_addrchass, dump_namespace,
dump_symbol, dump_type, dump_linetable, dump_strtbl): Remove 2nd
unused copy!
* buildsym.c (define_symbol): Handle global register variables
(from Pierre Willard). Complain if register numbers are too large.
1992-03-30 07:17:36 +08:00
|
|
|
|
free ((PTR)subfile);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
1993-03-26 22:59:43 +08:00
|
|
|
|
/* Set this for the main source file. */
|
1992-03-30 06:33:35 +08:00
|
|
|
|
if (symtab)
|
1992-07-28 12:22:18 +08:00
|
|
|
|
{
|
1993-03-26 22:59:43 +08:00
|
|
|
|
symtab->primary = 1;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
}
|
1992-03-01 09:04:13 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
last_source_file = NULL;
|
|
|
|
|
current_subfile = NULL;
|
1991-10-28 06:26:02 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
return (symtab);
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
1991-11-09 18:50:07 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Push a context block. Args are an identifying nesting level (checkable
|
|
|
|
|
when you pop it), and the starting PC address of this context. */
|
|
|
|
|
|
|
|
|
|
struct context_stack *
|
|
|
|
|
push_context (desc, valu)
|
|
|
|
|
int desc;
|
|
|
|
|
CORE_ADDR valu;
|
|
|
|
|
{
|
|
|
|
|
register struct context_stack *new;
|
|
|
|
|
|
|
|
|
|
if (context_stack_depth == context_stack_size)
|
|
|
|
|
{
|
|
|
|
|
context_stack_size *= 2;
|
|
|
|
|
context_stack = (struct context_stack *)
|
1992-02-22 09:46:16 +08:00
|
|
|
|
xrealloc ((char *) context_stack,
|
|
|
|
|
(context_stack_size * sizeof (struct context_stack)));
|
1991-11-09 18:50:07 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
new = &context_stack[context_stack_depth++];
|
|
|
|
|
new->depth = desc;
|
|
|
|
|
new->locals = local_symbols;
|
|
|
|
|
new->old_blocks = pending_blocks;
|
|
|
|
|
new->start_addr = valu;
|
1992-07-28 12:22:18 +08:00
|
|
|
|
new->name = NULL;
|
1991-11-09 18:50:07 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
local_symbols = NULL;
|
1991-11-09 18:50:07 +08:00
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
return (new);
|
1991-11-09 18:50:07 +08:00
|
|
|
|
}
|
1992-07-28 12:22:18 +08:00
|
|
|
|
|
1993-08-10 07:49:18 +08:00
|
|
|
|
|
|
|
|
|
/* Compute a small integer hash code for the given name. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
hashname (name)
|
|
|
|
|
char *name;
|
|
|
|
|
{
|
|
|
|
|
register char *p = name;
|
|
|
|
|
register int total = p[0];
|
|
|
|
|
register int c;
|
|
|
|
|
|
|
|
|
|
c = p[1];
|
|
|
|
|
total += c << 2;
|
|
|
|
|
if (c)
|
|
|
|
|
{
|
|
|
|
|
c = p[2];
|
|
|
|
|
total += c << 4;
|
|
|
|
|
if (c)
|
|
|
|
|
{
|
|
|
|
|
total += p[3] << 6;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Ensure result is positive. */
|
|
|
|
|
if (total < 0)
|
|
|
|
|
{
|
|
|
|
|
total += (1000 << 6);
|
|
|
|
|
}
|
|
|
|
|
return (total % HASHSIZE);
|
|
|
|
|
}
|
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
|
|
|
|
|
/* Initialize anything that needs initializing when starting to read
|
|
|
|
|
a fresh piece of a symbol file, e.g. reading in the stuff corresponding
|
|
|
|
|
to a psymtab. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
buildsym_init ()
|
|
|
|
|
{
|
1992-07-28 12:22:18 +08:00
|
|
|
|
free_pendings = NULL;
|
|
|
|
|
file_symbols = NULL;
|
|
|
|
|
global_symbols = NULL;
|
|
|
|
|
pending_blocks = NULL;
|
1991-10-26 15:21:30 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize anything that needs initializing when a completely new
|
|
|
|
|
symbol file is specified (not just adding some symbols from another
|
|
|
|
|
file, e.g. a shared library). */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
buildsym_new_init ()
|
|
|
|
|
{
|
|
|
|
|
buildsym_init ();
|
|
|
|
|
}
|
|
|
|
|
|
1992-07-28 12:22:18 +08:00
|
|
|
|
/* Initializer for this module */
|
1992-04-09 15:57:10 +08:00
|
|
|
|
|
1991-10-26 15:21:30 +08:00
|
|
|
|
void
|
|
|
|
|
_initialize_buildsym ()
|
|
|
|
|
{
|
|
|
|
|
}
|