1992-07-28 04:22:18 +00:00
|
|
|
|
/* Support routines for building symbol tables in GDB's internal format.
|
1996-01-08 17:55:25 +00:00
|
|
|
|
Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1995, 1996
|
1992-06-13 02:18:44 +00:00
|
|
|
|
Free Software Foundation, Inc.
|
1991-10-26 07:21:30 +00: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
|
1995-08-02 03:41:12 +00:00
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
/* This module provides subroutines used for creating and adding to
|
|
|
|
|
the symbol table. These routines are called from various symbol-
|
1992-07-28 04:22:18 +00:00
|
|
|
|
file-reading routines.
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
Routines to support specific debugging information formats (stabs,
|
|
|
|
|
DWARF, etc) belong somewhere else. */
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
1992-07-28 04:22:18 +00:00
|
|
|
|
#include "bfd.h"
|
1991-10-26 07:21:30 +00:00
|
|
|
|
#include "obstack.h"
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "symfile.h" /* Needed for "struct complaint" */
|
1992-03-21 01:56:01 +00:00
|
|
|
|
#include "objfiles.h"
|
1995-02-12 18:46:45 +00:00
|
|
|
|
#include "gdbtypes.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 12:18:53 +00:00
|
|
|
|
#include "complaints.h"
|
* configure.in: Check for working mmap, ansi headers, string.h,
strings.h, and memory.h.
* configure: Regenerated.
* gdb_stat.h: New file, "portable" <sys/stat.h>.
* gdb_string.h: New file, "portable" <string.h>.
* altos-xdep.c, arm-tdep.c, arm-xdep.c, convex-tdep.c,
convex-xdep.c, coredep.c, cxux-nat.c, dbxread.c, exec.c,
gould-xdep.c, hppa-tdep.c, i386aix-nat.c, i386b-nat.c,
i386mach-nat.c, i386v-nat.c, infptrace.c, m88k-nat.c, main.c,
mdebugread.c, objfiles.c, os9kread.c, procfs.c, pyr-xdep.c,
rs6000-nat.c, source.c, standalone.c, stuff.c, sun386-nat.c,
symfile.c, symm-nat.c, symm-tdep.c, symtab.c, top.c, ultra3-nat.c,
ultra3-xdep.c, umax-xdep.c, xcoffread.c: Include "gdb_stat.h"
instead of <sys/stat.h>.
* alpha-tdep.c, breakpoint.c, buildsym.c, c-typeprint.c,
ch-typeprint.c, coffread.c, command.c, core-sol2.c, core-svr4.c,
core.c, corelow.c, cp-valprint.c, dbxread.c, dcache.c, demangle.c,
dpx2-nat.c, dstread.c, dwarfread.c, elfread.c, environ.c, eval.c,
exec.c, f-lang.c, f-typeprint.c, f-valprint.c, findvar.c,
fork-child.c, gdbtypes.c, hpread.c, i386-tdep.c, infcmd.c,
inflow.c, infptrace.c, infrun.c, irix5-nat.c, language.c,
m2-typeprint.c, main.c, mdebugread.c, minsyms.c, mipsread.c,
monitor.c, nlmread.c, objfiles.c, os9kread.c, osfsolib.c, parse.c,
printcmd.c, procfs.c, regex.c, remote-adapt.c, remote-arc.c,
remote-array.c, remote-bug.c, remote-e7000.c, remote-eb.c,
remote-es.c, remote-hms.c, remote-mm.c, remote-os9k.c,
remote-pa.c, remote-sim.c, remote-st.c, remote-udi.c,
remote-utils.c, remote-vx.c, remote-vx29k.c, remote-vx68.c,
remote-vx960.c, remote-vxmips.c, remote-vxsparc.c, remote.c,
solib.c, somread.c, source.c, stabsread.c, stack.c, symfile.c,
symmisc.c, symtab.c, target.c, top.c, typeprint.c, utils.c,
valarith.c, valops.c, valprint.c, values.c, xcoffread.c: Include
"gdb_string.h" instead of <string.h>.
* gdbtk.c: Likewise.
* config/xm-sysv4.h, i386/xm-ptx.h, m68k/xm-sun3os4.h,
sparc/xm-sun4os4.h (HAVE_MMAP): Removed.
* config/xm-lynx.h, config/i386/xm-ptx.h,
config/m68k/nm-apollo68b.h, config/m68k/xm-hp300hpux.h,
config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/mips/xm-news-mips.h, config/mips/xm-riscos.h,
config/pa/hppah.h, config/rs6000/xm-rs6000.h,
config/sparc/xm-sun4os4.h, config/sparc/xm-sun4sol2.h,
config/vax/xm-vaxbsd.h, config/vax/xm-vaxult.h,
config/vax/xm-vaxult2.h (MEM_FNS_DECLARED): Removed.
* config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/pa/xm-hppah.h (memcpy, memset): Removed declarations.
1995-08-01 20:14:27 +00:00
|
|
|
|
#include "gdb_string.h"
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
/* Ask buildsym.h to define the vars it normally declares `extern'. */
|
|
|
|
|
#define EXTERN /**/
|
|
|
|
|
#include "buildsym.h" /* Our own declarations */
|
|
|
|
|
#undef EXTERN
|
|
|
|
|
|
* Makefile.in (c-exp.tab.o): Remove notice about shift/reduce conflicts
which no longer occur.
gcc -Wall lint:
* findvar.c (symbol_read_needs_frame), corelow.c (ignore),
inflow.c (gdb_has_a_terminal): Make sure to return a value.
* regex.h: Declare re_set_syntax.
* printcmd.c: Include valprint.h.
* infcmd.c, exec.c, maint.c, core.c: Include language.h.
* maint.c: Include expression.h.
* infrun.c, fork-child.c, corelow.c, inflow.c: Include thread.h.
* inftarg.c: Include command.h.
* coredep.c: Include value.h.
* c-exp.y, m2-exp.y, ch-exp.y: Include bfd.h, symfile.h and objfiles.h.
* ch-typeprint.c: Include typeprint.h.
* ch-valprint.c: Include c-lang.h.
* nlmread.c: Include buildsym.h.
* environ.c: Include gdbcore.h. Only include defs.h once.
(set_in_environ): Cast const char * to char * when passing to
set_gnutarget.
Remove unused variables:
* printcmd.c (printf_command): args_to_vprintf.
* coffread.c (coff_symfile_init): strsection.
Move variables to within the #ifdefs where they are used:
* symtab.c (gdb_mangle_name): opname.
* inftarg.c (child_attach): pid and exec_file.
* inftarg.c (child_detach): siggnal.
* objfiles.c (allocate_objfile): mapto, md, and fd.
* objfiles.c (free_objfile): mmfd.
* infrun.c (wait_for_inferior): Include BPSTAT_WHAT_LAST in switch.
* infrun.c (wait_for_inferior): Remove unused same_pid label.
* inferior.h: Declare set_sigint_trap and clear_sigint_trap.
* parser-defs.h: Declare write_exp_elt_block.
* stabsread.h: Declare elfstab_offset_sections and
coffstab_build_psymtabs.
1993-10-21 20:41:50 +00:00
|
|
|
|
/* For cleanup_undefined_types and finish_global_stabs (somewhat
|
|
|
|
|
questionable--see comment where we call them). */
|
|
|
|
|
#include "stabsread.h"
|
|
|
|
|
|
1996-10-08 19:00:38 +00:00
|
|
|
|
/* Pointer to the head of a linked list of symbol blocks which have
|
|
|
|
|
already been finalized (lexical contexts already closed) and which are
|
|
|
|
|
just waiting to be built into a blockvector when finalizing the
|
|
|
|
|
associated symtab. */
|
|
|
|
|
|
|
|
|
|
static struct pending_block *pending_blocks = NULL;
|
|
|
|
|
|
|
|
|
|
/* List of free `struct pending' structures for reuse. */
|
|
|
|
|
|
|
|
|
|
static struct pending *free_pendings;
|
|
|
|
|
|
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
static int
|
|
|
|
|
compare_line_numbers PARAMS ((const void *, const void *));
|
|
|
|
|
|
|
|
|
|
|
1991-10-27 22:26:02 +00: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 04:22:18 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
/* Complaints about the symbols we have encountered. */
|
|
|
|
|
|
1996-10-07 17:58:56 +00:00
|
|
|
|
struct complaint block_end_complaint =
|
|
|
|
|
{"block end address less than block start address in %s (patched it)", 0, 0};
|
|
|
|
|
|
|
|
|
|
struct complaint anon_block_end_complaint =
|
|
|
|
|
{"block end address 0x%lx less than block start address 0x%lx (patched it)", 0, 0};
|
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
struct complaint innerblock_complaint =
|
|
|
|
|
{"inner block not inside outer block in %s", 0, 0};
|
|
|
|
|
|
1992-07-04 12:23:23 +00:00
|
|
|
|
struct complaint innerblock_anon_complaint =
|
1996-10-07 17:58:56 +00:00
|
|
|
|
{"inner block (0x%lx-0x%lx) not inside outer block (0x%lx-0x%lx)", 0, 0};
|
1992-07-04 12:23:23 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
struct complaint blockvector_complaint =
|
Tue Sep 28 09:45:38 1993 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)
* symmisc.c (print_symbol): Use %02x not %2x for LOC_CONST_BYTES.
Clean up problems with targets and hosts that have 64 bit longs
and pointers and 32 bit ints.
* breakpoint.c, buildsym.c, c-lang.c, c-valprint.c, ch-lang.c,
ch-valprint.c, core.c, cp-valprint.c, dbxread.c, exec.c,
expprint.c, gdbtypes.c, infcmd.c, language.c, language.h,
m2-lang.c, maint.c, mips-tdep.c, mipsread.c, partial-stab.h,
printcmd.c, remote-vx.c, solib.c, source.c, stack.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Change all printf formats from %x to %lx if outputting an address.
Change la_*_format to use long format.
local_hex_string, local_hex_string_custom now take an unsigned long
argument, change all callers.
* coffread.c (read_coff_symtab): Remove superfluous cast for
complaint output.
* dbxread.c (end_psymtab): Cast MSYMBOL_INFO to long, not int.
* findvar.c, value.h (write_register): Change register value to long.
* gdbtypes.h (struct type): Change `bitsize' to long as
TYPE_FIELD_STATIC_PHYSNAME uses this field as a pointer.
* inferior.h (struct inferior_status): Change type of stop_pc to
CORE_ADDR.
* language.h (local_octal_string, local_octal_string_custom):
Remove prototype, the functions are neither defined nor used.
* mipsread.c (parse_symbol): Use temporary variable for bitsize as
f->bitsize is a long now.
* objfiles.c (add_to_objfile_sections, build_objfile_section_table):
Use unsigned long casts instead of int for abusing sections_end
pointer as integer.
* stack.c (parse_frame_specification): Change type of `args' to
CORE_ADDR for SETUP_ARBITRARY_FRAME.
* printcmd.c (make_vasize): Allow redefinition via MAKEVA_SIZE.
* mipsread.c (parse_type): Alpha cc now supports the t->continued
bit, update algorithm to match the way the compiler uses it.
1993-09-28 17:43:25 +00:00
|
|
|
|
{"block at 0x%lx out of order", 0, 0};
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* maintain the lists of symbols and blocks */
|
|
|
|
|
|
|
|
|
|
/* Add a symbol to one of the lists of symbols. */
|
1992-07-28 04:22:18 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
void
|
|
|
|
|
add_symbol_to_list (symbol, listhead)
|
|
|
|
|
struct symbol *symbol;
|
|
|
|
|
struct pending **listhead;
|
|
|
|
|
{
|
1992-07-28 04:22:18 +00:00
|
|
|
|
register struct pending *link;
|
|
|
|
|
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
if (*listhead == NULL || (*listhead)->nsyms == PENDINGSIZE)
|
1991-10-26 07:21:30 +00:00
|
|
|
|
{
|
|
|
|
|
if (free_pendings)
|
|
|
|
|
{
|
|
|
|
|
link = free_pendings;
|
|
|
|
|
free_pendings = link->next;
|
|
|
|
|
}
|
|
|
|
|
else
|
1992-07-28 04:22:18 +00:00
|
|
|
|
{
|
|
|
|
|
link = (struct pending *) xmalloc (sizeof (struct pending));
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
link->next = *listhead;
|
|
|
|
|
*listhead = link;
|
|
|
|
|
link->nsyms = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
(*listhead)->symbol[(*listhead)->nsyms++] = symbol;
|
|
|
|
|
}
|
|
|
|
|
|
1993-09-01 21:15:27 +00:00
|
|
|
|
/* Find a symbol named NAME on a LIST. NAME need not be '\0'-terminated;
|
|
|
|
|
LENGTH is the length of the name. */
|
1992-07-28 04:22:18 +00:00
|
|
|
|
|
1991-11-09 10:50:07 +00:00
|
|
|
|
struct symbol *
|
|
|
|
|
find_symbol_in_list (list, name, length)
|
|
|
|
|
struct pending *list;
|
|
|
|
|
char *name;
|
|
|
|
|
int length;
|
|
|
|
|
{
|
|
|
|
|
int j;
|
1992-07-28 04:22:18 +00:00
|
|
|
|
char *pp;
|
1991-11-09 10:50:07 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00: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 10:50:07 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
return (NULL);
|
1991-11-09 10:50:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
/* At end of reading syms, or in case of quit,
|
1992-07-28 04:22:18 +00:00
|
|
|
|
really free as many `struct pending's as we can easily find. */
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
/* ARGSUSED */
|
|
|
|
|
void
|
|
|
|
|
really_free_pendings (foo)
|
|
|
|
|
int foo;
|
|
|
|
|
{
|
|
|
|
|
struct pending *next, *next1;
|
|
|
|
|
|
|
|
|
|
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-29 23:17:36 +00:00
|
|
|
|
free ((PTR)next);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
free_pendings = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1996-10-08 19:00:38 +00:00
|
|
|
|
free_pending_blocks ();
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
for (next = file_symbols; next != NULL; next = next1)
|
1991-10-26 07:21:30 +00: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-29 23:17:36 +00:00
|
|
|
|
free ((PTR)next);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
file_symbols = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
for (next = global_symbols; next != NULL; next = next1)
|
1991-10-26 07:21:30 +00: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-29 23:17:36 +00:00
|
|
|
|
free ((PTR)next);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
global_symbols = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
1996-10-08 19:00:38 +00:00
|
|
|
|
/* This function is called to discard any pending blocks. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
free_pending_blocks ()
|
|
|
|
|
{
|
|
|
|
|
#if 0 /* Now we make the links in the symbol_obstack, so don't free them. */
|
|
|
|
|
struct pending_block *bnext, *bnext1;
|
|
|
|
|
|
|
|
|
|
for (bnext = pending_blocks; bnext; bnext = bnext1)
|
|
|
|
|
{
|
|
|
|
|
bnext1 = bnext->next;
|
|
|
|
|
free ((PTR)bnext);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
pending_blocks = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
1991-10-26 07:21:30 +00: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 01:46:16 +00:00
|
|
|
|
finish_block (symbol, listhead, old_blocks, start, end, objfile)
|
1991-10-26 07:21:30 +00:00
|
|
|
|
struct symbol *symbol;
|
|
|
|
|
struct pending **listhead;
|
|
|
|
|
struct pending_block *old_blocks;
|
|
|
|
|
CORE_ADDR start, end;
|
1992-02-22 01:46:16 +00:00
|
|
|
|
struct objfile *objfile;
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
register int j;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
/* Count the length of the list of symbols. */
|
|
|
|
|
|
1992-08-01 20:40:59 +00:00
|
|
|
|
for (next = *listhead, i = 0;
|
|
|
|
|
next;
|
|
|
|
|
i += next->nsyms, next = next->next)
|
1992-07-28 04:22:18 +00:00
|
|
|
|
{
|
|
|
|
|
/*EMPTY*/;
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
block = (struct block *) obstack_alloc (&objfile -> symbol_obstack,
|
1991-11-09 10:50:07 +00:00
|
|
|
|
(sizeof (struct block) + ((i - 1) * sizeof (struct symbol *))));
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
{
|
|
|
|
|
BLOCK_SYM (block, --i) = next->symbol[j];
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BLOCK_START (block) = start;
|
|
|
|
|
BLOCK_END (block) = end;
|
1992-07-28 04:22:18 +00:00
|
|
|
|
/* Superblock filled in when containing block is made */
|
|
|
|
|
BLOCK_SUPERBLOCK (block) = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
BLOCK_GCC_COMPILED (block) = processing_gcc_compilation;
|
|
|
|
|
|
|
|
|
|
/* Put the block in as the value of the symbol that names it. */
|
|
|
|
|
|
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
1995-02-12 18:46:45 +00:00
|
|
|
|
struct type *ftype = SYMBOL_TYPE (symbol);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
SYMBOL_BLOCK_VALUE (symbol) = block;
|
|
|
|
|
BLOCK_FUNCTION (block) = symbol;
|
1995-02-12 18:46:45 +00:00
|
|
|
|
|
|
|
|
|
if (TYPE_NFIELDS (ftype) <= 0)
|
|
|
|
|
{
|
|
|
|
|
/* No parameter type information is recorded with the function's
|
|
|
|
|
type. Set that from the type of the parameter symbols. */
|
|
|
|
|
int nparams = 0, iparams;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
for (i = 0; i < BLOCK_NSYMS (block); i++)
|
|
|
|
|
{
|
|
|
|
|
sym = BLOCK_SYM (block, i);
|
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
case LOC_REGPARM:
|
|
|
|
|
case LOC_REGPARM_ADDR:
|
1996-10-15 23:44:13 +00:00
|
|
|
|
case LOC_BASEREG_ARG:
|
|
|
|
|
case LOC_LOCAL_ARG:
|
1995-02-12 18:46:45 +00:00
|
|
|
|
nparams++;
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
|
break;
|
|
|
|
|
case LOC_UNDEF:
|
|
|
|
|
case LOC_CONST:
|
|
|
|
|
case LOC_STATIC:
|
|
|
|
|
case LOC_REGISTER:
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_TYPEDEF:
|
|
|
|
|
case LOC_LABEL:
|
|
|
|
|
case LOC_BLOCK:
|
|
|
|
|
case LOC_CONST_BYTES:
|
|
|
|
|
case LOC_BASEREG:
|
1995-10-28 11:57:02 +00:00
|
|
|
|
case LOC_UNRESOLVED:
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
|
case LOC_OPTIMIZED_OUT:
|
|
|
|
|
default:
|
|
|
|
|
break;
|
1995-02-12 18:46:45 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (nparams > 0)
|
|
|
|
|
{
|
|
|
|
|
TYPE_NFIELDS (ftype) = nparams;
|
|
|
|
|
TYPE_FIELDS (ftype) = (struct field *)
|
|
|
|
|
TYPE_ALLOC (ftype, nparams * sizeof (struct field));
|
|
|
|
|
|
|
|
|
|
for (i = iparams = 0; iparams < nparams; i++)
|
|
|
|
|
{
|
|
|
|
|
sym = BLOCK_SYM (block, i);
|
|
|
|
|
switch (SYMBOL_CLASS (sym))
|
|
|
|
|
{
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
case LOC_REGPARM:
|
|
|
|
|
case LOC_REGPARM_ADDR:
|
1996-10-15 23:44:13 +00:00
|
|
|
|
case LOC_BASEREG_ARG:
|
|
|
|
|
case LOC_LOCAL_ARG:
|
1995-02-12 18:46:45 +00:00
|
|
|
|
TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
|
|
|
|
|
iparams++;
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
|
break;
|
|
|
|
|
case LOC_UNDEF:
|
|
|
|
|
case LOC_CONST:
|
|
|
|
|
case LOC_STATIC:
|
|
|
|
|
case LOC_REGISTER:
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_TYPEDEF:
|
|
|
|
|
case LOC_LABEL:
|
|
|
|
|
case LOC_BLOCK:
|
|
|
|
|
case LOC_CONST_BYTES:
|
|
|
|
|
case LOC_BASEREG:
|
1995-10-28 11:57:02 +00:00
|
|
|
|
case LOC_UNRESOLVED:
|
* dache.c (struct dcache_block): Change data member from unsigned char
to char, since everything passed in and out of dcache is char or casted
to appropriate type anyway.
(dcache_alloc): Move assignment of db out of test and combine separate
tests into if-else.
(dcache_peek_byte): Change ptr from unsigned char* to char*.
(dcache_peek_byte): Remove now unnecessary cast in read_memory call.
(dcache_peek): Change cast of incoming data arg.
(dcache_poke): Change cast of addr of incoming data arg.
(dcache_info): Mask data passed to printf_filtered to lsbyte only.
(dcache_info): Change printf_filtered arg from "% 2x" to " %2x".
* target.c (debug_to_thread_alive): Change return type to int and
return zero, for type compatibility with other *_thread_alive funcs.
(cleanup_target): Change cast of ignore function to match type of the
to_thread_alive member.
* defs.h (error_hook): Add ATTR_NORETURN.
* defs.h (NORETURN, ATTR_NORETURN): Switch from volatile to
__attribute__ method with gcc 2.7, to avoid gcc 2.6.3 bug.
* remote.c (remote_wait): Cast first arg to strtol, strchr, and strncmp
to "const char *" from "unsigned char *".
(remote_wait): Cast arg to putpkt and strcpy from "unsigned char *" to
"char *".
(remote_wait): Change printf format for long arg from "%d" to "%ld".
(getpkt): Remove unused variable "bp".
(remote_fetch_word, remote_store_word): Ifdef out apparently unused
functions.
* breakpoint.c (watchpoint_check): Removed unused variables
"saved_level" and "saved_frame".
* valops.c (value_arg_coerce): Add other enum TYPE_CODE_* and
default cases to switch for completeness.
* infrun.c (wait_for_inferior): Enclose "have_waited" label
in #ifdef that matches the one in which it is referenced.
* ser-unix.c (hardwire_noflush_set_tty_state): Enclose otherwise
unused variable "state" in #ifdef that matches one in which it is
referenced.
* eval.c (evaluate_subexp_standard): Remove unused variable "var".
* eval.c (evaluate_subexp_standard): Remove unused variable "tmp_symbol".
* valarith.c (value_subscript): Remove unused variable "lowerbound",
which is redeclared in a nested scope prior to use.
* printcmd.c (print_frame_nameless_args): Use "%ld" to print long
arg, not "%d".
* {mem-break.c, remote-pa.c, remote.c, saber.suppress}:
Remove unused static var "check_break_insn_size".
* buildsym.c (finish_block): Add other enum LOC_* and default
cases to switch for completeness.
ch-lang.c (type_lower_upper): Removed unused label "retry".
Add other enum TYPE_* and default cases to switch for completeness.
* f-typeprint.c (f_type_print_args): Ifdef out unused function
that may be used someday when Fortran support is complete.
* ch-valprint.c (chill_print_type_scalar): Add other enum
TYPE_* and default cases to switch for completeness.
(chill_val_print): Remove unused local var "high_bound" that
is redeclared in a nested scope prior to use.
(chill_var_print): Use "%ld" to print long arg, not "%d".
* regex.c (re_compile_fastmap, re_match_2): Add remaining enum types
and default to switches for completeness.
* minsyms.c (lookup_minimal_symbol_text): Delete unused variable
"trampoline_symbol".
(prim_record_minimal_symbol_and_info): Return NULL rather than trash.
* elfread.c (elf_symtab_read): Don't dereference NULL returns from
record_minimal_symbol_and_info.
* f-lang.c (saved_function_list_end): Ifdef out unused variable
that may be used someday.
* f-valprint.c (f_val_print): Remove unused local variable "straddr".
1995-07-18 04:38:06 +00:00
|
|
|
|
case LOC_OPTIMIZED_OUT:
|
|
|
|
|
default:
|
|
|
|
|
break;
|
1995-02-12 18:46:45 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
1992-07-28 04:22:18 +00:00
|
|
|
|
{
|
|
|
|
|
BLOCK_FUNCTION (block) = NULL;
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
*listhead = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1996-10-07 17:58:56 +00:00
|
|
|
|
#if 1
|
|
|
|
|
/* Check to be sure that the blocks have an end address that is
|
|
|
|
|
greater than starting address */
|
|
|
|
|
|
|
|
|
|
if (BLOCK_END (block) < BLOCK_START (block))
|
|
|
|
|
{
|
|
|
|
|
if (symbol)
|
|
|
|
|
{
|
|
|
|
|
complain (&block_end_complaint, SYMBOL_SOURCE_NAME (symbol));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
complain (&anon_block_end_complaint, BLOCK_END (block), BLOCK_START (block));
|
|
|
|
|
}
|
|
|
|
|
/* Better than nothing */
|
|
|
|
|
BLOCK_END (block) = BLOCK_START (block);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
opblock = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
for (pblock = pending_blocks; pblock != old_blocks; pblock = pblock->next)
|
|
|
|
|
{
|
1992-07-28 04:22:18 +00:00
|
|
|
|
if (BLOCK_SUPERBLOCK (pblock->block) == NULL)
|
|
|
|
|
{
|
1991-10-26 07:21:30 +00:00
|
|
|
|
#if 1
|
1992-07-28 04:22:18 +00: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 06:34:57 +00:00
|
|
|
|
complain (&innerblock_complaint,
|
|
|
|
|
SYMBOL_SOURCE_NAME (symbol));
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1996-10-07 17:58:56 +00:00
|
|
|
|
complain (&innerblock_anon_complaint, BLOCK_START (pblock->block),
|
|
|
|
|
BLOCK_END (pblock->block), BLOCK_START (block),
|
|
|
|
|
BLOCK_END (block));
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
1997-02-09 17:36:49 +00:00
|
|
|
|
if (BLOCK_START (pblock->block) < BLOCK_START (block))
|
|
|
|
|
BLOCK_START (pblock->block) = BLOCK_START (block);
|
|
|
|
|
if (BLOCK_END (pblock->block) > BLOCK_END (block))
|
|
|
|
|
BLOCK_END (pblock->block) = BLOCK_END (block);
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
#endif
|
1992-07-28 04:22:18 +00:00
|
|
|
|
BLOCK_SUPERBLOCK (pblock->block) = block;
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
opblock = pblock;
|
|
|
|
|
}
|
|
|
|
|
|
1996-10-08 19:00:38 +00:00
|
|
|
|
record_pending_block (objfile, block, opblock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Record BLOCK on the list of all blocks in the file. Put it after
|
|
|
|
|
OPBLOCK, or at the beginning if opblock is NULL. This puts the block
|
|
|
|
|
in the list after all its subblocks.
|
|
|
|
|
|
|
|
|
|
Allocate the pending block struct in the symbol_obstack to save
|
|
|
|
|
time. This wastes a little space. FIXME: Is it worth it? */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
record_pending_block (objfile, block, opblock)
|
|
|
|
|
struct objfile* objfile;
|
|
|
|
|
struct block *block;
|
|
|
|
|
struct pending_block *opblock;
|
|
|
|
|
{
|
|
|
|
|
register struct pending_block *pblock;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
pblock = (struct pending_block *)
|
1996-10-08 19:00:38 +00:00
|
|
|
|
obstack_alloc (&objfile -> symbol_obstack, sizeof (struct pending_block));
|
|
|
|
|
pblock -> block = block;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
if (opblock)
|
|
|
|
|
{
|
1996-10-08 19:00:38 +00:00
|
|
|
|
pblock -> next = opblock -> next;
|
|
|
|
|
opblock -> next = pblock;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1996-10-08 19:00:38 +00:00
|
|
|
|
pblock -> next = pending_blocks;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
pending_blocks = pblock;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1996-10-08 19:00:38 +00:00
|
|
|
|
/* Note that this is only used in this file and in dstread.c, which should be
|
|
|
|
|
fixed to not need direct access to this function. When that is done, it can
|
|
|
|
|
be made static again. */
|
|
|
|
|
|
|
|
|
|
struct blockvector *
|
1992-02-22 01:46:16 +00:00
|
|
|
|
make_blockvector (objfile)
|
1993-09-01 21:15:27 +00:00
|
|
|
|
struct objfile *objfile;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
{
|
|
|
|
|
register struct pending_block *next;
|
|
|
|
|
register struct blockvector *blockvector;
|
|
|
|
|
register int i;
|
|
|
|
|
|
|
|
|
|
/* Count the length of the list of blocks. */
|
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
for (next = pending_blocks, i = 0; next; next = next->next, i++) {;}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
blockvector = (struct blockvector *)
|
1992-02-22 01:46:16 +00:00
|
|
|
|
obstack_alloc (&objfile -> symbol_obstack,
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
for (next = pending_blocks; next; next = next->next)
|
|
|
|
|
{
|
|
|
|
|
BLOCKVECTOR_BLOCK (blockvector, --i) = next->block;
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
pending_blocks = NULL;
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
{
|
|
|
|
|
for (i = 1; i < BLOCKVECTOR_NBLOCKS (blockvector); i++)
|
|
|
|
|
{
|
|
|
|
|
if (BLOCK_START(BLOCKVECTOR_BLOCK (blockvector, i-1))
|
|
|
|
|
> BLOCK_START(BLOCKVECTOR_BLOCK (blockvector, i)))
|
|
|
|
|
{
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 00:36:05 +00:00
|
|
|
|
|
|
|
|
|
/* FIXME-32x64: loses if CORE_ADDR doesn't fit in a
|
|
|
|
|
long. Possible solutions include a version of
|
|
|
|
|
complain which takes a callback, a
|
|
|
|
|
sprintf_address_numeric to match
|
|
|
|
|
print_address_numeric, or a way to set up a GDB_FILE
|
|
|
|
|
* which causes sprintf rather than fprintf to be
|
|
|
|
|
called. */
|
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
complain (&blockvector_complaint,
|
Tue Sep 28 09:45:38 1993 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)
* symmisc.c (print_symbol): Use %02x not %2x for LOC_CONST_BYTES.
Clean up problems with targets and hosts that have 64 bit longs
and pointers and 32 bit ints.
* breakpoint.c, buildsym.c, c-lang.c, c-valprint.c, ch-lang.c,
ch-valprint.c, core.c, cp-valprint.c, dbxread.c, exec.c,
expprint.c, gdbtypes.c, infcmd.c, language.c, language.h,
m2-lang.c, maint.c, mips-tdep.c, mipsread.c, partial-stab.h,
printcmd.c, remote-vx.c, solib.c, source.c, stack.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Change all printf formats from %x to %lx if outputting an address.
Change la_*_format to use long format.
local_hex_string, local_hex_string_custom now take an unsigned long
argument, change all callers.
* coffread.c (read_coff_symtab): Remove superfluous cast for
complaint output.
* dbxread.c (end_psymtab): Cast MSYMBOL_INFO to long, not int.
* findvar.c, value.h (write_register): Change register value to long.
* gdbtypes.h (struct type): Change `bitsize' to long as
TYPE_FIELD_STATIC_PHYSNAME uses this field as a pointer.
* inferior.h (struct inferior_status): Change type of stop_pc to
CORE_ADDR.
* language.h (local_octal_string, local_octal_string_custom):
Remove prototype, the functions are neither defined nor used.
* mipsread.c (parse_symbol): Use temporary variable for bitsize as
f->bitsize is a long now.
* objfiles.c (add_to_objfile_sections, build_objfile_section_table):
Use unsigned long casts instead of int for abusing sections_end
pointer as integer.
* stack.c (parse_frame_specification): Change type of `args' to
CORE_ADDR for SETUP_ARBITRARY_FRAME.
* printcmd.c (make_vasize): Allow redefinition via MAKEVA_SIZE.
* mipsread.c (parse_type): Alpha cc now supports the t->continued
bit, update algorithm to match the way the compiler uses it.
1993-09-28 17:43:25 +00:00
|
|
|
|
(unsigned long) BLOCK_START(BLOCKVECTOR_BLOCK (blockvector, i)));
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
return (blockvector);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1991-10-27 22:26:02 +00:00
|
|
|
|
/* Start recording information about source code that came from an included
|
1993-09-01 21:15:27 +00:00
|
|
|
|
(or otherwise merged-in) source file with a different name. NAME is
|
|
|
|
|
the name of the file (cannot be NULL), DIRNAME is the directory in which
|
|
|
|
|
it resides (or NULL if not known). */
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
void
|
1991-10-27 22:26:02 +00: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 06:34:57 +00:00
|
|
|
|
if (STREQ (subfile->name, name))
|
1991-10-27 22:26:02 +00: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 */
|
1994-03-26 04:26:26 +00:00
|
|
|
|
subfile->name = (name == NULL) ? NULL : savestring (name, strlen (name));
|
|
|
|
|
subfile->dirname =
|
|
|
|
|
(dirname == NULL) ? NULL : savestring (dirname, strlen (dirname));
|
1991-10-27 22:26:02 +00:00
|
|
|
|
|
|
|
|
|
/* Initialize line-number recording for this subfile. */
|
1992-07-28 04:22:18 +00: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 06:34:57 +00: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 00:22:08 +00: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
|
1993-09-21 17:41:45 +00:00
|
|
|
|
of any pending subfiles from C to C++. We also accept any other C++
|
|
|
|
|
suffixes accepted by deduce_language_from_filename (in particular,
|
|
|
|
|
some people use .cxx with cfront). */
|
1995-02-12 17:53:34 +00:00
|
|
|
|
/* Likewise for f2c. */
|
1993-07-28 00:22:08 +00:00
|
|
|
|
|
|
|
|
|
if (subfile->name)
|
|
|
|
|
{
|
|
|
|
|
struct subfile *s;
|
1995-02-12 17:53:34 +00:00
|
|
|
|
enum language sublang = deduce_language_from_filename (subfile->name);
|
1993-07-28 00:22:08 +00:00
|
|
|
|
|
1995-02-12 17:53:34 +00:00
|
|
|
|
if (sublang == language_cplus || sublang == language_fortran)
|
1993-07-28 00:22:08 +00:00
|
|
|
|
for (s = subfiles; s != NULL; s = s->next)
|
|
|
|
|
if (s->language == language_c)
|
1995-02-12 17:53:34 +00:00
|
|
|
|
s->language = sublang;
|
1993-07-28 00:22:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* And patch up this file if necessary. */
|
|
|
|
|
if (subfile->language == language_c
|
|
|
|
|
&& subfile->next != NULL
|
1995-02-12 17:53:34 +00:00
|
|
|
|
&& (subfile->next->language == language_cplus
|
|
|
|
|
|| subfile->next->language == language_fortran))
|
1993-07-28 00:22:08 +00:00
|
|
|
|
{
|
1995-02-12 17:53:34 +00:00
|
|
|
|
subfile->language = subfile->next->language;
|
1993-07-28 00:22:08 +00:00
|
|
|
|
}
|
1991-10-27 22:26:02 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
|
1992-08-06 19:59:46 +00: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;
|
1994-03-26 04:26:26 +00:00
|
|
|
|
subfile->name = savestring (name, strlen (name));
|
1995-03-25 09:23:10 +00:00
|
|
|
|
last_source_file = 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 06:34:57 +00: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-06 19:59:46 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1991-10-27 22:26:02 +00:00
|
|
|
|
|
1991-11-09 10:50:07 +00: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 04:22:18 +00:00
|
|
|
|
if (current_subfile == NULL || current_subfile->name == NULL)
|
|
|
|
|
{
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
1991-11-09 10:50:07 +00:00
|
|
|
|
tem->name = current_subfile->name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
pop_subfile ()
|
|
|
|
|
{
|
|
|
|
|
register char *name;
|
|
|
|
|
register struct subfile_stack *link = subfile_stack;
|
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
if (link == NULL)
|
|
|
|
|
{
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
1991-11-09 10:50:07 +00: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-29 23:17:36 +00:00
|
|
|
|
free ((PTR)link);
|
1992-07-28 04:22:18 +00:00
|
|
|
|
return (name);
|
1991-11-09 10:50:07 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
|
1991-11-09 10:50:07 +00:00
|
|
|
|
|
1993-09-02 00:24:46 +00:00
|
|
|
|
/* Add a linetable entry for line number LINE and address PC to the line
|
|
|
|
|
vector for SUBFILE. */
|
1991-10-27 22:26:02 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
record_line (subfile, line, pc)
|
|
|
|
|
register struct subfile *subfile;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
int line;
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
{
|
|
|
|
|
struct linetable_entry *e;
|
|
|
|
|
/* Ignore the dummy line number in libg.o */
|
|
|
|
|
|
|
|
|
|
if (line == 0xffff)
|
1992-07-28 04:22:18 +00:00
|
|
|
|
{
|
|
|
|
|
return;
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1991-10-27 22:26:02 +00:00
|
|
|
|
/* Make sure line vector exists and is big enough. */
|
1992-07-28 04:22:18 +00:00
|
|
|
|
if (!subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
subfile->line_vector_length = INITIAL_LINE_VECTOR_LENGTH;
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
1991-10-27 22:26:02 +00:00
|
|
|
|
xmalloc (sizeof (struct linetable)
|
|
|
|
|
+ subfile->line_vector_length * sizeof (struct linetable_entry));
|
1992-07-28 04:22:18 +00:00
|
|
|
|
subfile->line_vector->nitems = 0;
|
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1991-10-27 22:26:02 +00:00
|
|
|
|
if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length)
|
1991-10-26 07:21:30 +00:00
|
|
|
|
{
|
1991-10-27 22:26:02 +00:00
|
|
|
|
subfile->line_vector_length *= 2;
|
|
|
|
|
subfile->line_vector = (struct linetable *)
|
1992-02-22 01:46:16 +00:00
|
|
|
|
xrealloc ((char *) subfile->line_vector, (sizeof (struct linetable)
|
1992-07-28 04:22:18 +00:00
|
|
|
|
+ subfile->line_vector_length * sizeof (struct linetable_entry)));
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
1991-10-27 22:26:02 +00:00
|
|
|
|
e = subfile->line_vector->item + subfile->line_vector->nitems++;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
e->line = line; e->pc = pc;
|
|
|
|
|
}
|
1991-10-27 22:26:02 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Needed in order to sort line tables from IBM xcoff files. Sigh! */
|
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
static int
|
|
|
|
|
compare_line_numbers (ln1p, ln2p)
|
1996-08-13 04:27:08 +00:00
|
|
|
|
const void *ln1p;
|
|
|
|
|
const void *ln2p;
|
1991-10-27 22:26:02 +00:00
|
|
|
|
{
|
1993-09-01 21:15:27 +00:00
|
|
|
|
struct linetable_entry *ln1 = (struct linetable_entry *) ln1p;
|
|
|
|
|
struct linetable_entry *ln2 = (struct linetable_entry *) ln2p;
|
|
|
|
|
|
|
|
|
|
/* Note: this code does not assume that CORE_ADDRs can fit in ints.
|
|
|
|
|
Please keep it that way. */
|
|
|
|
|
if (ln1->pc < ln2->pc)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (ln1->pc > ln2->pc)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* If pc equal, sort by line. I'm not sure whether this is optimum
|
|
|
|
|
behavior (see comment at struct linetable in symtab.h). */
|
|
|
|
|
return ln1->line - ln2->line;
|
1991-10-27 22:26:02 +00:00
|
|
|
|
}
|
1992-02-22 01:46:16 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
/* Start a new symtab for a new source file.
|
1992-07-28 04:22:18 +00: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 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
file_symbols = NULL;
|
|
|
|
|
global_symbols = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
within_function = 0;
|
|
|
|
|
|
1991-11-09 10:50:07 +00:00
|
|
|
|
/* Context stack is initially empty. Allocate first one with room for
|
|
|
|
|
10 levels; reuse it forever afterward. */
|
1992-07-28 04:22:18 +00: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 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
subfiles = NULL;
|
|
|
|
|
current_subfile = NULL;
|
1991-10-26 07:21:30 +00: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-12 18:17:48 +00:00
|
|
|
|
END_ADDR is the address of the end of the file's text.
|
1993-03-26 14:59:43 +00:00
|
|
|
|
SECTION is the section number (in objfile->section_offsets) of
|
|
|
|
|
the blockvector and linetable.
|
1992-08-12 18:17:48 +00: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 07:21:30 +00:00
|
|
|
|
|
|
|
|
|
struct symtab *
|
1996-01-08 17:55:25 +00:00
|
|
|
|
end_symtab (end_addr, objfile, section)
|
1991-10-26 07:21:30 +00:00
|
|
|
|
CORE_ADDR end_addr;
|
1991-11-09 10:50:07 +00:00
|
|
|
|
struct objfile *objfile;
|
1993-03-26 14:59:43 +00:00
|
|
|
|
int section;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
{
|
1993-09-08 21:30:33 +00:00
|
|
|
|
register struct symtab *symtab = NULL;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
register struct blockvector *blockvector;
|
|
|
|
|
register struct subfile *subfile;
|
1992-07-28 04:22:18 +00:00
|
|
|
|
register struct context_stack *cstk;
|
1991-10-26 07:21:30 +00:00
|
|
|
|
struct subfile *nextsub;
|
|
|
|
|
|
|
|
|
|
/* Finish the lexical context of the last function in the file;
|
|
|
|
|
pop the context stack. */
|
|
|
|
|
|
|
|
|
|
if (context_stack_depth > 0)
|
|
|
|
|
{
|
1996-10-22 01:26:20 +00:00
|
|
|
|
cstk = pop_context();
|
1991-10-26 07:21:30 +00:00
|
|
|
|
/* Make a block for the local symbols within. */
|
|
|
|
|
finish_block (cstk->name, &local_symbols, cstk->old_blocks,
|
1992-02-22 01:46:16 +00:00
|
|
|
|
cstk->start_addr, end_addr, objfile);
|
1991-11-09 10:50:07 +00:00
|
|
|
|
|
|
|
|
|
if (context_stack_depth > 0)
|
1992-07-28 04:22:18 +00:00
|
|
|
|
{
|
1993-10-18 15:40:04 +00:00
|
|
|
|
/* This is said to happen with SCO. The old coffread.c code
|
|
|
|
|
simply emptied the context stack, so we do the same. FIXME:
|
|
|
|
|
Find out why it is happening. This is not believed to happen
|
|
|
|
|
in most cases (even for coffread.c); it used to be an abort(). */
|
|
|
|
|
static struct complaint msg =
|
|
|
|
|
{"Context stack not empty in end_symtab", 0, 0};
|
|
|
|
|
complain (&msg);
|
|
|
|
|
context_stack_depth = 0;
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
1996-01-08 17:55:25 +00:00
|
|
|
|
/* Reordered executables may have out of order pending blocks; if
|
|
|
|
|
OBJF_REORDERED is true, then sort the pending blocks. */
|
|
|
|
|
if ((objfile->flags & OBJF_REORDERED) && pending_blocks)
|
1992-07-28 04:22:18 +00:00
|
|
|
|
{
|
1997-04-17 21:32:25 +00:00
|
|
|
|
/* FIXME! Remove this horrid bubble sort and use merge sort!!! */
|
1992-07-28 04:22:18 +00:00
|
|
|
|
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-27 22:26:02 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
file_symbols is still good).
|
1993-09-01 21:15:27 +00:00
|
|
|
|
|
|
|
|
|
Both cleanup_undefined_types and finish_global_stabs are stabs
|
|
|
|
|
specific, but harmless for other symbol readers, since on gdb
|
|
|
|
|
startup or when finished reading stabs, the state is set so these
|
|
|
|
|
are no-ops. FIXME: Is this handled right in case of QUIT? Can
|
|
|
|
|
we make this cleaner? */
|
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
cleanup_undefined_types ();
|
1992-07-28 04:22:18 +00:00
|
|
|
|
finish_global_stabs (objfile);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00: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 07:21:30 +00:00
|
|
|
|
|
1992-02-29 06:03:43 +00: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 00:32:58 +00:00
|
|
|
|
PROCESS_LINENUMBER_HOOK (); /* Needed for xcoff. */
|
1992-02-29 06:03:43 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
1991-10-26 07:21:30 +00: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)
|
|
|
|
|
{
|
1993-09-08 21:30:33 +00:00
|
|
|
|
int linetablesize = 0;
|
1991-11-09 10:50:07 +00: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 04:22:18 +00:00
|
|
|
|
symtab = NULL;
|
|
|
|
|
if (blockvector)
|
|
|
|
|
{
|
|
|
|
|
if (subfile->line_vector)
|
|
|
|
|
{
|
|
|
|
|
linetablesize = sizeof (struct linetable) +
|
|
|
|
|
subfile->line_vector->nitems * sizeof (struct linetable_entry);
|
1993-09-01 21:15:27 +00:00
|
|
|
|
#if 0
|
|
|
|
|
/* I think this is artifact from before it went on the obstack.
|
|
|
|
|
I doubt we'll need the memory between now and when we
|
|
|
|
|
free it later in this function. */
|
|
|
|
|
/* First, shrink the linetable to make more memory. */
|
1992-07-28 04:22:18 +00:00
|
|
|
|
subfile->line_vector = (struct linetable *)
|
|
|
|
|
xrealloc ((char *) subfile->line_vector, linetablesize);
|
1993-09-01 21:15:27 +00:00
|
|
|
|
#endif
|
1992-07-28 04:22:18 +00:00
|
|
|
|
|
1996-01-08 17:55:25 +00:00
|
|
|
|
/* Like the pending blocks, the line table may be scrambled
|
|
|
|
|
in reordered executables. Sort it if OBJF_REORDERED is
|
|
|
|
|
true. */
|
|
|
|
|
if (objfile->flags & OBJF_REORDERED)
|
1992-07-28 04:22:18 +00:00
|
|
|
|
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-27 22:26:02 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00: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 14:59:43 +00:00
|
|
|
|
symtab->block_line_section = section;
|
1992-08-06 17:58:26 +00: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 04:22:18 +00:00
|
|
|
|
symtab->free_code = free_linetable;
|
|
|
|
|
symtab->free_ptr = NULL;
|
1992-03-01 01:04:13 +00: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 06:34:57 +00: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 14:59:43 +00: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 01:04:13 +00:00
|
|
|
|
|
1993-03-26 14:59:43 +00:00
|
|
|
|
symtab->primary = 0;
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
1992-08-06 19:59:46 +00: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 04:22:18 +00:00
|
|
|
|
{
|
1992-08-06 19:59:46 +00:00
|
|
|
|
free ((PTR) subfile->line_vector);
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
1991-10-27 22:26:02 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00: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-29 23:17:36 +00:00
|
|
|
|
free ((PTR)subfile);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
1993-03-26 14:59:43 +00:00
|
|
|
|
/* Set this for the main source file. */
|
1992-03-29 22:33:35 +00:00
|
|
|
|
if (symtab)
|
1992-07-28 04:22:18 +00:00
|
|
|
|
{
|
1993-03-26 14:59:43 +00:00
|
|
|
|
symtab->primary = 1;
|
1992-07-28 04:22:18 +00:00
|
|
|
|
}
|
1992-03-01 01:04:13 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
last_source_file = NULL;
|
|
|
|
|
current_subfile = NULL;
|
1991-10-27 22:26:02 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
return (symtab);
|
1991-10-26 07:21:30 +00:00
|
|
|
|
}
|
1991-11-09 10:50:07 +00: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 01:46:16 +00:00
|
|
|
|
xrealloc ((char *) context_stack,
|
|
|
|
|
(context_stack_size * sizeof (struct context_stack)));
|
1991-11-09 10:50:07 +00: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 04:22:18 +00:00
|
|
|
|
new->name = NULL;
|
1991-11-09 10:50:07 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
local_symbols = NULL;
|
1991-11-09 10:50:07 +00:00
|
|
|
|
|
1992-07-28 04:22:18 +00:00
|
|
|
|
return (new);
|
1991-11-09 10:50:07 +00:00
|
|
|
|
}
|
1992-07-28 04:22:18 +00:00
|
|
|
|
|
1993-08-09 23:49:18 +00: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 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
free_pendings = NULL;
|
|
|
|
|
file_symbols = NULL;
|
|
|
|
|
global_symbols = NULL;
|
|
|
|
|
pending_blocks = NULL;
|
1991-10-26 07:21:30 +00: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 04:22:18 +00:00
|
|
|
|
/* Initializer for this module */
|
1992-04-09 07:57:10 +00:00
|
|
|
|
|
1991-10-26 07:21:30 +00:00
|
|
|
|
void
|
|
|
|
|
_initialize_buildsym ()
|
|
|
|
|
{
|
|
|
|
|
}
|