X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmachoread.c;h=2bb3ab32cb30d21048479b6cd570b849180f16c8;hb=60318db6c5459d73ac6fa1ff6d44ca17d797a1aa;hp=ad33f63a63820b6eda7c7ccc93e3a894163e1b5c;hpb=025bb325db8dce957db69eaf148c5bec373d4bb6;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/machoread.c b/gdb/machoread.c
index ad33f63a63..2bb3ab32cb 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -1,5 +1,5 @@
/* Darwin support for GDB, the GNU debugger.
- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2008-2020 Free Software Foundation, Inc.
Contributed by AdaCore.
@@ -16,8 +16,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
- */
+ along with this program. If not, see . */
#include "defs.h"
#include "symtab.h"
@@ -25,19 +24,18 @@
#include "bfd.h"
#include "symfile.h"
#include "objfiles.h"
-#include "buildsym.h"
#include "gdbcmd.h"
#include "gdbcore.h"
#include "mach-o.h"
-#include "gdb_assert.h"
#include "aout/stab_gnu.h"
-#include "vec.h"
#include "psympriv.h"
-
-#include
+#include "complaints.h"
+#include "gdb_bfd.h"
+#include
+#include
/* If non-zero displays debugging message. */
-static int mach_o_debug_level = 0;
+static unsigned int mach_o_debug_level = 0;
/* Dwarf debugging information are never in the final executable. They stay
in object files and the executable contains the list of object files read
@@ -46,48 +44,31 @@ static 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
{
- /* Object file name. */
+ 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;
/* Associated time stamp. */
unsigned long mtime;
- /* Number of sections. This is the length of SYMBOLS and OFFSETS array. */
- int num_sections;
-
- /* Each seaction of the object file is represented by a symbol and its
- offset. If the offset is 0, we assume that the symbol is at offset 0
- in the OSO object file and a symbol lookup in the main file is
- required to get the offset. */
- asymbol **symbols;
- bfd_vma *offsets;
-}
-oso_el;
-
-/* Vector of object files to be read after the executable. This is one
- global variable but it's life-time is the one of macho_symfile_read. */
-DEF_VEC_O (oso_el);
-static VEC (oso_el) *oso_vector;
-
-struct macho_oso_data
-{
- /* Per objfile symbol table. This is used to apply relocation to sections
- It is loaded only once, then relocated, and free after sections are
- relocated. */
- asymbol **symbol_table;
-
- /* The offsets for this objfile. Used to relocate the symbol_table. */
- struct oso_el *oso;
+ /* Stab symbols range for this OSO. */
+ asymbol **oso_sym;
+ asymbol **end_sym;
- struct objfile *main_objfile;
+ /* Number of interesting stabs in the range. */
+ unsigned int nbr_syms;
};
-/* Data for OSO being processed. */
-
-static struct macho_oso_data current_oso;
-
static void
macho_new_init (struct objfile *objfile)
{
@@ -97,187 +78,240 @@ static void
macho_symfile_init (struct objfile *objfile)
{
objfile->flags |= OBJF_REORDERED;
- init_entry_point_info (objfile);
}
-/* Add a new OSO to the vector of OSO to load. */
+/* Add symbol SYM to the minimal symbol table of OBJFILE. */
static void
-macho_register_oso (const asymbol *oso_sym, int nbr_sections,
- asymbol **symbols, bfd_vma *offsets)
+macho_symtab_add_minsym (minimal_symbol_reader &reader,
+ struct objfile *objfile, const asymbol *sym)
{
- oso_el el;
-
- el.name = oso_sym->name;
- el.mtime = oso_sym->value;
- el.num_sections = nbr_sections;
- el.symbols = symbols;
- el.offsets = offsets;
- VEC_safe_push (oso_el, oso_vector, &el);
+ if (sym->name == NULL || *sym->name == '\0')
+ {
+ /* Skip names that don't exist (shouldn't happen), or names
+ that are null strings (may happen). */
+ return;
+ }
+
+ if (sym->flags & (BSF_GLOBAL | BSF_LOCAL | BSF_WEAK))
+ {
+ CORE_ADDR symaddr;
+ enum minimal_symbol_type ms_type;
+
+ /* Bfd symbols are section relative. */
+ symaddr = sym->value + sym->section->vma;
+
+ if (sym->section == bfd_abs_section_ptr)
+ ms_type = mst_abs;
+ else if (sym->section->flags & SEC_CODE)
+ {
+ if (sym->flags & (BSF_GLOBAL | BSF_WEAK))
+ ms_type = mst_text;
+ else
+ ms_type = mst_file_text;
+ }
+ else if (sym->section->flags & SEC_ALLOC)
+ {
+ if (sym->flags & (BSF_GLOBAL | BSF_WEAK))
+ {
+ if (sym->section->flags & SEC_LOAD)
+ ms_type = mst_data;
+ else
+ ms_type = mst_bss;
+ }
+ else if (sym->flags & BSF_LOCAL)
+ {
+ /* Not a special stabs-in-elf symbol, do regular
+ symbol processing. */
+ if (sym->section->flags & SEC_LOAD)
+ ms_type = mst_file_data;
+ else
+ ms_type = mst_file_bss;
+ }
+ else
+ ms_type = mst_unknown;
+ }
+ else
+ return; /* Skip this symbol. */
+
+ reader.record_with_info (sym->name, symaddr, ms_type,
+ gdb_bfd_section_index (objfile->obfd,
+ sym->section));
+ }
}
/* Build the minimal symbol table from SYMBOL_TABLE of length
- NUMBER_OF_SYMBOLS for OBJFILE.
- Read OSO files at the end. */
+ NUMBER_OF_SYMBOLS for OBJFILE. Registers OSO filenames found. */
static void
-macho_symtab_read (struct objfile *objfile,
- long number_of_symbols, asymbol **symbol_table)
+macho_symtab_read (minimal_symbol_reader &reader,
+ struct objfile *objfile,
+ long number_of_symbols, asymbol **symbol_table,
+ std::vector *oso_vector_ptr)
{
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- long storage_needed;
- long i, j;
- CORE_ADDR offset;
- enum minimal_symbol_type ms_type;
- unsigned int nbr_sections = bfd_count_sections (objfile->obfd);
- asymbol **first_symbol = NULL;
- bfd_vma *first_offset = NULL;
- const asymbol *oso_file = NULL;
+ long i;
+ const asymbol *file_so = NULL;
+ asymbol **oso_file = NULL;
+ unsigned int nbr_syms = 0;
- for (i = 0; i < number_of_symbols; i++)
- {
- asymbol *sym = symbol_table[i];
- bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
+ /* Current state while reading stabs. */
+ enum
+ {
+ /* Not within an SO part. Only non-debugging symbols should be present,
+ and will be added to the minimal symbols table. */
+ S_NO_SO,
- offset = ANOFFSET (objfile->section_offsets, sym->section->index);
+ /* First SO read. Introduce an SO section, and may be followed by a second
+ SO. The SO section should contain onl debugging symbols. */
+ S_FIRST_SO,
- if (sym->flags & BSF_DEBUGGING)
- {
- bfd_vma addr;
+ /* Second non-null SO found, just after the first one. Means that the first
+ is in fact a directory name. */
+ S_SECOND_SO,
- /* Debugging symbols are used to collect OSO file names as well
- as section offsets. */
+ /* Non-null OSO found. Debugging info are DWARF in this OSO file. */
+ S_DWARF_FILE,
- switch (mach_o_sym->n_type)
- {
- case N_SO:
- /* An empty SO entry terminates a chunk for an OSO file. */
- if ((sym->name == NULL || sym->name[0] == 0) && oso_file != NULL)
- {
- macho_register_oso (oso_file, nbr_sections,
- first_symbol, first_offset);
- first_symbol = NULL;
- first_offset = NULL;
- oso_file = NULL;
- }
- break;
- case N_FUN:
- case N_STSYM:
- if (sym->name == NULL || sym->name[0] == '\0')
- break;
- /* Fall through. */
- case N_BNSYM:
- gdb_assert (oso_file != NULL);
- addr = sym->value
- + bfd_get_section_vma (sym->section->bfd, sym->section);
- if (addr != 0
- && first_symbol[sym->section->index] == NULL)
- {
- /* These STAB entries can directly relocate a section. */
- first_symbol[sym->section->index] = sym;
- first_offset[sym->section->index] = addr + offset;
- }
- break;
- case N_GSYM:
- gdb_assert (oso_file != NULL);
- if (first_symbol[sym->section->index] == NULL)
+ S_STAB_FILE
+ } state = S_NO_SO;
+
+ for (i = 0; i < number_of_symbols; i++)
+ {
+ const asymbol *sym = symbol_table[i];
+ bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
+
+ switch (state)
+ {
+ case S_NO_SO:
+ if (mach_o_sym->n_type == N_SO)
+ {
+ /* Start of object stab. */
+ if (sym->name == NULL || sym->name[0] == 0)
{
- /* This STAB entry needs a symbol look-up to relocate
- the section. */
- first_symbol[sym->section->index] = sym;
- first_offset[sym->section->index] = 0;
+ /* Unexpected empty N_SO. */
+ complaint (_("Unexpected empty N_SO stab"));
+ }
+ else
+ {
+ file_so = sym;
+ state = S_FIRST_SO;
+ }
+ }
+ else if (sym->flags & BSF_DEBUGGING)
+ {
+ if (mach_o_sym->n_type == N_OPT)
+ {
+ /* No complaint for OPT. */
+ break;
}
- break;
- case N_OSO:
- /* New OSO file. */
- gdb_assert (oso_file == NULL);
- first_symbol = (asymbol **)xmalloc (nbr_sections
- * sizeof (asymbol *));
- first_offset = (bfd_vma *)xmalloc (nbr_sections
- * sizeof (bfd_vma));
- for (j = 0; j < nbr_sections; j++)
- first_symbol[j] = NULL;
- oso_file = sym;
- break;
- }
- continue;
- }
-
- if (sym->name == NULL || *sym->name == '\0')
- {
- /* Skip names that don't exist (shouldn't happen), or names
- that are null strings (may happen). */
- continue;
- }
- if (sym->flags & (BSF_GLOBAL | BSF_LOCAL | BSF_WEAK))
- {
- struct minimal_symbol *msym;
- CORE_ADDR symaddr;
-
- /* Bfd symbols are section relative. */
- symaddr = sym->value + sym->section->vma;
-
- /* Select global/local/weak symbols. Note that bfd puts abs
- symbols in their own section, so all symbols we are
- interested in will have a section. */
- /* Relocate all non-absolute and non-TLS symbols by the
- section offset. */
- if (sym->section != &bfd_abs_section
- && !(sym->section->flags & SEC_THREAD_LOCAL))
- symaddr += offset;
-
- if (sym->section == &bfd_abs_section)
- ms_type = mst_abs;
- else if (sym->section->flags & SEC_CODE)
- {
- if (sym->flags & (BSF_GLOBAL | BSF_WEAK))
- ms_type = mst_text;
- else
- ms_type = mst_file_text;
- }
- else if (sym->section->flags & SEC_ALLOC)
- {
- if (sym->flags & (BSF_GLOBAL | BSF_WEAK))
- {
- if (sym->section->flags & SEC_LOAD)
- ms_type = mst_data;
- else
- ms_type = mst_bss;
- }
- else if (sym->flags & BSF_LOCAL)
- {
- /* Not a special stabs-in-elf symbol, do regular
- symbol processing. */
- if (sym->section->flags & SEC_LOAD)
- ms_type = mst_file_data;
- else
- ms_type = mst_file_bss;
- }
- else
- ms_type = mst_unknown;
- }
- else
- continue; /* Skip this symbol. */
+ /* Debugging symbols are not expected here. */
+ complaint (_("%s: Unexpected debug stab outside SO markers"),
+ objfile_name (objfile));
+ }
+ else
+ {
+ /* Non-debugging symbols go to the minimal symbol table. */
+ macho_symtab_add_minsym (reader, objfile, sym);
+ }
+ break;
- gdb_assert (sym->section->index < nbr_sections);
- if (oso_file != NULL
- && first_symbol[sym->section->index] == NULL)
- {
- /* Standard symbols can directly relocate sections. */
- first_symbol[sym->section->index] = sym;
- first_offset[sym->section->index] = symaddr;
- }
+ case S_FIRST_SO:
+ case S_SECOND_SO:
+ if (mach_o_sym->n_type == N_SO)
+ {
+ if (sym->name == NULL || sym->name[0] == 0)
+ {
+ /* Unexpected empty N_SO. */
+ complaint (_("Empty SO section"));
+ state = S_NO_SO;
+ }
+ else if (state == S_FIRST_SO)
+ {
+ /* Second SO stab for the file name. */
+ file_so = sym;
+ state = S_SECOND_SO;
+ }
+ else
+ complaint (_("Three SO in a raw"));
+ }
+ else if (mach_o_sym->n_type == N_OSO)
+ {
+ if (sym->name == NULL || sym->name[0] == 0)
+ {
+ /* Empty OSO. Means that this file was compiled with
+ stabs. */
+ state = S_STAB_FILE;
+ warning (_("stabs debugging not supported for %s"),
+ file_so->name);
+ }
+ else
+ {
+ /* Non-empty OSO for a Dwarf file. */
+ oso_file = symbol_table + i;
+ nbr_syms = 0;
+ state = S_DWARF_FILE;
+ }
+ }
+ else
+ complaint (_("Unexpected stab after SO"));
+ break;
- msym = prim_record_minimal_symbol_and_info
- (sym->name, symaddr, ms_type, sym->section->index,
- sym->section, objfile);
- }
+ case S_STAB_FILE:
+ case S_DWARF_FILE:
+ if (mach_o_sym->n_type == N_SO)
+ {
+ if (sym->name == NULL || sym->name[0] == 0)
+ {
+ /* End of file. */
+ if (state == S_DWARF_FILE)
+ oso_vector_ptr->emplace_back (oso_file, symbol_table + i,
+ nbr_syms);
+ state = S_NO_SO;
+ }
+ else
+ {
+ complaint (_("Missing nul SO"));
+ file_so = sym;
+ state = S_FIRST_SO;
+ }
+ }
+ else if (sym->flags & BSF_DEBUGGING)
+ {
+ if (state == S_STAB_FILE)
+ {
+ /* FIXME: to be implemented. */
+ }
+ else
+ {
+ switch (mach_o_sym->n_type)
+ {
+ case N_FUN:
+ if (sym->name == NULL || sym->name[0] == 0)
+ break;
+ /* Fall through. */
+ case N_STSYM:
+ /* Interesting symbol. */
+ nbr_syms++;
+ break;
+ case N_ENSYM:
+ case N_BNSYM:
+ case N_GSYM:
+ break;
+ default:
+ complaint (_("unhandled stab for dwarf OSO file"));
+ break;
+ }
+ }
+ }
+ else
+ complaint (_("non-debugging symbol within SO"));
+ break;
+ }
}
- /* Just in case there is no trailing SO entry. */
- if (oso_file != NULL)
- macho_register_oso (oso_file, nbr_sections, first_symbol, first_offset);
+ if (state != S_NO_SO)
+ complaint (_("missing nul SO"));
}
/* If NAME describes an archive member (ie: ARCHIVE '(' MEMBER ')'),
@@ -287,193 +321,348 @@ macho_symtab_read (struct objfile *objfile,
static int
get_archive_prefix_len (const char *name)
{
- char *lparen;
+ const char *lparen;
int name_len = strlen (name);
if (name_len == 0 || name[name_len - 1] != ')')
return -1;
-
+
lparen = strrchr (name, '(');
if (lparen == NULL || lparen == name)
return -1;
return lparen - name;
}
-static int
-oso_el_compare_name (const void *vl, const void *vr)
+/* Compare function to std::sort OSOs, so that members of a library
+ are gathered. */
+
+static bool
+oso_el_compare_name (const oso_el &l, const oso_el &r)
+{
+ return strcmp (l.name, r.name) < 0;
+}
+
+/* Hash table entry structure for the stabs symbols in the main object file.
+ This is used to speed up lookup for symbols in the OSO. */
+
+struct macho_sym_hash_entry
+{
+ struct bfd_hash_entry base;
+ const asymbol *sym;
+};
+
+/* Routine to create an entry in the hash table. */
+
+static struct bfd_hash_entry *
+macho_sym_hash_newfunc (struct bfd_hash_entry *entry,
+ struct bfd_hash_table *table,
+ const char *string)
{
- const oso_el *l = (const oso_el *)vl;
- const oso_el *r = (const oso_el *)vr;
+ struct macho_sym_hash_entry *ret = (struct macho_sym_hash_entry *) entry;
+
+ /* Allocate the structure if it has not already been allocated by a
+ subclass. */
+ if (ret == NULL)
+ ret = (struct macho_sym_hash_entry *) bfd_hash_allocate (table,
+ sizeof (* ret));
+ if (ret == NULL)
+ return NULL;
+
+ /* Call the allocation method of the superclass. */
+ ret = (struct macho_sym_hash_entry *)
+ bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string);
- return strcmp (l->name, r->name);
+ if (ret)
+ {
+ /* Initialize the local fields. */
+ ret->sym = NULL;
+ }
+
+ return (struct bfd_hash_entry *) ret;
}
-/* Add an oso file as a symbol file. */
+/* Get the value of SYM from the minimal symtab of MAIN_OBJFILE. This is used
+ to get the value of global and common symbols. */
+
+static CORE_ADDR
+macho_resolve_oso_sym_with_minsym (struct objfile *main_objfile, asymbol *sym)
+{
+ /* For common symbol and global symbols, use the min symtab. */
+ struct bound_minimal_symbol msym;
+ const char *name = sym->name;
+
+ if (name[0] == bfd_get_symbol_leading_char (main_objfile->obfd))
+ ++name;
+ msym = lookup_minimal_symbol (name, NULL, main_objfile);
+ if (msym.minsym == NULL)
+ {
+ warning (_("can't find symbol '%s' in minsymtab"), name);
+ return 0;
+ }
+ else
+ return BMSYMBOL_VALUE_ADDRESS (msym);
+}
+
+/* Add oso file OSO/ABFD as a symbol file. */
static void
-macho_add_oso_symfile (oso_el *oso, bfd *abfd,
- struct objfile *main_objfile, int symfile_flags)
+macho_add_oso_symfile (oso_el *oso, const gdb_bfd_ref_ptr &abfd,
+ const char *name,
+ struct objfile *main_objfile,
+ symfile_add_flags symfile_flags)
{
- struct objfile *objfile;
+ int storage;
int i;
- char leading_char;
+ asymbol **symbol_table;
+ asymbol **symp;
+ struct bfd_hash_table table;
+ int nbr_sections;
+
+ /* Per section flag to mark which section have been rebased. */
+ unsigned char *sections_rebased;
if (mach_o_debug_level > 0)
- printf_unfiltered (_("Loading symbols from oso: %s\n"), oso->name);
+ printf_unfiltered
+ (_("Loading debugging symbols from oso: %s\n"), oso->name);
- if (!bfd_check_format (abfd, bfd_object))
+ if (!bfd_check_format (abfd.get (), bfd_object))
{
warning (_("`%s': can't read symbols: %s."), oso->name,
bfd_errmsg (bfd_get_error ()));
- bfd_close (abfd);
return;
}
- bfd_set_cacheable (abfd, 1);
+ if (abfd->my_archive == NULL && oso->mtime != bfd_get_mtime (abfd.get ()))
+ {
+ warning (_("`%s': file time stamp mismatch."), oso->name);
+ return;
+ }
- /* Relocate sections. */
+ if (!bfd_hash_table_init_n (&table, macho_sym_hash_newfunc,
+ sizeof (struct macho_sym_hash_entry),
+ oso->nbr_syms))
+ {
+ warning (_("`%s': can't create hash table"), oso->name);
+ return;
+ }
- leading_char = bfd_get_symbol_leading_char (main_objfile->obfd);
+ bfd_set_cacheable (abfd.get (), 1);
- for (i = 0; i < oso->num_sections; i++)
- {
- asection *sect;
- const char *sectname;
- bfd_vma vma;
+ /* Read symbols table. */
+ storage = bfd_get_symtab_upper_bound (abfd.get ());
+ symbol_table = (asymbol **) xmalloc (storage);
+ bfd_canonicalize_symtab (abfd.get (), symbol_table);
- /* Empty slot. */
- if (oso->symbols[i] == NULL)
- continue;
+ /* Init section flags. */
+ nbr_sections = bfd_count_sections (abfd.get ());
+ sections_rebased = (unsigned char *) alloca (nbr_sections);
+ for (i = 0; i < nbr_sections; i++)
+ sections_rebased[i] = 0;
- if (oso->offsets[i])
- vma = oso->offsets[i];
- else
+ /* Put symbols for the OSO file in the hash table. */
+ for (symp = oso->oso_sym; symp != oso->end_sym; symp++)
+ {
+ const asymbol *sym = *symp;
+ bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
+
+ switch (mach_o_sym->n_type)
+ {
+ case N_ENSYM:
+ case N_BNSYM:
+ case N_GSYM:
+ sym = NULL;
+ break;
+ case N_FUN:
+ if (sym->name == NULL || sym->name[0] == 0)
+ sym = NULL;
+ break;
+ case N_STSYM:
+ break;
+ default:
+ sym = NULL;
+ break;
+ }
+ if (sym != NULL)
{
- struct minimal_symbol *msym;
- const char *name = oso->symbols[i]->name;
-
- if (name[0] == leading_char)
- ++name;
-
- if (mach_o_debug_level > 3)
- printf_unfiltered (_("resolve sect %s with %s\n"),
- oso->symbols[i]->section->name,
- oso->symbols[i]->name);
- msym = lookup_minimal_symbol (name, NULL, main_objfile);
- if (msym == NULL)
+ struct macho_sym_hash_entry *ent;
+
+ ent = (struct macho_sym_hash_entry *)
+ bfd_hash_lookup (&table, sym->name, TRUE, FALSE);
+ if (ent->sym != NULL)
+ complaint (_("Duplicated symbol %s in symbol table"), sym->name);
+ else
{
- warning (_("can't find symbol '%s' in minsymtab"), name);
- continue;
+ if (mach_o_debug_level > 4)
+ {
+ struct gdbarch *arch = get_objfile_arch (main_objfile);
+ printf_unfiltered
+ (_("Adding symbol %s (addr: %s)\n"),
+ sym->name, paddress (arch, sym->value));
+ }
+ ent->sym = sym;
}
- else
- vma = SYMBOL_VALUE_ADDRESS (msym);
}
- sectname = (char *)oso->symbols[i]->section->name;
+ }
- sect = bfd_get_section_by_name (abfd, sectname);
- if (sect == NULL)
+ /* Relocate symbols of the OSO. */
+ for (i = 0; symbol_table[i]; i++)
+ {
+ asymbol *sym = symbol_table[i];
+ bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
+
+ if (mach_o_sym->n_type & BFD_MACH_O_N_STAB)
+ continue;
+ if ((mach_o_sym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_UNDF
+ && sym->value != 0)
{
- warning (_("can't find section '%s' in OSO file %s"),
- sectname, oso->name);
- continue;
+ /* For common symbol use the min symtab and modify the OSO
+ symbol table. */
+ CORE_ADDR res;
+
+ res = macho_resolve_oso_sym_with_minsym (main_objfile, sym);
+ if (res != 0)
+ {
+ sym->section = bfd_com_section_ptr;
+ sym->value = res;
+ }
}
- bfd_set_section_vma (abfd, sect, vma);
+ else if ((mach_o_sym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_SECT)
+ {
+ /* Normal symbol. */
+ asection *sec = sym->section;
+ bfd_mach_o_section *msec;
+ unsigned int sec_type;
+
+ /* Skip buggy ones. */
+ if (sec == NULL || sections_rebased[sec->index] != 0)
+ continue;
+
+ /* Only consider regular, non-debugging sections. */
+ msec = bfd_mach_o_get_mach_o_section (sec);
+ sec_type = msec->flags & BFD_MACH_O_SECTION_TYPE_MASK;
+ if ((sec_type == BFD_MACH_O_S_REGULAR
+ || sec_type == BFD_MACH_O_S_ZEROFILL)
+ && (msec->flags & BFD_MACH_O_S_ATTR_DEBUG) == 0)
+ {
+ CORE_ADDR addr = 0;
- if (mach_o_debug_level > 1)
- printf_unfiltered (_(" %s: %s\n"),
- core_addr_to_string (vma), sectname);
- }
+ if ((mach_o_sym->n_type & BFD_MACH_O_N_EXT) != 0)
+ {
+ /* Use the min symtab for global symbols. */
+ addr = macho_resolve_oso_sym_with_minsym (main_objfile, sym);
+ }
+ else
+ {
+ struct macho_sym_hash_entry *ent;
- /* Make sure that the filename was malloc'ed. The current filename comes
- either from an OSO symbol name or from an archive name. Memory for both
- is not managed by gdb. */
- abfd->filename = xstrdup (abfd->filename);
+ ent = (struct macho_sym_hash_entry *)
+ bfd_hash_lookup (&table, sym->name, FALSE, FALSE);
+ if (ent != NULL)
+ addr = bfd_asymbol_value (ent->sym);
+ }
- gdb_assert (current_oso.symbol_table == NULL);
- current_oso.main_objfile = main_objfile;
+ /* Adjust the section. */
+ if (addr != 0)
+ {
+ CORE_ADDR res = addr - sym->value;
- /* We need to clear SYMFILE_MAINLINE to avoid interractive question
+ if (mach_o_debug_level > 3)
+ {
+ struct gdbarch *arch = get_objfile_arch (main_objfile);
+ printf_unfiltered
+ (_("resolve sect %s with %s (set to %s)\n"),
+ sec->name, sym->name,
+ paddress (arch, res));
+ }
+ bfd_set_section_vma (sec, res);
+ sections_rebased[sec->index] = 1;
+ }
+ }
+ else
+ {
+ /* Mark the section as never rebased. */
+ sections_rebased[sec->index] = 2;
+ }
+ }
+ }
+
+ bfd_hash_table_free (&table);
+
+ /* We need to clear SYMFILE_MAINLINE to avoid interactive question
from symfile.c:symbol_file_add_with_addrs_or_offsets. */
- objfile = symbol_file_add_from_bfd
- (abfd, symfile_flags & ~(SYMFILE_MAINLINE | SYMFILE_VERBOSE), NULL,
+ symbol_file_add_from_bfd
+ (abfd.get (), name, symfile_flags & ~(SYMFILE_MAINLINE | SYMFILE_VERBOSE),
+ NULL,
main_objfile->flags & (OBJF_REORDERED | OBJF_SHARED
- | OBJF_READNOW | OBJF_USERLOADED));
- add_separate_debug_objfile (objfile, main_objfile);
-
- current_oso.main_objfile = NULL;
- if (current_oso.symbol_table)
- {
- xfree (current_oso.symbol_table);
- current_oso.symbol_table = NULL;
- }
+ | OBJF_READNOW | OBJF_USERLOADED),
+ main_objfile);
}
-/* Read symbols from the vector of oso files. */
+/* Read symbols from the vector of oso files.
+
+ Note that this function sorts OSO_VECTOR_PTR. */
static void
-macho_symfile_read_all_oso (struct objfile *main_objfile, int symfile_flags)
+macho_symfile_read_all_oso (std::vector *oso_vector_ptr,
+ struct objfile *main_objfile,
+ symfile_add_flags symfile_flags)
{
int ix;
- VEC (oso_el) *vec;
oso_el *oso;
- vec = oso_vector;
- oso_vector = NULL;
-
/* 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)
{
- bfd *archive_bfd;
- bfd *member_bfd;
- char *archive_name = XNEWVEC (char, pfx_len + 1);
int last_ix;
oso_el *oso2;
int ix2;
- memcpy (archive_name, oso->name, pfx_len);
- archive_name[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++)
{
- if (strncmp (oso2->name, archive_name, pfx_len) != 0)
+ 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. */
- archive_bfd = bfd_openr (archive_name, gnutarget);
+ gdb_bfd_ref_ptr archive_bfd (gdb_bfd_open (archive_name.c_str (),
+ gnutarget, -1));
if (archive_bfd == NULL)
{
warning (_("Could not open OSO archive file \"%s\""),
- archive_name);
+ archive_name.c_str ());
ix = last_ix;
continue;
}
- if (!bfd_check_format (archive_bfd, bfd_archive))
+ if (!bfd_check_format (archive_bfd.get (), bfd_archive))
{
warning (_("OSO archive file \"%s\" not an archive."),
- archive_name);
- bfd_close (archive_bfd);
+ archive_name.c_str ());
ix = last_ix;
continue;
}
- member_bfd = bfd_openr_next_archived_file (archive_bfd, NULL);
-
+
+ gdb_bfd_ref_ptr member_bfd
+ (gdb_bfd_openr_next_archived_file (archive_bfd.get (), NULL));
+
if (member_bfd == NULL)
{
warning (_("Could not read archive members out of "
- "OSO archive \"%s\""), archive_name);
- bfd_close (archive_bfd);
+ "OSO archive \"%s\""), archive_name.c_str ());
ix = last_ix;
continue;
}
@@ -481,14 +670,13 @@ macho_symfile_read_all_oso (struct objfile *main_objfile, int symfile_flags)
/* Load all oso in this library. */
while (member_bfd != NULL)
{
- bfd *prev;
- 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
@@ -496,23 +684,19 @@ macho_symfile_read_all_oso (struct objfile *main_objfile, int symfile_flags)
member_len))
{
macho_add_oso_symfile (oso2, member_bfd,
+ bfd_get_filename (member_bfd.get ()),
main_objfile, symfile_flags);
oso2->name = NULL;
break;
}
}
- prev = member_bfd;
- member_bfd = bfd_openr_next_archived_file
- (archive_bfd, member_bfd);
-
- /* Free previous member if not referenced by an oso. */
- if (ix2 >= last_ix)
- bfd_close (prev);
+ member_bfd = gdb_bfd_openr_next_archived_file (archive_bfd.get (),
+ member_bfd.get ());
}
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 "
@@ -522,25 +706,17 @@ macho_symfile_read_all_oso (struct objfile *main_objfile, int symfile_flags)
}
else
{
- bfd *abfd;
-
- abfd = bfd_openr (oso->name, gnutarget);
- if (!abfd)
+ gdb_bfd_ref_ptr abfd (gdb_bfd_open (oso->name, gnutarget, -1));
+ if (abfd == NULL)
warning (_("`%s': can't open to read symbols: %s."), oso->name,
bfd_errmsg (bfd_get_error ()));
else
- macho_add_oso_symfile (oso, abfd, main_objfile, symfile_flags);
+ macho_add_oso_symfile (oso, abfd, oso->name, main_objfile,
+ symfile_flags);
ix++;
}
}
-
- for (ix = 0; VEC_iterate (oso_el, vec, ix, oso); ix++)
- {
- xfree (oso->symbols);
- xfree (oso->offsets);
- }
- VEC_free (oso_el, vec);
}
/* DSYM (debug symbols) files contain the debug info of an executable.
@@ -550,22 +726,23 @@ macho_symfile_read_all_oso (struct objfile *main_objfile, int symfile_flags)
executable name and the executable base name to get the DSYM file name. */
#define DSYM_SUFFIX ".dSYM/Contents/Resources/DWARF/"
-/* Check if a dsym file exists for OBJFILE. If so, returns a bfd for it.
- Return NULL if no valid dsym file is found. */
+/* Check if a dsym file exists for OBJFILE. If so, returns a bfd for it
+ and return *FILENAMEP with its original filename.
+ Return NULL if no valid dsym file is found (FILENAMEP is not used in
+ such case). */
-static bfd *
-macho_check_dsym (struct objfile *objfile)
+static gdb_bfd_ref_ptr
+macho_check_dsym (struct objfile *objfile, std::string *filenamep)
{
- size_t name_len = strlen (objfile->name);
+ size_t name_len = strlen (objfile_name (objfile));
size_t dsym_len = strlen (DSYM_SUFFIX);
- const char *base_name = lbasename (objfile->name);
+ const char *base_name = lbasename (objfile_name (objfile));
size_t base_len = strlen (base_name);
- char *dsym_filename = alloca (name_len + dsym_len + base_len + 1);
- bfd *dsym_bfd;
+ char *dsym_filename = (char *) alloca (name_len + dsym_len + base_len + 1);
bfd_mach_o_load_command *main_uuid;
bfd_mach_o_load_command *dsym_uuid;
- strcpy (dsym_filename, objfile->name);
+ strcpy (dsym_filename, objfile_name (objfile));
strcpy (dsym_filename + name_len, DSYM_SUFFIX);
strcpy (dsym_filename + name_len + dsym_len, base_name);
@@ -575,62 +752,56 @@ macho_check_dsym (struct objfile *objfile)
if (bfd_mach_o_lookup_command (objfile->obfd,
BFD_MACH_O_LC_UUID, &main_uuid) == 0)
{
- warning (_("can't find UUID in %s"), objfile->name);
+ warning (_("can't find UUID in %s"), objfile_name (objfile));
return NULL;
}
- dsym_filename = xstrdup (dsym_filename);
- dsym_bfd = bfd_openr (dsym_filename, gnutarget);
+ gdb_bfd_ref_ptr dsym_bfd (gdb_bfd_openr (dsym_filename, gnutarget));
if (dsym_bfd == NULL)
{
warning (_("can't open dsym file %s"), dsym_filename);
- xfree (dsym_filename);
return NULL;
}
- if (!bfd_check_format (dsym_bfd, bfd_object))
+ if (!bfd_check_format (dsym_bfd.get (), bfd_object))
{
- bfd_close (dsym_bfd);
warning (_("bad dsym file format: %s"), bfd_errmsg (bfd_get_error ()));
- xfree (dsym_filename);
return NULL;
}
- if (bfd_mach_o_lookup_command (dsym_bfd,
+ if (bfd_mach_o_lookup_command (dsym_bfd.get (),
BFD_MACH_O_LC_UUID, &dsym_uuid) == 0)
{
warning (_("can't find UUID in %s"), dsym_filename);
- bfd_close (dsym_bfd);
- xfree (dsym_filename);
return NULL;
}
if (memcmp (dsym_uuid->command.uuid.uuid, main_uuid->command.uuid.uuid,
sizeof (main_uuid->command.uuid.uuid)))
{
- warning (_("dsym file UUID doesn't match the one in %s"), objfile->name);
- bfd_close (dsym_bfd);
- xfree (dsym_filename);
+ warning (_("dsym file UUID doesn't match the one in %s"),
+ objfile_name (objfile));
return NULL;
}
+ *filenamep = std::string (dsym_filename);
return dsym_bfd;
}
static void
-macho_symfile_read (struct objfile *objfile, int symfile_flags)
+macho_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
{
bfd *abfd = objfile->obfd;
- struct cleanup *back_to;
- CORE_ADDR offset;
long storage_needed;
- bfd *dsym_bfd;
-
- init_minimal_symbol_collection ();
- back_to = make_cleanup_discard_minimal_symbols ();
+ std::vector 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 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))
{
+ std::string dsym_filename;
+
/* Process the normal symbol table first. */
storage_needed = bfd_get_symtab_upper_bound (objfile->obfd);
if (storage_needed < 0)
@@ -640,49 +811,41 @@ macho_symfile_read (struct objfile *objfile, int symfile_flags)
if (storage_needed > 0)
{
- asymbol **symbol_table;
long symcount;
- symbol_table = (asymbol **) xmalloc (storage_needed);
- make_cleanup (xfree, symbol_table);
- symcount = bfd_canonicalize_symtab (objfile->obfd, symbol_table);
-
+ symbol_table.resize (storage_needed / sizeof (asymbol *));
+
+ minimal_symbol_reader reader (objfile);
+
+ 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 (objfile, symcount, symbol_table);
+
+ macho_symtab_read (reader, objfile, symcount, symbol_table.data (),
+ &oso_vector);
+
+ reader.install ();
}
-
- install_minimal_symbols (objfile);
/* Try to read .eh_frame / .debug_frame. */
/* First, locate these sections. We ignore the result status
as it only checks for debug info. */
- dwarf2_has_info (objfile);
+ dwarf2_has_info (objfile, NULL);
dwarf2_build_frame_info (objfile);
-
+
/* Check for DSYM file. */
- dsym_bfd = macho_check_dsym (objfile);
+ gdb_bfd_ref_ptr dsym_bfd (macho_check_dsym (objfile, &dsym_filename));
if (dsym_bfd != NULL)
{
- int ix;
- oso_el *oso;
struct bfd_section *asect, *dsect;
if (mach_o_debug_level > 0)
printf_unfiltered (_("dsym file found\n"));
- /* Remove oso. They won't be used. */
- for (ix = 0; VEC_iterate (oso_el, oso_vector, ix, oso); ix++)
- {
- xfree (oso->symbols);
- xfree (oso->offsets);
- }
- VEC_free (oso_el, oso_vector);
- oso_vector = NULL;
-
/* Set dsym section size. */
for (asect = objfile->obfd->sections, dsect = dsym_bfd->sections;
asect && dsect;
@@ -690,30 +853,27 @@ macho_symfile_read (struct objfile *objfile, int symfile_flags)
{
if (strcmp (asect->name, dsect->name) != 0)
break;
- bfd_set_section_size (dsym_bfd, 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, symfile_flags, objfile);
-
+ 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. */
return;
}
}
- if (dwarf2_has_info (objfile))
+ if (dwarf2_has_info (objfile, NULL))
{
/* DWARF 2 sections */
dwarf2_build_psymtabs (objfile);
}
- /* Do not try to read .eh_frame/.debug_frame as they are not relocated
- and dwarf2_build_frame_info cannot deal with unrelocated sections. */
-
/* Then the oso. */
- if (oso_vector != NULL)
- macho_symfile_read_all_oso (objfile, symfile_flags);
+ if (!oso_vector.empty ())
+ macho_symfile_read_all_oso (&oso_vector, objfile, symfile_flags);
}
static bfd_byte *
@@ -729,48 +889,7 @@ macho_symfile_relocate (struct objfile *objfile, asection *sectp,
if (mach_o_debug_level > 0)
printf_unfiltered (_("Relocate section '%s' of %s\n"),
- sectp->name, objfile->name);
-
- if (current_oso.symbol_table == NULL)
- {
- int storage;
- int i;
- char leading_char;
-
- storage = bfd_get_symtab_upper_bound (abfd);
- current_oso.symbol_table = (asymbol **) xmalloc (storage);
- bfd_canonicalize_symtab (abfd, current_oso.symbol_table);
-
- leading_char = bfd_get_symbol_leading_char (abfd);
-
- for (i = 0; current_oso.symbol_table[i]; i++)
- {
- asymbol *sym = current_oso.symbol_table[i];
-
- if (bfd_is_com_section (sym->section))
- {
- /* This one must be solved. */
- struct minimal_symbol *msym;
- const char *name = sym->name;
-
- if (name[0] == leading_char)
- name++;
-
- msym = lookup_minimal_symbol
- (name, NULL, current_oso.main_objfile);
- if (msym == NULL)
- {
- warning (_("can't find symbol '%s' in minsymtab"), name);
- continue;
- }
- else
- {
- sym->section = &bfd_abs_section;
- sym->value = SYMBOL_VALUE_ADDRESS (msym);
- }
- }
- }
- }
+ sectp->name, objfile_name (objfile));
return bfd_simple_get_relocated_section_contents (abfd, sectp, buf, NULL);
}
@@ -782,19 +901,13 @@ macho_symfile_finish (struct objfile *objfile)
static void
macho_symfile_offsets (struct objfile *objfile,
- struct section_addr_info *addrs)
+ const section_addr_info &addrs)
{
unsigned int i;
- unsigned int num_sections;
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
@@ -805,18 +918,15 @@ macho_symfile_offsets (struct objfile *objfile,
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++)
{
- if (addrs->other[i].name == NULL)
- continue;
-
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;
}
}
@@ -827,9 +937,9 @@ macho_symfile_offsets (struct objfile *objfile,
ALL_OBJFILE_OSECTIONS (objfile, osect)
{
const char *bfd_sect_name = osect->the_bfd_section->name;
- int sect_index = osect->the_bfd_section->index;
-
- if (strncmp (bfd_sect_name, "LC_SEGMENT.", 11) == 0)
+ int sect_index = osect - objfile->sections;;
+
+ if (startswith (bfd_sect_name, "LC_SEGMENT."))
bfd_sect_name += 11;
if (strcmp (bfd_sect_name, "__TEXT") == 0
|| strcmp (bfd_sect_name, "__TEXT.__text") == 0)
@@ -838,28 +948,28 @@ macho_symfile_offsets (struct objfile *objfile,
}
static const struct sym_fns macho_sym_fns = {
- bfd_target_mach_o_flavour,
-
macho_new_init, /* init anything gbl to entire symtab */
macho_symfile_init, /* read initial info, setup for sym_read() */
macho_symfile_read, /* read a symbol file into symtab */
+ NULL, /* sym_read_psymbols */
macho_symfile_finish, /* finished with file, cleanup */
macho_symfile_offsets, /* xlate external to internal form */
default_symfile_segments, /* Get segment information from a file. */
NULL,
macho_symfile_relocate, /* Relocate a debug section. */
+ NULL, /* sym_get_probes */
&psym_functions
};
void
-_initialize_machoread ()
+_initialize_machoread (void)
{
- add_symtab_fns (&macho_sym_fns);
-
- add_setshow_zinteger_cmd ("mach-o", class_obscure,
- &mach_o_debug_level,
- _("Set if printing Mach-O symbols processing."),
- _("Show if printing Mach-O symbols processing."),
- NULL, NULL, NULL,
- &setdebuglist, &showdebuglist);
+ add_symtab_fns (bfd_target_mach_o_flavour, &macho_sym_fns);
+
+ add_setshow_zuinteger_cmd ("mach-o", class_obscure,
+ &mach_o_debug_level,
+ _("Set if printing Mach-O symbols processing."),
+ _("Show if printing Mach-O symbols processing."),
+ NULL, NULL, NULL,
+ &setdebuglist, &showdebuglist);
}