2010-11-19 Jan Kratochvil <jan.kratochvil@redhat.com>

[deliverable/binutils-gdb.git] / gdb / xcoffsolib.c

diff --git a/gdb/xcoffsolib.c b/gdb/xcoffsolib.c
index f2bc60e576d2644d39edfe1a80e69ae20fe5400f..ba84f43ca376ee5367c28784dfaf8304742ed7da 100644 (file)
--- a/gdb/xcoffsolib.c
+++ b/gdb/xcoffsolib.c
@@ -1,12 +1,13 @@
 /* Shared library support for RS/6000 (xcoff) object files, for GDB.
 /* Shared library support for RS/6000 (xcoff) object files, for GDB.

-   Copyright 1991, 1992, 2001 Free Software Foundation.
+   Copyright (C) 1991, 1992, 1995, 1996, 1999, 2000, 2001, 2007, 2008, 2009,
+   2010 Free Software Foundation, Inc.

    Contributed by IBM Corporation.
 
    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
    Contributed by IBM Corporation.
 
    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,


@@ -15,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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

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


@@ -47,11 +46,11 @@ xcoff_solib_address (CORE_ADDR addr)
     if (vp->tstart <= addr && addr < vp->tend)
       {
        xfree (buffer);
     if (vp->tstart <= addr && addr < vp->tend)
       {
        xfree (buffer);

-       xasprintf (&buffer, "%s%s%s%s",
-                           vp->name,
-                           *vp->member ? "(" : "",
-                           vp->member,
-                           *vp->member ? ")" : "");
+       buffer = xstrprintf ("%s%s%s%s",
+                            vp->name,
+                            *vp->member ? "(" : "",
+                            vp->member,
+                            *vp->member ? ")" : "");

        return buffer;
       }
   return NULL;
        return buffer;
       }
   return NULL;


@@ -63,11 +62,12 @@ static void sharedlibrary_command (char *pattern, int from_tty);
 static void
 solib_info (char *args, int from_tty)
 {
 static void
 solib_info (char *args, int from_tty)
 {

+  int addr_size = gdbarch_addr_bit (target_gdbarch) / 8;

   struct vmap *vp = vmap;
 
   /* Check for new shared libraries loaded with load ().  */
   struct vmap *vp = vmap;
 
   /* Check for new shared libraries loaded with load ().  */

-  if (inferior_pid)
-    xcoff_relocate_symtab (inferior_pid);
+  if (! ptid_equal (inferior_ptid, null_ptid))
+    xcoff_relocate_symtab (PIDGET (inferior_ptid));

 
   if (vp == NULL || vp->nxt == NULL)
     {
 
   if (vp == NULL || vp->nxt == NULL)
     {


@@ -84,8 +84,10 @@ Text Range           Data Range              Syms    Shared Object Library\n");
   for (; vp != NULL; vp = vp->nxt)
     {
       printf_unfiltered ("0x%s-0x%s    0x%s-0x%s       %s      %s%s%s%s\n",
   for (; vp != NULL; vp = vp->nxt)
     {
       printf_unfiltered ("0x%s-0x%s    0x%s-0x%s       %s      %s%s%s%s\n",

-                        paddr (vp->tstart),paddr (vp->tend),
-                        paddr (vp->dstart), paddr (vp->dend),
+                        phex (vp->tstart, addr_size),
+                        phex (vp->tend, addr_size),
+                        phex (vp->dstart, addr_size),
+                        phex (vp->dend, addr_size),

                         vp->loaded ? "Yes" : "No ",
                         vp->name,
                         *vp->member ? "(" : "",
                         vp->loaded ? "Yes" : "No ",
                         vp->name,
                         *vp->member ? "(" : "",


@@ -100,15 +102,15 @@ sharedlibrary_command (char *pattern, int from_tty)
   dont_repeat ();
 
   /* Check for new shared libraries loaded with load ().  */
   dont_repeat ();
 
   /* Check for new shared libraries loaded with load ().  */

-  if (inferior_pid)
-    xcoff_relocate_symtab (inferior_pid);
+  if (! ptid_equal (inferior_ptid, null_ptid))
+    xcoff_relocate_symtab (PIDGET (inferior_ptid));

 
   if (pattern)
     {
       char *re_err = re_comp (pattern);
 
       if (re_err)
 
   if (pattern)
     {
       char *re_err = re_comp (pattern);
 
       if (re_err)

-       error ("Invalid regexp: %s", re_err);
+       error (_("Invalid regexp: %s"), re_err);

     }
 
   /* Walk the list of currently loaded shared libraries, and read
     }
 
   /* Walk the list of currently loaded shared libraries, and read


@@ -157,21 +159,22 @@ sharedlibrary_command (char *pattern, int from_tty)
 }
 
 void
 }
 
 void

-_initialize_solib (void)
+_initialize_xcoffsolib (void)

 {
   add_com ("sharedlibrary", class_files, sharedlibrary_command,
 {
   add_com ("sharedlibrary", class_files, sharedlibrary_command,

-          "Load shared object library symbols for files matching REGEXP.");
+          _("Load shared object library symbols for files matching REGEXP."));

   add_info ("sharedlibrary", solib_info,
   add_info ("sharedlibrary", solib_info,

-           "Status of loaded shared object libraries");
-
-  add_show_from_set
-    (add_set_cmd ("auto-solib-add", class_support, var_zinteger,
-                 (char *) &auto_solib_add,
-                 "Set autoloading of shared library symbols.\n\
-If nonzero, symbols from all shared object libraries will be loaded\n\
-automatically when the inferior begins execution or when the dynamic linker\n\
-informs gdb that a new library has been loaded.  Otherwise, symbols\n\
-must be loaded manually, using `sharedlibrary'.",
-                 &setlist),
-     &showlist);
+           _("Status of loaded shared object libraries"));
+
+  add_setshow_boolean_cmd ("auto-solib-add", class_support,
+                          &auto_solib_add, _("\
+Set autoloading of shared library symbols."), _("\
+Show autoloading of shared library symbols."), _("\
+If \"on\", symbols from all shared object libraries will be loaded\n\
+automatically when the inferior begins execution, when the dynamic linker\n\
+informs gdb that a new library has been loaded, or when attaching to the\n\
+inferior.  Otherwise, symbols must be loaded manually, using `sharedlibrary'."),
+                          NULL,
+                          NULL, /* FIXME: i18n: */
+                          &setlist, &showlist);

 }
 }