gdb/

[binutils.git] / gdb / solib.c

diff --git a/gdb/solib.c b/gdb/solib.c
index 0b511f2ab9374f5f3e60d3f4760b3f5f06ac9025..639788b3e50367e588a976d5cf0f4cfcdc4b4dd8 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1,7 +1,7 @@
 /* Handle shared libraries for GDB, the GNU Debugger.
 /* Handle shared libraries for GDB, the GNU Debugger.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -39,8 +39,10 @@
 #include "language.h"
 #include "gdbcmd.h"
 #include "completer.h"
 #include "language.h"
 #include "gdbcmd.h"
 #include "completer.h"

+#include "filenames.h"         /* for DOSish file names */

 
 #include "solist.h"
 
 #include "solist.h"

+#include <readline/readline.h>

 
 /* external data declarations */
 
 
 /* external data declarations */
 


@@ -101,10 +103,14 @@ solib_open (char *in_pathname, char **found_pathname)
 {
   int found_file = -1;
   char *temp_pathname = NULL;
 {
   int found_file = -1;
   char *temp_pathname = NULL;

+  char *p = in_pathname;
+
+  while (*p && !IS_DIR_SEPARATOR (*p))
+    p++;

 
 

-  if (strchr (in_pathname, SLASH_CHAR))
+  if (*p)

     {
     {

-      if (! ROOTED_P (in_pathname) || solib_absolute_prefix == NULL)
+      if (! IS_ABSOLUTE_PATH (in_pathname) || solib_absolute_prefix == NULL)

         temp_pathname = in_pathname;
       else
        {
         temp_pathname = in_pathname;
       else
        {


@@ -112,7 +118,7 @@ solib_open (char *in_pathname, char **found_pathname)
 
          /* Remove trailing slashes from absolute prefix.  */
          while (prefix_len > 0
 
          /* Remove trailing slashes from absolute prefix.  */
          while (prefix_len > 0

-                && SLASH_P (solib_absolute_prefix[prefix_len - 1]))
+                && IS_DIR_SEPARATOR (solib_absolute_prefix[prefix_len - 1]))

            prefix_len--;
 
          /* Cat the prefixed pathname together.  */
            prefix_len--;
 
          /* Cat the prefixed pathname together.  */


@@ -126,10 +132,33 @@ solib_open (char *in_pathname, char **found_pathname)
       found_file = open (temp_pathname, O_RDONLY, 0);
     }
 
       found_file = open (temp_pathname, O_RDONLY, 0);
     }
 

+  /* If the search in solib_absolute_prefix failed, and the path name is
+     absolute at this point, make it relative.  (openp will try and open the
+     file according to its absolute path otherwise, which is not what we want.)
+     Affects subsequent searches for this solib.  */
+  if (found_file < 0 && IS_ABSOLUTE_PATH (in_pathname))
+    {
+      /* First, get rid of any drive letters etc.  */
+      while (!IS_DIR_SEPARATOR (*in_pathname))
+        in_pathname++;
+
+      /* Next, get rid of all leading dir separators.  */
+      while (IS_DIR_SEPARATOR (*in_pathname))
+        in_pathname++;
+    }
+  

   /* If not found, next search the solib_search_path (if any).  */
   if (found_file < 0 && solib_search_path != NULL)
     found_file = openp (solib_search_path,
                        1, in_pathname, O_RDONLY, 0, &temp_pathname);
   /* If not found, next search the solib_search_path (if any).  */
   if (found_file < 0 && solib_search_path != NULL)
     found_file = openp (solib_search_path,
                        1, in_pathname, O_RDONLY, 0, &temp_pathname);

+  
+  /* If not found, next search the solib_search_path (if any) for the basename
+     only (ignoring the path).  This is to allow reading solibs from a path
+     that differs from the opened path.  */
+  if (found_file < 0 && solib_search_path != NULL)
+    found_file = openp (solib_search_path, 
+                        1, lbasename (in_pathname), O_RDONLY, 0,
+                        &temp_pathname);

 
   /* If not found, next search the inferior's $PATH environment variable. */
   if (found_file < 0 && solib_search_path != NULL)
 
   /* If not found, next search the inferior's $PATH environment variable. */
   if (found_file < 0 && solib_search_path != NULL)


@@ -209,7 +238,7 @@ solib_map_sections (PTR arg)
 
   /* Leave bfd open, core_xfer_memory and "info files" need it.  */
   so->abfd = abfd;
 
   /* Leave bfd open, core_xfer_memory and "info files" need it.  */
   so->abfd = abfd;

-  abfd->cacheable = true;
+  abfd->cacheable = 1;

 
   /* copy full path name into so_name, so that later symbol_file_add
      can find it */
 
   /* copy full path name into so_name, so that later symbol_file_add
      can find it */


@@ -461,30 +490,20 @@ update_solib_list (int from_tty, struct target_ops *target)
          catch_errors (solib_map_sections, i,
                        "Error while mapping shared library sections:\n",
                        RETURN_MASK_ALL);
          catch_errors (solib_map_sections, i,
                        "Error while mapping shared library sections:\n",
                        RETURN_MASK_ALL);

-       }
-
-      /* If requested, add the shared objects' sections to the the
-        TARGET's section table.  */
-      if (target)
-       {
-         int new_sections;

 
 

-         /* Figure out how many sections we'll need to add in total.  */
-         new_sections = 0;
-         for (i = inferior; i; i = i->next)
-           new_sections += (i->sections_end - i->sections);
-
-         if (new_sections > 0)
+         /* If requested, add the shared object's sections to the TARGET's
+            section table.  Do this immediately after mapping the object so
+            that later nodes in the list can query this object, as is needed
+            in solib-osf.c.  */
+         if (target)

            {
            {

-             int space = target_resize_to_sections (target, new_sections);
-
-             for (i = inferior; i; i = i->next)
+             int count = (i->sections_end - i->sections);
+             if (count > 0)

                {
                {

-                 int count = (i->sections_end - i->sections);
+                 int space = target_resize_to_sections (target, count);

                  memcpy (target->to_sections + space,
                          i->sections,
                          count * sizeof (i->sections[0]));
                  memcpy (target->to_sections + space,
                          i->sections,
                          count * sizeof (i->sections[0]));

-                 space += count;

                }
            }
        }
                }
            }
        }


@@ -498,7 +517,8 @@ update_solib_list (int from_tty, struct target_ops *target)
 
    SYNOPSIS
 
 
    SYNOPSIS
 

-   void solib_add (char *pattern, int from_tty, struct target_ops *TARGET)
+   void solib_add (char *pattern, int from_tty, struct target_ops
+   *TARGET, int readsyms)

 
    DESCRIPTION
 
 
    DESCRIPTION
 


@@ -506,10 +526,13 @@ update_solib_list (int from_tty, struct target_ops *target)
    match PATTERN.  (If we've already read a shared object's symbol
    info, leave it alone.)  If PATTERN is zero, read them all.
 
    match PATTERN.  (If we've already read a shared object's symbol
    info, leave it alone.)  If PATTERN is zero, read them all.
 

+   If READSYMS is 0, defer reading symbolic information until later
+   but still do any needed low level processing.
+

    FROM_TTY and TARGET are as described for update_solib_list, above.  */
 
 void
    FROM_TTY and TARGET are as described for update_solib_list, above.  */
 
 void

-solib_add (char *pattern, int from_tty, struct target_ops *target)
+solib_add (char *pattern, int from_tty, struct target_ops *target, int readsyms)

 {
   struct so_list *gdb;
 
 {
   struct so_list *gdb;
 


@@ -541,7 +564,7 @@ solib_add (char *pattern, int from_tty, struct target_ops *target)
                printf_unfiltered ("Symbols already loaded for %s\n",
                                   gdb->so_name);
            }
                printf_unfiltered ("Symbols already loaded for %s\n",
                                   gdb->so_name);
            }

-         else
+         else if (readsyms)

            {
              if (catch_errors
                  (symbol_add_stub, gdb,
            {
              if (catch_errors
                  (symbol_add_stub, gdb,


@@ -596,22 +619,13 @@ info_sharedlibrary_command (char *ignore, int from_tty)
   int header_done = 0;
   int addr_width;
   char *addr_fmt;
   int header_done = 0;
   int addr_width;
   char *addr_fmt;

-  int arch_size;

 
 

-  if (exec_bfd == NULL)
-    {
-      printf_unfiltered ("No executable file.\n");
-      return;
-    }
-
-  arch_size = bfd_get_arch_size (exec_bfd);
-  /* Default to 32-bit in case of failure (non-elf). */
-  if (arch_size == 32 || arch_size == -1)
+  if (TARGET_PTR_BIT == 32)

     {
       addr_width = 8 + 4;
       addr_fmt = "08l";
     }
     {
       addr_width = 8 + 4;
       addr_fmt = "08l";
     }

-  else if (arch_size == 64)
+  else if (TARGET_PTR_BIT == 64)

     {
       addr_width = 16 + 4;
       addr_fmt = "016l";
     {
       addr_width = 16 + 4;
       addr_fmt = "016l";


@@ -619,8 +633,8 @@ info_sharedlibrary_command (char *ignore, int from_tty)
   else
     {
       internal_error (__FILE__, __LINE__,
   else
     {
       internal_error (__FILE__, __LINE__,

-                     "bfd_get_arch_size() returned unknown size %d",
-                     arch_size);
+                     "TARGET_PTR_BIT returned unknown size %d",
+                     TARGET_PTR_BIT);

     }
 
   update_solib_list (from_tty, 0);
     }
 
   update_solib_list (from_tty, 0);


@@ -639,13 +653,13 @@ info_sharedlibrary_command (char *ignore, int from_tty)
 
          printf_unfiltered ("%-*s", addr_width,
                             so->textsection != NULL 
 
          printf_unfiltered ("%-*s", addr_width,
                             so->textsection != NULL 

-                              ? longest_local_hex_string_custom (
+                              ? local_hex_string_custom (

                                   (LONGEST) so->textsection->addr,
                                   addr_fmt)
                               : "");
          printf_unfiltered ("%-*s", addr_width,
                             so->textsection != NULL 
                                   (LONGEST) so->textsection->addr,
                                   addr_fmt)
                               : "");
          printf_unfiltered ("%-*s", addr_width,
                             so->textsection != NULL 

-                              ? longest_local_hex_string_custom (
+                              ? local_hex_string_custom (

                                   (LONGEST) so->textsection->endaddr,
                                   addr_fmt)
                               : "");
                                   (LONGEST) so->textsection->endaddr,
                                   addr_fmt)
                               : "");


@@ -732,6 +746,8 @@ clear_solib (void)
     {
       struct so_list *so = so_list_head;
       so_list_head = so->next;
     {
       struct so_list *so = so_list_head;
       so_list_head = so->next;

+      if (so->abfd)
+       remove_target_sections (so->abfd);

       free_so (so);
     }
 
       free_so (so);
     }
 


@@ -806,9 +822,27 @@ static void
 sharedlibrary_command (char *args, int from_tty)
 {
   dont_repeat ();
 sharedlibrary_command (char *args, int from_tty)
 {
   dont_repeat ();

-  solib_add (args, from_tty, (struct target_ops *) 0);
+  solib_add (args, from_tty, (struct target_ops *) 0, 1);

 }
 
 }
 

+/* LOCAL FUNCTION
+
+   no_shared_libraries -- handle command to explicitly discard symbols
+   from shared libraries.
+
+   DESCRIPTION
+
+   Implements the command "nosharedlibrary", which discards symbols
+   that have been auto-loaded from shared libraries.  Symbols from
+   shared libraries that were added by explicit request of the user
+   are not discarded.  Also called from remote.c.  */
+
+void
+no_shared_libraries (char *ignored, int from_tty)
+{
+  objfile_purge_solibs ();
+  do_clear_solib (NULL);
+}

 
 void
 _initialize_solib (void)
 
 void
 _initialize_solib (void)


@@ -819,15 +853,17 @@ _initialize_solib (void)
           "Load shared object library symbols for files matching REGEXP.");
   add_info ("sharedlibrary", info_sharedlibrary_command,
            "Status of loaded shared object libraries.");
           "Load shared object library symbols for files matching REGEXP.");
   add_info ("sharedlibrary", info_sharedlibrary_command,
            "Status of loaded shared object libraries.");

+  add_com ("nosharedlibrary", class_files, no_shared_libraries,
+          "Unload all shared object library symbols.");

 
   add_show_from_set
 
   add_show_from_set

-    (add_set_cmd ("auto-solib-add", class_support, var_zinteger,
+    (add_set_cmd ("auto-solib-add", class_support, var_boolean,

                  (char *) &auto_solib_add,
                  "Set autoloading of shared library symbols.\n\
                  (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'.",
+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'.",

                  &setlist),
      &showlist);
 
                  &setlist),
      &showlist);
 


@@ -837,7 +873,7 @@ must be loaded manually, using `sharedlibrary'.",
 For other (relative) files, you can add values using `set solib-search-path'.",
                   &setlist);
   add_show_from_set (c, &showlist);
 For other (relative) files, you can add values using `set solib-search-path'.",
                   &setlist);
   add_show_from_set (c, &showlist);

-  c->completer = filename_completer;
+  set_cmd_completer (c, filename_completer);

 
   c = add_set_cmd ("solib-search-path", class_support, var_string,
                   (char *) &solib_search_path,
 
   c = add_set_cmd ("solib-search-path", class_support, var_string,
                   (char *) &solib_search_path,


@@ -845,5 +881,5 @@ For other (relative) files, you can add values using `set solib-search-path'.",
 This takes precedence over the environment variables PATH and LD_LIBRARY_PATH.",
                   &setlist);
   add_show_from_set (c, &showlist);
 This takes precedence over the environment variables PATH and LD_LIBRARY_PATH.",
                   &setlist);
   add_show_from_set (c, &showlist);

-  c->completer = filename_completer;
+  set_cmd_completer (c, filename_completer);

 }
 }