Removed v850eq sanitization.

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

diff --git a/gdb/xcoffsolib.c b/gdb/xcoffsolib.c
index a6ca8a7739699a34abc456fe12ab7f955bb145e8..13d8065ea1d3c213933c56eca4959fc8db992477 100644 (file)
--- a/gdb/xcoffsolib.c
+++ b/gdb/xcoffsolib.c
@@ -16,14 +16,26 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#if 0
 #include <sys/types.h>
 #include <sys/ldr.h>
+#endif
 
 #include "defs.h"
 #include "bfd.h"
 #include "xcoffsolib.h"
+#include "inferior.h"
+#include "command.h"
+
+/* Hook to relocate symbols at runtime.  If gdb is build natively, this
+   hook is initialized in by rs6000-nat.c.  If not, it is currently left
+   NULL and never called. */
+
+void (*xcoff_relocate_symtab_hook) PARAMS ((unsigned int)) = NULL;
+
+#ifdef SOLIB_SYMBOLS_MANUAL
 
 extern struct symtab *current_source_symtab;
 extern int           current_source_line;
@@ -72,7 +84,7 @@ solib_add (arg_string, from_tty, target)
       /* if already loaded, continue with the next one. */
       if (vp->loaded) {
        
-       printf ("%s%s%s%s: already loaded.\n",
+       printf_unfiltered ("%s%s%s%s: already loaded.\n",
          *vp->member ? "(" : "",
          vp->member,
          *vp->member ? ") " : "",
@@ -80,13 +92,16 @@ solib_add (arg_string, from_tty, target)
        continue;
       }
 
-      printf ("Loading  %s%s%s%s...",
+      printf_unfiltered ("Loading  %s%s%s%s...",
          *vp->member ? "(" : "",
          vp->member,
          *vp->member ? ") " : "",
          vp->name);
-      fflush (stdout);
+      gdb_flush (gdb_stdout);
 
+      /* This is gross and doesn't work.  If this code is re-enabled,
+        just stick a objfile member into the struct vmap; that's the
+        way solib.c (for SunOS/SVR4) does it.  */
        obj = lookup_objfile_bfd (vp->bfd);
        if (!obj) {
          warning ("\nObj structure for the shared object not found. Loading failed.");
@@ -96,7 +111,7 @@ solib_add (arg_string, from_tty, target)
        syms_from_objfile (obj, 0, 0, 0);
        new_symfile_objfile (obj, 0, 0);
        vmap_symtab (vp, 0, 0);
-       printf ("Done.\n");
+       printf_unfiltered ("Done.\n");
        loaded = vp->loaded = 1;
     }
   }
@@ -113,9 +128,9 @@ solib_add (arg_string, from_tty, target)
 /*    reinit_frame_cache(); */
   }
   else if (!matched)
-    printf ("No matching shared object found.\n");
+    printf_unfiltered ("No matching shared object found.\n");
 }
-
+#endif /* SOLIB_SYMBOLS_MANUAL */
 
 /* Return the module name of a given text address. Note that returned buffer
    is not persistent. */
@@ -141,53 +156,65 @@ CORE_ADDR addr;
    return "(unknown load module)";
 }
 
+static void solib_info PARAMS ((char *, int));
 
-solib_info (ldi)
-register struct ld_info *ldi;
+static void
+solib_info (args, from_tty)
+     char *args;
+     int from_tty;
 {
+  struct vmap *vp = vmap;
 
-   struct vmap *vp = vmap;
+  /* Check for new shared libraries loaded with load ().  */
+  if (xcoff_relocate_symtab_hook != NULL)
+    (*xcoff_relocate_symtab_hook) (inferior_pid);
 
-   if (!vp || !vp->nxt) {
-     printf("No shared libraries loaded at this time.\n");     
-     return;
-   }
+  if (vp == NULL || vp->nxt == NULL)
+    {
+      printf_unfiltered ("No shared libraries loaded at this time.\n");        
+      return;
+    }
 
-   /* skip over the first vmap, it is the main program, always loaded. */
-   vp = vp->nxt;
+  /* Skip over the first vmap, it is the main program, always loaded.  */
+  vp = vp->nxt;
 
-   printf ("\
+  printf_unfiltered ("\
 Text Range             Data Range              Syms    Shared Object Library\n");
 
-   for (; vp; vp = vp->nxt) {
-
-     printf ("0x%08x-0x%08x    0x%08x-0x%08x   %s      %s%s%s%s\n",
-       vp->tstart, vp->tend,
-       vp->dstart, vp->dend,
-       vp->loaded ? "Yes" : "No ",
-       *vp->member ? "(" : "",
-       vp->member,
-       *vp->member ? ") " : "",
-       vp->name);
-   }
+  for (; vp != NULL; vp = vp->nxt)
+    {
+      printf_unfiltered ("0x%08x-0x%08x        0x%08x-0x%08x   %s      %s%s%s%s\n",
+                        vp->tstart, vp->tend,
+                        vp->dstart, vp->dend,
+                        vp->loaded ? "Yes" : "No ",
+                        *vp->member ? "(" : "",
+                        vp->member,
+                        *vp->member ? ") " : "",
+                        vp->name);
+    }
 }
 
-
 void
 sharedlibrary_command (args, from_tty)
-  char *args;
-  int from_tty;
+     char *args;
+     int from_tty;
 {
-  dont_repeat();
+  dont_repeat ();
+
+  /* Check for new shared libraries loaded with load ().  */
+  if (xcoff_relocate_symtab_hook != NULL)
+    (*xcoff_relocate_symtab_hook) (inferior_pid);
+
+#ifdef SOLIB_SYMBOLS_MANUAL
   solib_add (args, from_tty, (struct target_ops *)0);
+#endif /* SOLIB_SYMBOLS_MANUAL */
 }
 
 void
 _initialize_solib()
 {
-
-  add_com("sharedlibrary", class_files, sharedlibrary_command,
+  add_com ("sharedlibrary", class_files, sharedlibrary_command,
           "Load shared object library symbols for files matching REGEXP.");
-  add_info("sharedlibrary", solib_info, 
-          "Status of loaded shared object libraries");
+  add_info ("sharedlibrary", solib_info, 
+           "Status of loaded shared object libraries");
 }