/* GDB routines for manipulating objfiles.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1992-2019 Free Software Foundation, Inc.
Contributed by Cygnus Support, using pieces from other GDB modules.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* This file contains support routines for creating, manipulating, and
- destroying objfile structures. */
+ destroying objfile structures. */
#include "defs.h"
#include "bfd.h" /* Binary File Description */
#include "gdb-stabs.h"
#include "target.h"
#include "bcache.h"
-#include "mdebugread.h"
#include "expression.h"
#include "parser-defs.h"
-#include "gdb_assert.h"
#include <sys/types.h>
-#include "gdb_stat.h"
+#include <sys/stat.h>
#include <fcntl.h>
#include "gdb_obstack.h"
-#include "gdb_string.h"
#include "hashtab.h"
#include "breakpoint.h"
#include "addrmap.h"
#include "arch-utils.h"
#include "exec.h"
-#include "observer.h"
+#include "observable.h"
+#include "complaints.h"
+#include "psymtab.h"
+#include "solist.h"
+#include "gdb_bfd.h"
+#include "btrace.h"
+#include "gdbsupport/pathstuff.h"
-/* Prototypes for local functions */
+#include <vector>
-static void objfile_alloc_data (struct objfile *objfile);
-static void objfile_free_data (struct objfile *objfile);
+/* Keep a registry of per-objfile data-pointers required by other GDB
+ modules. */
+
+DEFINE_REGISTRY (objfile, REGISTRY_ACCESS_FIELD)
/* Externally visible variables that are owned by this module.
- See declarations in objfile.h for more info. */
+ See declarations in objfile.h for more info. */
-struct objfile *object_files; /* Linked list of all objfiles */
-struct objfile *current_objfile; /* For symbol file being read in */
-struct objfile *symfile_objfile; /* Main symbol table loaded from */
-struct objfile *rt_common_objfile; /* For runtime common symbols */
+struct objfile_pspace_info
+{
+ objfile_pspace_info () = default;
+ ~objfile_pspace_info ();
-/* Records whether any objfiles appeared or disappeared since we last updated
- address to obj section map. */
+ struct obj_section **sections = nullptr;
+ int num_sections = 0;
-static int objfiles_changed_p;
+ /* Nonzero if object files have been added since the section map
+ was last updated. */
+ int new_objfiles_available = 0;
-/* Locate all mappable sections of a BFD file.
- objfile_p_char is a char * to get it through
- bfd_map_over_sections; we cast it back to its proper type. */
+ /* Nonzero if the section map MUST be updated before use. */
+ int section_map_dirty = 0;
-/* Called via bfd_map_over_sections to build up the section table that
- the objfile references. The objfile contains pointers to the start
- of the table (objfile->sections) and to the first location after
- the end of the table (objfile->sections_end). */
+ /* Nonzero if section map updates should be inhibited if possible. */
+ int inhibit_updates = 0;
+};
-static void
-add_to_objfile_sections (struct bfd *abfd, struct bfd_section *asect,
- void *objfile_p_char)
+/* Per-program-space data key. */
+static const struct program_space_key<objfile_pspace_info>
+ objfiles_pspace_data;
+
+objfile_pspace_info::~objfile_pspace_info ()
{
- struct objfile *objfile = (struct objfile *) objfile_p_char;
- struct obj_section section;
- flagword aflag;
-
- aflag = bfd_get_section_flags (abfd, asect);
-
- if (!(aflag & SEC_ALLOC))
- return;
-
- if (0 == bfd_section_size (abfd, asect))
- return;
- section.objfile = objfile;
- section.the_bfd_section = asect;
- section.ovly_mapped = 0;
- obstack_grow (&objfile->objfile_obstack, (char *) §ion, sizeof (section));
- objfile->sections_end
- = (struct obj_section *) (((size_t) objfile->sections_end) + 1);
+ xfree (sections);
}
-/* Builds a section table for OBJFILE.
- Returns 0 if OK, 1 on error (in which case bfd_error contains the
- error).
+/* Get the current svr4 data. If none is found yet, add it now. This
+ function always returns a valid object. */
- Note that while we are building the table, which goes into the
- psymbol obstack, we hijack the sections_end pointer to instead hold
- a count of the number of sections. When bfd_map_over_sections
- returns, this count is used to compute the pointer to the end of
- the sections table, which then overwrites the count.
+static struct objfile_pspace_info *
+get_objfile_pspace_data (struct program_space *pspace)
+{
+ struct objfile_pspace_info *info;
- Also note that the OFFSET and OVLY_MAPPED in each table entry
- are initialized to zero.
+ info = objfiles_pspace_data.get (pspace);
+ if (info == NULL)
+ info = objfiles_pspace_data.emplace (pspace);
- Also note that if anything else writes to the psymbol obstack while
- we are building the table, we're pretty much hosed. */
+ return info;
+}
-int
-build_objfile_section_table (struct objfile *objfile)
-{
- /* objfile->sections can be already set when reading a mapped symbol
- file. I believe that we do need to rebuild the section table in
- this case (we rebuild other things derived from the bfd), but we
- can't free the old one (it's in the objfile_obstack). So we just
- waste some memory. */
+\f
- objfile->sections_end = 0;
- bfd_map_over_sections (objfile->obfd,
- add_to_objfile_sections, (void *) objfile);
- objfile->sections = obstack_finish (&objfile->objfile_obstack);
- objfile->sections_end = objfile->sections + (size_t) objfile->sections_end;
- return (0);
+/* Per-BFD data key. */
+
+static const struct bfd_key<objfile_per_bfd_storage> objfiles_bfd_data;
+
+objfile_per_bfd_storage::~objfile_per_bfd_storage ()
+{
}
-/* Given a pointer to an initialized bfd (ABFD) and some flag bits
- allocate a new objfile struct, fill it in as best we can, link it
- into the list of all known objfiles, and return a pointer to the
- new objfile struct.
+/* Create the per-BFD storage object for OBJFILE. If ABFD is not
+ NULL, and it already has a per-BFD storage object, use that.
+ Otherwise, allocate a new per-BFD storage object. Note that it is
+ not safe to call this multiple times for a given OBJFILE -- it can
+ only be called when allocating or re-initializing OBJFILE. */
- The FLAGS word contains various bits (OBJF_*) that can be taken as
- requests for specific operations. Other bits like OBJF_SHARED are
- simply copied through to the new objfile flags member. */
-
-/* NOTE: carlton/2003-02-04: This function is called with args NULL, 0
- by jv-lang.c, to create an artificial objfile used to hold
- information about dynamically-loaded Java classes. Unfortunately,
- that branch of this function doesn't get tested very frequently, so
- it's prone to breakage. (E.g. at one time the name was set to NULL
- in that situation, which broke a loop over all names in the dynamic
- library loader.) If you change this function, please try to leave
- things in a consistent state even if abfd is NULL. */
-
-struct objfile *
-allocate_objfile (bfd *abfd, int flags)
+static struct objfile_per_bfd_storage *
+get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd)
{
- struct objfile *objfile = NULL;
- struct objfile *last_one = NULL;
+ struct objfile_per_bfd_storage *storage = NULL;
- /* If we don't support mapped symbol files, didn't ask for the file to be
- mapped, or failed to open the mapped file for some reason, then revert
- back to an unmapped objfile. */
+ if (abfd != NULL)
+ storage = objfiles_bfd_data.get (abfd);
- if (objfile == NULL)
+ if (storage == NULL)
{
- objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
- memset (objfile, 0, sizeof (struct objfile));
- objfile->psymbol_cache = bcache_xmalloc ();
- objfile->macro_cache = bcache_xmalloc ();
- /* We could use obstack_specify_allocation here instead, but
- gdb_obstack.h specifies the alloc/dealloc functions. */
- obstack_init (&objfile->objfile_obstack);
- terminate_minimal_symbol_table (objfile);
+ storage = new objfile_per_bfd_storage;
+ /* If the object requires gdb to do relocations, we simply fall
+ back to not sharing data across users. These cases are rare
+ enough that this seems reasonable. */
+ if (abfd != NULL && !gdb_bfd_requires_relocations (abfd))
+ objfiles_bfd_data.set (abfd, storage);
+
+ /* Look up the gdbarch associated with the BFD. */
+ if (abfd != NULL)
+ storage->gdbarch = gdbarch_from_bfd (abfd);
}
- objfile_alloc_data (objfile);
+ return storage;
+}
- /* Update the per-objfile information that comes from the bfd, ensuring
- that any data that is reference is saved in the per-objfile data
- region. */
+/* See objfiles.h. */
- objfile->obfd = abfd;
- if (objfile->name != NULL)
- {
- xfree (objfile->name);
- }
- if (abfd != NULL)
- {
- /* Look up the gdbarch associated with the BFD. */
- objfile->gdbarch = gdbarch_from_bfd (abfd);
+void
+set_objfile_per_bfd (struct objfile *objfile)
+{
+ objfile->per_bfd = get_objfile_bfd_data (objfile, objfile->obfd);
+}
- objfile->name = xstrdup (bfd_get_filename (abfd));
- objfile->mtime = bfd_get_mtime (abfd);
+/* Set the objfile's per-BFD notion of the "main" name and
+ language. */
- /* Build section table. */
+void
+set_objfile_main_name (struct objfile *objfile,
+ const char *name, enum language lang)
+{
+ if (objfile->per_bfd->name_of_main == NULL
+ || strcmp (objfile->per_bfd->name_of_main, name) != 0)
+ objfile->per_bfd->name_of_main
+ = obstack_strdup (&objfile->per_bfd->storage_obstack, name);
+ objfile->per_bfd->language_of_main = lang;
+}
- if (build_objfile_section_table (objfile))
- {
- error (_("Can't find the file sections in `%s': %s"),
- objfile->name, bfd_errmsg (bfd_get_error ()));
- }
- }
- else
- {
- objfile->name = xstrdup ("<<anonymous objfile>>");
- }
+/* Helper structure to map blocks to static link properties in hash tables. */
- /* Initialize the section indexes for this objfile, so that we can
- later detect if they are used w/o being properly assigned to. */
+struct static_link_htab_entry
+{
+ const struct block *block;
+ const struct dynamic_prop *static_link;
+};
- objfile->sect_index_text = -1;
- objfile->sect_index_data = -1;
- objfile->sect_index_bss = -1;
- objfile->sect_index_rodata = -1;
+/* Return a hash code for struct static_link_htab_entry *P. */
- /* We don't yet have a C++-specific namespace symtab. */
+static hashval_t
+static_link_htab_entry_hash (const void *p)
+{
+ const struct static_link_htab_entry *e
+ = (const struct static_link_htab_entry *) p;
- objfile->cp_namespace_symtab = NULL;
+ return htab_hash_pointer (e->block);
+}
- /* Add this file onto the tail of the linked list of other such files. */
+/* Return whether P1 an P2 (pointers to struct static_link_htab_entry) are
+ mappings for the same block. */
- objfile->next = NULL;
- if (object_files == NULL)
- object_files = objfile;
- else
- {
- for (last_one = object_files;
- last_one->next;
- last_one = last_one->next);
- last_one->next = objfile;
- }
+static int
+static_link_htab_entry_eq (const void *p1, const void *p2)
+{
+ const struct static_link_htab_entry *e1
+ = (const struct static_link_htab_entry *) p1;
+ const struct static_link_htab_entry *e2
+ = (const struct static_link_htab_entry *) p2;
- /* Save passed in flag bits. */
- objfile->flags |= flags;
+ return e1->block == e2->block;
+}
- objfiles_changed_p = 1; /* Rebuild section map next time we need it. */
+/* Register STATIC_LINK as the static link for BLOCK, which is part of OBJFILE.
+ Must not be called more than once for each BLOCK. */
- return (objfile);
+void
+objfile_register_static_link (struct objfile *objfile,
+ const struct block *block,
+ const struct dynamic_prop *static_link)
+{
+ void **slot;
+ struct static_link_htab_entry lookup_entry;
+ struct static_link_htab_entry *entry;
+
+ if (objfile->static_links == NULL)
+ objfile->static_links.reset (htab_create_alloc
+ (1, &static_link_htab_entry_hash, static_link_htab_entry_eq, NULL,
+ xcalloc, xfree));
+
+ /* Create a slot for the mapping, make sure it's the first mapping for this
+ block and then create the mapping itself. */
+ lookup_entry.block = block;
+ slot = htab_find_slot (objfile->static_links.get (), &lookup_entry, INSERT);
+ gdb_assert (*slot == NULL);
+
+ entry = XOBNEW (&objfile->objfile_obstack, static_link_htab_entry);
+ entry->block = block;
+ entry->static_link = static_link;
+ *slot = (void *) entry;
}
-/* Retrieve the gdbarch associated with OBJFILE. */
-struct gdbarch *
-get_objfile_arch (struct objfile *objfile)
+/* Look for a static link for BLOCK, which is part of OBJFILE. Return NULL if
+ none was found. */
+
+const struct dynamic_prop *
+objfile_lookup_static_link (struct objfile *objfile,
+ const struct block *block)
{
- return objfile->gdbarch;
+ struct static_link_htab_entry *entry;
+ struct static_link_htab_entry lookup_entry;
+
+ if (objfile->static_links == NULL)
+ return NULL;
+ lookup_entry.block = block;
+ entry = ((struct static_link_htab_entry *)
+ htab_find (objfile->static_links.get (), &lookup_entry));
+ if (entry == NULL)
+ return NULL;
+
+ gdb_assert (entry->block == block);
+ return entry->static_link;
}
-/* Initialize entry point information for this objfile. */
+\f
+
+/* Called via bfd_map_over_sections to build up the section table that
+ the objfile references. The objfile contains pointers to the start
+ of the table (objfile->sections) and to the first location after
+ the end of the table (objfile->sections_end). */
+
+static void
+add_to_objfile_sections_full (struct bfd *abfd, struct bfd_section *asect,
+ struct objfile *objfile, int force)
+{
+ struct obj_section *section;
+
+ if (!force)
+ {
+ flagword aflag;
+
+ aflag = bfd_section_flags (asect);
+ if (!(aflag & SEC_ALLOC))
+ return;
+ }
+
+ section = &objfile->sections[gdb_bfd_section_index (abfd, asect)];
+ section->objfile = objfile;
+ section->the_bfd_section = asect;
+ section->ovly_mapped = 0;
+}
+
+static void
+add_to_objfile_sections (struct bfd *abfd, struct bfd_section *asect,
+ void *objfilep)
+{
+ add_to_objfile_sections_full (abfd, asect, (struct objfile *) objfilep, 0);
+}
+
+/* Builds a section table for OBJFILE.
+
+ Note that the OFFSET and OVLY_MAPPED in each table entry are
+ initialized to zero. */
void
-init_entry_point_info (struct objfile *objfile)
+build_objfile_section_table (struct objfile *objfile)
{
- /* Save startup file's range of PC addresses to help blockframe.c
- decide where the bottom of the stack is. */
+ int count = gdb_bfd_count_sections (objfile->obfd);
+
+ objfile->sections = OBSTACK_CALLOC (&objfile->objfile_obstack,
+ count,
+ struct obj_section);
+ objfile->sections_end = (objfile->sections + count);
+ bfd_map_over_sections (objfile->obfd,
+ add_to_objfile_sections, (void *) objfile);
+
+ /* See gdb_bfd_section_index. */
+ add_to_objfile_sections_full (objfile->obfd, bfd_com_section_ptr, objfile, 1);
+ add_to_objfile_sections_full (objfile->obfd, bfd_und_section_ptr, objfile, 1);
+ add_to_objfile_sections_full (objfile->obfd, bfd_abs_section_ptr, objfile, 1);
+ add_to_objfile_sections_full (objfile->obfd, bfd_ind_section_ptr, objfile, 1);
+}
+
+/* Given a pointer to an initialized bfd (ABFD) and some flag bits,
+ initialize the new objfile as best we can and link it into the list
+ of all known objfiles.
+
+ NAME should contain original non-canonicalized filename or other
+ identifier as entered by user. If there is no better source use
+ bfd_get_filename (ABFD). NAME may be NULL only if ABFD is NULL.
+ NAME content is copied into returned objfile.
+
+ The FLAGS word contains various bits (OBJF_*) that can be taken as
+ requests for specific operations. Other bits like OBJF_SHARED are
+ simply copied through to the new objfile flags member. */
+
+objfile::objfile (bfd *abfd, const char *name, objfile_flags flags_)
+ : flags (flags_),
+ pspace (current_program_space),
+ partial_symtabs (new psymtab_storage ()),
+ obfd (abfd)
+{
+ const char *expanded_name;
+
+ /* We could use obstack_specify_allocation here instead, but
+ gdb_obstack.h specifies the alloc/dealloc functions. */
+ obstack_init (&objfile_obstack);
+
+ objfile_alloc_data (this);
- if (bfd_get_file_flags (objfile->obfd) & EXEC_P)
+ gdb::unique_xmalloc_ptr<char> name_holder;
+ if (name == NULL)
{
- /* Executable file -- record its entry point so we'll recognize
- the startup file because it contains the entry point. */
- objfile->ei.entry_point = bfd_get_start_address (objfile->obfd);
+ gdb_assert (abfd == NULL);
+ gdb_assert ((flags & OBJF_NOT_FILENAME) != 0);
+ expanded_name = "<<anonymous objfile>>";
}
- else if (bfd_get_file_flags (objfile->obfd) & DYNAMIC
- && bfd_get_start_address (objfile->obfd) != 0)
- /* Some shared libraries may have entry points set and be
- runnable. There's no clear way to indicate this, so just check
- for values other than zero. */
- objfile->ei.entry_point = bfd_get_start_address (objfile->obfd);
+ else if ((flags & OBJF_NOT_FILENAME) != 0
+ || is_target_filename (name))
+ expanded_name = name;
else
{
- /* Examination of non-executable.o files. Short-circuit this stuff. */
- objfile->ei.entry_point = INVALID_ENTRY_POINT;
+ name_holder = gdb_abspath (name);
+ expanded_name = name_holder.get ();
}
-}
+ original_name = obstack_strdup (&objfile_obstack, expanded_name);
-/* Get current entry point address. */
+ /* Update the per-objfile information that comes from the bfd, ensuring
+ that any data that is reference is saved in the per-objfile data
+ region. */
-CORE_ADDR
-entry_point_address (void)
-{
- struct gdbarch *gdbarch;
- CORE_ADDR entry_point;
+ gdb_bfd_ref (abfd);
+ if (abfd != NULL)
+ {
+ mtime = bfd_get_mtime (abfd);
- if (symfile_objfile == NULL)
- return 0;
+ /* Build section table. */
+ build_objfile_section_table (this);
+ }
+
+ per_bfd = get_objfile_bfd_data (this, abfd);
+}
+
+/* Retrieve the gdbarch associated with OBJFILE. */
- gdbarch = get_objfile_arch (symfile_objfile);
+struct gdbarch *
+get_objfile_arch (const struct objfile *objfile)
+{
+ return objfile->per_bfd->gdbarch;
+}
- entry_point = symfile_objfile->ei.entry_point;
+/* If there is a valid and known entry point, function fills *ENTRY_P with it
+ and returns non-zero; otherwise it returns zero. */
- /* Make certain that the address points at real code, and not a
- function descriptor. */
- entry_point = gdbarch_convert_from_func_ptr_addr (gdbarch, entry_point,
- ¤t_target);
+int
+entry_point_address_query (CORE_ADDR *entry_p)
+{
+ if (symfile_objfile == NULL || !symfile_objfile->per_bfd->ei.entry_point_p)
+ return 0;
- /* Remove any ISA markers, so that this matches entries in the
- symbol table. */
- entry_point = gdbarch_addr_bits_remove (gdbarch, entry_point);
+ *entry_p = (symfile_objfile->per_bfd->ei.entry_point
+ + ANOFFSET (symfile_objfile->section_offsets,
+ symfile_objfile->per_bfd->ei.the_bfd_section_index));
- return entry_point;
+ return 1;
}
-/* Create the terminating entry of OBJFILE's minimal symbol table.
- If OBJFILE->msymbols is zero, allocate a single entry from
- OBJFILE->objfile_obstack; otherwise, just initialize
- OBJFILE->msymbols[OBJFILE->minimal_symbol_count]. */
-void
-terminate_minimal_symbol_table (struct objfile *objfile)
+/* Get current entry point address. Call error if it is not known. */
+
+CORE_ADDR
+entry_point_address (void)
{
- if (! objfile->msymbols)
- objfile->msymbols = ((struct minimal_symbol *)
- obstack_alloc (&objfile->objfile_obstack,
- sizeof (objfile->msymbols[0])));
+ CORE_ADDR retval;
- {
- struct minimal_symbol *m
- = &objfile->msymbols[objfile->minimal_symbol_count];
+ if (!entry_point_address_query (&retval))
+ error (_("Entry point address is not known."));
- memset (m, 0, sizeof (*m));
- /* Don't rely on these enumeration values being 0's. */
- MSYMBOL_TYPE (m) = mst_unknown;
- SYMBOL_INIT_LANGUAGE_SPECIFIC (m, language_unknown);
- }
+ return retval;
}
-
-/* Put one object file before a specified on in the global list.
- This can be used to make sure an object file is destroyed before
- another when using ALL_OBJFILES_SAFE to free all objfiles. */
-void
-put_objfile_before (struct objfile *objfile, struct objfile *before_this)
+separate_debug_iterator &
+separate_debug_iterator::operator++ ()
{
- struct objfile **objp;
+ gdb_assert (m_objfile != nullptr);
+
+ struct objfile *res;
- unlink_objfile (objfile);
-
- for (objp = &object_files; *objp != NULL; objp = &((*objp)->next))
+ /* If any, return the first child. */
+ res = m_objfile->separate_debug_objfile;
+ if (res != nullptr)
{
- if (*objp == before_this)
- {
- objfile->next = *objp;
- *objp = objfile;
- return;
- }
+ m_objfile = res;
+ return *this;
}
-
- internal_error (__FILE__, __LINE__,
- _("put_objfile_before: before objfile not in list"));
-}
-/* Put OBJFILE at the front of the list. */
+ /* Common case where there is no separate debug objfile. */
+ if (m_objfile == m_parent)
+ {
+ m_objfile = nullptr;
+ return *this;
+ }
-void
-objfile_to_front (struct objfile *objfile)
-{
- struct objfile **objp;
- for (objp = &object_files; *objp != NULL; objp = &((*objp)->next))
+ /* Return the brother if any. Note that we don't iterate on brothers of
+ the parents. */
+ res = m_objfile->separate_debug_objfile_link;
+ if (res != nullptr)
+ {
+ m_objfile = res;
+ return *this;
+ }
+
+ for (res = m_objfile->separate_debug_objfile_backlink;
+ res != m_parent;
+ res = res->separate_debug_objfile_backlink)
{
- if (*objp == objfile)
+ gdb_assert (res != nullptr);
+ if (res->separate_debug_objfile_link != nullptr)
{
- /* Unhook it from where it is. */
- *objp = objfile->next;
- /* Put it in the front. */
- objfile->next = object_files;
- object_files = objfile;
- break;
+ m_objfile = res->separate_debug_objfile_link;
+ return *this;
}
}
+ m_objfile = nullptr;
+ return *this;
}
-/* Unlink OBJFILE from the list of known objfiles, if it is found in the
- list.
+/* Add OBJFILE as a separate debug objfile of PARENT. */
- It is not a bug, or error, to call this function if OBJFILE is not known
- to be in the current list. This is done in the case of mapped objfiles,
- for example, just to ensure that the mapped objfile doesn't appear twice
- in the list. Since the list is threaded, linking in a mapped objfile
- twice would create a circular list.
+static void
+add_separate_debug_objfile (struct objfile *objfile, struct objfile *parent)
+{
+ gdb_assert (objfile && parent);
+
+ /* Must not be already in a list. */
+ gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
+ gdb_assert (objfile->separate_debug_objfile_link == NULL);
+ gdb_assert (objfile->separate_debug_objfile == NULL);
+ gdb_assert (parent->separate_debug_objfile_backlink == NULL);
+ gdb_assert (parent->separate_debug_objfile_link == NULL);
+
+ objfile->separate_debug_objfile_backlink = parent;
+ objfile->separate_debug_objfile_link = parent->separate_debug_objfile;
+ parent->separate_debug_objfile = objfile;
+}
- If OBJFILE turns out to be in the list, we zap it's NEXT pointer after
- unlinking it, just to ensure that we have completely severed any linkages
- between the OBJFILE and the list. */
+/* See objfiles.h. */
-void
-unlink_objfile (struct objfile *objfile)
+objfile *
+objfile::make (bfd *bfd_, const char *name_, objfile_flags flags_,
+ objfile *parent)
{
- struct objfile **objpp;
-
- for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp)->next))
- {
- if (*objpp == objfile)
- {
- *objpp = (*objpp)->next;
- objfile->next = NULL;
- return;
- }
- }
+ objfile *result = new objfile (bfd_, name_, flags_);
+ if (parent != nullptr)
+ add_separate_debug_objfile (result, parent);
- internal_error (__FILE__, __LINE__,
- _("unlink_objfile: objfile already unlinked"));
-}
+ current_program_space->add_objfile (result, parent);
+ /* Rebuild section map next time we need it. */
+ get_objfile_pspace_data (current_program_space)->new_objfiles_available = 1;
-/* Destroy an objfile and all the symtabs and psymtabs under it. Note
- that as much as possible is allocated on the objfile_obstack
- so that the memory can be efficiently freed.
+ return result;
+}
- Things which we do NOT free because they are not in malloc'd memory
- or not in memory specific to the objfile include:
+/* See objfiles.h. */
- objfile -> sf
+void
+objfile::unlink ()
+{
+ current_program_space->remove_objfile (this);
+ delete this;
+}
- FIXME: If the objfile is using reusable symbol information (via mmalloc),
- then we need to take into account the fact that more than one process
- may be using the symbol information at the same time (when mmalloc is
- extended to support cooperative locking). When more than one process
- is using the mapped symbol info, we need to be more careful about when
- we free objects in the reusable area. */
+/* Free all separate debug objfile of OBJFILE, but don't free OBJFILE
+ itself. */
void
-free_objfile (struct objfile *objfile)
+free_objfile_separate_debug (struct objfile *objfile)
{
- if (objfile->separate_debug_objfile)
+ struct objfile *child;
+
+ for (child = objfile->separate_debug_objfile; child;)
{
- free_objfile (objfile->separate_debug_objfile);
+ struct objfile *next_child = child->separate_debug_objfile_link;
+ child->unlink ();
+ child = next_child;
}
-
- if (objfile->separate_debug_objfile_backlink)
+}
+
+/* Destroy an objfile and all the symtabs and psymtabs under it. */
+
+objfile::~objfile ()
+{
+ /* First notify observers that this objfile is about to be freed. */
+ gdb::observers::free_objfile.notify (this);
+
+ /* Free all separate debug objfiles. */
+ free_objfile_separate_debug (this);
+
+ if (separate_debug_objfile_backlink)
{
/* We freed the separate debug file, make sure the base objfile
doesn't reference it. */
- objfile->separate_debug_objfile_backlink->separate_debug_objfile = NULL;
+ struct objfile *child;
+
+ child = separate_debug_objfile_backlink->separate_debug_objfile;
+
+ if (child == this)
+ {
+ /* THIS is the first child. */
+ separate_debug_objfile_backlink->separate_debug_objfile =
+ separate_debug_objfile_link;
+ }
+ else
+ {
+ /* Find THIS in the list. */
+ while (1)
+ {
+ if (child->separate_debug_objfile_link == this)
+ {
+ child->separate_debug_objfile_link =
+ separate_debug_objfile_link;
+ break;
+ }
+ child = child->separate_debug_objfile_link;
+ gdb_assert (child);
+ }
+ }
}
-
+
/* Remove any references to this objfile in the global value
lists. */
- preserve_values (objfile);
+ preserve_values (this);
+
+ /* It still may reference data modules have associated with the objfile and
+ the symbol file data. */
+ forget_cached_source_info_for_objfile (this);
+
+ breakpoint_free_objfile (this);
+ btrace_free_objfile (this);
/* First do any symbol file specific actions required when we are
finished with a particular symbol file. Note that if the objfile
is using reusable symbol information (via mmalloc) then each of
these routines is responsible for doing the correct thing, either
freeing things which are valid only during this particular gdb
- execution, or leaving them to be reused during the next one. */
-
- if (objfile->sf != NULL)
- {
- (*objfile->sf->sym_finish) (objfile);
- }
-
- /* Discard any data modules have associated with the objfile. */
- objfile_free_data (objfile);
-
- gdb_bfd_unref (objfile->obfd);
+ execution, or leaving them to be reused during the next one. */
- /* Remove it from the chain of all objfiles. */
+ if (sf != NULL)
+ (*sf->sym_finish) (this);
- unlink_objfile (objfile);
+ /* Discard any data modules have associated with the objfile. The function
+ still may reference obfd. */
+ objfile_free_data (this);
- /* If we are going to free the runtime common objfile, mark it
- as unallocated. */
-
- if (objfile == rt_common_objfile)
- rt_common_objfile = NULL;
+ if (obfd)
+ gdb_bfd_unref (obfd);
+ else
+ delete per_bfd;
/* Before the symbol table code was redone to make it easier to
selectively load and remove information particular to a specific
linkage unit, gdb used to do these things whenever the monolithic
symbol table was blown away. How much still needs to be done
is unknown, but we play it safe for now and keep each action until
- it is shown to be no longer needed. */
+ it is shown to be no longer needed. */
/* Not all our callers call clear_symtab_users (objfile_purge_solibs,
for example), so we need to call this here. */
clear_pc_function_cache ();
- /* Clear globals which might have pointed into a removed objfile.
- FIXME: It's not clear which of these are supposed to persist
- between expressions and which ought to be reset each time. */
- expression_context_block = NULL;
- innermost_block = NULL;
-
/* Check to see if the current_source_symtab belongs to this objfile,
- and if so, call clear_current_source_symtab_and_line. */
+ and if so, call clear_current_source_symtab_and_line. */
{
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
- struct symtab *s;
- ALL_OBJFILE_SYMTABS (objfile, s)
- {
- if (s == cursal.symtab)
- clear_current_source_symtab_and_line ();
- }
+ if (cursal.symtab && SYMTAB_OBJFILE (cursal.symtab) == this)
+ clear_current_source_symtab_and_line ();
}
- /* The last thing we do is free the objfile struct itself. */
+ /* Free the obstacks for non-reusable objfiles. */
+ obstack_free (&objfile_obstack, 0);
- if (objfile->name != NULL)
- {
- xfree (objfile->name);
- }
- if (objfile->global_psymbols.list)
- xfree (objfile->global_psymbols.list);
- if (objfile->static_psymbols.list)
- xfree (objfile->static_psymbols.list);
- /* Free the obstacks for non-reusable objfiles */
- bcache_xfree (objfile->psymbol_cache);
- bcache_xfree (objfile->macro_cache);
- if (objfile->demangled_names_hash)
- htab_delete (objfile->demangled_names_hash);
- obstack_free (&objfile->objfile_obstack, 0);
- xfree (objfile);
- objfile = NULL;
- objfiles_changed_p = 1; /* Rebuild section map next time we need it. */
-}
-
-static void
-do_free_objfile_cleanup (void *obj)
-{
- free_objfile (obj);
-}
-
-struct cleanup *
-make_cleanup_free_objfile (struct objfile *obj)
-{
- return make_cleanup (do_free_objfile_cleanup, obj);
+ /* Rebuild section map next time we need it. */
+ get_objfile_pspace_data (pspace)->section_map_dirty = 1;
}
/* Free all the object files at once and clean up their users. */
void
free_all_objfiles (void)
{
- struct objfile *objfile, *temp;
+ struct so_list *so;
- ALL_OBJFILES_SAFE (objfile, temp)
- {
- free_objfile (objfile);
- }
- clear_symtab_users ();
+ /* Any objfile reference would become stale. */
+ for (so = master_so_list (); so; so = so->next)
+ gdb_assert (so->objfile == NULL);
+
+ for (objfile *objfile : current_program_space->objfiles_safe ())
+ objfile->unlink ();
+ clear_symtab_users (0);
}
\f
+/* A helper function for objfile_relocate1 that relocates a single
+ symbol. */
+
+static void
+relocate_one_symbol (struct symbol *sym, struct objfile *objfile,
+ struct section_offsets *delta)
+{
+ fixup_symbol_section (sym, objfile);
+
+ /* The RS6000 code from which this was taken skipped
+ any symbols in STRUCT_DOMAIN or UNDEF_DOMAIN.
+ But I'm leaving out that test, on the theory that
+ they can't possibly pass the tests below. */
+ if ((SYMBOL_CLASS (sym) == LOC_LABEL
+ || SYMBOL_CLASS (sym) == LOC_STATIC)
+ && SYMBOL_SECTION (sym) >= 0)
+ {
+ SET_SYMBOL_VALUE_ADDRESS (sym,
+ SYMBOL_VALUE_ADDRESS (sym)
+ + ANOFFSET (delta, SYMBOL_SECTION (sym)));
+ }
+}
+
/* Relocate OBJFILE to NEW_OFFSETS. There should be OBJFILE->NUM_SECTIONS
- entries in new_offsets. */
-void
-objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets)
+ entries in new_offsets. SEPARATE_DEBUG_OBJFILE is not touched here.
+ Return non-zero iff any change happened. */
+
+static int
+objfile_relocate1 (struct objfile *objfile,
+ const struct section_offsets *new_offsets)
{
- struct obj_section *s;
struct section_offsets *delta =
((struct section_offsets *)
alloca (SIZEOF_N_SECTION_OFFSETS (objfile->num_sections)));
- {
- int i;
- int something_changed = 0;
- for (i = 0; i < objfile->num_sections; ++i)
- {
- delta->offsets[i] =
- ANOFFSET (new_offsets, i) - ANOFFSET (objfile->section_offsets, i);
- if (ANOFFSET (delta, i) != 0)
- something_changed = 1;
- }
- if (!something_changed)
- return;
- }
-
- /* OK, get all the symtabs. */
- {
- struct symtab *s;
+ int something_changed = 0;
- ALL_OBJFILE_SYMTABS (objfile, s)
+ for (int i = 0; i < objfile->num_sections; ++i)
{
- struct linetable *l;
- struct blockvector *bv;
- int i;
+ delta->offsets[i] =
+ ANOFFSET (new_offsets, i) - ANOFFSET (objfile->section_offsets, i);
+ if (ANOFFSET (delta, i) != 0)
+ something_changed = 1;
+ }
+ if (!something_changed)
+ return 0;
- /* First the line table. */
- l = LINETABLE (s);
- if (l)
- {
- for (i = 0; i < l->nitems; ++i)
- l->item[i].pc += ANOFFSET (delta, s->block_line_section);
- }
+ /* OK, get all the symtabs. */
+ {
+ for (compunit_symtab *cust : objfile->compunits ())
+ {
+ for (symtab *s : compunit_filetabs (cust))
+ {
+ struct linetable *l;
+
+ /* First the line table. */
+ l = SYMTAB_LINETABLE (s);
+ if (l)
+ {
+ for (int i = 0; i < l->nitems; ++i)
+ l->item[i].pc += ANOFFSET (delta,
+ COMPUNIT_BLOCK_LINE_SECTION
+ (cust));
+ }
+ }
+ }
- /* Don't relocate a shared blockvector more than once. */
- if (!s->primary)
- continue;
+ for (compunit_symtab *cust : objfile->compunits ())
+ {
+ const struct blockvector *bv = COMPUNIT_BLOCKVECTOR (cust);
+ int block_line_section = COMPUNIT_BLOCK_LINE_SECTION (cust);
- bv = BLOCKVECTOR (s);
- if (BLOCKVECTOR_MAP (bv))
- addrmap_relocate (BLOCKVECTOR_MAP (bv),
- ANOFFSET (delta, s->block_line_section));
+ if (BLOCKVECTOR_MAP (bv))
+ addrmap_relocate (BLOCKVECTOR_MAP (bv),
+ ANOFFSET (delta, block_line_section));
- for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i)
- {
- struct block *b;
- struct symbol *sym;
- struct dict_iterator iter;
+ for (int i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i)
+ {
+ struct block *b;
+ struct symbol *sym;
+ struct mdict_iterator miter;
- b = BLOCKVECTOR_BLOCK (bv, i);
- BLOCK_START (b) += ANOFFSET (delta, s->block_line_section);
- BLOCK_END (b) += ANOFFSET (delta, s->block_line_section);
+ b = BLOCKVECTOR_BLOCK (bv, i);
+ BLOCK_START (b) += ANOFFSET (delta, block_line_section);
+ BLOCK_END (b) += ANOFFSET (delta, block_line_section);
- ALL_BLOCK_SYMBOLS (b, iter, sym)
- {
- fixup_symbol_section (sym, objfile);
-
- /* The RS6000 code from which this was taken skipped
- any symbols in STRUCT_DOMAIN or UNDEF_DOMAIN.
- But I'm leaving out that test, on the theory that
- they can't possibly pass the tests below. */
- if ((SYMBOL_CLASS (sym) == LOC_LABEL
- || SYMBOL_CLASS (sym) == LOC_STATIC)
- && SYMBOL_SECTION (sym) >= 0)
+ if (BLOCK_RANGES (b) != nullptr)
+ for (int j = 0; j < BLOCK_NRANGES (b); j++)
{
- SYMBOL_VALUE_ADDRESS (sym) +=
- ANOFFSET (delta, SYMBOL_SECTION (sym));
+ BLOCK_RANGE_START (b, j)
+ += ANOFFSET (delta, block_line_section);
+ BLOCK_RANGE_END (b, j) += ANOFFSET (delta,
+ block_line_section);
}
- }
- }
- }
- }
-
- {
- struct partial_symtab *p;
-
- ALL_OBJFILE_PSYMTABS (objfile, p)
- {
- p->textlow += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
- p->texthigh += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
- }
- }
-
- {
- struct partial_symbol **psym;
- for (psym = objfile->global_psymbols.list;
- psym < objfile->global_psymbols.next;
- psym++)
- {
- fixup_psymbol_section (*psym, objfile);
- if (SYMBOL_SECTION (*psym) >= 0)
- SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- SYMBOL_SECTION (*psym));
- }
- for (psym = objfile->static_psymbols.list;
- psym < objfile->static_psymbols.next;
- psym++)
- {
- fixup_psymbol_section (*psym, objfile);
- if (SYMBOL_SECTION (*psym) >= 0)
- SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
- SYMBOL_SECTION (*psym));
+ /* We only want to iterate over the local symbols, not any
+ symbols in included symtabs. */
+ ALL_DICT_SYMBOLS (BLOCK_MULTIDICT (b), miter, sym)
+ {
+ relocate_one_symbol (sym, objfile, delta);
+ }
+ }
}
}
+ /* This stores relocated addresses and so must be cleared. This
+ will cause it to be recreated on demand. */
+ objfile->psymbol_map.clear ();
+
+ /* Relocate isolated symbols. */
{
- struct minimal_symbol *msym;
- ALL_OBJFILE_MSYMBOLS (objfile, msym)
- if (SYMBOL_SECTION (msym) >= 0)
- SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
+ struct symbol *iter;
+
+ for (iter = objfile->template_symbols; iter; iter = iter->hash_next)
+ relocate_one_symbol (iter, objfile, delta);
}
- /* Relocating different sections by different amounts may cause the symbols
- to be out of order. */
- msymbols_sort (objfile);
{
int i;
+
for (i = 0; i < objfile->num_sections; ++i)
(objfile->section_offsets)->offsets[i] = ANOFFSET (new_offsets, i);
}
- if (objfile->ei.entry_point != ~(CORE_ADDR) 0)
- {
- /* Relocate ei.entry_point with its section offset, use SECT_OFF_TEXT
- only as a fallback. */
- struct obj_section *s;
- s = find_pc_section (objfile->ei.entry_point);
- if (s)
- objfile->ei.entry_point += ANOFFSET (delta, s->the_bfd_section->index);
- else
- objfile->ei.entry_point += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
- }
+ /* Rebuild section map next time we need it. */
+ get_objfile_pspace_data (objfile->pspace)->section_map_dirty = 1;
/* Update the table in exec_ops, used to read memory. */
+ struct obj_section *s;
ALL_OBJFILE_OSECTIONS (objfile, s)
{
- int idx = s->the_bfd_section->index;
+ int idx = s - objfile->sections;
exec_set_section_address (bfd_get_filename (objfile->obfd), idx,
obj_section_addr (s));
}
- /* Relocate breakpoints as necessary, after things are relocated. */
- breakpoint_re_set ();
- objfiles_changed_p = 1; /* Rebuild section map next time we need it. */
+ /* Data changed. */
+ return 1;
+}
+
+/* Relocate OBJFILE to NEW_OFFSETS. There should be OBJFILE->NUM_SECTIONS
+ entries in new_offsets. Process also OBJFILE's SEPARATE_DEBUG_OBJFILEs.
+
+ The number and ordering of sections does differ between the two objfiles.
+ Only their names match. Also the file offsets will differ (objfile being
+ possibly prelinked but separate_debug_objfile is probably not prelinked) but
+ the in-memory absolute address as specified by NEW_OFFSETS must match both
+ files. */
+
+void
+objfile_relocate (struct objfile *objfile,
+ const struct section_offsets *new_offsets)
+{
+ int changed = 0;
+
+ changed |= objfile_relocate1 (objfile, new_offsets);
+
+ for (::objfile *debug_objfile : objfile->separate_debug_objfiles ())
+ {
+ if (debug_objfile == objfile)
+ continue;
+
+ section_addr_info objfile_addrs
+ = build_section_addr_info_from_objfile (objfile);
+
+ /* Here OBJFILE_ADDRS contain the correct absolute addresses, the
+ relative ones must be already created according to debug_objfile. */
+
+ addr_info_make_relative (&objfile_addrs, debug_objfile->obfd);
+
+ gdb_assert (debug_objfile->num_sections
+ == gdb_bfd_count_sections (debug_objfile->obfd));
+ std::vector<struct section_offsets>
+ new_debug_offsets (SIZEOF_N_SECTION_OFFSETS (debug_objfile->num_sections));
+ relative_addr_info_to_section_offsets (new_debug_offsets.data (),
+ debug_objfile->num_sections,
+ objfile_addrs);
+
+ changed |= objfile_relocate1 (debug_objfile, new_debug_offsets.data ());
+ }
+
+ /* Relocate breakpoints as necessary, after things are relocated. */
+ if (changed)
+ breakpoint_re_set ();
+}
+
+/* Rebase (add to the offsets) OBJFILE by SLIDE. SEPARATE_DEBUG_OBJFILE is
+ not touched here.
+ Return non-zero iff any change happened. */
+
+static int
+objfile_rebase1 (struct objfile *objfile, CORE_ADDR slide)
+{
+ struct section_offsets *new_offsets =
+ ((struct section_offsets *)
+ alloca (SIZEOF_N_SECTION_OFFSETS (objfile->num_sections)));
+ int i;
+
+ for (i = 0; i < objfile->num_sections; ++i)
+ new_offsets->offsets[i] = slide;
+
+ return objfile_relocate1 (objfile, new_offsets);
+}
+
+/* Rebase (add to the offsets) OBJFILE by SLIDE. Process also OBJFILE's
+ SEPARATE_DEBUG_OBJFILEs. */
+
+void
+objfile_rebase (struct objfile *objfile, CORE_ADDR slide)
+{
+ int changed = 0;
+
+ for (::objfile *debug_objfile : objfile->separate_debug_objfiles ())
+ changed |= objfile_rebase1 (debug_objfile, slide);
+
+ /* Relocate breakpoints as necessary, after things are relocated. */
+ if (changed)
+ breakpoint_re_set ();
}
\f
+/* Return non-zero if OBJFILE has partial symbols. */
+
+int
+objfile_has_partial_symbols (struct objfile *objfile)
+{
+ if (!objfile->sf)
+ return 0;
+
+ /* If we have not read psymbols, but we have a function capable of reading
+ them, then that is an indication that they are in fact available. Without
+ this function the symbols may have been already read in but they also may
+ not be present in this objfile. */
+ if ((objfile->flags & OBJF_PSYMTABS_READ) == 0
+ && objfile->sf->sym_read_psymbols != NULL)
+ return 1;
+
+ return objfile->sf->qf->has_symbols (objfile);
+}
+
+/* Return non-zero if OBJFILE has full symbols. */
+
+int
+objfile_has_full_symbols (struct objfile *objfile)
+{
+ return objfile->compunit_symtabs != NULL;
+}
+
+/* Return non-zero if OBJFILE has full or partial symbols, either directly
+ or through a separate debug file. */
+
+int
+objfile_has_symbols (struct objfile *objfile)
+{
+ for (::objfile *o : objfile->separate_debug_objfiles ())
+ if (objfile_has_partial_symbols (o) || objfile_has_full_symbols (o))
+ return 1;
+ return 0;
+}
+
+
/* Many places in gdb want to test just to see if we have any partial
symbols available. This function returns zero if none are currently
- available, nonzero otherwise. */
+ available, nonzero otherwise. */
int
have_partial_symbols (void)
{
- struct objfile *ofp;
-
- ALL_OBJFILES (ofp)
- {
- if (ofp->psymtabs != NULL)
- {
+ for (objfile *ofp : current_program_space->objfiles ())
+ {
+ if (objfile_has_partial_symbols (ofp))
return 1;
- }
- }
+ }
return 0;
}
/* Many places in gdb want to test just to see if we have any full
symbols available. This function returns zero if none are currently
- available, nonzero otherwise. */
+ available, nonzero otherwise. */
int
have_full_symbols (void)
{
- struct objfile *ofp;
-
- ALL_OBJFILES (ofp)
- {
- if (ofp->symtabs != NULL)
- {
+ for (objfile *ofp : current_program_space->objfiles ())
+ {
+ if (objfile_has_full_symbols (ofp))
return 1;
- }
- }
+ }
return 0;
}
/* This operations deletes all objfile entries that represent solibs that
weren't explicitly loaded by the user, via e.g., the add-symbol-file
- command.
- */
+ command. */
+
void
objfile_purge_solibs (void)
{
- struct objfile *objf;
- struct objfile *temp;
+ for (objfile *objf : current_program_space->objfiles_safe ())
+ {
+ /* We assume that the solib package has been purged already, or will
+ be soon. */
- ALL_OBJFILES_SAFE (objf, temp)
- {
- /* We assume that the solib package has been purged already, or will
- be soon.
- */
- if (!(objf->flags & OBJF_USERLOADED) && (objf->flags & OBJF_SHARED))
- free_objfile (objf);
- }
+ if (!(objf->flags & OBJF_USERLOADED) && (objf->flags & OBJF_SHARED))
+ objf->unlink ();
+ }
}
/* Many places in gdb want to test just to see if we have any minimal
symbols available. This function returns zero if none are currently
- available, nonzero otherwise. */
+ available, nonzero otherwise. */
int
have_minimal_symbols (void)
{
- struct objfile *ofp;
-
- ALL_OBJFILES (ofp)
- {
- if (ofp->minimal_symbol_count > 0)
- {
- return 1;
- }
- }
+ for (objfile *ofp : current_program_space->objfiles ())
+ {
+ if (ofp->per_bfd->minimal_symbol_count > 0)
+ {
+ return 1;
+ }
+ }
return 0;
}
/* Qsort comparison function. */
-static int
-qsort_cmp (const void *a, const void *b)
+static bool
+sort_cmp (const struct obj_section *sect1, const obj_section *sect2)
{
- const struct obj_section *sect1 = *(const struct obj_section **) a;
- const struct obj_section *sect2 = *(const struct obj_section **) b;
const CORE_ADDR sect1_addr = obj_section_addr (sect1);
const CORE_ADDR sect2_addr = obj_section_addr (sect2);
if (sect1_addr < sect2_addr)
+ return true;
+ else if (sect1_addr > sect2_addr)
+ return false;
+ else
{
- gdb_assert (obj_section_endaddr (sect1) <= sect2_addr);
- return -1;
+ /* Sections are at the same address. This could happen if
+ A) we have an objfile and a separate debuginfo.
+ B) we are confused, and have added sections without proper relocation,
+ or something like that. */
+
+ const struct objfile *const objfile1 = sect1->objfile;
+ const struct objfile *const objfile2 = sect2->objfile;
+
+ if (objfile1->separate_debug_objfile == objfile2
+ || objfile2->separate_debug_objfile == objfile1)
+ {
+ /* Case A. The ordering doesn't matter: separate debuginfo files
+ will be filtered out later. */
+
+ return false;
+ }
+
+ /* Case B. Maintain stable sort order, so bugs in GDB are easier to
+ triage. This section could be slow (since we iterate over all
+ objfiles in each call to sort_cmp), but this shouldn't happen
+ very often (GDB is already in a confused state; one hopes this
+ doesn't happen at all). If you discover that significant time is
+ spent in the loops below, do 'set complaints 100' and examine the
+ resulting complaints. */
+ if (objfile1 == objfile2)
+ {
+ /* Both sections came from the same objfile. We are really
+ confused. Sort on sequence order of sections within the
+ objfile. The order of checks is important here, if we find a
+ match on SECT2 first then either SECT2 is before SECT1, or,
+ SECT2 == SECT1, in both cases we should return false. The
+ second case shouldn't occur during normal use, but std::sort
+ does check that '!(a < a)' when compiled in debug mode. */
+
+ const struct obj_section *osect;
+
+ ALL_OBJFILE_OSECTIONS (objfile1, osect)
+ if (osect == sect2)
+ return false;
+ else if (osect == sect1)
+ return true;
+
+ /* We should have found one of the sections before getting here. */
+ gdb_assert_not_reached ("section not found");
+ }
+ else
+ {
+ /* Sort on sequence number of the objfile in the chain. */
+
+ for (objfile *objfile : current_program_space->objfiles ())
+ if (objfile == objfile1)
+ return true;
+ else if (objfile == objfile2)
+ return false;
+
+ /* We should have found one of the objfiles before getting here. */
+ gdb_assert_not_reached ("objfile not found");
+ }
}
- else if (sect1_addr > sect2_addr)
+
+ /* Unreachable. */
+ gdb_assert_not_reached ("unexpected code path");
+ return false;
+}
+
+/* Select "better" obj_section to keep. We prefer the one that came from
+ the real object, rather than the one from separate debuginfo.
+ Most of the time the two sections are exactly identical, but with
+ prelinking the .rel.dyn section in the real object may have different
+ size. */
+
+static struct obj_section *
+preferred_obj_section (struct obj_section *a, struct obj_section *b)
+{
+ gdb_assert (obj_section_addr (a) == obj_section_addr (b));
+ gdb_assert ((a->objfile->separate_debug_objfile == b->objfile)
+ || (b->objfile->separate_debug_objfile == a->objfile));
+ gdb_assert ((a->objfile->separate_debug_objfile_backlink == b->objfile)
+ || (b->objfile->separate_debug_objfile_backlink == a->objfile));
+
+ if (a->objfile->separate_debug_objfile != NULL)
+ return a;
+ return b;
+}
+
+/* Return 1 if SECTION should be inserted into the section map.
+ We want to insert only non-overlay and non-TLS section. */
+
+static int
+insert_section_p (const struct bfd *abfd,
+ const struct bfd_section *section)
+{
+ const bfd_vma lma = bfd_section_lma (section);
+
+ if (overlay_debugging && lma != 0 && lma != bfd_section_vma (section)
+ && (bfd_get_file_flags (abfd) & BFD_IN_MEMORY) == 0)
+ /* This is an overlay section. IN_MEMORY check is needed to avoid
+ discarding sections from the "system supplied DSO" (aka vdso)
+ on some Linux systems (e.g. Fedora 11). */
+ return 0;
+ if ((bfd_section_flags (section) & SEC_THREAD_LOCAL) != 0)
+ /* This is a TLS section. */
+ return 0;
+
+ return 1;
+}
+
+/* Filter out overlapping sections where one section came from the real
+ objfile, and the other from a separate debuginfo file.
+ Return the size of table after redundant sections have been eliminated. */
+
+static int
+filter_debuginfo_sections (struct obj_section **map, int map_size)
+{
+ int i, j;
+
+ for (i = 0, j = 0; i < map_size - 1; i++)
{
- gdb_assert (sect1_addr >= obj_section_endaddr (sect2));
- return 1;
+ struct obj_section *const sect1 = map[i];
+ struct obj_section *const sect2 = map[i + 1];
+ const struct objfile *const objfile1 = sect1->objfile;
+ const struct objfile *const objfile2 = sect2->objfile;
+ const CORE_ADDR sect1_addr = obj_section_addr (sect1);
+ const CORE_ADDR sect2_addr = obj_section_addr (sect2);
+
+ if (sect1_addr == sect2_addr
+ && (objfile1->separate_debug_objfile == objfile2
+ || objfile2->separate_debug_objfile == objfile1))
+ {
+ map[j++] = preferred_obj_section (sect1, sect2);
+ ++i;
+ }
+ else
+ map[j++] = sect1;
}
- /* This can happen for separate debug-info files. */
- gdb_assert (obj_section_endaddr (sect1) == obj_section_endaddr (sect2));
- return 0;
+ if (i < map_size)
+ {
+ gdb_assert (i == map_size - 1);
+ map[j++] = map[i];
+ }
+
+ /* The map should not have shrunk to less than half the original size. */
+ gdb_assert (map_size / 2 <= j);
+
+ return j;
}
-/* Update PMAP, PMAP_SIZE with non-TLS sections from all objfiles. */
+/* Filter out overlapping sections, issuing a warning if any are found.
+ Overlapping sections could really be overlay sections which we didn't
+ classify as such in insert_section_p, or we could be dealing with a
+ corrupt binary. */
+
+static int
+filter_overlapping_sections (struct obj_section **map, int map_size)
+{
+ int i, j;
+
+ for (i = 0, j = 0; i < map_size - 1; )
+ {
+ int k;
+
+ map[j++] = map[i];
+ for (k = i + 1; k < map_size; k++)
+ {
+ struct obj_section *const sect1 = map[i];
+ struct obj_section *const sect2 = map[k];
+ const CORE_ADDR sect1_addr = obj_section_addr (sect1);
+ const CORE_ADDR sect2_addr = obj_section_addr (sect2);
+ const CORE_ADDR sect1_endaddr = obj_section_endaddr (sect1);
+
+ gdb_assert (sect1_addr <= sect2_addr);
+
+ if (sect1_endaddr <= sect2_addr)
+ break;
+ else
+ {
+ /* We have an overlap. Report it. */
+
+ struct objfile *const objf1 = sect1->objfile;
+ struct objfile *const objf2 = sect2->objfile;
+
+ const struct bfd_section *const bfds1 = sect1->the_bfd_section;
+ const struct bfd_section *const bfds2 = sect2->the_bfd_section;
+
+ const CORE_ADDR sect2_endaddr = obj_section_endaddr (sect2);
+
+ struct gdbarch *const gdbarch = get_objfile_arch (objf1);
+
+ complaint (_("unexpected overlap between:\n"
+ " (A) section `%s' from `%s' [%s, %s)\n"
+ " (B) section `%s' from `%s' [%s, %s).\n"
+ "Will ignore section B"),
+ bfd_section_name (bfds1), objfile_name (objf1),
+ paddress (gdbarch, sect1_addr),
+ paddress (gdbarch, sect1_endaddr),
+ bfd_section_name (bfds2), objfile_name (objf2),
+ paddress (gdbarch, sect2_addr),
+ paddress (gdbarch, sect2_endaddr));
+ }
+ }
+ i = k;
+ }
+
+ if (i < map_size)
+ {
+ gdb_assert (i == map_size - 1);
+ map[j++] = map[i];
+ }
+
+ return j;
+}
+
+
+/* Update PMAP, PMAP_SIZE with sections from all objfiles, excluding any
+ TLS, overlay and overlapping sections. */
static void
-update_section_map (struct obj_section ***pmap, int *pmap_size)
+update_section_map (struct program_space *pspace,
+ struct obj_section ***pmap, int *pmap_size)
{
- int map_size, idx;
+ struct objfile_pspace_info *pspace_info;
+ int alloc_size, map_size, i;
struct obj_section *s, **map;
- struct objfile *objfile;
- gdb_assert (objfiles_changed_p != 0);
+ pspace_info = get_objfile_pspace_data (pspace);
+ gdb_assert (pspace_info->section_map_dirty != 0
+ || pspace_info->new_objfiles_available != 0);
map = *pmap;
xfree (map);
-#define insert_p(objf, sec) \
- ((bfd_get_section_flags ((objf)->obfd, (sec)->the_bfd_section) \
- & SEC_THREAD_LOCAL) == 0)
+ alloc_size = 0;
+ for (objfile *objfile : pspace->objfiles ())
+ ALL_OBJFILE_OSECTIONS (objfile, s)
+ if (insert_section_p (objfile->obfd, s->the_bfd_section))
+ alloc_size += 1;
- map_size = 0;
- ALL_OBJSECTIONS (objfile, s)
- if (insert_p (objfile, s))
- map_size += 1;
+ /* This happens on detach/attach (e.g. in gdb.base/attach.exp). */
+ if (alloc_size == 0)
+ {
+ *pmap = NULL;
+ *pmap_size = 0;
+ return;
+ }
- map = xmalloc (map_size * sizeof (*map));
+ map = XNEWVEC (struct obj_section *, alloc_size);
- idx = 0;
- ALL_OBJSECTIONS (objfile, s)
- if (insert_p (objfile, s))
- map[idx++] = s;
+ i = 0;
+ for (objfile *objfile : pspace->objfiles ())
+ ALL_OBJFILE_OSECTIONS (objfile, s)
+ if (insert_section_p (objfile->obfd, s->the_bfd_section))
+ map[i++] = s;
-#undef insert_p
+ std::sort (map, map + alloc_size, sort_cmp);
+ map_size = filter_debuginfo_sections(map, alloc_size);
+ map_size = filter_overlapping_sections(map, map_size);
- qsort (map, map_size, sizeof (*map), qsort_cmp);
+ if (map_size < alloc_size)
+ /* Some sections were eliminated. Trim excess space. */
+ map = XRESIZEVEC (struct obj_section *, map, map_size);
+ else
+ gdb_assert (alloc_size == map_size);
*pmap = map;
*pmap_size = map_size;
}
-/* Bsearch comparison function. */
+/* Bsearch comparison function. */
static int
bsearch_cmp (const void *key, const void *elt)
struct obj_section *
find_pc_section (CORE_ADDR pc)
{
- static struct obj_section **sections;
- static int num_sections;
-
+ struct objfile_pspace_info *pspace_info;
struct obj_section *s, **sp;
/* Check for mapped overlay section first. */
if (s)
return s;
- if (objfiles_changed_p != 0)
+ pspace_info = get_objfile_pspace_data (current_program_space);
+ if (pspace_info->section_map_dirty
+ || (pspace_info->new_objfiles_available
+ && !pspace_info->inhibit_updates))
{
- update_section_map (§ions, &num_sections);
+ update_section_map (current_program_space,
+ &pspace_info->sections,
+ &pspace_info->num_sections);
+
+ /* Don't need updates to section map until objfiles are added,
+ removed or relocated. */
+ pspace_info->new_objfiles_available = 0;
+ pspace_info->section_map_dirty = 0;
+ }
- /* Don't need updates to section map until objfiles are added
- or removed. */
- objfiles_changed_p = 0;
+ /* The C standard (ISO/IEC 9899:TC2) requires the BASE argument to
+ bsearch be non-NULL. */
+ if (pspace_info->sections == NULL)
+ {
+ gdb_assert (pspace_info->num_sections == 0);
+ return NULL;
}
- sp = (struct obj_section **) bsearch (&pc, sections, num_sections,
- sizeof (*sections), bsearch_cmp);
+ sp = (struct obj_section **) bsearch (&pc,
+ pspace_info->sections,
+ pspace_info->num_sections,
+ sizeof (*pspace_info->sections),
+ bsearch_cmp);
if (sp != NULL)
return *sp;
return NULL;
}
-/* In SVR4, we recognize a trampoline by it's section name.
- That is, if the pc is in a section named ".plt" then we are in
- a trampoline. */
+/* Return non-zero if PC is in a section called NAME. */
int
-in_plt_section (CORE_ADDR pc, char *name)
+pc_in_section (CORE_ADDR pc, const char *name)
{
struct obj_section *s;
int retval = 0;
retval = (s != NULL
&& s->the_bfd_section->name != NULL
- && strcmp (s->the_bfd_section->name, ".plt") == 0);
+ && strcmp (s->the_bfd_section->name, name) == 0);
return (retval);
}
\f
-/* Keep a registry of per-objfile data-pointers required by other GDB
- modules. */
+/* Set section_map_dirty so section map will be rebuilt next time it
+ is used. Called by reread_symbols. */
-struct objfile_data
+void
+objfiles_changed (void)
{
- unsigned index;
- void (*cleanup) (struct objfile *, void *);
-};
+ /* Rebuild section map next time we need it. */
+ get_objfile_pspace_data (current_program_space)->section_map_dirty = 1;
+}
-struct objfile_data_registration
-{
- struct objfile_data *data;
- struct objfile_data_registration *next;
-};
-
-struct objfile_data_registry
+/* See comments in objfiles.h. */
+
+scoped_restore_tmpl<int>
+inhibit_section_map_updates (struct program_space *pspace)
{
- struct objfile_data_registration *registrations;
- unsigned num_registrations;
-};
+ return scoped_restore_tmpl<int>
+ (&get_objfile_pspace_data (pspace)->inhibit_updates, 1);
+}
-static struct objfile_data_registry objfile_data_registry = { NULL, 0 };
+/* Return 1 if ADDR maps into one of the sections of OBJFILE and 0
+ otherwise. */
-const struct objfile_data *
-register_objfile_data_with_cleanup (void (*cleanup) (struct objfile *, void *))
+int
+is_addr_in_objfile (CORE_ADDR addr, const struct objfile *objfile)
{
- struct objfile_data_registration **curr;
+ struct obj_section *osect;
- /* Append new registration. */
- for (curr = &objfile_data_registry.registrations;
- *curr != NULL; curr = &(*curr)->next);
+ if (objfile == NULL)
+ return 0;
- *curr = XMALLOC (struct objfile_data_registration);
- (*curr)->next = NULL;
- (*curr)->data = XMALLOC (struct objfile_data);
- (*curr)->data->index = objfile_data_registry.num_registrations++;
- (*curr)->data->cleanup = cleanup;
+ ALL_OBJFILE_OSECTIONS (objfile, osect)
+ {
+ if (section_is_overlay (osect) && !section_is_mapped (osect))
+ continue;
- return (*curr)->data;
+ if (obj_section_addr (osect) <= addr
+ && addr < obj_section_endaddr (osect))
+ return 1;
+ }
+ return 0;
}
-const struct objfile_data *
-register_objfile_data (void)
+int
+shared_objfile_contains_address_p (struct program_space *pspace,
+ CORE_ADDR address)
{
- return register_objfile_data_with_cleanup (NULL);
-}
+ for (objfile *objfile : pspace->objfiles ())
+ {
+ if ((objfile->flags & OBJF_SHARED) != 0
+ && is_addr_in_objfile (address, objfile))
+ return 1;
+ }
-static void
-objfile_alloc_data (struct objfile *objfile)
-{
- gdb_assert (objfile->data == NULL);
- objfile->num_data = objfile_data_registry.num_registrations;
- objfile->data = XCALLOC (objfile->num_data, void *);
+ return 0;
}
-static void
-objfile_free_data (struct objfile *objfile)
-{
- gdb_assert (objfile->data != NULL);
- clear_objfile_data (objfile);
- xfree (objfile->data);
- objfile->data = NULL;
-}
+/* The default implementation for the "iterate_over_objfiles_in_search_order"
+ gdbarch method. It is equivalent to use the objfiles iterable,
+ searching the objfiles in the order they are stored internally,
+ ignoring CURRENT_OBJFILE.
+
+ On most platforms, it should be close enough to doing the best
+ we can without some knowledge specific to the architecture. */
void
-clear_objfile_data (struct objfile *objfile)
+default_iterate_over_objfiles_in_search_order
+ (struct gdbarch *gdbarch,
+ iterate_over_objfiles_in_search_order_cb_ftype *cb,
+ void *cb_data, struct objfile *current_objfile)
{
- struct objfile_data_registration *registration;
- int i;
-
- gdb_assert (objfile->data != NULL);
-
- for (registration = objfile_data_registry.registrations, i = 0;
- i < objfile->num_data;
- registration = registration->next, i++)
- if (objfile->data[i] != NULL && registration->data->cleanup)
- registration->data->cleanup (objfile, objfile->data[i]);
+ int stop = 0;
- memset (objfile->data, 0, objfile->num_data * sizeof (void *));
+ for (objfile *objfile : current_program_space->objfiles ())
+ {
+ stop = cb (objfile, cb_data);
+ if (stop)
+ return;
+ }
}
-void
-set_objfile_data (struct objfile *objfile, const struct objfile_data *data,
- void *value)
-{
- gdb_assert (data->index < objfile->num_data);
- objfile->data[data->index] = value;
-}
+/* See objfiles.h. */
-void *
-objfile_data (struct objfile *objfile, const struct objfile_data *data)
+const char *
+objfile_name (const struct objfile *objfile)
{
- gdb_assert (data->index < objfile->num_data);
- return objfile->data[data->index];
+ if (objfile->obfd != NULL)
+ return bfd_get_filename (objfile->obfd);
+
+ return objfile->original_name;
}
-/* Set objfiles_changed_p so section map will be rebuilt next time it
- is used. Called by reread_symbols. */
+/* See objfiles.h. */
-void
-objfiles_changed (void)
+const char *
+objfile_filename (const struct objfile *objfile)
{
- objfiles_changed_p = 1; /* Rebuild section map next time we need it. */
-}
+ if (objfile->obfd != NULL)
+ return bfd_get_filename (objfile->obfd);
-/* Unreference and possibly close abfd. */
-void
-gdb_bfd_unref (struct bfd *abfd)
-{
- int *p_refcount;
- char *name;
+ return NULL;
+}
- if (abfd == NULL)
- return;
+/* See objfiles.h. */
- p_refcount = abfd->usrdata;
+const char *
+objfile_debug_name (const struct objfile *objfile)
+{
+ return lbasename (objfile->original_name);
+}
- /* Valid range for p_refcount: NULL (single owner), or a pointer
- to int counter, which has a value of 1 (single owner) or 2 (shared). */
- gdb_assert (p_refcount == NULL || *p_refcount == 1 || *p_refcount == 2);
+/* See objfiles.h. */
- if (p_refcount != NULL)
- {
- *p_refcount -= 1;
- if (*p_refcount > 0)
- return;
- }
- xfree (p_refcount);
- abfd->usrdata = NULL; /* Paranoia. */
-
- name = bfd_get_filename (abfd);
- if (!bfd_close (abfd))
- warning (_("cannot close \"%s\": %s"),
- name, bfd_errmsg (bfd_get_error ()));
- xfree (name);
+const char *
+objfile_flavour_name (struct objfile *objfile)
+{
+ if (objfile->obfd != NULL)
+ return bfd_flavour_name (bfd_get_flavour (objfile->obfd));
+ return NULL;
}
projects / deliverable / binutils-gdb.git / blobdiff