2009-08-06 Paul Pluzhnikov <ppluzhnikov@google.com>

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

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index cf42fcb78e150c2d541bba13192560f9ac9b5862..6cfaa85ea8e94eb801e65dbb8c14adf360e17c92 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -266,7 +266,7 @@ IGNORE_FIRST_LINK_MAP_ENTRY (struct so_list *so)
 
   /* Assume that everything is a library if the dynamic loader was loaded
      late by a static executable.  */
-  if (bfd_get_section_by_name (exec_bfd, ".dynamic") == NULL)
+  if (exec_bfd && bfd_get_section_by_name (exec_bfd, ".dynamic") == NULL)
     return 0;
 
   return extract_typed_address (so->lm_info->lm + lmo->l_prev_offset,
@@ -465,6 +465,7 @@ bfd_lookup_symbol (bfd *abfd, char *symname)
 static gdb_byte *
 read_program_header (int type, int *p_sect_size, int *p_arch_size)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   CORE_ADDR at_phdr, at_phent, at_phnum;
   int arch_size, sect_size;
   CORE_ADDR sect_addr;
@@ -501,7 +502,8 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size)
                                  (gdb_byte *)&phdr, sizeof (phdr)))
            return 0;
 
-         if (extract_unsigned_integer ((gdb_byte *)phdr.p_type, 4) == type)
+         if (extract_unsigned_integer ((gdb_byte *)phdr.p_type,
+                                       4, byte_order) == type)
            break;
        }
 
@@ -509,8 +511,10 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size)
        return 0;
 
       /* Retrieve address and size.  */
-      sect_addr = extract_unsigned_integer ((gdb_byte *)phdr.p_vaddr, 4);
-      sect_size = extract_unsigned_integer ((gdb_byte *)phdr.p_memsz, 4);
+      sect_addr = extract_unsigned_integer ((gdb_byte *)phdr.p_vaddr,
+                                           4, byte_order);
+      sect_size = extract_unsigned_integer ((gdb_byte *)phdr.p_memsz,
+                                           4, byte_order);
     }
   else
     {
@@ -524,7 +528,8 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size)
                                  (gdb_byte *)&phdr, sizeof (phdr)))
            return 0;
 
-         if (extract_unsigned_integer ((gdb_byte *)phdr.p_type, 4) == type)
+         if (extract_unsigned_integer ((gdb_byte *)phdr.p_type,
+                                       4, byte_order) == type)
            break;
        }
 
@@ -532,8 +537,10 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size)
        return 0;
 
       /* Retrieve address and size.  */
-      sect_addr = extract_unsigned_integer ((gdb_byte *)phdr.p_vaddr, 8);
-      sect_size = extract_unsigned_integer ((gdb_byte *)phdr.p_memsz, 8);
+      sect_addr = extract_unsigned_integer ((gdb_byte *)phdr.p_vaddr,
+                                           8, byte_order);
+      sect_size = extract_unsigned_integer ((gdb_byte *)phdr.p_memsz,
+                                           8, byte_order);
     }
 
   /* Read in requested program header.  */
@@ -600,9 +607,13 @@ scan_dyntag (int dyntag, bfd *abfd, CORE_ADDR *ptr)
 
   if (abfd == NULL)
     return 0;
+
+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+    return 0;
+
   arch_size = bfd_get_arch_size (abfd);
   if (arch_size == -1)
-   return 0;
+    return 0;
 
   /* Find the start address of the .dynamic section.  */
   sect = bfd_get_section_by_name (abfd, ".dynamic");
@@ -669,6 +680,7 @@ scan_dyntag (int dyntag, bfd *abfd, CORE_ADDR *ptr)
 static int
 scan_dyntag_auxv (int dyntag, CORE_ADDR *ptr)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   int sect_size, arch_size, step;
   long dyn_tag;
   CORE_ADDR dyn_ptr;
@@ -689,14 +701,18 @@ scan_dyntag_auxv (int dyntag, CORE_ADDR *ptr)
     if (arch_size == 32)
       {
        Elf32_External_Dyn *dynp = (Elf32_External_Dyn *) buf;
-       dyn_tag = extract_unsigned_integer ((gdb_byte *) dynp->d_tag, 4);
-       dyn_ptr = extract_unsigned_integer ((gdb_byte *) dynp->d_un.d_ptr, 4);
+       dyn_tag = extract_unsigned_integer ((gdb_byte *) dynp->d_tag,
+                                           4, byte_order);
+       dyn_ptr = extract_unsigned_integer ((gdb_byte *) dynp->d_un.d_ptr,
+                                           4, byte_order);
       }
     else
       {
        Elf64_External_Dyn *dynp = (Elf64_External_Dyn *) buf;
-       dyn_tag = extract_unsigned_integer ((gdb_byte *) dynp->d_tag, 8);
-       dyn_ptr = extract_unsigned_integer ((gdb_byte *) dynp->d_un.d_ptr, 8);
+       dyn_tag = extract_unsigned_integer ((gdb_byte *) dynp->d_tag,
+                                           8, byte_order);
+       dyn_ptr = extract_unsigned_integer ((gdb_byte *) dynp->d_un.d_ptr,
+                                           8, byte_order);
       }
     if (dyn_tag == DT_NULL)
       break;
