/* Handle Darwin shared libraries for GDB, the GNU Debugger.
- Copyright (C) 2009-2013 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbthread.h"
#include "gdb_bfd.h"
-#include "gdb_assert.h"
-
#include "solist.h"
#include "solib.h"
#include "solib-svr4.h"
#include "elf-bfd.h"
#include "exec.h"
#include "auxv.h"
-#include "exceptions.h"
#include "mach-o.h"
#include "mach-o/external.h"
/* Current all_image_infos version. */
#define DYLD_VERSION_MIN 1
-#define DYLD_VERSION_MAX 12
+#define DYLD_VERSION_MAX 14
/* Per PSPACE specific data. */
struct darwin_info
static void
darwin_pspace_data_cleanup (struct program_space *pspace, void *arg)
{
- struct darwin_info *info;
-
- info = program_space_data (pspace, solib_darwin_pspace_data);
- xfree (info);
+ xfree (arg);
}
/* Get the current darwin data. If none is found yet, add it now. This
{
struct darwin_info *info;
- info = program_space_data (current_program_space, solib_darwin_pspace_data);
+ info = (struct darwin_info *) program_space_data (current_program_space,
+ solib_darwin_pspace_data);
if (info != NULL)
return info;
- info = XZALLOC (struct darwin_info);
+ info = XCNEW (struct darwin_info);
set_program_space_data (current_program_space,
solib_darwin_pspace_data, info);
return info;
/* Return program interpreter string. */
-static gdb_byte *
+static char *
find_program_interpreter (void)
{
- gdb_byte *buf = NULL;
+ char *buf = NULL;
/* If we have an exec_bfd, get the interpreter from the load commands. */
if (exec_bfd)
for (i = 0; i < info->all_image.count; i++)
{
CORE_ADDR iinfo = info->all_image.info + i * image_info_size;
- char buf[image_info_size];
+ gdb_byte buf[image_info_size];
CORE_ADDR load_addr;
CORE_ADDR path_addr;
struct mach_o_header_external hdr;
char *file_path;
int errcode;
struct darwin_so_list *dnew;
- struct so_list *new;
+ struct so_list *newobj;
struct cleanup *old_chain;
/* Read image info from inferior. */
path_addr = extract_typed_address (buf + ptr_len, ptr_type);
/* Read Mach-O header from memory. */
- if (target_read_memory (load_addr, (char *) &hdr, sizeof (hdr) - 4))
+ if (target_read_memory (load_addr, (gdb_byte *) &hdr, sizeof (hdr) - 4))
break;
/* Discard wrong magic numbers. Shouldn't happen. */
hdr_val = extract_unsigned_integer
break;
/* Create and fill the new so_list element. */
- dnew = XZALLOC (struct darwin_so_list);
- new = &dnew->sl;
+ dnew = XCNEW (struct darwin_so_list);
+ newobj = &dnew->sl;
old_chain = make_cleanup (xfree, dnew);
- new->lm_info = &dnew->li;
+ newobj->lm_info = &dnew->li;
- strncpy (new->so_name, file_path, SO_NAME_MAX_PATH_SIZE - 1);
- new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
- strcpy (new->so_original_name, new->so_name);
+ 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);
- new->lm_info->lm_addr = load_addr;
+ newobj->lm_info->lm_addr = load_addr;
if (head == NULL)
- head = new;
+ head = newobj;
else
- tail->next = new;
- tail = new;
+ tail->next = newobj;
+ tail = newobj;
discard_cleanups (old_chain);
}
for (i = 0; i < info->all_image.count; i++)
{
CORE_ADDR iinfo = info->all_image.info + i * image_info_size;
- char buf[image_info_size];
+ gdb_byte buf[image_info_size];
CORE_ADDR load_addr;
struct mach_o_header_external hdr;
unsigned long hdr_val;
load_addr = extract_typed_address (buf, ptr_type);
/* Read Mach-O header from memory. */
- if (target_read_memory (load_addr, (char *) &hdr, sizeof (hdr) - 4))
+ if (target_read_memory (load_addr, (gdb_byte *) &hdr, sizeof (hdr) - 4))
break;
/* Discard wrong magic numbers. Shouldn't happen. */
hdr_val = extract_unsigned_integer
static void
darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info)
{
- gdb_byte *interp_name;
+ char *interp_name;
CORE_ADDR load_addr = 0;
bfd *dyld_bfd = NULL;
struct cleanup *cleanup;
darwin_load_image_infos (info);
if (!darwin_dyld_version_ok (info))
- return;
+ {
+ warning (_("unhandled dyld version (%d)"), info->all_image.version);
+ return;
+ }
create_solib_event_breakpoint (target_gdbarch (), info->all_image.notifier);
load_addr = darwin_read_exec_load_addr (info);
if (load_addr != 0 && symfile_objfile != NULL)
{
- CORE_ADDR vmaddr = 0;
- struct mach_o_data_struct *md = bfd_mach_o_get_data (exec_bfd);
- unsigned int i, num;
+ CORE_ADDR vmaddr;
/* Find the base address of the executable. */
- for (i = 0; i < md->header.ncmds; i++)
- {
- struct bfd_mach_o_load_command *cmd = &md->commands[i];
-
- if (cmd->type != BFD_MACH_O_LC_SEGMENT
- && cmd->type != BFD_MACH_O_LC_SEGMENT_64)
- continue;
- if (cmd->command.segment.fileoff == 0
- && cmd->command.segment.vmaddr != 0
- && cmd->command.segment.filesize != 0)
- {
- vmaddr = cmd->command.segment.vmaddr;
- break;
- }
- }
+ vmaddr = bfd_mach_o_get_base_address (exec_bfd);
/* Relocate. */
if (vmaddr != load_addr)
so->addr_low = sec->addr;
}
\f
-static struct symbol *
-darwin_lookup_lib_symbol (const struct objfile *objfile,
+static struct block_symbol
+darwin_lookup_lib_symbol (struct objfile *objfile,
const char *name,
const domain_enum domain)
{
- return NULL;
+ return (struct block_symbol) {NULL, NULL};
}
static bfd *
bfd_get_filename (abfd), 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));
+ res->filename = xstrdup (pathname);
+
gdb_bfd_unref (abfd);
return res;
}