/* Reading symbol files from memory.
- Copyright (C) 1986-1987, 1989, 1991, 1994-1996, 1998, 2000-2005,
- 2007-2012 Free Software Foundation, Inc.
+ Copyright (C) 1986-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "symtab.h"
#include "gdbcore.h"
#include "objfiles.h"
-#include "exceptions.h"
#include "gdbcmd.h"
#include "target.h"
#include "value.h"
#include "observer.h"
#include "auxv.h"
#include "elf/common.h"
+#include "gdb_bfd.h"
/* Verify parameters of target_read_memory_bfd and target_read_memory are
compatible. */
}
/* Read inferior memory at ADDR to find the header of a loaded object file
- and read its in-core symbols out of inferior memory. TEMPL is a bfd
+ and read its in-core symbols out of inferior memory. SIZE, if
+ non-zero, is the known size of the object. TEMPL is a bfd
representing the target's format. NAME is the name to use for this
symbol file in messages; it can be NULL or a malloc-allocated string
which will be attached to the BFD. */
static struct objfile *
-symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, char *name,
- int from_tty)
+symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr,
+ size_t size, char *name, int from_tty)
{
struct objfile *objf;
struct bfd *nbfd;
struct section_addr_info *sai;
unsigned int i;
struct cleanup *cleanup;
+ symfile_add_flags add_flags = 0;
if (bfd_get_flavour (templ) != bfd_target_elf_flavour)
error (_("add-symbol-file-from-memory not supported for this target"));
- nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
+ nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, size, &loadbase,
target_read_memory_bfd);
if (nbfd == NULL)
error (_("Failed to read a valid object file image from memory."));
+ gdb_bfd_ref (nbfd);
+ /* Manage the new reference for the duration of this function. */
+ gdb_bfd_ref_ptr nbfd_holder (nbfd);
+
+ xfree (bfd_get_filename (nbfd));
if (name == NULL)
nbfd->filename = xstrdup ("shared object read from target memory");
else
nbfd->filename = name;
if (!bfd_check_format (nbfd, bfd_object))
- {
- /* FIXME: should be checking for errors from bfd_close (for one thing,
- on error it does not free all the storage associated with the
- bfd). */
- bfd_close (nbfd);
- error (_("Got object file from memory but can't read symbols: %s."),
- bfd_errmsg (bfd_get_error ()));
- }
+ error (_("Got object file from memory but can't read symbols: %s."),
+ bfd_errmsg (bfd_get_error ()));
sai = alloc_section_addr_info (bfd_count_sections (nbfd));
cleanup = make_cleanup (xfree, sai);
sai->other[i].sectindex = sec->index;
++i;
}
+ sai->num_sections = i;
+
+ if (from_tty)
+ add_flags |= SYMFILE_VERBOSE;
+
+ objf = symbol_file_add_from_bfd (nbfd, bfd_get_filename (nbfd),
+ add_flags, sai, OBJF_SHARED, NULL);
- objf = symbol_file_add_from_bfd (nbfd, from_tty ? SYMFILE_VERBOSE : 0,
- sai, OBJF_SHARED, NULL);
+ add_target_sections_of_objfile (objf);
/* This might change our ideas about frames already looked at. */
reinit_frame_cache ();
error (_("Must use symbol-file or exec-file "
"before add-symbol-file-from-memory."));
- symbol_file_add_from_memory (templ, addr, NULL, from_tty);
+ symbol_file_add_from_memory (templ, addr, 0, NULL, from_tty);
}
/* Arguments for symbol_file_add_from_memory_wrapper. */
{
struct bfd *bfd;
CORE_ADDR sysinfo_ehdr;
+ size_t size;
char *name;
int from_tty;
};
static int
symbol_file_add_from_memory_wrapper (struct ui_out *uiout, void *data)
{
- struct symbol_file_add_from_memory_args *args = data;
+ struct symbol_file_add_from_memory_args *args
+ = (struct symbol_file_add_from_memory_args *) data;
- symbol_file_add_from_memory (args->bfd, args->sysinfo_ehdr, args->name,
- args->from_tty);
+ symbol_file_add_from_memory (args->bfd, args->sysinfo_ehdr, args->size,
+ args->name, args->from_tty);
return 0;
}
static void
add_vsyscall_page (struct target_ops *target, int from_tty)
{
- CORE_ADDR sysinfo_ehdr;
+ struct mem_range vsyscall_range;
- if (target_auxv_search (target, AT_SYSINFO_EHDR, &sysinfo_ehdr) > 0
- && sysinfo_ehdr != (CORE_ADDR) 0)
+ if (gdbarch_vsyscall_range (target_gdbarch (), &vsyscall_range))
{
struct bfd *bfd;
struct symbol_file_add_from_memory_args args;
format should fix this. */
{
warning (_("Could not load vsyscall page "
- "because no executable was specified\n"
- "try using the \"file\" command first."));
+ "because no executable was specified"));
return;
}
args.bfd = bfd;
- args.sysinfo_ehdr = sysinfo_ehdr;
+ args.sysinfo_ehdr = vsyscall_range.start;
+ args.size = vsyscall_range.length;
+
args.name = xstrprintf ("system-supplied DSO at %s",
- paddress (target_gdbarch, sysinfo_ehdr));
+ paddress (target_gdbarch (), vsyscall_range.start));
/* Pass zero for FROM_TTY, because the action of loading the
vsyscall DSO was not triggered by the user, even if the user
typed "run" at the TTY. */
}
}
-\f
-
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_symfile_mem;
-
void
_initialize_symfile_mem (void)
{
projects / deliverable / binutils-gdb.git / blobdiff