* defs.h (extract_signed_integer, extract_unsigned_integer,

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

diff --git a/gdb/solib-sunos.c b/gdb/solib-sunos.c
index 0717607d6590d961c5b705b7281538ddb34b72eb..ff41847ac5bc348a62fa4da89c45305d4236c4aa 100644 (file)
--- a/gdb/solib-sunos.c
+++ b/gdb/solib-sunos.c
@@ -1,13 +1,13 @@
 /* Handle SunOS shared libraries for GDB, the GNU Debugger.
 
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
 /* Handle SunOS shared libraries for GDB, the GNU Debugger.
 
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,

-   2001, 2004, 2007 Free Software Foundation, Inc.
+   2001, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 
 
 #include "defs.h"
 


@@ -38,6 +36,7 @@
 #include "objfiles.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "objfiles.h"
 #include "gdbcore.h"
 #include "inferior.h"

+#include "gdbthread.h"

 #include "solist.h"
 #include "bcache.h"
 #include "regcache.h"
 #include "solist.h"
 #include "bcache.h"
 #include "regcache.h"


@@ -121,7 +120,8 @@ static char *main_name_list[] =
    Assume that the address is unsigned.  */
 
 #define SOLIB_EXTRACT_ADDRESS(MEMBER) \
    Assume that the address is unsigned.  */
 
 #define SOLIB_EXTRACT_ADDRESS(MEMBER) \

-       extract_unsigned_integer (&(MEMBER), sizeof (MEMBER))
+       extract_unsigned_integer (&(MEMBER), sizeof (MEMBER), \
+                                 gdbarch_byte_order (target_gdbarch))

 
 /* local data declarations */
 
 
 /* local data declarations */
 


@@ -141,33 +141,36 @@ static CORE_ADDR flag_addr;
 static CORE_ADDR
 LM_ADDR (struct so_list *so)
 {
 static CORE_ADDR
 LM_ADDR (struct so_list *so)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   int lm_addr_offset = offsetof (struct link_map, lm_addr);
   int lm_addr_size = fieldsize (struct link_map, lm_addr);
 
   return (CORE_ADDR) extract_signed_integer (so->lm_info->lm + lm_addr_offset, 
   int lm_addr_offset = offsetof (struct link_map, lm_addr);
   int lm_addr_size = fieldsize (struct link_map, lm_addr);
 
   return (CORE_ADDR) extract_signed_integer (so->lm_info->lm + lm_addr_offset, 

-                                            lm_addr_size);
+                                            lm_addr_size, byte_order);

 }
 
 static CORE_ADDR
 LM_NEXT (struct so_list *so)
 {
 }
 
 static CORE_ADDR
 LM_NEXT (struct so_list *so)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   int lm_next_offset = offsetof (struct link_map, lm_next);
   int lm_next_size = fieldsize (struct link_map, lm_next);
 
   /* Assume that the address is unsigned.  */
   return extract_unsigned_integer (so->lm_info->lm + lm_next_offset,
   int lm_next_offset = offsetof (struct link_map, lm_next);
   int lm_next_size = fieldsize (struct link_map, lm_next);
 
   /* Assume that the address is unsigned.  */
   return extract_unsigned_integer (so->lm_info->lm + lm_next_offset,

-                                  lm_next_size);
+                                  lm_next_size, byte_order);

 }
 
 static CORE_ADDR
 LM_NAME (struct so_list *so)
 {
 }
 
 static CORE_ADDR
 LM_NAME (struct so_list *so)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   int lm_name_offset = offsetof (struct link_map, lm_name);
   int lm_name_size = fieldsize (struct link_map, lm_name);
 
   /* Assume that the address is unsigned.  */
   return extract_unsigned_integer (so->lm_info->lm + lm_name_offset,
   int lm_name_offset = offsetof (struct link_map, lm_name);
   int lm_name_size = fieldsize (struct link_map, lm_name);
 
   /* Assume that the address is unsigned.  */
   return extract_unsigned_integer (so->lm_info->lm + lm_name_offset,

-                                  lm_name_size);
+                                  lm_name_size, byte_order);

 }
 
 static CORE_ADDR debug_base;   /* Base of dynamic linker structures */
 }
 
 static CORE_ADDR debug_base;   /* Base of dynamic linker structures */


