/* GDB routines for manipulating objfiles.
- Copyright 1992 Free Software Foundation, Inc.
+ Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
Contributed by Cygnus Support, using pieces from other GDB modules.
-This file is part of GDB.
+ 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 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.
+ 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. */
+ 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., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
/* This file contains support routines for creating, manipulating, and
destroying objfile structures. */
#include "target.h"
#include <sys/types.h>
-#include <sys/stat.h>
+#include "gdb_stat.h"
#include <fcntl.h>
-#include <obstack.h>
+#include "obstack.h"
+#include "gdb_string.h"
-/* Prototypes for local functions */
+#include "breakpoint.h"
-#if !defined(NO_MMALLOC) && defined(HAVE_MMAP)
+/* Prototypes for local functions */
-static int
-open_existing_mapped_file PARAMS ((char *, long, int));
+#if defined(USE_MMALLOC) && defined(HAVE_MMAP)
-static int
-open_mapped_file PARAMS ((char *filename, long mtime, int mapped));
+static int open_existing_mapped_file (char *, long, int);
-static CORE_ADDR
-map_to_address PARAMS ((void));
+static int open_mapped_file (char *filename, long mtime, int flags);
-#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */
+static PTR map_to_file (int);
-/* Message to be printed before the error message, when an error occurs. */
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
-extern char *error_pre_print;
+static void add_to_objfile_sections (bfd *, sec_ptr, PTR);
/* Externally visible variables that are owned by this module.
See declarations in objfile.h for more info. */
-struct objfile *object_files; /* Linked list of all objfiles */
+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 */
-int mapped_symbol_files; /* Try to use mapped symbol files */
+int mapped_symbol_files; /* Try to use mapped symbol files */
/* 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. */
+#ifndef TARGET_KEEP_SECTION
+#define TARGET_KEEP_SECTION(ASECT) 0
+#endif
+
+/* 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 (abfd, asect, objfile_p_char)
bfd *abfd;
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))
+
+ if (!(aflag & SEC_ALLOC) && !(TARGET_KEEP_SECTION (asect)))
return;
+
if (0 == bfd_section_size (abfd, asect))
return;
section.offset = 0;
section.objfile = objfile;
- section.sec_ptr = asect;
+ section.the_bfd_section = asect;
+ section.ovly_mapped = 0;
section.addr = bfd_section_vma (abfd, asect);
section.endaddr = section.addr + bfd_section_size (abfd, asect);
- obstack_grow (&objfile->psymbol_obstack, §ion, sizeof(section));
+ obstack_grow (&objfile->psymbol_obstack, (char *) §ion, sizeof (section));
objfile->sections_end = (struct obj_section *) (((unsigned long) objfile->sections_end) + 1);
}
/* Builds a section table for OBJFILE.
- Returns 0 if OK, 1 on error. */
+ Returns 0 if OK, 1 on error (in which case bfd_error contains the
+ error).
-static int
+ 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.
+
+ Also note that the OFFSET and OVLY_MAPPED in each table entry
+ are initialized to zero.
+
+ Also note that if anything else writes to the psymbol obstack while
+ we are building the table, we're pretty much hosed. */
+
+int
build_objfile_section_table (objfile)
struct objfile *objfile;
{
- if (objfile->sections)
- abort();
+ /* 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 psymbol_obstack). So we just
+ waste some memory. */
objfile->sections_end = 0;
- bfd_map_over_sections (objfile->obfd, add_to_objfile_sections, (char *)objfile);
+ bfd_map_over_sections (objfile->obfd, add_to_objfile_sections, (char *) objfile);
objfile->sections = (struct obj_section *)
obstack_finish (&objfile->psymbol_obstack);
objfile->sections_end = objfile->sections + (unsigned long) objfile->sections_end;
- return(0);
+ return (0);
}
-/* Given a pointer to an initialized bfd (ABFD) and a flag that indicates
- whether or not an objfile is to be mapped (MAPPED), 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. */
+/* 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.
+
+ The FLAGS word contains various bits (OBJF_*) that can be taken as
+ requests for specific operations, like trying to open a mapped
+ version of the objfile (OBJF_MAPPED). Other bits like
+ OBJF_SHARED are simply copied through to the new objfile flags
+ member. */
struct objfile *
-allocate_objfile (abfd, mapped)
+allocate_objfile (abfd, flags)
bfd *abfd;
- int mapped;
+ int flags;
{
struct objfile *objfile = NULL;
- int fd;
- void *md;
- CORE_ADDR mapto;
-
- mapped |= mapped_symbol_files;
-
-#if !defined(NO_MMALLOC) && defined(HAVE_MMAP)
+ struct objfile *last_one = NULL;
- /* If we can support mapped symbol files, try to open/reopen the mapped file
- that corresponds to the file from which we wish to read symbols. If the
- objfile is to be mapped, we must malloc the structure itself using the
- mmap version, and arrange that all memory allocation for the objfile uses
- the mmap routines. If we are reusing an existing mapped file, from which
- we get our objfile pointer, we have to make sure that we update the
- pointers to the alloc/free functions in the obstack, in case these
- functions have moved within the current gdb. */
+ if (mapped_symbol_files)
+ flags |= OBJF_MAPPED;
- fd = open_mapped_file (bfd_get_filename (abfd), bfd_get_mtime (abfd),
- mapped);
- if (fd >= 0)
+#if defined(USE_MMALLOC) && defined(HAVE_MMAP)
+ if (abfd != NULL)
{
- if (((mapto = map_to_address ()) == 0) ||
- ((md = mmalloc_attach (fd, (void *) mapto)) == NULL))
- {
- close (fd);
- }
- else if ((objfile = (struct objfile *) mmalloc_getkey (md, 0)) != NULL)
+
+ /* If we can support mapped symbol files, try to open/reopen the
+ mapped file that corresponds to the file from which we wish to
+ read symbols. If the objfile is to be mapped, we must malloc
+ the structure itself using the mmap version, and arrange that
+ all memory allocation for the objfile uses the mmap routines.
+ If we are reusing an existing mapped file, from which we get
+ our objfile pointer, we have to make sure that we update the
+ pointers to the alloc/free functions in the obstack, in case
+ these functions have moved within the current gdb. */
+
+ int fd;
+
+ fd = open_mapped_file (bfd_get_filename (abfd), bfd_get_mtime (abfd),
+ flags);
+ if (fd >= 0)
{
- /* Update memory corruption handler function addresses. */
- init_malloc (md);
- objfile -> md = md;
- objfile -> mmfd = fd;
- /* Update pointers to functions to *our* copies */
- obstack_chunkfun (&objfile -> psymbol_obstack, xmmalloc);
- obstack_freefun (&objfile -> psymbol_obstack, mfree);
- obstack_chunkfun (&objfile -> symbol_obstack, xmmalloc);
- obstack_freefun (&objfile -> symbol_obstack, mfree);
- obstack_chunkfun (&objfile -> type_obstack, xmmalloc);
- obstack_freefun (&objfile -> type_obstack, mfree);
- /* If already in objfile list, unlink it. */
- unlink_objfile (objfile);
- /* Forget things specific to a particular gdb, may have changed. */
- objfile -> sf = NULL;
+ PTR md;
+
+ if ((md = map_to_file (fd)) == NULL)
+ {
+ close (fd);
+ }
+ else if ((objfile = (struct objfile *) mmalloc_getkey (md, 0)) != NULL)
+ {
+ /* Update memory corruption handler function addresses. */
+ init_malloc (md);
+ objfile->md = md;
+ objfile->mmfd = fd;
+ /* Update pointers to functions to *our* copies */
+ obstack_chunkfun (&objfile->psymbol_cache.cache, xmmalloc);
+ obstack_freefun (&objfile->psymbol_cache.cache, mfree);
+ obstack_chunkfun (&objfile->psymbol_obstack, xmmalloc);
+ obstack_freefun (&objfile->psymbol_obstack, mfree);
+ obstack_chunkfun (&objfile->symbol_obstack, xmmalloc);
+ obstack_freefun (&objfile->symbol_obstack, mfree);
+ obstack_chunkfun (&objfile->type_obstack, xmmalloc);
+ obstack_freefun (&objfile->type_obstack, mfree);
+ /* If already in objfile list, unlink it. */
+ unlink_objfile (objfile);
+ /* Forget things specific to a particular gdb, may have changed. */
+ objfile->sf = NULL;
+ }
+ else
+ {
+
+ /* Set up to detect internal memory corruption. MUST be
+ done before the first malloc. See comments in
+ init_malloc() and mmcheck(). */
+
+ init_malloc (md);
+
+ objfile = (struct objfile *)
+ xmmalloc (md, sizeof (struct objfile));
+ memset (objfile, 0, sizeof (struct objfile));
+ objfile->md = md;
+ objfile->mmfd = fd;
+ objfile->flags |= OBJF_MAPPED;
+ mmalloc_setkey (objfile->md, 0, objfile);
+ obstack_specify_allocation_with_arg (&objfile->psymbol_cache.cache,
+ 0, 0, xmmalloc, mfree,
+ objfile->md);
+ obstack_specify_allocation_with_arg (&objfile->psymbol_obstack,
+ 0, 0, xmmalloc, mfree,
+ objfile->md);
+ obstack_specify_allocation_with_arg (&objfile->symbol_obstack,
+ 0, 0, xmmalloc, mfree,
+ objfile->md);
+ obstack_specify_allocation_with_arg (&objfile->type_obstack,
+ 0, 0, xmmalloc, mfree,
+ objfile->md);
+ }
}
- else
+
+ if ((flags & OBJF_MAPPED) && (objfile == NULL))
{
- /* Set up to detect internal memory corruption. MUST be done before
- the first malloc. See comments in init_malloc() and mmcheck(). */
- init_malloc (md);
- objfile = (struct objfile *) xmmalloc (md, sizeof (struct objfile));
- memset (objfile, 0, sizeof (struct objfile));
- objfile -> md = md;
- objfile -> mmfd = fd;
- objfile -> flags |= OBJF_MAPPED;
- mmalloc_setkey (objfile -> md, 0, objfile);
- obstack_specify_allocation_with_arg (&objfile -> psymbol_obstack,
- 0, 0, xmmalloc, mfree,
- objfile -> md);
- obstack_specify_allocation_with_arg (&objfile -> symbol_obstack,
- 0, 0, xmmalloc, mfree,
- objfile -> md);
- obstack_specify_allocation_with_arg (&objfile -> type_obstack,
- 0, 0, xmmalloc, mfree,
- objfile -> md);
+ warning ("symbol table for '%s' will not be mapped",
+ bfd_get_filename (abfd));
+ flags &= ~OBJF_MAPPED;
}
}
+#else /* !defined(USE_MMALLOC) || !defined(HAVE_MMAP) */
- if (mapped && (objfile == NULL))
+ if (flags & OBJF_MAPPED)
{
- warning ("symbol table for '%s' will not be mapped",
- bfd_get_filename (abfd));
- }
-
-#else /* defined(NO_MMALLOC) || !defined(HAVE_MMAP) */
-
- if (mapped)
- {
- warning ("this version of gdb does not support mapped symbol tables.");
+ warning ("mapped symbol tables are not supported on this machine; missing or broken mmap().");
/* Turn off the global flag so we don't try to do mapped symbol tables
- any more, which shuts up gdb unless the user specifically gives the
- "mapped" keyword again. */
+ any more, which shuts up gdb unless the user specifically gives the
+ "mapped" keyword again. */
mapped_symbol_files = 0;
+ flags &= ~OBJF_MAPPED;
}
-#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
/* 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
{
objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
memset (objfile, 0, sizeof (struct objfile));
- objfile -> md = NULL;
- obstack_specify_allocation (&objfile -> psymbol_obstack, 0, 0, xmalloc,
+ objfile->md = NULL;
+ obstack_specify_allocation (&objfile->psymbol_cache.cache, 0, 0,
+ xmalloc, free);
+ obstack_specify_allocation (&objfile->psymbol_obstack, 0, 0, xmalloc,
free);
- obstack_specify_allocation (&objfile -> symbol_obstack, 0, 0, xmalloc,
+ obstack_specify_allocation (&objfile->symbol_obstack, 0, 0, xmalloc,
free);
- obstack_specify_allocation (&objfile -> type_obstack, 0, 0, xmalloc,
+ obstack_specify_allocation (&objfile->type_obstack, 0, 0, xmalloc,
free);
+ flags &= ~OBJF_MAPPED;
}
/* 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. */
- objfile -> obfd = abfd;
- if (objfile -> name != NULL)
+ objfile->obfd = abfd;
+ if (objfile->name != NULL)
{
- mfree (objfile -> md, objfile -> name);
+ mfree (objfile->md, objfile->name);
}
- objfile -> name = mstrsave (objfile -> md, bfd_get_filename (abfd));
- objfile -> mtime = bfd_get_mtime (abfd);
+ if (abfd != NULL)
+ {
+ objfile->name = mstrsave (objfile->md, bfd_get_filename (abfd));
+ objfile->mtime = bfd_get_mtime (abfd);
- /* Build section table. */
+ /* Build section table. */
- if (build_objfile_section_table (objfile))
- {
- error ("Can't find the file sections in `%s': %s",
- objfile -> name, bfd_errmsg (bfd_error));
+ if (build_objfile_section_table (objfile))
+ {
+ error ("Can't find the file sections in `%s': %s",
+ objfile->name, bfd_errmsg (bfd_get_error ()));
+ }
}
- /* Push this file onto the head of the linked list of other such files. */
+ /* Initialize the section indexes for this objfile, so that we can
+ later detect if they are used w/o being properly assigned to. */
+
+ objfile->sect_index_text = -1;
+ objfile->sect_index_data = -1;
+ objfile->sect_index_bss = -1;
+ objfile->sect_index_rodata = -1;
+
+ /* Add this file onto the tail of the linked list of other such files. */
+
+ 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;
+ }
- objfile -> next = object_files;
- object_files = objfile;
+ /* Save passed in flag bits. */
+ objfile->flags |= flags;
return (objfile);
}
+/* Put OBJFILE at the front of the list. */
+
+void
+objfile_to_front (objfile)
+ struct objfile *objfile;
+{
+ struct objfile **objp;
+ for (objp = &object_files; *objp != NULL; objp = &((*objp)->next))
+ {
+ if (*objp == objfile)
+ {
+ /* Unhook it from where it is. */
+ *objp = objfile->next;
+ /* Put it in the front. */
+ objfile->next = object_files;
+ object_files = objfile;
+ break;
+ }
+ }
+}
+
/* Unlink OBJFILE from the list of known objfiles, if it is found in the
list.
unlink_objfile (objfile)
struct objfile *objfile;
{
- struct objfile** objpp;
+ struct objfile **objpp;
- for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp) -> next))
+ for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp)->next))
{
- if (*objpp == objfile)
+ if (*objpp == objfile)
{
- *objpp = (*objpp) -> next;
- objfile -> next = NULL;
- break;
+ *objpp = (*objpp)->next;
+ objfile->next = NULL;
+ return;
}
}
+
+ internal_error ("objfiles.c (unlink_objfile): objfile already unlinked");
}
Things which we do NOT free because they are not in malloc'd memory
or not in memory specific to the objfile include:
- objfile -> sf
+ objfile -> sf
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
free_objfile (objfile)
struct objfile *objfile;
{
- int mmfd;
-
/* 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
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)
+ if (objfile->sf != NULL)
{
- (*objfile -> sf -> sym_finish) (objfile);
+ (*objfile->sf->sym_finish) (objfile);
}
/* We always close the bfd. */
- if (objfile -> obfd != NULL)
+ if (objfile->obfd != NULL)
{
char *name = bfd_get_filename (objfile->obfd);
- bfd_close (objfile -> obfd);
+ if (!bfd_close (objfile->obfd))
+ warning ("cannot close \"%s\": %s",
+ name, bfd_errmsg (bfd_get_error ()));
free (name);
}
unlink_objfile (objfile);
+ /* If we are going to free the runtime common objfile, mark it
+ as unallocated. */
+
+ if (objfile == rt_common_objfile)
+ rt_common_objfile = NULL;
+
/* 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. */
-
-#if defined (CLEAR_SOLIB)
- CLEAR_SOLIB ();
- /* CLEAR_SOLIB closes the bfd's for any shared libraries. But
- the to_sections for a core file might refer to those bfd's. So
- detach any core file. */
- {
- struct target_ops *t = find_core_target ();
- if (t != NULL)
- (t->to_detach) (NULL, 0);
- }
-#endif
+
+ /* I *think* all our callers call clear_symtab_users. If so, no need
+ to call this here. */
clear_pc_function_cache ();
/* The last thing we do is free the objfile struct itself for the
case. Note that the mmalloc_detach or the mfree is the last thing
we can do with this objfile. */
-#if !defined(NO_MMALLOC) && defined(HAVE_MMAP)
+#if defined(USE_MMALLOC) && defined(HAVE_MMAP)
- if (objfile -> flags & OBJF_MAPPED)
+ if (objfile->flags & OBJF_MAPPED)
{
/* Remember the fd so we can close it. We can't close it before
- doing the detach, and after the detach the objfile is gone. */
- mmfd = objfile -> mmfd;
- mmalloc_detach (objfile -> md);
+ doing the detach, and after the detach the objfile is gone. */
+ int mmfd;
+
+ mmfd = objfile->mmfd;
+ mmalloc_detach (objfile->md);
objfile = NULL;
close (mmfd);
}
-#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
/* If we still have an objfile, then either we don't support reusable
objfiles or this one was not reusable. So free it normally. */
if (objfile != NULL)
{
- if (objfile -> name != NULL)
+ if (objfile->name != NULL)
{
- mfree (objfile -> md, objfile -> name);
+ mfree (objfile->md, objfile->name);
}
if (objfile->global_psymbols.list)
mfree (objfile->md, objfile->global_psymbols.list);
if (objfile->static_psymbols.list)
mfree (objfile->md, objfile->static_psymbols.list);
/* Free the obstacks for non-reusable objfiles */
- obstack_free (&objfile -> psymbol_obstack, 0);
- obstack_free (&objfile -> symbol_obstack, 0);
- obstack_free (&objfile -> type_obstack, 0);
- mfree (objfile -> md, objfile);
+ free_bcache (&objfile->psymbol_cache);
+ obstack_free (&objfile->psymbol_obstack, 0);
+ obstack_free (&objfile->symbol_obstack, 0);
+ obstack_free (&objfile->type_obstack, 0);
+ mfree (objfile->md, objfile);
objfile = NULL;
}
}
+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);
+}
/* Free all the object files at once and clean up their users. */
struct objfile *objfile, *temp;
ALL_OBJFILES_SAFE (objfile, temp)
- {
- free_objfile (objfile);
- }
+ {
+ free_objfile (objfile);
+ }
clear_symtab_users ();
}
\f
struct objfile *objfile;
struct section_offsets *new_offsets;
{
- struct section_offsets *delta = (struct section_offsets *) alloca
- (sizeof (struct section_offsets)
- + objfile->num_sections * sizeof (delta->offsets));
+ struct section_offsets *delta =
+ (struct section_offsets *) alloca (SIZEOF_SECTION_OFFSETS);
{
int i;
{
struct symtab *s;
- for (s = objfile->symtabs; s; s = s->next)
- {
- struct linetable *l;
- struct blockvector *bv;
- int i;
-
- /* 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);
- }
+ ALL_OBJFILE_SYMTABS (objfile, s)
+ {
+ struct linetable *l;
+ struct blockvector *bv;
+ int i;
- /* Don't relocate a shared blockvector more than once. */
- if (!s->primary)
- continue;
+ /* 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);
+ }
- bv = BLOCKVECTOR (s);
- for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i)
- {
- struct block *b;
- int j;
-
- b = BLOCKVECTOR_BLOCK (bv, i);
- BLOCK_START (b) += ANOFFSET (delta, s->block_line_section);
- BLOCK_END (b) += ANOFFSET (delta, s->block_line_section);
-
- for (j = 0; j < BLOCK_NSYMS (b); ++j)
- {
- struct symbol *sym = BLOCK_SYM (b, j);
- /* The RS6000 code from which this was taken skipped
- any symbols in STRUCT_NAMESPACE or UNDEF_NAMESPACE.
- 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)
- {
- SYMBOL_VALUE_ADDRESS (sym) +=
- ANOFFSET (delta, SYMBOL_SECTION (sym));
- }
- }
- }
- }
+ /* Don't relocate a shared blockvector more than once. */
+ if (!s->primary)
+ continue;
+
+ bv = BLOCKVECTOR (s);
+ for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i)
+ {
+ struct block *b;
+ int j;
+
+ b = BLOCKVECTOR_BLOCK (bv, i);
+ BLOCK_START (b) += ANOFFSET (delta, s->block_line_section);
+ BLOCK_END (b) += ANOFFSET (delta, s->block_line_section);
+
+ for (j = 0; j < BLOCK_NSYMS (b); ++j)
+ {
+ struct symbol *sym = BLOCK_SYM (b, j);
+ /* The RS6000 code from which this was taken skipped
+ any symbols in STRUCT_NAMESPACE or UNDEF_NAMESPACE.
+ 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_CLASS (sym) == LOC_INDIRECT)
+ && SYMBOL_SECTION (sym) >= 0)
+ {
+ SYMBOL_VALUE_ADDRESS (sym) +=
+ ANOFFSET (delta, SYMBOL_SECTION (sym));
+ }
+#ifdef MIPS_EFI_SYMBOL_NAME
+ /* Relocate Extra Function Info for ecoff. */
+
+ else if (SYMBOL_CLASS (sym) == LOC_CONST
+ && SYMBOL_NAMESPACE (sym) == LABEL_NAMESPACE
+ && STRCMP (SYMBOL_NAME (sym), MIPS_EFI_SYMBOL_NAME) == 0)
+ ecoff_relocate_efi (sym, ANOFFSET (delta,
+ s->block_line_section));
+#endif
+ }
+ }
+ }
}
{
struct partial_symtab *p;
ALL_OBJFILE_PSYMTABS (objfile, p)
- {
- /* FIXME: specific to symbol readers which use gdb-stabs.h.
- We can only get away with it since objfile_relocate is only
- used on XCOFF, which lacks psymtabs, and for gdb-stabs.h
- targets. */
- p->textlow += ANOFFSET (delta, SECT_OFF_TEXT);
- p->texthigh += ANOFFSET (delta, SECT_OFF_TEXT);
- }
+ {
+ p->textlow += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ p->texthigh += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ }
}
{
- struct partial_symbol *psym;
+ struct partial_symbol **psym;
for (psym = objfile->global_psymbols.list;
psym < objfile->global_psymbols.next;
psym++)
- if (SYMBOL_SECTION (psym) >= 0)
- SYMBOL_VALUE_ADDRESS (psym) += ANOFFSET (delta, SYMBOL_SECTION (psym));
+ 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++)
- if (SYMBOL_SECTION (psym) >= 0)
- SYMBOL_VALUE_ADDRESS (psym) += ANOFFSET (delta, SYMBOL_SECTION (psym));
+ if (SYMBOL_SECTION (*psym) >= 0)
+ SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
+ SYMBOL_SECTION (*psym));
}
{
struct minimal_symbol *msym;
ALL_OBJFILE_MSYMBOLS (objfile, msym)
if (SYMBOL_SECTION (msym) >= 0)
- SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
+ SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
}
+ /* 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)
ANOFFSET (objfile->section_offsets, i) = ANOFFSET (new_offsets, i);
}
+
+ {
+ struct obj_section *s;
+ bfd *abfd;
+
+ abfd = objfile->obfd;
+
+ ALL_OBJFILE_OSECTIONS (objfile, s)
+ {
+ flagword flags;
+
+ flags = bfd_get_section_flags (abfd, s->the_bfd_section);
+
+ if (flags & SEC_CODE)
+ {
+ s->addr += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ s->endaddr += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ }
+ else if (flags & (SEC_DATA | SEC_LOAD))
+ {
+ s->addr += ANOFFSET (delta, SECT_OFF_DATA (objfile));
+ s->endaddr += ANOFFSET (delta, SECT_OFF_DATA (objfile));
+ }
+ else if (flags & SEC_ALLOC)
+ {
+ s->addr += ANOFFSET (delta, SECT_OFF_BSS (objfile));
+ s->endaddr += ANOFFSET (delta, SECT_OFF_BSS (objfile));
+ }
+ }
+ }
+
+ if (objfile->ei.entry_point != ~(CORE_ADDR) 0)
+ objfile->ei.entry_point += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+
+ if (objfile->ei.entry_func_lowpc != INVALID_ENTRY_LOWPC)
+ {
+ objfile->ei.entry_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ objfile->ei.entry_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ }
+
+ if (objfile->ei.entry_file_lowpc != INVALID_ENTRY_LOWPC)
+ {
+ objfile->ei.entry_file_lowpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ objfile->ei.entry_file_highpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ }
+
+ if (objfile->ei.main_func_lowpc != INVALID_ENTRY_LOWPC)
+ {
+ objfile->ei.main_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ objfile->ei.main_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
+ }
+
+ /* Relocate breakpoints as necessary, after things are relocated. */
+ breakpoint_re_set ();
}
\f
/* Many places in gdb want to test just to see if we have any partial
struct objfile *ofp;
ALL_OBJFILES (ofp)
- {
- if (ofp -> psymtabs != NULL)
- {
- return 1;
- }
- }
+ {
+ if (ofp->psymtabs != NULL)
+ {
+ return 1;
+ }
+ }
return 0;
}
struct objfile *ofp;
ALL_OBJFILES (ofp)
- {
- if (ofp -> symtabs != NULL)
- {
- return 1;
- }
- }
+ {
+ if (ofp->symtabs != NULL)
+ {
+ 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.
+ */
+void
+objfile_purge_solibs ()
+{
+ struct objfile *objf;
+ struct objfile *temp;
+
+ 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);
+ }
+}
+
+
/* 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. */
struct objfile *ofp;
ALL_OBJFILES (ofp)
- {
- if (ofp -> msymbols != NULL)
- {
- return 1;
- }
- }
+ {
+ if (ofp->msymbols != NULL)
+ {
+ return 1;
+ }
+ }
return 0;
}
-#if !defined(NO_MMALLOC) && defined(HAVE_MMAP)
+#if defined(USE_MMALLOC) && defined(HAVE_MMAP)
/* Given the name of a mapped symbol file in SYMSFILENAME, and the timestamp
of the corresponding symbol file in MTIME, try to open an existing file
Otherwise, returns the open file descriptor. */
static int
-open_existing_mapped_file (symsfilename, mtime, mapped)
+open_existing_mapped_file (symsfilename, mtime, flags)
char *symsfilename;
long mtime;
- int mapped;
+ int flags;
{
int fd = -1;
struct stat sbuf;
{
if (sbuf.st_mtime < mtime)
{
- if (!mapped)
+ if (!(flags & OBJF_MAPPED))
{
warning ("mapped symbol file `%s' is out of date, ignored it",
symsfilename);
{
if (error_pre_print)
{
- printf (error_pre_print);
+ printf_unfiltered (error_pre_print);
}
print_sys_errmsg (symsfilename, errno);
}
/bin for example). */
static int
-open_mapped_file (filename, mtime, mapped)
+open_mapped_file (filename, mtime, flags)
char *filename;
long mtime;
- int mapped;
+ int flags;
{
int fd;
char *symsfilename;
then try the directory where the symbol file is located. */
symsfilename = concat ("./", basename (filename), ".syms", (char *) NULL);
- if ((fd = open_existing_mapped_file (symsfilename, mtime, mapped)) < 0)
+ if ((fd = open_existing_mapped_file (symsfilename, mtime, flags)) < 0)
{
free (symsfilename);
symsfilename = concat (filename, ".syms", (char *) NULL);
- fd = open_existing_mapped_file (symsfilename, mtime, mapped);
+ fd = open_existing_mapped_file (symsfilename, mtime, flags);
}
/* If we don't have an open file by now, then either the file does not
By default the file is rw for everyone, with the user's umask taking
care of turning off the permissions the user wants off. */
- if ((fd < 0) && mapped)
+ if ((fd < 0) && (flags & OBJF_MAPPED))
{
free (symsfilename);
symsfilename = concat ("./", basename (filename), ".syms",
{
if (error_pre_print)
{
- printf (error_pre_print);
+ printf_unfiltered (error_pre_print);
}
print_sys_errmsg (symsfilename, errno);
}
return (fd);
}
-/* Return the base address at which we would like the next objfile's
- mapped data to start.
-
- For now, we use the kludge that the configuration specifies a base
- address to which it is safe to map the first mmalloc heap, and an
- increment to add to this address for each successive heap. There are
- a lot of issues to deal with here to make this work reasonably, including:
+static PTR
+map_to_file (fd)
+ int fd;
+{
+ PTR md;
+ CORE_ADDR mapto;
- Avoid memory collisions with existing mapped address spaces
+ md = mmalloc_attach (fd, (PTR) 0);
+ if (md != NULL)
+ {
+ mapto = (CORE_ADDR) mmalloc_getkey (md, 1);
+ md = mmalloc_detach (md);
+ if (md != NULL)
+ {
+ /* FIXME: should figure out why detach failed */
+ md = NULL;
+ }
+ else if (mapto != (CORE_ADDR) NULL)
+ {
+ /* This mapping file needs to be remapped at "mapto" */
+ md = mmalloc_attach (fd, (PTR) mapto);
+ }
+ else
+ {
+ /* This is a freshly created mapping file. */
+ mapto = (CORE_ADDR) mmalloc_findbase (20 * 1024 * 1024);
+ if (mapto != 0)
+ {
+ /* To avoid reusing the freshly created mapping file, at the
+ address selected by mmap, we must truncate it before trying
+ to do an attach at the address we want. */
+ ftruncate (fd, 0);
+ md = mmalloc_attach (fd, (PTR) mapto);
+ if (md != NULL)
+ {
+ mmalloc_setkey (md, 1, (PTR) mapto);
+ }
+ }
+ }
+ }
+ return (md);
+}
- Reclaim address spaces when their mmalloc heaps are unmapped
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
- When mmalloc heaps are shared between processes they have to be
- mapped at the same addresses in each
+/* Returns a section whose range includes PC and SECTION,
+ or NULL if none found. Note the distinction between the return type,
+ struct obj_section (which is defined in gdb), and the input type
+ struct sec (which is a bfd-defined data type). The obj_section
+ contains a pointer to the bfd struct sec section. */
- Once created, a mmalloc heap that is to be mapped back in must be
- mapped at the original address. I.E. each objfile will expect to
- be remapped at it's original address. This becomes a problem if
- the desired address is already in use.
+struct obj_section *
+find_pc_sect_section (pc, section)
+ CORE_ADDR pc;
+ struct sec *section;
+{
+ struct obj_section *s;
+ struct objfile *objfile;
- etc, etc, etc.
+ ALL_OBJSECTIONS (objfile, s)
+ if ((section == 0 || section == s->the_bfd_section) &&
+ s->addr <= pc && pc < s->endaddr)
+ return (s);
- */
+ return (NULL);
+}
+/* Returns a section whose range includes PC or NULL if none found.
+ Backward compatibility, no section. */
-static CORE_ADDR
-map_to_address ()
+struct obj_section *
+find_pc_section (pc)
+ CORE_ADDR pc;
{
+ return find_pc_sect_section (pc, find_pc_mapped_section (pc));
+}
-#if defined(MMAP_BASE_ADDRESS) && defined (MMAP_INCREMENT)
-
- static CORE_ADDR next = MMAP_BASE_ADDRESS;
- CORE_ADDR mapto = next;
- next += MMAP_INCREMENT;
- return (mapto);
+/* 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. */
-#else
+int
+in_plt_section (pc, name)
+ CORE_ADDR pc;
+ char *name;
+{
+ struct obj_section *s;
+ int retval = 0;
- return (0);
-
-#endif
+ s = find_pc_section (pc);
+ retval = (s != NULL
+ && s->the_bfd_section->name != NULL
+ && STREQ (s->the_bfd_section->name, ".plt"));
+ return (retval);
}
-#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */
-
-/* Returns a section whose range includes PC or NULL if none found. */
+/* Return nonzero if NAME is in the import list of OBJFILE. Else
+ return zero. */
-struct obj_section *
-find_pc_section(pc)
- CORE_ADDR pc;
+int
+is_in_import_list (name, objfile)
+ char *name;
+ struct objfile *objfile;
{
- struct obj_section *s;
- struct objfile *objfile;
-
- ALL_OBJFILES (objfile)
- for (s = objfile->sections; s < objfile->sections_end; ++s)
- if (s->addr <= pc
- && pc < s->endaddr)
- return(s);
-
- return(NULL);
+ register int i;
+
+ if (!objfile || !name || !*name)
+ return 0;
+
+ for (i = 0; i < objfile->import_list_size; i++)
+ if (objfile->import_list[i] && STREQ (name, objfile->import_list[i]))
+ return 1;
+ return 0;
}
+