1991-11-12 15:50:47 +00:00
|
|
|
|
/* Execute AIXcoff files, for GDB.
|
* core.c, eval.c, exec.c, inftarg.c, remote-adapt.c, remote-eb.c,
remote-hms.c, remote-mm.c, remote-nindy.c, remote-vx.c, remote.c,
target.c, target.h, valarith.c, valops.c, value.h, xcoffexec.c:
Remove to_call_function and target_call_function, since it
always calls the same thing (call_function_by_hand).
1992-02-21 01:34:46 +00:00
|
|
|
|
Copyright 1988, 1989, 1991, 1992 Free Software Foundation, Inc.
|
1991-11-12 15:50:47 +00:00
|
|
|
|
Derived from exec.c. Modified by IBM Corporation.
|
|
|
|
|
Donated by IBM Corporation and Cygnus Support.
|
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
|
|
|
|
|
|
/* xcoff-exec - deal with executing XCOFF files. */
|
|
|
|
|
|
1992-03-03 23:26:26 +00:00
|
|
|
|
#include "defs.h"
|
|
|
|
|
|
1991-11-12 15:50:47 +00:00
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <sys/ldr.h>
|
|
|
|
|
|
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "inferior.h"
|
|
|
|
|
#include "target.h"
|
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "gdbcore.h"
|
|
|
|
|
#include "symfile.h"
|
1992-03-21 01:56:01 +00:00
|
|
|
|
#include "objfiles.h"
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
#include "libbfd.h" /* BFD internals (sigh!) FIXME */
|
1993-03-12 23:12:59 +00:00
|
|
|
|
#include "bfd.h"
|
1992-03-29 22:33:35 +00:00
|
|
|
|
#include "xcoffsolib.h"
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
file_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
exec_close PARAMS ((int));
|
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
static struct vmap *
|
|
|
|
|
map_vmap PARAMS ((bfd *, bfd *));
|
|
|
|
|
|
1991-11-12 15:50:47 +00:00
|
|
|
|
struct section_table *exec_sections, *exec_sections_end;
|
|
|
|
|
|
|
|
|
|
/* Whether to open exec and core files read-only or read-write. */
|
|
|
|
|
|
|
|
|
|
int write_files = 0;
|
|
|
|
|
|
1992-02-29 06:03:43 +00:00
|
|
|
|
extern int info_verbose;
|
|
|
|
|
|
1991-11-12 15:50:47 +00:00
|
|
|
|
bfd *exec_bfd; /* needed by core.c */
|
|
|
|
|
|
|
|
|
|
extern char *getenv();
|
|
|
|
|
extern void add_syms_addr_command ();
|
|
|
|
|
extern void symbol_file_command ();
|
|
|
|
|
static void exec_files_info();
|
1992-03-29 22:33:35 +00:00
|
|
|
|
|
|
|
|
|
struct vmap *vmap; /* current vmap */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
extern struct target_ops exec_ops;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* exec_close - done with exec file, clean up all resources. */
|
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
static void
|
1992-02-29 06:03:43 +00:00
|
|
|
|
exec_close(quitting)
|
|
|
|
|
{
|
|
|
|
|
register struct vmap *vp, *nxt;
|
|
|
|
|
struct objfile *obj;
|
|
|
|
|
|
|
|
|
|
for (nxt = vmap; vp = nxt; )
|
|
|
|
|
{
|
|
|
|
|
nxt = vp->nxt;
|
|
|
|
|
|
|
|
|
|
/* if there is an objfile associated with this bfd,
|
|
|
|
|
free_objfile() will do proper cleanup of objfile *and* bfd. */
|
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
if (vp->objfile)
|
|
|
|
|
free_objfile (vp->objfile);
|
1992-02-29 06:03:43 +00:00
|
|
|
|
else
|
|
|
|
|
bfd_close(vp->bfd);
|
1993-03-12 23:12:59 +00:00
|
|
|
|
|
|
|
|
|
/* FIXME: This routine is #if 0'd in symfile.c. What should we
|
|
|
|
|
be doing here? Should we just free everything in
|
|
|
|
|
vp->objfile->symtabs? Should free_objfile do that? */
|
1992-02-29 06:03:43 +00:00
|
|
|
|
free_named_symtabs(vp->name);
|
|
|
|
|
free(vp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vmap = 0;
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
|
|
|
|
if (exec_bfd) {
|
|
|
|
|
bfd_close (exec_bfd);
|
|
|
|
|
exec_bfd = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (exec_ops.to_sections) {
|
|
|
|
|
free (exec_ops.to_sections);
|
|
|
|
|
exec_ops.to_sections = NULL;
|
|
|
|
|
exec_ops.to_sections_end = NULL;
|
|
|
|
|
}
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* exec_file_command - handle the "exec" command, &c.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
exec_file_command(filename, from_tty)
|
|
|
|
|
char *filename;
|
|
|
|
|
{
|
|
|
|
|
target_preopen(from_tty);
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
|
|
|
|
/* Remove any previous exec file. */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
unpush_target(&exec_ops);
|
|
|
|
|
|
|
|
|
|
/* Now open and digest the file the user requested, if any. */
|
|
|
|
|
|
|
|
|
|
if (filename) {
|
|
|
|
|
char *scratch_pathname;
|
|
|
|
|
int scratch_chan;
|
|
|
|
|
|
|
|
|
|
filename = tilde_expand(filename);
|
1992-02-22 01:46:16 +00:00
|
|
|
|
make_cleanup (free, filename);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
scratch_chan = openp(getenv("PATH"), 1, filename,
|
|
|
|
|
write_files? O_RDWR: O_RDONLY, 0,
|
|
|
|
|
&scratch_pathname);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
if (scratch_chan < 0)
|
|
|
|
|
perror_with_name(filename);
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
exec_bfd = bfd_fdopenr(scratch_pathname, NULL, scratch_chan);
|
|
|
|
|
if (!exec_bfd)
|
1991-11-12 15:50:47 +00:00
|
|
|
|
error("Could not open `%s' as an executable file: %s"
|
|
|
|
|
, scratch_pathname, bfd_errmsg(bfd_error));
|
|
|
|
|
|
|
|
|
|
/* make sure we have an object file */
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
if (!bfd_check_format(exec_bfd, bfd_object))
|
|
|
|
|
error("\"%s\": not in executable format: %s.",
|
|
|
|
|
scratch_pathname, bfd_errmsg(bfd_error));
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* setup initial vmap */
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
map_vmap (exec_bfd, 0);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
if (!vmap)
|
1992-03-13 01:42:25 +00:00
|
|
|
|
error("Can't find the file sections in `%s': %s",
|
|
|
|
|
exec_bfd->filename, bfd_errmsg(bfd_error));
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
if (build_section_table (exec_bfd, &exec_ops.to_sections,
|
|
|
|
|
&exec_ops.to_sections_end))
|
1991-11-12 15:50:47 +00:00
|
|
|
|
error ("Can't find the file sections in `%s': %s",
|
|
|
|
|
exec_bfd->filename, bfd_errmsg (bfd_error));
|
|
|
|
|
|
|
|
|
|
/* make sure core, if present, matches */
|
|
|
|
|
validate_files();
|
|
|
|
|
|
|
|
|
|
push_target(&exec_ops);
|
|
|
|
|
|
|
|
|
|
/* Tell display code(if any) about the changed file name. */
|
|
|
|
|
|
|
|
|
|
if (exec_file_display_hook)
|
|
|
|
|
(*exec_file_display_hook)(filename);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
exec_close(0); /* just in case */
|
|
|
|
|
if (from_tty)
|
|
|
|
|
printf("No exec file now.\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set both the exec file and the symbol file, in one command. What a
|
|
|
|
|
* novelty. Why did GDB go through four major releases before this
|
|
|
|
|
* command was added?
|
|
|
|
|
*/
|
1992-02-22 01:46:16 +00:00
|
|
|
|
static void
|
1991-11-12 15:50:47 +00:00
|
|
|
|
file_command(arg, from_tty)
|
|
|
|
|
char *arg; {
|
|
|
|
|
|
|
|
|
|
exec_file_command(arg, from_tty);
|
|
|
|
|
symbol_file_command(arg, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Locate all mappable sections of a BFD file.
|
|
|
|
|
table_pp_char is a char * to get it through bfd_map_over_sections;
|
|
|
|
|
we cast it back to its proper type. */
|
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
static void
|
1991-11-12 15:50:47 +00:00
|
|
|
|
add_to_section_table (abfd, asect, table_pp_char)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
sec_ptr asect;
|
|
|
|
|
char *table_pp_char;
|
|
|
|
|
{
|
|
|
|
|
struct section_table **table_pp = (struct section_table **)table_pp_char;
|
|
|
|
|
flagword aflag;
|
|
|
|
|
|
|
|
|
|
aflag = bfd_get_section_flags (abfd, asect);
|
|
|
|
|
/* FIXME, we need to handle BSS segment here...it alloc's but doesn't load */
|
|
|
|
|
if (!(aflag & SEC_LOAD))
|
|
|
|
|
return;
|
1992-03-13 01:42:25 +00:00
|
|
|
|
if (0 == bfd_section_size (abfd, asect))
|
|
|
|
|
return;
|
|
|
|
|
(*table_pp)->bfd = abfd;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
(*table_pp)->sec_ptr = asect;
|
|
|
|
|
(*table_pp)->addr = bfd_section_vma (abfd, asect);
|
|
|
|
|
(*table_pp)->endaddr = (*table_pp)->addr + bfd_section_size (abfd, asect);
|
|
|
|
|
(*table_pp)++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
build_section_table (some_bfd, start, end)
|
|
|
|
|
bfd *some_bfd;
|
|
|
|
|
struct section_table **start, **end;
|
|
|
|
|
{
|
|
|
|
|
unsigned count;
|
|
|
|
|
|
|
|
|
|
count = bfd_count_sections (some_bfd);
|
|
|
|
|
if (count == 0)
|
|
|
|
|
abort(); /* return 1? */
|
|
|
|
|
if (*start)
|
|
|
|
|
free (*start);
|
|
|
|
|
*start = (struct section_table *) xmalloc (count * sizeof (**start));
|
|
|
|
|
*end = *start;
|
|
|
|
|
bfd_map_over_sections (some_bfd, add_to_section_table, (char *)end);
|
|
|
|
|
if (*end > *start + count)
|
|
|
|
|
abort();
|
|
|
|
|
/* We could realloc the table, but it probably loses for most files. */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1993-03-12 23:12:59 +00:00
|
|
|
|
|
1991-11-12 15:50:47 +00:00
|
|
|
|
void
|
|
|
|
|
sex_to_vmap(bfd *bf, sec_ptr sex, struct vmap_and_bfd *vmap_bfd)
|
|
|
|
|
{
|
|
|
|
|
register struct vmap *vp, **vpp;
|
|
|
|
|
register struct symtab *syms;
|
|
|
|
|
bfd *arch = vmap_bfd->pbfd;
|
|
|
|
|
vp = vmap_bfd->pvmap;
|
|
|
|
|
|
|
|
|
|
if ((bfd_get_section_flags(bf, sex) & SEC_LOAD) == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
* 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(bfd_section_name(bf, sex), ".text")) {
|
1991-11-12 15:50:47 +00:00
|
|
|
|
vp->tstart = 0;
|
|
|
|
|
vp->tend = vp->tstart + bfd_section_size(bf, sex);
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
/* When it comes to this adjustment value, in contrast to our previous
|
|
|
|
|
belief shared objects should behave the same as the main load segment.
|
|
|
|
|
This is the offset from the beginning of text section to the first
|
|
|
|
|
real instruction. */
|
|
|
|
|
|
|
|
|
|
vp->tadj = sex->filepos - bfd_section_vma(bf, sex);
|
1991-11-12 15:50:47 +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
|
|
|
|
else if (STREQ(bfd_section_name(bf, sex), ".data")) {
|
1991-11-12 15:50:47 +00:00
|
|
|
|
vp->dstart = 0;
|
|
|
|
|
vp->dend = vp->dstart + bfd_section_size(bf, sex);
|
|
|
|
|
}
|
|
|
|
|
|
* 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
|
|
|
|
else if (STREQ(bfd_section_name(bf, sex), ".bss")) /* FIXMEmgo */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
printf ("bss section in exec! Don't know what the heck to do!\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make a vmap for the BFD "bf", which might be a member of the archive
|
1993-03-12 23:12:59 +00:00
|
|
|
|
BFD "arch". Return the new vmap. */
|
|
|
|
|
struct vmap *
|
1991-11-12 15:50:47 +00:00
|
|
|
|
map_vmap (bfd *bf, bfd *arch)
|
|
|
|
|
{
|
|
|
|
|
struct vmap_and_bfd vmap_bfd;
|
|
|
|
|
struct vmap *vp, **vpp;
|
|
|
|
|
struct objfile *obj;
|
|
|
|
|
|
|
|
|
|
vp = (void*) xmalloc (sizeof (*vp));
|
1992-03-29 22:33:35 +00:00
|
|
|
|
bzero (vp, sizeof (*vp));
|
1991-11-12 15:50:47 +00:00
|
|
|
|
vp->nxt = 0;
|
|
|
|
|
vp->bfd = bf;
|
|
|
|
|
vp->name = bfd_get_filename(arch ? arch : bf);
|
|
|
|
|
vp->member = arch ? bfd_get_filename(bf) : "";
|
|
|
|
|
|
|
|
|
|
vmap_bfd.pbfd = arch;
|
|
|
|
|
vmap_bfd.pvmap = vp;
|
|
|
|
|
bfd_map_over_sections (bf, sex_to_vmap, &vmap_bfd);
|
|
|
|
|
|
|
|
|
|
/* find the end of the list, and append. */
|
|
|
|
|
for (vpp = &vmap; *vpp; vpp = &(*vpp)->nxt)
|
|
|
|
|
;
|
|
|
|
|
*vpp = vp;
|
1993-03-12 23:12:59 +00:00
|
|
|
|
|
|
|
|
|
return vp;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
/* true, if symbol table and minimal symbol table are relocated. */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
int symtab_relocated = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* vmap_symtab - handle symbol translation on vmapping */
|
|
|
|
|
|
|
|
|
|
vmap_symtab(vp, old_start, vip)
|
|
|
|
|
register struct vmap *vp;
|
|
|
|
|
CORE_ADDR old_start;
|
|
|
|
|
struct stat *vip;
|
|
|
|
|
{
|
1992-02-22 01:46:16 +00:00
|
|
|
|
register struct symtab *s;
|
|
|
|
|
register struct objfile *objfile;
|
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
|
|
|
|
register struct minimal_symbol *msymbol;
|
1992-02-22 01:46:16 +00:00
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
objfile = vp->objfile;
|
|
|
|
|
if (objfile == NULL)
|
1992-02-22 01:46:16 +00:00
|
|
|
|
{
|
1993-03-12 23:12:59 +00:00
|
|
|
|
/* OK, it's not an objfile we opened ourselves.
|
|
|
|
|
Currently, that can only happen with the exec file, so
|
|
|
|
|
relocate the symbols for the symfile. */
|
|
|
|
|
if (symfile_objfile == NULL)
|
|
|
|
|
return;
|
|
|
|
|
objfile = symfile_objfile;
|
|
|
|
|
}
|
1992-11-19 00:04:44 +00:00
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
s = objfile->symtabs;
|
1992-11-19 00:04:44 +00:00
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
if (vp->tstart != old_start) {
|
|
|
|
|
|
|
|
|
|
/* Once we find a relocation base address for one of the symtabs
|
|
|
|
|
in this objfile, it will be the same for all symtabs in this
|
|
|
|
|
objfile. Clean this algorithm. FIXME. */
|
|
|
|
|
|
|
|
|
|
for (; s; s = s->next)
|
|
|
|
|
if (!s->nonreloc || LINETABLE(s))
|
|
|
|
|
vmap_symtab_1(s, vp, old_start);
|
1992-04-03 20:25:57 +00:00
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
#if 1
|
|
|
|
|
/* I believe trampoline entries now have a name like
|
|
|
|
|
<trampoline>. In any event, if something needs to be changed,
|
|
|
|
|
it should be changed in ALL_MSYMBOLS, so it works everywhere. */
|
|
|
|
|
/*
|
1992-04-03 20:25:57 +00:00
|
|
|
|
Himm.., recently we nullified trampoline entry names in order not
|
|
|
|
|
to confuse them with real symbols. Appearently this turned into a
|
|
|
|
|
problem, and msymbol vector did not get relocated properly. If
|
|
|
|
|
msymbols have to have non-null names, then we should name
|
1993-03-12 23:12:59 +00:00
|
|
|
|
trampoline entries with empty strings. */
|
1992-04-03 20:25:57 +00:00
|
|
|
|
|
|
|
|
|
ALL_MSYMBOLS (objfile, msymbol)
|
|
|
|
|
#else
|
|
|
|
|
for (msymbol = objfile->msymbols;
|
1993-01-05 04:20:54 +00:00
|
|
|
|
SYMBOL_NAME (msymbol) || SYMBOL_VALUE_ADDRESS (msymbol);
|
|
|
|
|
(msymbol)++)
|
1992-04-03 20:25:57 +00:00
|
|
|
|
#endif
|
1993-01-05 04:20:54 +00:00
|
|
|
|
if (SYMBOL_VALUE_ADDRESS (msymbol) < TEXT_SEGMENT_BASE)
|
|
|
|
|
SYMBOL_VALUE_ADDRESS (msymbol) += vp->tstart - old_start;
|
1992-04-03 20:25:57 +00:00
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
1992-02-29 06:03:43 +00:00
|
|
|
|
if (vp->tstart != old_start) {
|
|
|
|
|
/* breakpoints need to be relocated as well. */
|
|
|
|
|
fixup_breakpoints (0, TEXT_SEGMENT_BASE, vp->tstart - old_start);
|
|
|
|
|
}
|
1992-02-22 01:46:16 +00:00
|
|
|
|
|
|
|
|
|
symtab_relocated = 1;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
1991-11-12 15:50:47 +00:00
|
|
|
|
vmap_symtab_1(s, vp, old_start)
|
|
|
|
|
register struct symtab *s;
|
|
|
|
|
register struct vmap *vp;
|
|
|
|
|
CORE_ADDR old_start;
|
|
|
|
|
{
|
|
|
|
|
register int i, j;
|
|
|
|
|
int len, blen;
|
|
|
|
|
register struct linetable *l;
|
|
|
|
|
struct blockvector *bv;
|
|
|
|
|
register struct block *b;
|
|
|
|
|
int depth;
|
|
|
|
|
register ulong reloc, dreloc;
|
|
|
|
|
|
|
|
|
|
if ((reloc = vp->tstart - old_start) == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
dreloc = vp->dstart; /* data relocation */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* The line table must be relocated. This is only present for
|
1992-02-29 06:03:43 +00:00
|
|
|
|
* .text sections, so only vp->text type maps need be considered.
|
1991-11-12 15:50:47 +00:00
|
|
|
|
*/
|
|
|
|
|
l = LINETABLE (s);
|
1992-02-29 06:03:43 +00:00
|
|
|
|
if (l) {
|
|
|
|
|
len = l->nitems;
|
|
|
|
|
for (i = 0; i < len; i++)
|
1991-11-12 15:50:47 +00:00
|
|
|
|
l->item[i].pc += reloc;
|
1992-02-29 06:03:43 +00:00
|
|
|
|
}
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
/* if this symbol table is not relocatable, only line table should
|
|
|
|
|
be relocated and the rest ignored. */
|
|
|
|
|
if (s->nonreloc)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
bv = BLOCKVECTOR(s);
|
|
|
|
|
len = BLOCKVECTOR_NBLOCKS(bv);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
b = BLOCKVECTOR_BLOCK(bv, i);
|
|
|
|
|
|
|
|
|
|
BLOCK_START(b) += reloc;
|
|
|
|
|
BLOCK_END(b) += reloc;
|
|
|
|
|
|
|
|
|
|
blen = BLOCK_NSYMS(b);
|
|
|
|
|
for (j = 0; j < blen; j++) {
|
|
|
|
|
register struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
sym = BLOCK_SYM(b, j);
|
|
|
|
|
switch (SYMBOL_NAMESPACE(sym)) {
|
|
|
|
|
case STRUCT_NAMESPACE:
|
|
|
|
|
case UNDEF_NAMESPACE:
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
case LABEL_NAMESPACE:
|
|
|
|
|
case VAR_NAMESPACE:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (SYMBOL_CLASS(sym)) {
|
|
|
|
|
case LOC_CONST:
|
|
|
|
|
case LOC_CONST_BYTES:
|
|
|
|
|
case LOC_LOCAL:
|
|
|
|
|
case LOC_REGISTER:
|
|
|
|
|
case LOC_ARG:
|
|
|
|
|
case LOC_LOCAL_ARG:
|
|
|
|
|
case LOC_REF_ARG:
|
|
|
|
|
case LOC_REGPARM:
|
|
|
|
|
case LOC_TYPEDEF:
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
#ifdef FIXME
|
|
|
|
|
case LOC_EXTERNAL:
|
|
|
|
|
#endif
|
|
|
|
|
case LOC_LABEL:
|
|
|
|
|
SYMBOL_VALUE_ADDRESS(sym) += reloc;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LOC_STATIC:
|
|
|
|
|
SYMBOL_VALUE_ADDRESS(sym) += dreloc;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LOC_BLOCK:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
fatal("botched symbol class %x"
|
|
|
|
|
, SYMBOL_CLASS(sym));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1993-03-17 04:07:29 +00:00
|
|
|
|
/* Add symbols for an objfile. */
|
|
|
|
|
static int
|
|
|
|
|
objfile_symbol_add (arg)
|
|
|
|
|
char *arg;
|
|
|
|
|
{
|
|
|
|
|
struct objfile *obj = (struct objfile *) arg;
|
|
|
|
|
syms_from_objfile (obj, 0, 0, 0);
|
|
|
|
|
new_symfile_objfile (obj, 0, 0);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
static struct vmap *add_vmap PARAMS ((struct ld_info *));
|
|
|
|
|
|
|
|
|
|
/* Add a new vmap entry based on ldinfo() information.
|
|
|
|
|
|
|
|
|
|
If ldi->ldinfo_fd is not valid (e.g. this struct ld_info is from a
|
|
|
|
|
core file), the caller should set it to -1, and we will open the file.
|
|
|
|
|
|
|
|
|
|
Return the vmap new entry. */
|
|
|
|
|
static struct vmap *
|
1991-11-12 15:50:47 +00:00
|
|
|
|
add_vmap(ldi)
|
1993-03-12 23:12:59 +00:00
|
|
|
|
register struct ld_info *ldi;
|
|
|
|
|
{
|
1991-11-12 15:50:47 +00:00
|
|
|
|
bfd *bfd, *last;
|
1992-03-13 01:42:25 +00:00
|
|
|
|
register char *mem, *objname;
|
1993-03-12 23:12:59 +00:00
|
|
|
|
struct objfile *obj;
|
|
|
|
|
struct vmap *vp;
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
|
|
|
|
/* This ldi structure was allocated using alloca() in
|
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
|
|
|
|
xcoff_relocate_symtab(). Now we need to have persistent object
|
1992-03-13 01:42:25 +00:00
|
|
|
|
and member names, so we should save them. */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
mem = ldi->ldinfo_filename + strlen(ldi->ldinfo_filename) + 1;
|
1992-03-13 01:42:25 +00:00
|
|
|
|
mem = savestring (mem, strlen (mem));
|
|
|
|
|
objname = savestring (ldi->ldinfo_filename, strlen (ldi->ldinfo_filename));
|
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
if (ldi->ldinfo_fd < 0)
|
|
|
|
|
/* Note that this opens it once for every member; a possible
|
|
|
|
|
enhancement would be to only open it once for every object. */
|
|
|
|
|
bfd = bfd_openr (objname, NULL);
|
|
|
|
|
else
|
|
|
|
|
bfd = bfd_fdopenr(objname, NULL, ldi->ldinfo_fd);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
if (!bfd)
|
1992-03-13 01:42:25 +00:00
|
|
|
|
error("Could not open `%s' as an executable file: %s",
|
|
|
|
|
objname, bfd_errmsg(bfd_error));
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* make sure we have an object file */
|
|
|
|
|
|
|
|
|
|
if (bfd_check_format(bfd, bfd_object))
|
1993-03-12 23:12:59 +00:00
|
|
|
|
vp = map_vmap (bfd, 0);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
else if (bfd_check_format(bfd, bfd_archive)) {
|
|
|
|
|
last = 0;
|
|
|
|
|
/*
|
|
|
|
|
* FIXME??? am I tossing BFDs? bfd?
|
|
|
|
|
*/
|
|
|
|
|
while (last = bfd_openr_next_archived_file(bfd, last))
|
* 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(mem, last->filename))
|
1991-11-12 15:50:47 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (!last) {
|
1992-03-13 01:42:25 +00:00
|
|
|
|
bfd_close(bfd);
|
|
|
|
|
/* FIXME -- should be error */
|
|
|
|
|
warning("\"%s\": member \"%s\" missing.", bfd->filename, mem);
|
|
|
|
|
return;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!bfd_check_format(last, bfd_object)) {
|
|
|
|
|
bfd_close(last); /* XXX??? */
|
|
|
|
|
goto obj_err;
|
|
|
|
|
}
|
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
vp = map_vmap (last, bfd);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
obj_err:
|
|
|
|
|
bfd_close(bfd);
|
1993-03-12 23:12:59 +00:00
|
|
|
|
error ("\"%s\": not in executable format: %s.",
|
|
|
|
|
objname, bfd_errmsg(bfd_error));
|
|
|
|
|
/*NOTREACHED*/
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
1993-03-12 23:12:59 +00:00
|
|
|
|
obj = allocate_objfile (vp->bfd, 0);
|
|
|
|
|
vp->objfile = obj;
|
|
|
|
|
|
|
|
|
|
#ifndef SOLIB_SYMBOLS_MANUAL
|
1993-03-17 04:07:29 +00:00
|
|
|
|
if (catch_errors (objfile_symbol_add, (char *)obj,
|
|
|
|
|
"Error while reading shared library symbols:\n"))
|
|
|
|
|
{
|
|
|
|
|
/* Note this is only done if symbol reading was successful. */
|
|
|
|
|
vmap_symtab (vp, 0, 0);
|
|
|
|
|
vp->loaded = 1;
|
|
|
|
|
}
|
1993-03-12 23:12:59 +00:00
|
|
|
|
#endif
|
|
|
|
|
return vp;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
/* As well as symbol tables, exec_sections need relocation. After
|
|
|
|
|
the inferior process' termination, there will be a relocated symbol
|
|
|
|
|
table exist with no corresponding inferior process. At that time, we
|
|
|
|
|
need to use `exec' bfd, rather than the inferior process's memory space
|
|
|
|
|
to look up symbols.
|
|
|
|
|
|
|
|
|
|
`exec_sections' need to be relocated only once, as long as the exec
|
|
|
|
|
file remains unchanged.
|
1991-11-12 15:50:47 +00:00
|
|
|
|
*/
|
|
|
|
|
vmap_exec ()
|
|
|
|
|
{
|
|
|
|
|
static bfd *execbfd;
|
1992-05-09 21:49:28 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
1991-11-12 15:50:47 +00:00
|
|
|
|
if (execbfd == exec_bfd)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
execbfd = exec_bfd;
|
|
|
|
|
|
1992-05-09 21:49:28 +00:00
|
|
|
|
if (!vmap || !exec_ops.to_sections)
|
|
|
|
|
error ("vmap_exec: vmap or exec_ops.to_sections == 0\n");
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
1992-05-09 21:49:28 +00:00
|
|
|
|
for (i=0; &exec_ops.to_sections[i] < exec_ops.to_sections_end; i++)
|
|
|
|
|
{
|
* 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(".text", exec_ops.to_sections[i].sec_ptr->name))
|
1992-05-09 21:49:28 +00:00
|
|
|
|
{
|
|
|
|
|
exec_ops.to_sections[i].addr += vmap->tstart;
|
|
|
|
|
exec_ops.to_sections[i].endaddr += vmap->tstart;
|
|
|
|
|
}
|
* 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
|
|
|
|
else if (STREQ(".data", exec_ops.to_sections[i].sec_ptr->name))
|
1992-05-09 21:49:28 +00:00
|
|
|
|
{
|
|
|
|
|
exec_ops.to_sections[i].addr += vmap->dstart;
|
|
|
|
|
exec_ops.to_sections[i].endaddr += vmap->dstart;
|
|
|
|
|
}
|
|
|
|
|
}
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
#if 0
|
|
|
|
|
/* This was for the old, half-assed, core file support. */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
int
|
|
|
|
|
text_adjustment (abfd)
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
{
|
|
|
|
|
static bfd *execbfd;
|
|
|
|
|
static int adjustment;
|
|
|
|
|
sec_ptr sect;
|
|
|
|
|
|
|
|
|
|
if (exec_bfd == execbfd)
|
|
|
|
|
return adjustment;
|
|
|
|
|
|
|
|
|
|
sect = bfd_get_section_by_name (abfd, ".text");
|
|
|
|
|
if (sect)
|
|
|
|
|
adjustment = sect->filepos - sect->vma;
|
|
|
|
|
else
|
|
|
|
|
adjustment = 0x200; /* just a wild assumption */
|
|
|
|
|
|
|
|
|
|
return adjustment;
|
|
|
|
|
}
|
1993-03-12 23:12:59 +00:00
|
|
|
|
#endif
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* vmap_ldinfo - update VMAP info with ldinfo() information
|
|
|
|
|
*
|
|
|
|
|
* Input:
|
|
|
|
|
* ldi - ^ to ldinfo() results.
|
|
|
|
|
*/
|
|
|
|
|
vmap_ldinfo(ldi)
|
|
|
|
|
register struct ld_info *ldi;
|
|
|
|
|
{
|
|
|
|
|
struct stat ii, vi;
|
|
|
|
|
register struct vmap *vp;
|
|
|
|
|
register got_one, retried;
|
|
|
|
|
CORE_ADDR ostart;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* for each *ldi, see if we have a corresponding *vp
|
|
|
|
|
* if so, update the mapping, and symbol table.
|
|
|
|
|
* if not, add an entry and symbol table.
|
|
|
|
|
*/
|
|
|
|
|
do {
|
|
|
|
|
char *name = ldi->ldinfo_filename;
|
|
|
|
|
char *memb = name + strlen(name) + 1;
|
|
|
|
|
|
|
|
|
|
retried = 0;
|
|
|
|
|
|
|
|
|
|
if (fstat(ldi->ldinfo_fd, &ii) < 0)
|
|
|
|
|
fatal("cannot fstat(%d) on %s"
|
|
|
|
|
, ldi->ldinfo_fd
|
|
|
|
|
, name);
|
|
|
|
|
retry:
|
|
|
|
|
for (got_one = 0, vp = vmap; vp; vp = vp->nxt) {
|
1992-03-29 22:33:35 +00:00
|
|
|
|
FILE *io;
|
|
|
|
|
|
|
|
|
|
/* First try to find a `vp', which is the same as in ldinfo.
|
|
|
|
|
If not the same, just continue and grep the next `vp'. If same,
|
|
|
|
|
relocate its tstart, tend, dstart, dend values. If no such `vp'
|
|
|
|
|
found, get out of this for loop, add this ldi entry as a new vmap
|
|
|
|
|
(add_vmap) and come back, fins its `vp' and so on... */
|
|
|
|
|
|
|
|
|
|
/* The filenames are not always sufficient to match on. */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1993-02-27 02:35:04 +00:00
|
|
|
|
if ((name[0] == '/' && !STREQ(name, vp->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
|
|
|
|
|| (memb[0] && !STREQ(memb, vp->member)))
|
1992-03-29 22:33:35 +00:00
|
|
|
|
continue;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
io = bfd_cache_lookup(vp->bfd); /* totally opaque! */
|
|
|
|
|
if (!io)
|
|
|
|
|
fatal("cannot find BFD's iostream for %s", vp->name);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
/* see if we are referring to the same file */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
if (fstat(fileno(io), &vi) < 0)
|
|
|
|
|
fatal("cannot fstat BFD for %s", vp->name);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
if (ii.st_dev != vi.st_dev || ii.st_ino != vi.st_ino)
|
|
|
|
|
continue;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
if (!retried)
|
|
|
|
|
close(ldi->ldinfo_fd);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
++got_one;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
/* found a corresponding VMAP. remap! */
|
|
|
|
|
ostart = vp->tstart;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
vp->tstart = ldi->ldinfo_textorg;
|
|
|
|
|
vp->tend = vp->tstart + ldi->ldinfo_textsize;
|
|
|
|
|
vp->dstart = ldi->ldinfo_dataorg;
|
|
|
|
|
vp->dend = vp->dstart + ldi->ldinfo_datasize;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
if (vp->tadj) {
|
|
|
|
|
vp->tstart += vp->tadj;
|
|
|
|
|
vp->tend += vp->tadj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* relocate symbol table(s). */
|
|
|
|
|
vmap_symtab(vp, ostart, &vi);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
/* there may be more, so we don't break out of the loop. */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
/* if there was no matching *vp, we must perforce create the sucker(s) */
|
|
|
|
|
if (!got_one && !retried) {
|
|
|
|
|
add_vmap(ldi);
|
|
|
|
|
++retried;
|
|
|
|
|
goto retry;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
} while (ldi->ldinfo_next
|
|
|
|
|
&& (ldi = (void *) (ldi->ldinfo_next + (char *) ldi)));
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* vmap_inferior - print VMAP info for inferior
|
|
|
|
|
*/
|
|
|
|
|
vmap_inferior() {
|
|
|
|
|
|
|
|
|
|
if (inferior_pid == 0)
|
1992-03-13 01:42:25 +00:00
|
|
|
|
return 0; /* normal processing */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
exec_files_info();
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read or write the exec file.
|
|
|
|
|
|
|
|
|
|
Args are address within exec file, address within gdb address-space,
|
|
|
|
|
length, and a flag indicating whether to read or write.
|
|
|
|
|
|
|
|
|
|
Result is a length:
|
|
|
|
|
|
|
|
|
|
0: We cannot handle this address and length.
|
|
|
|
|
> 0: We have handled N bytes starting at this address.
|
|
|
|
|
(If N == length, we did it all.) We might be able
|
|
|
|
|
to handle more bytes beyond this length, but no
|
|
|
|
|
promises.
|
|
|
|
|
< 0: We cannot handle this address, but if somebody
|
|
|
|
|
else handles (-N) bytes, we can start from there.
|
|
|
|
|
|
|
|
|
|
The same routine is used to handle both core and exec files;
|
|
|
|
|
we just tail-call it with more arguments to select between them. */
|
|
|
|
|
|
|
|
|
|
int
|
1992-02-29 06:03:43 +00:00
|
|
|
|
xfer_memory (memaddr, myaddr, len, write, target)
|
1991-11-12 15:50:47 +00:00
|
|
|
|
CORE_ADDR memaddr;
|
|
|
|
|
char *myaddr;
|
|
|
|
|
int len;
|
|
|
|
|
int write;
|
1992-02-29 06:03:43 +00:00
|
|
|
|
struct target_ops *target;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
{
|
|
|
|
|
boolean res;
|
|
|
|
|
struct section_table *p;
|
|
|
|
|
CORE_ADDR nextsectaddr, memend;
|
1992-02-29 06:03:43 +00:00
|
|
|
|
boolean (*xfer_fn) PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
if (len <= 0)
|
|
|
|
|
abort();
|
|
|
|
|
|
|
|
|
|
memend = memaddr + len;
|
|
|
|
|
xfer_fn = write? bfd_set_section_contents: bfd_get_section_contents;
|
|
|
|
|
nextsectaddr = memend;
|
|
|
|
|
|
1992-02-29 06:03:43 +00:00
|
|
|
|
for (p = target->to_sections; p < target->to_sections_end; p++)
|
1991-11-12 15:50:47 +00:00
|
|
|
|
{
|
|
|
|
|
if (p->addr <= memaddr)
|
|
|
|
|
if (p->endaddr >= memend)
|
|
|
|
|
{
|
|
|
|
|
/* Entire transfer is within this section. */
|
1992-02-29 06:03:43 +00:00
|
|
|
|
res = xfer_fn (p->bfd, p->sec_ptr, myaddr, memaddr - p->addr, len);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
return (res != false)? len: 0;
|
|
|
|
|
}
|
|
|
|
|
else if (p->endaddr <= memaddr)
|
|
|
|
|
{
|
|
|
|
|
/* This section ends before the transfer starts. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* This section overlaps the transfer. Just do half. */
|
|
|
|
|
len = p->endaddr - memaddr;
|
1992-02-29 06:03:43 +00:00
|
|
|
|
res = xfer_fn (p->bfd, p->sec_ptr, myaddr, memaddr - p->addr, len);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
return (res != false)? len: 0;
|
|
|
|
|
}
|
|
|
|
|
else if (p->addr < nextsectaddr)
|
|
|
|
|
nextsectaddr = p->addr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (nextsectaddr >= memend)
|
|
|
|
|
return 0; /* We can't help */
|
|
|
|
|
else
|
|
|
|
|
return - (nextsectaddr - memaddr); /* Next boundary where we can help */
|
|
|
|
|
}
|
|
|
|
|
|
1992-02-29 06:03:43 +00:00
|
|
|
|
void
|
|
|
|
|
print_section_info (t, abfd)
|
|
|
|
|
struct target_ops *t;
|
|
|
|
|
bfd *abfd;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
{
|
1992-02-29 06:03:43 +00:00
|
|
|
|
struct section_table *p;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1992-02-29 06:03:43 +00:00
|
|
|
|
printf_filtered ("\t`%s', ", bfd_get_filename(abfd));
|
|
|
|
|
wrap_here (" ");
|
|
|
|
|
printf_filtered ("file type %s.\n", bfd_get_target(abfd));
|
|
|
|
|
|
|
|
|
|
for (p = t->to_sections; p < t->to_sections_end; p++) {
|
|
|
|
|
printf_filtered ("\t%s", local_hex_string_custom (p->addr, "08"));
|
|
|
|
|
printf_filtered (" - %s", local_hex_string_custom (p->endaddr, "08"));
|
|
|
|
|
if (info_verbose)
|
|
|
|
|
printf_filtered (" @ %s",
|
|
|
|
|
local_hex_string_custom (p->sec_ptr->filepos, "08"));
|
|
|
|
|
printf_filtered (" is %s", bfd_section_name (p->bfd, p->sec_ptr));
|
|
|
|
|
if (p->bfd != abfd) {
|
|
|
|
|
printf_filtered (" in %s", bfd_get_filename (p->bfd));
|
|
|
|
|
}
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
1992-02-29 06:03:43 +00:00
|
|
|
|
static void
|
|
|
|
|
exec_files_info (t)
|
|
|
|
|
struct target_ops *t;
|
|
|
|
|
{
|
1992-03-13 01:42:25 +00:00
|
|
|
|
register struct vmap *vp = vmap;
|
|
|
|
|
|
1992-02-29 06:03:43 +00:00
|
|
|
|
print_section_info (t, exec_bfd);
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
|
|
|
|
if (!vp)
|
|
|
|
|
return;
|
|
|
|
|
|
1992-03-29 22:33:35 +00:00
|
|
|
|
printf("\tMapping info for file `%s'.\n", vp->name);
|
|
|
|
|
|
|
|
|
|
printf("\t %8.8s %8.8s %8.8s %8.8s %8.8s %s\n",
|
|
|
|
|
"tstart", "tend", "dstart", "dend", "section", "file(member)");
|
1992-03-13 01:42:25 +00:00
|
|
|
|
|
|
|
|
|
for (; vp; vp = vp->nxt)
|
1992-03-29 22:33:35 +00:00
|
|
|
|
printf("\t0x%8.8x 0x%8.8x 0x%8.8x 0x%8.8x %s%s%s%s\n",
|
|
|
|
|
vp->tstart,
|
|
|
|
|
vp->tend,
|
|
|
|
|
vp->dstart,
|
|
|
|
|
vp->dend,
|
|
|
|
|
vp->name,
|
|
|
|
|
*vp->member ? "(" : "",
|
|
|
|
|
vp->member,
|
|
|
|
|
*vp->member ? ")" : "");
|
1991-11-12 15:50:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef DAMON
|
1991-11-21 22:08:25 +00:00
|
|
|
|
/* Damon's implementation of set_section_command! It is based on the sex member
|
1991-11-12 15:50:47 +00:00
|
|
|
|
(which is a section pointer from vmap) of vmap.
|
|
|
|
|
We will not have multiple vmap entries (one for each section), rather transmit
|
|
|
|
|
text and data base offsets and fix them at the same time. Elimination of sex
|
|
|
|
|
entry in vmap make this function obsolute, use the one from exec.c.
|
1991-11-21 22:08:25 +00:00
|
|
|
|
Need further testing!! FIXMEmgo. */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_section_command(args, from_tty)
|
|
|
|
|
char *args;
|
|
|
|
|
{
|
|
|
|
|
register struct vmap *vp = vmap;
|
|
|
|
|
char *secname;
|
|
|
|
|
unsigned seclen;
|
|
|
|
|
unsigned long secaddr;
|
|
|
|
|
char secprint[100];
|
|
|
|
|
long offset;
|
|
|
|
|
|
|
|
|
|
if (args == 0)
|
|
|
|
|
error("Must specify section name and its virtual address");
|
|
|
|
|
|
|
|
|
|
/* Parse out section name */
|
|
|
|
|
for (secname = args; !isspace(*args); args++)
|
|
|
|
|
;
|
|
|
|
|
seclen = args - secname;
|
|
|
|
|
|
|
|
|
|
/* Parse out new virtual address */
|
|
|
|
|
secaddr = parse_and_eval_address(args);
|
|
|
|
|
|
|
|
|
|
for (vp = vmap; vp; vp = vp->nxt) {
|
|
|
|
|
if (!strncmp(secname
|
|
|
|
|
, bfd_section_name(vp->bfd, vp->sex), seclen)
|
|
|
|
|
&& bfd_section_name(vp->bfd, vp->sex)[seclen] == '\0') {
|
|
|
|
|
offset = secaddr - vp->tstart;
|
|
|
|
|
vp->tstart += offset;
|
|
|
|
|
vp->tend += offset;
|
|
|
|
|
exec_files_info();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (seclen >= sizeof(secprint))
|
|
|
|
|
seclen = sizeof(secprint) - 1;
|
|
|
|
|
strncpy(secprint, secname, seclen);
|
|
|
|
|
secprint[seclen] = '\0';
|
|
|
|
|
error("Section %s not found", secprint);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
static void
|
|
|
|
|
set_section_command (args, from_tty)
|
|
|
|
|
char *args;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
struct section_table *p;
|
|
|
|
|
char *secname;
|
|
|
|
|
unsigned seclen;
|
|
|
|
|
unsigned long secaddr;
|
|
|
|
|
char secprint[100];
|
|
|
|
|
long offset;
|
|
|
|
|
|
|
|
|
|
if (args == 0)
|
|
|
|
|
error ("Must specify section name and its virtual address");
|
|
|
|
|
|
|
|
|
|
/* Parse out section name */
|
|
|
|
|
for (secname = args; !isspace(*args); args++) ;
|
|
|
|
|
seclen = args - secname;
|
|
|
|
|
|
|
|
|
|
/* Parse out new virtual address */
|
|
|
|
|
secaddr = parse_and_eval_address (args);
|
|
|
|
|
|
1992-03-13 01:42:25 +00:00
|
|
|
|
for (p = exec_ops.to_sections; p < exec_ops.to_sections_end; p++) {
|
1991-11-12 15:50:47 +00:00
|
|
|
|
if (!strncmp (secname, bfd_section_name (exec_bfd, p->sec_ptr), seclen)
|
|
|
|
|
&& bfd_section_name (exec_bfd, p->sec_ptr)[seclen] == '\0') {
|
|
|
|
|
offset = secaddr - p->addr;
|
|
|
|
|
p->addr += offset;
|
|
|
|
|
p->endaddr += offset;
|
1992-03-13 01:42:25 +00:00
|
|
|
|
if (from_tty)
|
|
|
|
|
exec_files_info(&exec_ops);
|
1991-11-12 15:50:47 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (seclen >= sizeof (secprint))
|
|
|
|
|
seclen = sizeof (secprint) - 1;
|
|
|
|
|
strncpy (secprint, secname, seclen);
|
|
|
|
|
secprint[seclen] = '\0';
|
|
|
|
|
error ("Section %s not found", secprint);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* !DAMON */
|
|
|
|
|
|
|
|
|
|
struct target_ops exec_ops = {
|
|
|
|
|
"exec", "Local exec file",
|
|
|
|
|
"Use an executable file as a target.\n\
|
|
|
|
|
Specify the filename of the executable file.",
|
|
|
|
|
exec_file_command, exec_close, /* open, close */
|
1992-09-25 19:11:25 +00:00
|
|
|
|
find_default_attach, 0, 0, 0, /* attach, detach, resume, wait, */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
0, 0, /* fetch_registers, store_registers, */
|
1992-09-18 09:56:28 +00:00
|
|
|
|
0, /* prepare_to_store */
|
1992-02-29 06:03:43 +00:00
|
|
|
|
xfer_memory, exec_files_info,
|
1991-11-12 15:50:47 +00:00
|
|
|
|
0, 0, /* insert_breakpoint, remove_breakpoint, */
|
|
|
|
|
0, 0, 0, 0, 0, /* terminal stuff */
|
|
|
|
|
0, 0, /* kill, load */
|
* core.c, eval.c, exec.c, inftarg.c, remote-adapt.c, remote-eb.c,
remote-hms.c, remote-mm.c, remote-nindy.c, remote-vx.c, remote.c,
target.c, target.h, valarith.c, valops.c, value.h, xcoffexec.c:
Remove to_call_function and target_call_function, since it
always calls the same thing (call_function_by_hand).
1992-02-21 01:34:46 +00:00
|
|
|
|
0, /* lookup sym */
|
1992-09-25 19:11:25 +00:00
|
|
|
|
find_default_create_inferior,
|
1991-11-12 15:50:47 +00:00
|
|
|
|
0, /* mourn_inferior */
|
1992-09-22 07:23:35 +00:00
|
|
|
|
0, /* can_run */
|
NOTICE_SIGNAL_HANDLING_CHANGE macro added to the target vector as
to_notice_signals.
* inferior.h (proc_signal_handling_change): prototype removed.
* infrun.c (NOTICE_SIGNAL_HANDLING_CHANGE): default removed.
(handle_command): now calls target_notice_signals.
* procfs.c (proc_signal_handling_change): renamed to
procfs_notice_signals. Now static. Add prototype. All callers
changed.
* target.h (struct target_ops): new field, to_notice_signals.
(target_notice_signals): new macro to cover new field.
* target.c (cleanup_target): default to_notice_signals to ignore.
* corelow.c (core_ops),
exec.c (exec_ops),
inftarg.c (child_ops),
procfs.c (procfs_ops),
remote-adapt.c (adapt-ops),
remote-eb.c (eb_ops),
remote-es1800.c (es1800_ops, es1800_child_ops),
remote-hms.c (hms_ops),
remote-mm.c (mm_ops),
remote-nindy.c (nindy_ops),
remote-st2000.c (st2000_ops),
remote-udi.c (udi_ops),
remote-vx.c (vx_ops, vx_run_ops),
remote.c (remote_ops),
target.c (dummy_target),
xcoffexec.c (exec_ops): added static initializer for
to_notice_signals.
* xm-irix4.h, xm-sysv4.h (NOTICE_SIGNAL_HANDLING_CHANGE): removed.
1992-10-06 22:54:57 +00:00
|
|
|
|
0, /* notice_signals */
|
1991-11-12 15:50:47 +00:00
|
|
|
|
file_stratum, 0, /* next */
|
|
|
|
|
0, 1, 0, 0, 0, /* all mem, mem, stack, regs, exec */
|
|
|
|
|
0, 0, /* section pointers */
|
|
|
|
|
OPS_MAGIC, /* Always the last thing */
|
|
|
|
|
};
|
1993-03-12 23:12:59 +00:00
|
|
|
|
|
|
|
|
|
/* Core file stuff. */
|
|
|
|
|
|
|
|
|
|
/* Relocate symtabs and read in shared library info, based on symbols
|
|
|
|
|
from the core file. */
|
|
|
|
|
void
|
|
|
|
|
xcoff_relocate_core ()
|
|
|
|
|
{
|
|
|
|
|
/* Offset of member MEMBER in a struct of type TYPE. */
|
|
|
|
|
#ifndef offsetof
|
|
|
|
|
#define offsetof(TYPE, MEMBER) ((int) &((TYPE *)0)->MEMBER)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Size of a struct ld_info except for the variable-length filename. */
|
|
|
|
|
#define LDINFO_SIZE (offsetof (struct ld_info, ldinfo_filename))
|
|
|
|
|
|
|
|
|
|
sec_ptr ldinfo_sec;
|
|
|
|
|
int offset = 0;
|
|
|
|
|
struct ld_info *ldip;
|
|
|
|
|
struct vmap *vp;
|
|
|
|
|
|
|
|
|
|
/* Allocated size of buffer. */
|
|
|
|
|
int buffer_size = LDINFO_SIZE;
|
|
|
|
|
char *buffer = xmalloc (buffer_size);
|
|
|
|
|
struct cleanup *old = make_cleanup (free_current_contents, &buffer);
|
|
|
|
|
|
|
|
|
|
ldinfo_sec = bfd_get_section_by_name (core_bfd, ".ldinfo");
|
|
|
|
|
if (ldinfo_sec == NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_err:
|
|
|
|
|
fprintf_filtered (stderr, "Couldn't get ldinfo from core file: %s\n",
|
|
|
|
|
bfd_errmsg (bfd_error));
|
|
|
|
|
do_cleanups (old);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int names_found = 0;
|
|
|
|
|
|
|
|
|
|
/* Read in everything but the name. */
|
|
|
|
|
if (bfd_get_section_contents (core_bfd, ldinfo_sec, buffer,
|
|
|
|
|
offset, LDINFO_SIZE) == 0)
|
|
|
|
|
goto bfd_err;
|
|
|
|
|
|
|
|
|
|
/* Now the name. */
|
|
|
|
|
i = LDINFO_SIZE;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if (i == buffer_size)
|
|
|
|
|
{
|
|
|
|
|
buffer_size *= 2;
|
|
|
|
|
buffer = xrealloc (buffer, buffer_size);
|
|
|
|
|
}
|
|
|
|
|
if (bfd_get_section_contents (core_bfd, ldinfo_sec, &buffer[i],
|
|
|
|
|
offset + i, 1) == 0)
|
|
|
|
|
goto bfd_err;
|
|
|
|
|
if (buffer[i++] == '\0')
|
|
|
|
|
++names_found;
|
|
|
|
|
} while (names_found < 2);
|
|
|
|
|
|
|
|
|
|
ldip = (struct ld_info *)buffer;
|
|
|
|
|
|
|
|
|
|
/* Can't use a file descriptor from the core file; need to open it. */
|
|
|
|
|
ldip->ldinfo_fd = -1;
|
|
|
|
|
|
|
|
|
|
/* The first ldinfo is for the exec file, allocated elsewhere. */
|
|
|
|
|
if (offset == 0)
|
|
|
|
|
vp = vmap;
|
|
|
|
|
else
|
|
|
|
|
vp = add_vmap (ldip);
|
|
|
|
|
|
|
|
|
|
offset += ldip->ldinfo_next;
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
1993-03-12 23:12:59 +00:00
|
|
|
|
vp->tstart = ldip->ldinfo_textorg;
|
|
|
|
|
vp->tend = vp->tstart + ldip->ldinfo_textsize;
|
|
|
|
|
vp->dstart = ldip->ldinfo_dataorg;
|
|
|
|
|
vp->dend = vp->dstart + ldip->ldinfo_datasize;
|
|
|
|
|
|
|
|
|
|
if (vp->tadj != 0) {
|
|
|
|
|
vp->tstart += vp->tadj;
|
|
|
|
|
vp->tend += vp->tadj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Unless this is the exec file,
|
|
|
|
|
add our sections to the section table for the core target. */
|
|
|
|
|
if (vp != vmap)
|
|
|
|
|
{
|
|
|
|
|
int count;
|
|
|
|
|
struct section_table *stp;
|
|
|
|
|
|
|
|
|
|
count = core_ops.to_sections_end - core_ops.to_sections;
|
|
|
|
|
count += 2;
|
|
|
|
|
core_ops.to_sections = (struct section_table *)
|
|
|
|
|
xrealloc (core_ops.to_sections,
|
|
|
|
|
sizeof (struct section_table) * count);
|
|
|
|
|
core_ops.to_sections_end = core_ops.to_sections + count;
|
|
|
|
|
stp = core_ops.to_sections_end - 2;
|
|
|
|
|
|
|
|
|
|
/* "Why do we add bfd_section_vma?", I hear you cry.
|
|
|
|
|
Well, the start of the section in the file is actually
|
|
|
|
|
that far into the section as the struct vmap understands it.
|
|
|
|
|
So for text sections, bfd_section_vma tends to be 0x200,
|
|
|
|
|
and if vp->tstart is 0xd0002000, then the first byte of
|
|
|
|
|
the text section on disk corresponds to address 0xd0002200. */
|
|
|
|
|
stp->bfd = vp->bfd;
|
|
|
|
|
stp->sec_ptr = bfd_get_section_by_name (stp->bfd, ".text");
|
|
|
|
|
stp->addr = bfd_section_vma (stp->bfd, stp->sec_ptr) + vp->tstart;
|
|
|
|
|
stp->endaddr = bfd_section_vma (stp->bfd, stp->sec_ptr) + vp->tend;
|
|
|
|
|
stp++;
|
|
|
|
|
|
|
|
|
|
stp->bfd = vp->bfd;
|
|
|
|
|
stp->sec_ptr = bfd_get_section_by_name (stp->bfd, ".data");
|
|
|
|
|
stp->addr = bfd_section_vma (stp->bfd, stp->sec_ptr) + vp->dstart;
|
|
|
|
|
stp->endaddr = bfd_section_vma (stp->bfd, stp->sec_ptr) + vp->dend;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vmap_symtab (vp, 0, 0);
|
|
|
|
|
|
|
|
|
|
add_text_to_loadinfo (ldip->ldinfo_textorg, ldip->ldinfo_dataorg);
|
|
|
|
|
} while (ldip->ldinfo_next != 0);
|
|
|
|
|
vmap_exec ();
|
|
|
|
|
do_cleanups (old);
|
|
|
|
|
}
|
1991-11-12 15:50:47 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_initialize_exec()
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
add_com("file", class_files, file_command,
|
|
|
|
|
"Use FILE as program to be debugged.\n\
|
|
|
|
|
It is read for its symbols, for getting the contents of pure memory,\n\
|
|
|
|
|
and it is the program executed when you use the `run' command.\n\
|
|
|
|
|
If FILE cannot be found as specified, your execution directory path\n\
|
|
|
|
|
($PATH) is searched for a command of that name.\n\
|
|
|
|
|
No arg means to have no executable file and no symbols.");
|
|
|
|
|
|
|
|
|
|
add_com("exec-file", class_files, exec_file_command,
|
|
|
|
|
"Use FILE as program for getting contents of pure memory.\n\
|
|
|
|
|
If FILE cannot be found as specified, your execution directory path\n\
|
|
|
|
|
is searched for a command of that name.\n\
|
|
|
|
|
No arg means have no executable file.");
|
|
|
|
|
|
|
|
|
|
add_com("section", class_files, set_section_command,
|
|
|
|
|
"Change the base address of section SECTION of the exec file to ADDR.\n\
|
|
|
|
|
This can be used if the exec file does not contain section addresses,\n\
|
|
|
|
|
(such as in the a.out format), or when the addresses specified in the\n\
|
|
|
|
|
file itself are wrong. Each section must be changed separately. The\n\
|
|
|
|
|
``info files'' command lists all the sections and their addresses.");
|
|
|
|
|
|
|
|
|
|
add_target(&exec_ops);
|
|
|
|
|
}
|