@@ -186,7 +189,6 @@ allocate_rt_common_objfile (void)
 
   objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
   memset (objfile, 0, sizeof (struct objfile));
 
   objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
   memset (objfile, 0, sizeof (struct objfile));

-  objfile->md = NULL;

   objfile->psymbol_cache = bcache_xmalloc ();
   objfile->macro_cache = bcache_xmalloc ();
   obstack_init (&objfile->objfile_obstack);
   objfile->psymbol_cache = bcache_xmalloc ();
   objfile->macro_cache = bcache_xmalloc ();
   obstack_init (&objfile->objfile_obstack);


@@ -740,6 +742,9 @@ sunos_special_symbol_handling (void)
 static void
 sunos_solib_create_inferior_hook (void)
 {
 static void
 sunos_solib_create_inferior_hook (void)
 {

+  struct thread_info *tp;
+  struct inferior *inf;
+

   if ((debug_base = locate_base ()) == 0)
     {
       /* Can't find the symbol or the executable is statically linked. */
   if ((debug_base = locate_base ()) == 0)
     {
       /* Can't find the symbol or the executable is statically linked. */


@@ -761,16 +766,20 @@ sunos_solib_create_inferior_hook (void)
      can go groveling around in the dynamic linker structures to find
      out what we need to know about them. */
 
      can go groveling around in the dynamic linker structures to find
      out what we need to know about them. */
 

+  inf = current_inferior ();
+  tp = inferior_thread ();
+

   clear_proceed_status ();
   clear_proceed_status ();

-  stop_soon = STOP_QUIETLY;
-  stop_signal = TARGET_SIGNAL_0;
+
+  inf->stop_soon = STOP_QUIETLY;
+  tp->stop_signal = TARGET_SIGNAL_0;

   do
     {
   do
     {

-      target_resume (pid_to_ptid (-1), 0, stop_signal);
-      wait_for_inferior ();
+      target_resume (pid_to_ptid (-1), 0, tp->stop_signal);
+      wait_for_inferior (0);

     }
     }

-  while (stop_signal != TARGET_SIGNAL_TRAP);
-  stop_soon = NO_STOP_QUIETLY;
+  while (tp->stop_signal != TARGET_SIGNAL_TRAP);
+  inf->stop_soon = NO_STOP_QUIETLY;

 
   /* We are now either at the "mapping complete" breakpoint (or somewhere
      else, a condition we aren't prepared to deal with anyway), so adjust
 
   /* We are now either at the "mapping complete" breakpoint (or somewhere
      else, a condition we aren't prepared to deal with anyway), so adjust


@@ -783,10 +792,10 @@ sunos_solib_create_inferior_hook (void)
      the GDB software break point list.  Thus we have to adjust the
      PC here.  */
 
      the GDB software break point list.  Thus we have to adjust the
      PC here.  */
 

-  if (gdbarch_decr_pc_after_break (current_gdbarch))
+  if (gdbarch_decr_pc_after_break (target_gdbarch))

     {
     {

-      stop_pc -= gdbarch_decr_pc_after_break (current_gdbarch);
-      write_register (PC_REGNUM, stop_pc);
+      stop_pc -= gdbarch_decr_pc_after_break (target_gdbarch);
+      regcache_write_pc (get_current_regcache (), stop_pc);

     }
 
   if (!disable_break ())
     }
 
   if (!disable_break ())


@@ -812,7 +821,7 @@ sunos_free_so (struct so_list *so)
 
 static void
 sunos_relocate_section_addresses (struct so_list *so,
 
 static void
 sunos_relocate_section_addresses (struct so_list *so,

-                                 struct section_table *sec)
+                                 struct target_section *sec)

 {
   sec->addr += LM_ADDR (so);
   sec->endaddr += LM_ADDR (so);
 {
   sec->addr += LM_ADDR (so);
   sec->endaddr += LM_ADDR (so);