/* Handle Darwin shared libraries for GDB, the GNU Debugger.
- Copyright (C) 2009-2016 Free Software Foundation, Inc.
+ Copyright (C) 2009-2017 Free Software Foundation, Inc.
This file is part of GDB.
/* Current all_image_infos version. */
#define DYLD_VERSION_MIN 1
-#define DYLD_VERSION_MAX 14
+#define DYLD_VERSION_MAX 15
/* Per PSPACE specific data. */
struct darwin_info
/* Link map info to include in an allocated so_list entry. */
-struct lm_info
+struct lm_info_darwin : public lm_info_base
{
/* The target location of lm. */
- CORE_ADDR lm_addr;
-};
-
-struct darwin_so_list
-{
- /* Common field. */
- struct so_list sl;
- /* Darwin specific data. */
- struct lm_info li;
+ CORE_ADDR lm_addr = 0;
};
/* Lookup the value for a specific symbol. */
static CORE_ADDR
-lookup_symbol_from_bfd (bfd *abfd, char *symname)
+lookup_symbol_from_bfd (bfd *abfd, const char *symname)
{
long storage_needed;
asymbol **symbol_table;
unsigned long hdr_val;
char *file_path;
int errcode;
- struct darwin_so_list *dnew;
struct so_list *newobj;
struct cleanup *old_chain;
break;
/* Create and fill the new so_list element. */
- dnew = XCNEW (struct darwin_so_list);
- newobj = &dnew->sl;
- old_chain = make_cleanup (xfree, dnew);
+ newobj = XCNEW (struct so_list);
+ old_chain = make_cleanup (xfree, newobj);
- newobj->lm_info = &dnew->li;
+ lm_info_darwin *li = new lm_info_darwin;
+ newobj->lm_info = li;
strncpy (newobj->so_name, file_path, SO_NAME_MAX_PATH_SIZE - 1);
newobj->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
strcpy (newobj->so_original_name, newobj->so_name);
xfree (file_path);
- newobj->lm_info->lm_addr = load_addr;
+ li->lm_addr = load_addr;
if (head == NULL)
head = newobj;
counting properly. This will either return NULL, or return a new
reference to a BFD. */
-static bfd *
+static gdb_bfd_ref_ptr
gdb_bfd_mach_o_fat_extract (bfd *abfd, bfd_format format,
const bfd_arch_info_type *arch)
{
else
gdb_bfd_mark_parent (result, abfd);
- return result;
+ return gdb_bfd_ref_ptr (result);
}
/* Extract dyld_all_image_addr when the process was just created, assuming the
{
char *interp_name;
CORE_ADDR load_addr = 0;
- bfd *dyld_bfd = NULL;
- struct cleanup *cleanup;
/* This method doesn't work with an attached process. */
if (current_inferior ()->attach_flag)
if (!interp_name)
return;
- cleanup = make_cleanup (null_cleanup, NULL);
-
/* Create a bfd for the interpreter. */
- dyld_bfd = gdb_bfd_open (interp_name, gnutarget, -1);
- if (dyld_bfd)
+ gdb_bfd_ref_ptr dyld_bfd (gdb_bfd_open (interp_name, gnutarget, -1));
+ if (dyld_bfd != NULL)
{
- bfd *sub;
-
- make_cleanup_bfd_unref (dyld_bfd);
- sub = gdb_bfd_mach_o_fat_extract
- (dyld_bfd, bfd_object, gdbarch_bfd_arch_info (target_gdbarch ()));
- if (sub)
- {
- dyld_bfd = sub;
- make_cleanup_bfd_unref (sub);
- }
+ gdb_bfd_ref_ptr sub
+ (gdb_bfd_mach_o_fat_extract (dyld_bfd.get (), bfd_object,
+ gdbarch_bfd_arch_info (target_gdbarch ())));
+ if (sub != NULL)
+ dyld_bfd = sub;
else
- dyld_bfd = NULL;
- }
- if (!dyld_bfd)
- {
- do_cleanups (cleanup);
- return;
+ dyld_bfd.release ();
}
+ if (dyld_bfd == NULL)
+ return;
/* We find the dynamic linker's base address by examining
the current pc (which should point at the entry point for the
dynamic linker) and subtracting the offset of the entry point. */
load_addr = (regcache_read_pc (get_current_regcache ())
- - bfd_get_start_address (dyld_bfd));
+ - bfd_get_start_address (dyld_bfd.get ()));
/* Now try to set a breakpoint in the dynamic linker. */
info->all_image_addr =
- lookup_symbol_from_bfd (dyld_bfd, "_dyld_all_image_infos");
-
- do_cleanups (cleanup);
+ lookup_symbol_from_bfd (dyld_bfd.get (), "_dyld_all_image_infos");
if (info->all_image_addr == 0)
return;
static void
darwin_free_so (struct so_list *so)
{
+ lm_info_darwin *li = (lm_info_darwin *) so->lm_info;
+
+ delete li;
}
/* The section table is built from bfd sections using bfd VMAs.
darwin_relocate_section_addresses (struct so_list *so,
struct target_section *sec)
{
- sec->addr += so->lm_info->lm_addr;
- sec->endaddr += so->lm_info->lm_addr;
+ lm_info_darwin *li = (lm_info_darwin *) so->lm_info;
+
+ sec->addr += li->lm_addr;
+ sec->endaddr += li->lm_addr;
/* Best effort to set addr_high/addr_low. This is used only by
'info sharedlibary'. */
return (struct block_symbol) {NULL, NULL};
}
-static bfd *
+static gdb_bfd_ref_ptr
darwin_bfd_open (char *pathname)
{
char *found_pathname;
int found_file;
- bfd *abfd;
- bfd *res;
/* Search for shared library file. */
found_pathname = solib_find (pathname, &found_file);
perror_with_name (pathname);
/* Open bfd for shared library. */
- abfd = solib_bfd_fopen (found_pathname, found_file);
+ gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname, found_file));
- res = gdb_bfd_mach_o_fat_extract (abfd, bfd_object,
- gdbarch_bfd_arch_info (target_gdbarch ()));
- if (!res)
- {
- make_cleanup_bfd_unref (abfd);
- error (_("`%s': not a shared-library: %s"),
- bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ()));
- }
+ gdb_bfd_ref_ptr res
+ (gdb_bfd_mach_o_fat_extract (abfd.get (), bfd_object,
+ gdbarch_bfd_arch_info (target_gdbarch ())));
+ if (res == NULL)
+ error (_("`%s': not a shared-library: %s"),
+ bfd_get_filename (abfd.get ()), bfd_errmsg (bfd_get_error ()));
/* The current filename for fat-binary BFDs is a name generated
by BFD, usually a string containing the name of the architecture.
Reset its value to the actual filename. */
- xfree (bfd_get_filename (res));
+ xfree (bfd_get_filename (res.get ()));
res->filename = xstrdup (pathname);
- gdb_bfd_unref (abfd);
return res;
}
projects / deliverable / binutils-gdb.git / blobdiff