Update copyright year in most headers.

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

diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index 97cc29c93dbf5898e24c74e0df6b754074aff21f..b019adaa398961d01c80b3b610e9e58fbf191dd6 100644 (file)
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -1,6 +1,6 @@
 /* Handle Darwin shared libraries for GDB, the GNU Debugger.
 
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -52,7 +52,8 @@ struct gdb_dyld_image_info
   unsigned long mtime;
 };
 
-/* Content of inferior dyld_all_image_infos structure.  */
+/* Content of inferior dyld_all_image_infos structure.
+   See /usr/include/mach-o/dyld_images.h for the documentation.  */
 struct gdb_dyld_all_image_infos
 {
   /* Version (1).  */
@@ -66,7 +67,8 @@ struct gdb_dyld_all_image_infos
 };
 
 /* Current all_image_infos version.  */
-#define DYLD_VERSION 1
+#define DYLD_VERSION_MIN 1
+#define DYLD_VERSION_MAX 7
 
 /* Address of structure dyld_all_image_infos in inferior.  */
 static CORE_ADDR dyld_all_image_addr;
@@ -74,7 +76,17 @@ static CORE_ADDR dyld_all_image_addr;
 /* Gdb copy of dyld_all_info_infos.  */
 static struct gdb_dyld_all_image_infos dyld_all_image;
 
+/* Return non-zero if the version in dyld_all_image is known.  */
+
+static int
+darwin_dyld_version_ok (void)
+{
+  return dyld_all_image.version >= DYLD_VERSION_MIN
+    && dyld_all_image.version <= DYLD_VERSION_MAX;
+}
+
 /* Read dyld_all_image from inferior.  */
+
 static void
 darwin_load_image_infos (void)
 {
@@ -99,7 +111,7 @@ darwin_load_image_infos (void)
 
   /* Extract the fields.  */
   dyld_all_image.version = extract_unsigned_integer (buf, 4, byte_order);
-  if (dyld_all_image.version != DYLD_VERSION)
+  if (!darwin_dyld_version_ok ())
     return;
 
   dyld_all_image.count = extract_unsigned_integer (buf + 4, 4, byte_order);
@@ -125,6 +137,7 @@ struct darwin_so_list
 };
 
 /* Lookup the value for a specific symbol.  */
+
 static CORE_ADDR
 lookup_symbol_from_bfd (bfd *abfd, char *symname)
 {
@@ -141,7 +154,7 @@ lookup_symbol_from_bfd (bfd *abfd, char *symname)
 
   symbol_table = (asymbol **) xmalloc (storage_needed);
   number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
-  
+
   for (i = 0; i < number_of_symbols; i++)
     {
       asymbol *sym = symbol_table[i];
@@ -159,27 +172,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;
-      
-      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);
+      bfd_mach_o_load_command *cmd;
 
-         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.
@@ -190,6 +196,7 @@ find_program_interpreter (void)
 /*  Not used.  I don't see how the main symbol file can be found: the
     interpreter name is needed and it is known from the executable file.
     Note that darwin-nat.c implements pid_to_exec_file.  */
+
 static int
 open_symbol_file_object (void *from_ttyp)
 {
@@ -197,6 +204,7 @@ open_symbol_file_object (void *from_ttyp)
 }
 
 /* Build a list of currently loaded shared objects.  See solib-svr4.c  */
+
 static struct so_list *
 darwin_current_sos (void)
 {
@@ -211,7 +219,7 @@ darwin_current_sos (void)
   /* Be sure image infos are loaded.  */
   darwin_load_image_infos ();
 
-  if (dyld_all_image.version != DYLD_VERSION)
+  if (!darwin_dyld_version_ok ())
     return NULL;
 
   image_info_size = ptr_len * 3;
@@ -269,6 +277,7 @@ darwin_current_sos (void)
 
 /* Return 1 if PC lies in the dynamic symbol resolution code of the
    run time loader.  */
+
 int
 darwin_in_dynsym_resolve_code (CORE_ADDR pc)
 {
@@ -277,12 +286,14 @@ darwin_in_dynsym_resolve_code (CORE_ADDR pc)
 
 
 /* No special symbol handling.  */
+
 static void
 darwin_special_symbol_handling (void)
 {
 }
 
 /* Shared library startup support.  See documentation in solib-svr4.c  */
+
 static void
 darwin_solib_create_inferior_hook (void)
 {
@@ -324,10 +335,7 @@ darwin_solib_create_inferior_hook (void)
        }
     }
   if (!dyld_bfd)
-    {
-      xfree (interp_name);
-      return;
-    }
+    return;
 
   if (!inf->attach_flag)
     {
@@ -340,18 +348,16 @@ darwin_solib_create_inferior_hook (void)
   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;
     }
 
   /* Now try to set a breakpoint in the dynamic linker.  */
   dyld_all_image_addr =
     lookup_symbol_from_bfd (dyld_bfd, "_dyld_all_image_infos");
-  
+
   bfd_close (dyld_bfd);
-  xfree (interp_name);
 
   if (dyld_all_image_addr == 0)
     return;
@@ -360,7 +366,7 @@ darwin_solib_create_inferior_hook (void)
 
   darwin_load_image_infos ();
 
-  if (dyld_all_image.version == DYLD_VERSION)
+  if (darwin_dyld_version_ok ())
     create_solib_event_breakpoint (target_gdbarch, dyld_all_image.notifier);
 }
 
@@ -378,6 +384,7 @@ darwin_free_so (struct so_list *so)
 
 /* The section table is built from bfd sections using bfd VMAs.
    Relocate these VMAs according to solib info.  */
+
 static void
 darwin_relocate_section_addresses (struct so_list *so,
                                   struct target_section *sec)