/* Handle Darwin shared libraries for GDB, the GNU Debugger.
- Copyright (C) 2009-2018 Free Software Foundation, Inc.
+ Copyright (C) 2009-2019 Free Software Foundation, Inc.
This file is part of GDB.
CORE_ADDR path_addr;
struct mach_o_header_external hdr;
unsigned long hdr_val;
- char *file_path;
+ gdb::unique_xmalloc_ptr<char> file_path;
int errcode;
- struct so_list *newobj;
- struct cleanup *old_chain;
/* Read image info from inferior. */
if (target_read_memory (iinfo, buf, image_info_size))
break;
/* Create and fill the new so_list element. */
- newobj = XCNEW (struct so_list);
- old_chain = make_cleanup (xfree, newobj);
+ gdb::unique_xmalloc_ptr<struct so_list> newobj (XCNEW (struct so_list));
lm_info_darwin *li = new lm_info_darwin;
newobj->lm_info = li;
- strncpy (newobj->so_name, file_path, SO_NAME_MAX_PATH_SIZE - 1);
+ strncpy (newobj->so_name, file_path.get (), 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);
li->lm_addr = load_addr;
if (head == NULL)
- head = newobj;
+ head = newobj.get ();
else
- tail->next = newobj;
- tail = newobj;
-
- discard_cleanups (old_chain);
+ tail->next = newobj.get ();
+ tail = newobj.release ();
}
return head;
return gdb_bfd_ref_ptr (result);
}
-/* Extract dyld_all_image_addr when the process was just created, assuming the
- current PC is at the entry of the dynamic linker. */
+/* Return the BFD for the program interpreter. */
-static void
-darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info)
+static gdb_bfd_ref_ptr
+darwin_get_dyld_bfd ()
{
char *interp_name;
- CORE_ADDR load_addr = 0;
/* This method doesn't work with an attached process. */
if (current_inferior ()->attach_flag)
- return;
+ return NULL;
/* Find the program interpreter. */
interp_name = find_program_interpreter ();
if (!interp_name)
- return;
+ return NULL;
/* Create a bfd for the interpreter. */
gdb_bfd_ref_ptr dyld_bfd (gdb_bfd_open (interp_name, gnutarget, -1));
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.release ();
+ dyld_bfd = sub;
}
+ return dyld_bfd;
+}
+
+/* Extract dyld_all_image_addr when the process was just created, assuming the
+ current PC is at the entry of the dynamic linker. */
+
+static void
+darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info)
+{
+ CORE_ADDR load_addr = 0;
+ gdb_bfd_ref_ptr dyld_bfd = darwin_get_dyld_bfd ();
+
if (dyld_bfd == NULL)
return;
if (TYPE_LENGTH (ptr_type) > sizeof (buf))
return;
- len = target_read (¤t_target, TARGET_OBJECT_DARWIN_DYLD_INFO, NULL,
- buf, 0, TYPE_LENGTH (ptr_type));
+ len = target_read (current_top_target (), TARGET_OBJECT_DARWIN_DYLD_INFO,
+ NULL, buf, 0, TYPE_LENGTH (ptr_type));
if (len <= 0)
return;
return;
}
- /* Add the breakpoint which is hit by dyld when the list of solib is
- modified. */
- create_solib_event_breakpoint (target_gdbarch (), info->all_image.notifier);
-
if (info->all_image.count != 0)
{
/* Possible relocate the main executable (PIE). */
if (vmaddr != load_addr)
objfile_rebase (symfile_objfile, load_addr - vmaddr);
}
+
+ /* Set solib notifier (to reload list of shared libraries). */
+ CORE_ADDR notifier = info->all_image.notifier;
+
+ if (info->all_image.count == 0)
+ {
+ /* Dyld hasn't yet relocated itself, so the notifier address may
+ be incorrect (as it has to be relocated). */
+ CORE_ADDR start = bfd_get_start_address (exec_bfd);
+ if (start == 0)
+ notifier = 0;
+ else
+ {
+ gdb_bfd_ref_ptr dyld_bfd = darwin_get_dyld_bfd ();
+ if (dyld_bfd != NULL)
+ {
+ CORE_ADDR dyld_bfd_start_address;
+ CORE_ADDR dyld_relocated_base_address;
+ CORE_ADDR pc;
+
+ dyld_bfd_start_address = bfd_get_start_address (dyld_bfd.get());
+
+ /* 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. */
+
+ pc = regcache_read_pc (get_current_regcache ());
+ dyld_relocated_base_address = pc - dyld_bfd_start_address;
+
+ /* We get the proper notifier relocated address by
+ adding the dyld relocated base address to the current
+ notifier offset value. */
+
+ notifier += dyld_relocated_base_address;
+ }
+ }
+ }
+
+ /* Add the breakpoint which is hit by dyld when the list of solib is
+ modified. */
+ if (notifier != 0)
+ create_solib_event_breakpoint (target_gdbarch (), notifier);
}
static void
const char *name,
const domain_enum domain)
{
- return (struct block_symbol) {NULL, NULL};
+ return {};
}
static gdb_bfd_ref_ptr
-darwin_bfd_open (char *pathname)
+darwin_bfd_open (const char *pathname)
{
- char *found_pathname;
int found_file;
/* Search for shared library file. */
- found_pathname = solib_find (pathname, &found_file);
+ gdb::unique_xmalloc_ptr<char> found_pathname
+ = solib_find (pathname, &found_file);
if (found_pathname == NULL)
perror_with_name (pathname);
/* Open bfd for shared library. */
- gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname, found_file));
+ gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname.get (), found_file));
gdb_bfd_ref_ptr res
(gdb_bfd_mach_o_fat_extract (abfd.get (), bfd_object,
projects / deliverable / binutils-gdb.git / blobdiff