* MAINTAINERS: Add myself under Write After Approval.

[deliverable/binutils-gdb.git] / gdb / solib-darwin.c

diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index 3305804e3a80565e4e3eb385cfb19f9d9052516f..8b96a6f2ca218add4b43467ae34381d11d33dc52 100644 (file)
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -26,6 +26,7 @@
 #include "gdbcore.h"
 #include "target.h"
 #include "inferior.h"
+#include "regcache.h"
 #include "gdbthread.h"
 
 #include "gdb_assert.h"
@@ -78,6 +79,7 @@ static void
 darwin_load_image_infos (void)
 {
   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;
   int len;
 
@@ -96,11 +98,11 @@ darwin_load_image_infos (void)
     return;
 
   /* Extract the fields.  */
-  dyld_all_image.version = extract_unsigned_integer (buf, 4);
+  dyld_all_image.version = extract_unsigned_integer (buf, 4, byte_order);
   if (dyld_all_image.version != DYLD_VERSION)
     return;
 
-  dyld_all_image.count = extract_unsigned_integer (buf + 4, 4);
+  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
     (buf + 8 + ptr_type->length, ptr_type);
@@ -157,27 +159,20 @@ lookup_symbol_from_bfd (bfd *abfd, char *symname)
 }
 
 /* Return program interpreter string.  */
+
 static gdb_byte *
 find_program_interpreter (void)
 {
   gdb_byte *buf = NULL;
 
-  /* If we have an exec_bfd, use its section table.  */
+  /* If we have an exec_bfd, get the interpreter from the load commands.  */
   if (exec_bfd)
     {
-      struct bfd_section *dylinker_sect;
+      bfd_mach_o_load_command *cmd;
       
-      dylinker_sect = bfd_get_section_by_name (exec_bfd, "LC_LOAD_DYLINKER");
-      if (dylinker_sect != NULL)
-       {
-         int sect_size = bfd_section_size (exec_bfd, dylinker_sect);
-
-         buf = xmalloc (sect_size);
-         if (bfd_get_section_contents (exec_bfd, dylinker_sect,
-                                       buf, 0, sect_size))
-           return buf;
-         xfree (buf);
-       }
+      if (bfd_mach_o_lookup_command (exec_bfd,
+                                     BFD_MACH_O_LC_LOAD_DYLINKER, &cmd) == 1)
+        return cmd->command.dylinker.name_str;
     }
 
   /* If we didn't find it, read from memory.
@@ -312,7 +307,7 @@ darwin_solib_create_inferior_hook (void)
     {
       bfd *sub;
       sub = bfd_mach_o_fat_extract (dyld_bfd, bfd_object,
-                                   gdbarch_bfd_arch_info (current_gdbarch));
+                                   gdbarch_bfd_arch_info (target_gdbarch));
       if (sub)
        dyld_bfd = sub;
       else
@@ -322,24 +317,21 @@ darwin_solib_create_inferior_hook (void)
        }
     }
   if (!dyld_bfd)
-    {
-      xfree (interp_name);
-      return;
-    }
-
+    return;
+  
   if (!inf->attach_flag)
     {
       /* 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 = (read_pc () - bfd_get_start_address (dyld_bfd));
+      load_addr = (regcache_read_pc (get_current_regcache ())
+                  - bfd_get_start_address (dyld_bfd));
     }
   else
     {
       /* FIXME: todo.
-        Get address of __DATA.__dyld in exec_bfd, read address at offset 0
+        Get address of __DATA.__dyld in exec_bfd, read address at offset 0.
       */
-      xfree (interp_name);
       return;
     }
 
@@ -348,7 +340,6 @@ darwin_solib_create_inferior_hook (void)
     lookup_symbol_from_bfd (dyld_bfd, "_dyld_all_image_infos");
   
   bfd_close (dyld_bfd);
-  xfree (interp_name);
 
   if (dyld_all_image_addr == 0)
     return;
@@ -358,7 +349,7 @@ darwin_solib_create_inferior_hook (void)
   darwin_load_image_infos ();
 
   if (dyld_all_image.version == DYLD_VERSION)
-    create_solib_event_breakpoint (dyld_all_image.notifier);
+    create_solib_event_breakpoint (target_gdbarch, dyld_all_image.notifier);
 }
 
 static void
@@ -377,7 +368,7 @@ darwin_free_so (struct so_list *so)
    Relocate these VMAs according to solib info.  */
 static void
 darwin_relocate_section_addresses (struct so_list *so,
-                                  struct section_table *sec)
+                                  struct target_section *sec)
 {
   sec->addr += so->lm_info->lm_addr;
   sec->endaddr += so->lm_info->lm_addr;
@@ -421,7 +412,7 @@ darwin_bfd_open (char *pathname)
   abfd = solib_bfd_fopen (found_pathname, found_file);
 
   res = bfd_mach_o_fat_extract (abfd, bfd_object,
-                               gdbarch_bfd_arch_info (current_gdbarch));
+                               gdbarch_bfd_arch_info (target_gdbarch));
   if (!res)
     {
       bfd_close (abfd);