X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsymfile-mem.c;h=6dcd6555eda973c22c3decf6ab9612b97464af7d;hb=71780f455fbf35ed4c48e94b4228c55c11a213c8;hp=cfb286d478ec112bad6de7c425f87673ac7fa505;hpb=6aba47ca06d9150c6196a374b745c2711b46e045;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c index cfb286d478..6dcd6555ed 100644 --- a/gdb/symfile-mem.c +++ b/gdb/symfile-mem.c @@ -1,13 +1,12 @@ /* Reading symbol files from memory. - Copyright (C) 1986, 1987, 1989, 1991, 1994, 1995, 1996, 1998, 2000, 2001, - 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,9 +15,7 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* This file defines functions (and commands to exercise those functions) for reading debugging information from object files @@ -48,69 +45,84 @@ #include "symtab.h" #include "gdbcore.h" #include "objfiles.h" -#include "exceptions.h" #include "gdbcmd.h" #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 (gdb_byte) == sizeof (bfd_byte)); +gdb_static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type)); + +/* Provide bfd/ compatible prototype for target_read_memory. Casting would not + be enough as LEN width may differ. */ + +static int +target_read_memory_bfd (bfd_vma memaddr, bfd_byte *myaddr, bfd_size_type len) +{ + /* MYADDR must be already allocated for the LEN size so it has to fit in + ssize_t. */ + gdb_assert ((ssize_t) len == len); + + return target_read_memory (memaddr, myaddr, len); +} /* 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 bfd_section *sec; bfd_vma loadbase; - struct section_addr_info *sai; - unsigned int i; + 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, - target_read_memory); + 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.")); + /* Manage the new reference for the duration of this function. */ + gdb_bfd_ref_ptr nbfd_holder = gdb_bfd_ref_ptr::new_reference (nbfd); + if (name == NULL) - nbfd->filename = xstrdup ("shared object read from target memory"); - else - nbfd->filename = name; + name = xstrdup ("shared object read from target memory"); + bfd_set_filename (nbfd, 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)); - 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; - } + if ((bfd_section_flags (sec) & (SEC_ALLOC|SEC_LOAD)) != 0) + sai.emplace_back (bfd_section_vma (sec) + loadbase, + bfd_section_name (sec), + sec->index); - objf = symbol_file_add_from_bfd (nbfd, from_tty, - sai, 0, OBJF_SHARED); + if (from_tty) + add_flags |= SYMFILE_VERBOSE; + + objf = symbol_file_add_from_bfd (nbfd, bfd_get_filename (nbfd), + 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 (); @@ -120,7 +132,7 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, char *name, 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; @@ -136,48 +148,23 @@ add_symbol_file_from_memory_command (char *args, int from_tty) else templ = exec_bfd; if (templ == NULL) - error (_("\ -Must use symbol-file or exec-file before add-symbol-file-from-memory.")); + 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 symbol_file_add_from_memory_args -{ - struct bfd *bfd; - CORE_ADDR sysinfo_ehdr; - 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 = data; - - symbol_file_add_from_memory (args->bfd, args->sysinfo_ehdr, 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. */ +/* Try to add the symbols for the vsyscall page, if there is one. + This function is called via the inferior_created observer. */ 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; if (core_bfd != NULL) bfd = core_bfd; @@ -191,35 +178,43 @@ add_vsyscall_page (struct target_ops *target, int from_tty) ``bfd_runtime'' (a BFD created using the loaded image) file format should fix this. */ { - warning (_("\ -Could not load vsyscall page because no executable was specified\n\ -try using the \"file\" command first.")); + warning (_("Could not load vsyscall page " + "because no executable was specified")); return; } - args.bfd = bfd; - args.sysinfo_ehdr = sysinfo_ehdr; - xasprintf (&args.name, "system-supplied DSO at 0x%s", - paddr_nz (sysinfo_ehdr)); - /* 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 (uiout, symbol_file_add_from_memory_wrapper, - &args, RETURN_MASK_ALL); + + char *name = xstrprintf ("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, + 0 /* from_tty */); + } + catch (const gdb_exception &ex) + { + exception_print (gdb_stderr, ex); + } } } - void _initialize_symfile_mem (void) { add_cmd ("add-symbol-file-from-memory", class_files, - add_symbol_file_from_memory_command, _("\ -Load the symbols out of memory from a dynamically loaded object file.\n\ -Give an expression for the address of the file's shared object file header."), + add_symbol_file_from_memory_command, + _("Load the symbols out of memory from a " + "dynamically loaded object file.\n" + "Give an expression for the address " + "of the file's shared object file header."), &cmdlist); /* 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); }