/* Handle Darwin shared libraries for GDB, the GNU Debugger.
- Copyright (C) 2009-2015 Free Software Foundation, Inc.
+ Copyright (C) 2009-2017 Free Software Foundation, Inc.
This file is part of GDB.
/* The structure has 4 fields: version (4 bytes), count (4 bytes),
info (pointer) and notifier (pointer). */
- len = 4 + 4 + 2 * ptr_type->length;
+ len = 4 + 4 + 2 * TYPE_LENGTH (ptr_type);
gdb_assert (len <= sizeof (buf));
memset (&info->all_image, 0, sizeof (info->all_image));
info->all_image.count = extract_unsigned_integer (buf + 4, 4, byte_order);
info->all_image.info = extract_typed_address (buf + 8, ptr_type);
info->all_image.notifier = extract_typed_address
- (buf + 8 + ptr_type->length, ptr_type);
+ (buf + 8 + TYPE_LENGTH (ptr_type), ptr_type);
}
/* Link map info to include in an allocated so_list entry. */
darwin_read_exec_load_addr_from_dyld (struct darwin_info *info)
{
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
- enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
int ptr_len = TYPE_LENGTH (ptr_type);
unsigned int image_info_size = ptr_len * 3;
int i;
return 0;
}
-
-/* No special symbol handling. */
-
-static void
-darwin_special_symbol_handling (void)
-{
-}
-
/* A wrapper for bfd_mach_o_fat_extract that handles reference
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;
{
gdb_byte buf[8];
LONGEST len;
- enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
/* Sanity check. */
- if (ptr_type->length > sizeof (buf))
+ if (TYPE_LENGTH (ptr_type) > sizeof (buf))
return;
len = target_read (¤t_target, TARGET_OBJECT_DARWIN_DYLD_INFO, NULL,
- buf, 0, ptr_type->length);
+ buf, 0, TYPE_LENGTH (ptr_type));
if (len <= 0)
return;
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;
}
darwin_so_ops.free_so = darwin_free_so;
darwin_so_ops.clear_solib = darwin_clear_solib;
darwin_so_ops.solib_create_inferior_hook = darwin_solib_create_inferior_hook;
- darwin_so_ops.special_symbol_handling = darwin_special_symbol_handling;
darwin_so_ops.current_sos = darwin_current_sos;
darwin_so_ops.open_symbol_file_object = open_symbol_file_object;
darwin_so_ops.in_dynsym_resolve_code = darwin_in_dynsym_resolve_code;
projects / deliverable / binutils-gdb.git / blobdiff