/* Darwin support for GDB, the GNU debugger.
- Copyright (C) 2008-2018 Free Software Foundation, Inc.
+ Copyright (C) 2008-2020 Free Software Foundation, Inc.
Contributed by AdaCore.
#include "bfd.h"
#include "symfile.h"
#include "objfiles.h"
-#include "buildsym.h"
#include "gdbcmd.h"
#include "gdbcore.h"
#include "mach-o.h"
#include "aout/stab_gnu.h"
-#include "vec.h"
-#include "psympriv.h"
#include "complaints.h"
#include "gdb_bfd.h"
#include <string>
+#include <algorithm>
/* If non-zero displays debugging message. */
static unsigned int mach_o_debug_level = 0;
creates such a structure. They are read after the processing of the
executable. */
-typedef struct oso_el
+struct oso_el
{
+ oso_el (asymbol **oso_sym_, asymbol **end_sym_, unsigned int nbr_syms_)
+ : name((*oso_sym_)->name),
+ mtime((*oso_sym_)->value),
+ oso_sym(oso_sym_),
+ end_sym(end_sym_),
+ nbr_syms(nbr_syms_)
+ {
+ }
+
/* Object file name. Can also be a member name. */
const char *name;
/* Number of interesting stabs in the range. */
unsigned int nbr_syms;
-}
-oso_el;
-
-/* Vector of object files to be read after the executable. */
-DEF_VEC_O (oso_el);
+};
static void
macho_new_init (struct objfile *objfile)
objfile->flags |= OBJF_REORDERED;
}
-/* Add a new OSO to the vector of OSO to load. */
-
-static void
-macho_register_oso (VEC (oso_el) **oso_vector_ptr,
- struct objfile *objfile,
- asymbol **oso_sym, asymbol **end_sym,
- unsigned int nbr_syms)
-{
- oso_el el;
-
- el.name = (*oso_sym)->name;
- el.mtime = (*oso_sym)->value;
- el.oso_sym = oso_sym;
- el.end_sym = end_sym;
- el.nbr_syms = nbr_syms;
- VEC_safe_push (oso_el, *oso_vector_ptr, &el);
-}
-
/* Add symbol SYM to the minimal symbol table of OBJFILE. */
static void
macho_symtab_read (minimal_symbol_reader &reader,
struct objfile *objfile,
long number_of_symbols, asymbol **symbol_table,
- VEC (oso_el) **oso_vector_ptr)
+ std::vector<oso_el> *oso_vector_ptr)
{
long i;
const asymbol *file_so = NULL;
if (sym->name == NULL || sym->name[0] == 0)
{
/* Unexpected empty N_SO. */
- complaint (&symfile_complaints,
- _("Unexpected empty N_SO stab"));
+ complaint (_("Unexpected empty N_SO stab"));
}
else
{
}
/* Debugging symbols are not expected here. */
- complaint (&symfile_complaints,
- _("%s: Unexpected debug stab outside SO markers"),
+ complaint (_("%s: Unexpected debug stab outside SO markers"),
objfile_name (objfile));
}
else
if (sym->name == NULL || sym->name[0] == 0)
{
/* Unexpected empty N_SO. */
- complaint (&symfile_complaints, _("Empty SO section"));
+ complaint (_("Empty SO section"));
state = S_NO_SO;
}
else if (state == S_FIRST_SO)
state = S_SECOND_SO;
}
else
- complaint (&symfile_complaints, _("Three SO in a raw"));
+ complaint (_("Three SO in a raw"));
}
else if (mach_o_sym->n_type == N_OSO)
{
}
}
else
- complaint (&symfile_complaints,
- _("Unexpected stab after SO"));
+ complaint (_("Unexpected stab after SO"));
break;
case S_STAB_FILE:
{
/* End of file. */
if (state == S_DWARF_FILE)
- macho_register_oso (oso_vector_ptr, objfile,
- oso_file, symbol_table + i,
- nbr_syms);
+ oso_vector_ptr->emplace_back (oso_file, symbol_table + i,
+ nbr_syms);
state = S_NO_SO;
}
else
{
- complaint (&symfile_complaints, _("Missing nul SO"));
+ complaint (_("Missing nul SO"));
file_so = sym;
state = S_FIRST_SO;
}
case N_GSYM:
break;
default:
- complaint (&symfile_complaints,
- _("unhandled stab for dwarf OSO file"));
+ complaint (_("unhandled stab for dwarf OSO file"));
break;
}
}
}
else
- complaint (&symfile_complaints,
- _("non-debugging symbol within SO"));
+ complaint (_("non-debugging symbol within SO"));
break;
}
}
if (state != S_NO_SO)
- complaint (&symfile_complaints, _("missing nul SO"));
+ complaint (_("missing nul SO"));
}
/* If NAME describes an archive member (ie: ARCHIVE '(' MEMBER ')'),
return lparen - name;
}
-/* Compare function to qsort OSOs, so that members of a library are
- gathered. */
+/* Compare function to std::sort OSOs, so that members of a library
+ are gathered. */
-static int
-oso_el_compare_name (const void *vl, const void *vr)
+static bool
+oso_el_compare_name (const oso_el &l, const oso_el &r)
{
- const oso_el *l = (const oso_el *)vl;
- const oso_el *r = (const oso_el *)vr;
-
- return strcmp (l->name, r->name);
+ return strcmp (l.name, r.name) < 0;
}
/* Hash table entry structure for the stabs symbols in the main object file.
ent = (struct macho_sym_hash_entry *)
bfd_hash_lookup (&table, sym->name, TRUE, FALSE);
if (ent->sym != NULL)
- complaint (&symfile_complaints,
- _("Duplicated symbol %s in symbol table"), sym->name);
+ complaint (_("Duplicated symbol %s in symbol table"), sym->name);
else
{
if (mach_o_debug_level > 4)
{
- struct gdbarch *arch = get_objfile_arch (main_objfile);
+ struct gdbarch *arch = main_objfile->arch ();
printf_unfiltered
(_("Adding symbol %s (addr: %s)\n"),
sym->name, paddress (arch, sym->value));
if (mach_o_debug_level > 3)
{
- struct gdbarch *arch = get_objfile_arch (main_objfile);
+ struct gdbarch *arch = main_objfile->arch ();
printf_unfiltered
(_("resolve sect %s with %s (set to %s)\n"),
sec->name, sym->name,
paddress (arch, res));
}
- bfd_set_section_vma (abfd.get (), sec, res);
+ bfd_set_section_vma (sec, res);
sections_rebased[sec->index] = 1;
}
}
bfd_hash_table_free (&table);
- /* We need to clear SYMFILE_MAINLINE to avoid interractive question
+ /* We need to clear SYMFILE_MAINLINE to avoid interactive question
from symfile.c:symbol_file_add_with_addrs_or_offsets. */
symbol_file_add_from_bfd
(abfd.get (), name, symfile_flags & ~(SYMFILE_MAINLINE | SYMFILE_VERBOSE),
Note that this function sorts OSO_VECTOR_PTR. */
static void
-macho_symfile_read_all_oso (VEC (oso_el) **oso_vector_ptr,
+macho_symfile_read_all_oso (std::vector<oso_el> *oso_vector_ptr,
struct objfile *main_objfile,
symfile_add_flags symfile_flags)
{
int ix;
- VEC (oso_el) *vec = *oso_vector_ptr;
oso_el *oso;
/* Sort oso by name so that files from libraries are gathered. */
- qsort (VEC_address (oso_el, vec), VEC_length (oso_el, vec),
- sizeof (oso_el), oso_el_compare_name);
+ std::sort (oso_vector_ptr->begin (), oso_vector_ptr->end (),
+ oso_el_compare_name);
- for (ix = 0; VEC_iterate (oso_el, vec, ix, oso);)
+ for (ix = 0; ix < oso_vector_ptr->size ();)
{
int pfx_len;
+ oso = &(*oso_vector_ptr)[ix];
+
/* Check if this is a library name. */
pfx_len = get_archive_prefix_len (oso->name);
if (pfx_len > 0)
std::string archive_name (oso->name, pfx_len);
/* Compute number of oso for this archive. */
- for (last_ix = ix;
- VEC_iterate (oso_el, vec, last_ix, oso2); last_ix++)
+ for (last_ix = ix; last_ix < oso_vector_ptr->size (); last_ix++)
{
+ oso2 = &(*oso_vector_ptr)[last_ix];
if (strncmp (oso2->name, archive_name.c_str (), pfx_len) != 0)
break;
}
/* Open the archive and check the format. */
gdb_bfd_ref_ptr archive_bfd (gdb_bfd_open (archive_name.c_str (),
- gnutarget, -1));
+ gnutarget));
if (archive_bfd == NULL)
{
warning (_("Could not open OSO archive file \"%s\""),
/* Load all oso in this library. */
while (member_bfd != NULL)
{
- const char *member_name = member_bfd->filename;
+ const char *member_name = bfd_get_filename (member_bfd.get ());
int member_len = strlen (member_name);
/* If this member is referenced, add it as a symfile. */
for (ix2 = ix; ix2 < last_ix; ix2++)
{
- oso2 = VEC_index (oso_el, vec, ix2);
+ oso2 = &(*oso_vector_ptr)[ix2];
if (oso2->name
&& strlen (oso2->name) == pfx_len + member_len + 2
member_len))
{
macho_add_oso_symfile (oso2, member_bfd,
- bfd_get_filename (member_bfd),
+ bfd_get_filename (member_bfd.get ()),
main_objfile, symfile_flags);
oso2->name = NULL;
break;
}
for (ix2 = ix; ix2 < last_ix; ix2++)
{
- oso_el *oso2 = VEC_index (oso_el, vec, ix2);
+ oso2 = &(*oso_vector_ptr)[ix2];
if (oso2->name != NULL)
warning (_("Could not find specified archive member "
}
else
{
- gdb_bfd_ref_ptr abfd (gdb_bfd_open (oso->name, gnutarget, -1));
+ gdb_bfd_ref_ptr abfd (gdb_bfd_open (oso->name, gnutarget));
if (abfd == NULL)
warning (_("`%s': can't open to read symbols: %s."), oso->name,
bfd_errmsg (bfd_get_error ()));
#define DSYM_SUFFIX ".dSYM/Contents/Resources/DWARF/"
/* Check if a dsym file exists for OBJFILE. If so, returns a bfd for it
- and return *FILENAMEP with its original xmalloc-ated filename.
+ and return *FILENAMEP with its original filename.
Return NULL if no valid dsym file is found (FILENAMEP is not used in
such case). */
static gdb_bfd_ref_ptr
-macho_check_dsym (struct objfile *objfile, char **filenamep)
+macho_check_dsym (struct objfile *objfile, std::string *filenamep)
{
size_t name_len = strlen (objfile_name (objfile));
size_t dsym_len = strlen (DSYM_SUFFIX);
objfile_name (objfile));
return NULL;
}
- *filenamep = xstrdup (dsym_filename);
+ *filenamep = std::string (dsym_filename);
return dsym_bfd;
}
{
bfd *abfd = objfile->obfd;
long storage_needed;
- VEC (oso_el) *oso_vector = NULL;
- struct cleanup *old_chain = make_cleanup (VEC_cleanup (oso_el), &oso_vector);
+ std::vector<oso_el> oso_vector;
+ /* We have to hold on to the symbol table until the call to
+ macho_symfile_read_all_oso at the end of this function. */
+ gdb::def_vector<asymbol *> symbol_table;
/* Get symbols from the symbol table only if the file is an executable.
The symbol table of object files is not relocated and is expected to
be in the executable. */
if (bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC))
{
- char *dsym_filename;
+ std::string dsym_filename;
/* Process the normal symbol table first. */
storage_needed = bfd_get_symtab_upper_bound (objfile->obfd);
if (storage_needed > 0)
{
- asymbol **symbol_table;
long symcount;
- symbol_table = (asymbol **) xmalloc (storage_needed);
- make_cleanup (xfree, symbol_table);
+ symbol_table.resize (storage_needed / sizeof (asymbol *));
minimal_symbol_reader reader (objfile);
- symcount = bfd_canonicalize_symtab (objfile->obfd, symbol_table);
+ symcount = bfd_canonicalize_symtab (objfile->obfd,
+ symbol_table.data ());
if (symcount < 0)
error (_("Can't read symbols from %s: %s"),
bfd_get_filename (objfile->obfd),
bfd_errmsg (bfd_get_error ()));
- macho_symtab_read (reader, objfile, symcount, symbol_table,
+ macho_symtab_read (reader, objfile, symcount, symbol_table.data (),
&oso_vector);
reader.install ();
{
struct bfd_section *asect, *dsect;
- make_cleanup (xfree, dsym_filename);
-
if (mach_o_debug_level > 0)
printf_unfiltered (_("dsym file found\n"));
{
if (strcmp (asect->name, dsect->name) != 0)
break;
- bfd_set_section_size (dsym_bfd.get (), dsect,
- bfd_get_section_size (asect));
+ bfd_set_section_size (dsect, bfd_section_size (asect));
}
/* Add the dsym file as a separate file. */
- symbol_file_add_separate (dsym_bfd.get (), dsym_filename,
+ symbol_file_add_separate (dsym_bfd.get (), dsym_filename.c_str (),
symfile_flags, objfile);
/* Don't try to read dwarf2 from main file or shared libraries. */
- do_cleanups (old_chain);
return;
}
}
}
/* Then the oso. */
- if (oso_vector != NULL)
+ if (!oso_vector.empty ())
macho_symfile_read_all_oso (&oso_vector, objfile, symfile_flags);
-
- do_cleanups (old_chain);
}
static bfd_byte *
static void
macho_symfile_offsets (struct objfile *objfile,
- const struct section_addr_info *addrs)
+ const section_addr_info &addrs)
{
unsigned int i;
struct obj_section *osect;
/* Allocate section_offsets. */
- objfile->num_sections = bfd_count_sections (objfile->obfd);
- objfile->section_offsets = (struct section_offsets *)
- obstack_alloc (&objfile->objfile_obstack,
- SIZEOF_N_SECTION_OFFSETS (objfile->num_sections));
- memset (objfile->section_offsets, 0,
- SIZEOF_N_SECTION_OFFSETS (objfile->num_sections));
+ objfile->section_offsets.assign (bfd_count_sections (objfile->obfd), 0);
/* This code is run when we first add the objfile with
symfile_add_with_addrs_or_offsets, when "addrs" not "offsets" are
N.B. if an objfile slides after we've already created it, then it
goes through objfile_relocate. */
- for (i = 0; i < addrs->num_sections; i++)
+ for (i = 0; i < addrs.size (); i++)
{
ALL_OBJFILE_OSECTIONS (objfile, osect)
{
const char *bfd_sect_name = osect->the_bfd_section->name;
- if (strcmp (bfd_sect_name, addrs->other[i].name) == 0)
+ if (bfd_sect_name == addrs[i].name)
{
- obj_section_offset (osect) = addrs->other[i].addr;
+ obj_section_offset (osect) = addrs[i].addr;
break;
}
}
&psym_functions
};
+void _initialize_machoread ();
void
-_initialize_machoread (void)
+_initialize_machoread ()
{
add_symtab_fns (bfd_target_mach_o_flavour, &macho_sym_fns);
projects / deliverable / binutils-gdb.git / blobdiff