@@ -825,11 +841,7 @@ locate_base (struct svr4_info *info)
      though if we don't have some link map offsets to work with.  */
 
   if (info->debug_base == 0 && svr4_have_link_map_offsets ())
-    {
-      if (exec_bfd != NULL
-         && bfd_get_flavour (exec_bfd) == bfd_target_elf_flavour)
-       info->debug_base = elf_locate_base ();
-    }
+    info->debug_base = elf_locate_base ();
   return info->debug_base;
 }
 
@@ -870,13 +882,14 @@ solib_svr4_r_ldsomap (struct svr4_info *info)
 {
   struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
   struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   ULONGEST version;
 
   /* Check version, and return zero if `struct r_debug' doesn't have
      the r_ldsomap member.  */
   version
     = read_memory_unsigned_integer (info->debug_base + lmo->r_version_offset,
-                                   lmo->r_version_size);
+                                   lmo->r_version_size, byte_order);
   if (version < 2 || lmo->r_ldsomap_offset == -1)
     return 0;
 
@@ -1309,7 +1322,7 @@ enable_break (struct svr4_info *info)
                interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
            }
 
-         create_solib_event_breakpoint (sym_addr);
+         create_solib_event_breakpoint (target_gdbarch, sym_addr);
          return 1;
        }
     }
@@ -1380,7 +1393,8 @@ enable_break (struct svr4_info *info)
          most cases.  */
       if (!load_addr_found)
        {
-         struct regcache *regcache = get_thread_regcache (inferior_ptid);
+         struct regcache *regcache
+           = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
          load_addr = (regcache_read_pc (regcache)
                       - exec_entry_point (tmp_bfd, tmp_bfd_target));
        }
@@ -1434,7 +1448,7 @@ enable_break (struct svr4_info *info)
 
       if (sym_addr != 0)
        {
-         create_solib_event_breakpoint (load_addr + sym_addr);
+         create_solib_event_breakpoint (target_gdbarch, load_addr + sym_addr);
          xfree (interp_name);
          return 1;
        }
@@ -1456,7 +1470,8 @@ enable_break (struct svr4_info *info)
       msymbol = lookup_minimal_symbol (*bkpt_namep, NULL, symfile_objfile);
       if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
        {
-         create_solib_event_breakpoint (SYMBOL_VALUE_ADDRESS (msymbol));
+         create_solib_event_breakpoint (target_gdbarch,
+                                        SYMBOL_VALUE_ADDRESS (msymbol));
          return 1;
        }
     }
@@ -1466,7 +1481,8 @@ enable_break (struct svr4_info *info)
       msymbol = lookup_minimal_symbol (*bkpt_namep, NULL, symfile_objfile);
       if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
        {
-         create_solib_event_breakpoint (SYMBOL_VALUE_ADDRESS (msymbol));
+         create_solib_event_breakpoint (target_gdbarch,
+                                        SYMBOL_VALUE_ADDRESS (msymbol));
          return 1;
        }
     }
@@ -1517,7 +1533,8 @@ static void
 svr4_relocate_main_executable (void)
 {
   asection *interp_sect;
-  struct regcache *regcache = get_thread_regcache (inferior_ptid);
+  struct regcache *regcache
+    = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
   CORE_ADDR pc = regcache_read_pc (regcache);
 
   /* Decide if the objfile needs to be relocated.  As indicated above,
@@ -1747,7 +1764,7 @@ svr4_truncate_ptr (CORE_ADDR addr)
 
 static void
 svr4_relocate_section_addresses (struct so_list *so,
-                                 struct section_table *sec)
+                                 struct target_section *sec)
 {
   sec->addr    = svr4_truncate_ptr (sec->addr    + LM_ADDR_CHECK (so,
                                                                  sec->bfd));
@@ -1917,6 +1934,7 @@ _initialize_svr4_solib (void)
   svr4_so_ops.current_sos = svr4_current_sos;
   svr4_so_ops.open_symbol_file_object = open_symbol_file_object;
   svr4_so_ops.in_dynsym_resolve_code = svr4_in_dynsym_resolve_code;
+  svr4_so_ops.bfd_open = solib_bfd_open;
   svr4_so_ops.lookup_lib_global_symbol = elf_lookup_lib_symbol;
   svr4_so_ops.same = svr4_same;