#include "inferior.h"
#include "regcache.h"
#include "gdbthread.h"
+#include "gdb_bfd.h"
#include "gdb_assert.h"
#include "auxv.h"
#include "exceptions.h"
#include "mach-o.h"
+#include "mach-o/external.h"
struct gdb_dyld_image_info
{
#define DYLD_VERSION_MIN 1
#define DYLD_VERSION_MAX 12
-/* Address of structure dyld_all_image_infos in inferior. */
-static CORE_ADDR dyld_all_image_addr;
+/* Per PSPACE specific data. */
+struct darwin_info
+{
+ /* Address of structure dyld_all_image_infos in inferior. */
+ CORE_ADDR all_image_addr;
+
+ /* Gdb copy of dyld_all_info_infos. */
+ struct gdb_dyld_all_image_infos all_image;
+};
+
+/* Per-program-space data key. */
+static const struct program_space_data *solib_darwin_pspace_data;
+
+static void
+darwin_pspace_data_cleanup (struct program_space *pspace, void *arg)
+{
+ struct darwin_info *info;
-/* Gdb copy of dyld_all_info_infos. */
-static struct gdb_dyld_all_image_infos dyld_all_image;
+ info = program_space_data (pspace, solib_darwin_pspace_data);
+ xfree (info);
+}
+
+/* Get the current darwin data. If none is found yet, add it now. This
+ function always returns a valid object. */
+
+static struct darwin_info *
+get_darwin_info (void)
+{
+ struct darwin_info *info;
+
+ info = program_space_data (current_program_space, solib_darwin_pspace_data);
+ if (info != NULL)
+ return info;
+
+ info = XZALLOC (struct darwin_info);
+ set_program_space_data (current_program_space,
+ solib_darwin_pspace_data, info);
+ return info;
+}
/* Return non-zero if the version in dyld_all_image is known. */
static int
-darwin_dyld_version_ok (void)
+darwin_dyld_version_ok (const struct darwin_info *info)
{
- return dyld_all_image.version >= DYLD_VERSION_MIN
- && dyld_all_image.version <= DYLD_VERSION_MAX;
+ return info->all_image.version >= DYLD_VERSION_MIN
+ && info->all_image.version <= DYLD_VERSION_MAX;
}
/* Read dyld_all_image from inferior. */
static void
-darwin_load_image_infos (void)
+darwin_load_image_infos (struct darwin_info *info)
{
gdb_byte buf[24];
- enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
- struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
+ struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
int len;
/* If the structure address is not known, don't continue. */
- if (dyld_all_image_addr == 0)
+ if (info->all_image_addr == 0)
return;
/* The structure has 4 fields: version (4 bytes), count (4 bytes),
info (pointer) and notifier (pointer). */
len = 4 + 4 + 2 * ptr_type->length;
gdb_assert (len <= sizeof (buf));
- memset (&dyld_all_image, 0, sizeof (dyld_all_image));
+ memset (&info->all_image, 0, sizeof (info->all_image));
/* Read structure raw bytes from target. */
- if (target_read_memory (dyld_all_image_addr, buf, len))
+ if (target_read_memory (info->all_image_addr, buf, len))
return;
/* Extract the fields. */
- dyld_all_image.version = extract_unsigned_integer (buf, 4, byte_order);
- if (!darwin_dyld_version_ok ())
+ info->all_image.version = extract_unsigned_integer (buf, 4, byte_order);
+ if (!darwin_dyld_version_ok (info))
return;
- dyld_all_image.count = extract_unsigned_integer (buf + 4, 4, byte_order);
- dyld_all_image.info = extract_typed_address (buf + 8, ptr_type);
- dyld_all_image.notifier = extract_typed_address
+ 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);
}
static struct so_list *
darwin_current_sos (void)
{
- struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
+ 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;
- CORE_ADDR lm;
struct so_list *head = NULL;
struct so_list *tail = NULL;
int i;
+ struct darwin_info *info = get_darwin_info ();
/* Be sure image infos are loaded. */
- darwin_load_image_infos ();
+ darwin_load_image_infos (info);
- if (!darwin_dyld_version_ok ())
+ if (!darwin_dyld_version_ok (info))
return NULL;
image_info_size = ptr_len * 3;
/* Read infos for each solib.
- This first entry is ignored as this is the executable itself. */
- for (i = 1; i < dyld_all_image.count; i++)
+ The first entry was rumored to be the executable itself, but this is not
+ true when a large number of shared libraries are used (table expanded ?).
+ We now check all entries, but discard executable images. */
+ for (i = 0; i < info->all_image.count; i++)
{
- CORE_ADDR info = dyld_all_image.info + i * image_info_size;
+ CORE_ADDR iinfo = info->all_image.info + i * image_info_size;
char buf[image_info_size];
CORE_ADDR load_addr;
CORE_ADDR path_addr;
+ struct mach_o_header_external hdr;
+ unsigned long hdr_val;
char *file_path;
int errcode;
struct darwin_so_list *dnew;
struct cleanup *old_chain;
/* Read image info from inferior. */
- if (target_read_memory (info, buf, image_info_size))
+ if (target_read_memory (iinfo, buf, image_info_size))
break;
load_addr = extract_typed_address (buf, ptr_type);
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))
+ break;
+ /* Discard wrong magic numbers. Shouldn't happen. */
+ hdr_val = extract_unsigned_integer
+ (hdr.magic, sizeof (hdr.magic), byte_order);
+ if (hdr_val != BFD_MACH_O_MH_MAGIC && hdr_val != BFD_MACH_O_MH_MAGIC_64)
+ continue;
+ /* Discard executable. Should happen only once. */
+ hdr_val = extract_unsigned_integer
+ (hdr.filetype, sizeof (hdr.filetype), byte_order);
+ if (hdr_val == BFD_MACH_O_MH_EXECUTE)
+ continue;
+
target_read_string (path_addr, &file_path,
SO_NAME_MAX_PATH_SIZE - 1, &errcode);
if (errcode)
/* Return 1 if PC lies in the dynamic symbol resolution code of the
run time loader. */
-int
+static int
darwin_in_dynsym_resolve_code (CORE_ADDR pc)
{
return 0;
{
}
+/* 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 *
+gdb_bfd_mach_o_fat_extract (bfd *abfd, bfd_format format,
+ const bfd_arch_info_type *arch)
+{
+ bfd *result = bfd_mach_o_fat_extract (abfd, format, arch);
+
+ if (result == NULL)
+ return NULL;
+
+ if (result == abfd)
+ gdb_bfd_ref (result);
+ else
+ gdb_bfd_mark_parent (result, abfd);
+
+ return result;
+}
+
/* 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 (void)
+darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info)
{
gdb_byte *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 = bfd_openr (interp_name, gnutarget);
+ dyld_bfd = gdb_bfd_open (interp_name, gnutarget, -1);
if (dyld_bfd)
{
bfd *sub;
- sub = bfd_mach_o_fat_extract (dyld_bfd, bfd_object,
- gdbarch_bfd_arch_info (target_gdbarch));
+ 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;
- else
{
- bfd_close (dyld_bfd);
- dyld_bfd = NULL;
+ dyld_bfd = sub;
+ make_cleanup_bfd_unref (sub);
}
+ else
+ dyld_bfd = NULL;
}
if (!dyld_bfd)
- return;
+ {
+ do_cleanups (cleanup);
+ return;
+ }
/* We find the dynamic linker's base address by examining
the current pc (which should point at the entry point for the
- bfd_get_start_address (dyld_bfd));
/* Now try to set a breakpoint in the dynamic linker. */
- dyld_all_image_addr =
+ info->all_image_addr =
lookup_symbol_from_bfd (dyld_bfd, "_dyld_all_image_infos");
- bfd_close (dyld_bfd);
+ do_cleanups (cleanup);
- if (dyld_all_image_addr == 0)
+ if (info->all_image_addr == 0)
return;
- dyld_all_image_addr += load_addr;
+ info->all_image_addr += load_addr;
}
/* Extract dyld_all_image_addr reading it from
TARGET_OBJECT_DARWIN_DYLD_INFO. */
static void
-darwin_solib_read_all_image_info_addr (void)
+darwin_solib_read_all_image_info_addr (struct darwin_info *info)
{
gdb_byte buf[8 + 8 + 4];
LONGEST len;
- enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
len = target_read (¤t_target, TARGET_OBJECT_DARWIN_DYLD_INFO, NULL,
buf, 0, sizeof (buf));
if (len != sizeof (buf))
return;
- dyld_all_image_addr = extract_unsigned_integer (buf, 8, byte_order);
+ info->all_image_addr = extract_unsigned_integer (buf, 8, byte_order);
}
/* Shared library startup support. See documentation in solib-svr4.c. */
static void
darwin_solib_create_inferior_hook (int from_tty)
{
- dyld_all_image_addr = 0;
+ struct darwin_info *info = get_darwin_info ();
+
+ info->all_image_addr = 0;
- darwin_solib_read_all_image_info_addr ();
+ darwin_solib_read_all_image_info_addr (info);
- if (dyld_all_image_addr == 0)
- darwin_solib_get_all_image_info_addr_at_init ();
+ if (info->all_image_addr == 0)
+ darwin_solib_get_all_image_info_addr_at_init (info);
- if (dyld_all_image_addr == 0)
+ if (info->all_image_addr == 0)
return;
- darwin_load_image_infos ();
+ darwin_load_image_infos (info);
- if (darwin_dyld_version_ok ())
- create_solib_event_breakpoint (target_gdbarch, dyld_all_image.notifier);
+ if (darwin_dyld_version_ok (info))
+ create_solib_event_breakpoint (target_gdbarch (), info->all_image.notifier);
}
static void
darwin_clear_solib (void)
{
- dyld_all_image_addr = 0;
- dyld_all_image.version = 0;
+ struct darwin_info *info = get_darwin_info ();
+
+ info->all_image_addr = 0;
+ info->all_image.version = 0;
}
static void
/* Open bfd for shared library. */
abfd = solib_bfd_fopen (found_pathname, found_file);
- res = bfd_mach_o_fat_extract (abfd, bfd_object,
- gdbarch_bfd_arch_info (target_gdbarch));
+ res = gdb_bfd_mach_o_fat_extract (abfd, bfd_object,
+ gdbarch_bfd_arch_info (target_gdbarch ()));
if (!res)
{
- bfd_close (abfd);
- make_cleanup (xfree, found_pathname);
+ make_cleanup_bfd_unref (abfd);
error (_("`%s': not a shared-library: %s"),
- found_pathname, bfd_errmsg (bfd_get_error ()));
+ bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ()));
}
+
+ gdb_bfd_unref (abfd);
return res;
}
struct target_so_ops darwin_so_ops;
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_darwin_solib;
+
void
_initialize_darwin_solib (void)
{
+ solib_darwin_pspace_data
+ = register_program_space_data_with_cleanup (NULL,
+ darwin_pspace_data_cleanup);
+
darwin_so_ops.relocate_section_addresses = darwin_relocate_section_addresses;
darwin_so_ops.free_so = darwin_free_so;
darwin_so_ops.clear_solib = darwin_clear_solib;
projects / deliverable / binutils-gdb.git / blobdiff