/* Reading symbol files from memory.
- Copyright (C) 1986-2015 Free Software Foundation, Inc.
+ Copyright (C) 1986-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "target.h"
#include "value.h"
#include "symfile.h"
-#include "observer.h"
+#include "observable.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. */
-gdb_static_assert (sizeof (CORE_ADDR) == sizeof (bfd_vma));
+gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (bfd_vma));
gdb_static_assert (sizeof (gdb_byte) == sizeof (bfd_byte));
gdb_static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type));
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. */
+ symbol file in messages; it can be NULL. */
static struct objfile *
symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr,
- size_t size, char *name, int from_tty)
+ size_t size, const char *name, int from_tty)
{
struct objfile *objf;
struct bfd *nbfd;
struct bfd_section *sec;
bfd_vma loadbase;
- 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"));
if (nbfd == NULL)
error (_("Failed to read a valid object file image from memory."));
- gdb_bfd_ref (nbfd);
- xfree (bfd_get_filename (nbfd));
- if (name == NULL)
- nbfd->filename = xstrdup ("shared object read from target memory");
- else
- nbfd->filename = name;
+ /* Manage the new reference for the duration of this function. */
+ gdb_bfd_ref_ptr nbfd_holder = gdb_bfd_ref_ptr::new_reference (nbfd);
- cleanup = make_cleanup_bfd_unref (nbfd);
+ if (name == NULL)
+ name = "shared object read from target memory";
+ bfd_set_filename (nbfd, name);
if (!bfd_check_format (nbfd, bfd_object))
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));
- make_cleanup (xfree, sai);
- i = 0;
+ section_addr_info sai;
for (sec = nbfd->sections; sec != NULL; sec = sec->next)
- if ((bfd_get_section_flags (nbfd, sec) & (SEC_ALLOC|SEC_LOAD)) != 0)
- {
- sai->other[i].addr = bfd_get_section_vma (nbfd, sec) + loadbase;
- sai->other[i].name = (char *) bfd_get_section_name (nbfd, sec);
- sai->other[i].sectindex = sec->index;
- ++i;
- }
- sai->num_sections = i;
+ if ((bfd_section_flags (sec) & (SEC_ALLOC|SEC_LOAD)) != 0)
+ sai.emplace_back (bfd_section_vma (sec) + loadbase,
+ bfd_section_name (sec),
+ sec->index);
+
+ if (from_tty)
+ add_flags |= SYMFILE_VERBOSE;
objf = symbol_file_add_from_bfd (nbfd, bfd_get_filename (nbfd),
- from_tty ? SYMFILE_VERBOSE : 0,
- sai, OBJF_SHARED, NULL);
+ add_flags, &sai, OBJF_SHARED, NULL);
add_target_sections_of_objfile (objf);
/* This might change our ideas about frames already looked at. */
reinit_frame_cache ();
- do_cleanups (cleanup);
return objf;
}
static void
-add_symbol_file_from_memory_command (char *args, int from_tty)
+add_symbol_file_from_memory_command (const char *args, int from_tty)
{
CORE_ADDR addr;
struct bfd *templ;
symbol_file_add_from_memory (templ, addr, 0, NULL, from_tty);
}
-/* Arguments for symbol_file_add_from_memory_wrapper. */
-
-struct symbol_file_add_from_memory_args
-{
- struct bfd *bfd;
- CORE_ADDR sysinfo_ehdr;
- size_t size;
- char *name;
- int from_tty;
-};
-
-/* Wrapper function for symbol_file_add_from_memory, for
- catch_exceptions. */
-
-static int
-symbol_file_add_from_memory_wrapper (struct ui_out *uiout, void *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->size,
- args->name, args->from_tty);
- return 0;
-}
-
/* Try to add the symbols for the vsyscall page, if there is one.
This function is called via the inferior_created observer. */
if (gdbarch_vsyscall_range (target_gdbarch (), &vsyscall_range))
{
struct bfd *bfd;
- struct symbol_file_add_from_memory_args args;
if (core_bfd != NULL)
bfd = core_bfd;
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 = vsyscall_range.start;
- args.size = vsyscall_range.length;
-
- args.name = xstrprintf ("system-supplied DSO at %s",
- 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. */
- args.from_tty = 0;
- catch_exceptions (current_uiout, symbol_file_add_from_memory_wrapper,
- &args, RETURN_MASK_ALL);
+
+ std::string name = string_printf ("system-supplied DSO at %s",
+ paddress (target_gdbarch (),
+ vsyscall_range.start));
+ try
+ {
+ /* 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. */
+ symbol_file_add_from_memory (bfd,
+ vsyscall_range.start,
+ vsyscall_range.length,
+ name.c_str (),
+ 0 /* from_tty */);
+ }
+ catch (const gdb_exception &ex)
+ {
+ exception_print (gdb_stderr, ex);
+ }
}
}
-\f
-
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_symfile_mem;
-
+void _initialize_symfile_mem ();
void
-_initialize_symfile_mem (void)
+_initialize_symfile_mem ()
{
add_cmd ("add-symbol-file-from-memory", class_files,
add_symbol_file_from_memory_command,
/* Want to know of each new inferior so that its vsyscall info can
be extracted. */
- observer_attach_inferior_created (add_vsyscall_page);
+ gdb::observers::inferior_created.attach (add_vsyscall_page);
}
projects / deliverable / binutils-gdb.git / blobdiff