* config/tc-sparc.c (initial_architecture,can_bump_v9_p): Deleted.

[binutils.git] / gdb / minsyms.c

diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 75281ce49cdb387a660e265b92003952db409575..6ef709a734968d4f017f1d87e33b510e46959283 100644 (file)
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -1,5 +1,5 @@
 /* GDB routines for manipulating the minimal symbol tables.
-   Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 1996, 1996 Free Software Foundation, Inc.
    Contributed by Cygnus Support, using pieces from other GDB modules.
 
 This file is part of GDB.
@@ -16,7 +16,7 @@ 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.  */
 
 
 /* This file contains support routines for creating, manipulating, and
@@ -38,7 +38,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
 #include "defs.h"
-#include <string.h>
+#include "gdb_string.h"
 #include "symtab.h"
 #include "bfd.h"
 #include "symfile.h"
@@ -194,7 +194,6 @@ lookup_minimal_symbol_text (name, sfile, objf)
   struct minimal_symbol *msymbol;
   struct minimal_symbol *found_symbol = NULL;
   struct minimal_symbol *found_file_symbol = NULL;
-  struct minimal_symbol *trampoline_symbol = NULL;
 
 #ifdef SOFUN_ADDRESS_MAYBE_MISSING
   if (sfile != NULL)
@@ -254,6 +253,55 @@ lookup_minimal_symbol_text (name, sfile, objf)
   return NULL;
 }
 
+/* Look through all the current minimal symbol tables and find the
+   first minimal symbol that matches NAME and of solib trampoline type.  
+   If OBJF is non-NULL, limit
+   the search to that objfile.  If SFILE is non-NULL, limit the search
+   to that source file.  Returns a pointer to the minimal symbol that
+   matches, or NULL if no match is found.
+*/
+   
+struct minimal_symbol *
+lookup_minimal_symbol_solib_trampoline (name, sfile, objf)
+     register const char *name;
+     const char *sfile;
+     struct objfile *objf;
+{
+  struct objfile *objfile;
+  struct minimal_symbol *msymbol;
+  struct minimal_symbol *found_symbol = NULL;
+  struct minimal_symbol *found_file_symbol = NULL;
+
+#ifdef SOFUN_ADDRESS_MAYBE_MISSING
+  if (sfile != NULL)
+    {
+      char *p = strrchr (sfile, '/');
+      if (p != NULL)
+       sfile = p + 1;
+    }
+#endif
+
+  for (objfile = object_files;
+       objfile != NULL && found_symbol == NULL;
+       objfile = objfile -> next)
+    {
+      if (objf == NULL || objf == objfile)
+       {
+         for (msymbol = objfile -> msymbols;
+              msymbol != NULL && SYMBOL_NAME (msymbol) != NULL &&
+              found_symbol == NULL;
+              msymbol++)
+           {
+             if (SYMBOL_MATCHES_NAME (msymbol, name) && 
+                 MSYMBOL_TYPE (msymbol) == mst_solib_trampoline)
+               return msymbol;
+           }
+       }
+    }
+
+  return NULL;
+}
+
 
 /* Search through the minimal symbol table for each objfile and find the
    symbol whose address is the largest address that is still less than or
@@ -326,6 +374,15 @@ lookup_minimal_symbol_by_pc (pc)
                      lo = new;
                    }
                }
+
+             /* If we have multiple symbols at the same address, we want
+                hi to point to the last one.  That way we can find the
+                right symbol if it has an index greater than hi.  */
+             while (hi < objfile -> minimal_symbol_count - 1
+                    && (SYMBOL_VALUE_ADDRESS (&msymbol[hi])
+                        == SYMBOL_VALUE_ADDRESS (&msymbol[hi+1])))
+               hi++;
+
              /* The minimal symbol indexed by hi now is the best one in this
                 objfile's minimal symbol table.  See if it is the best one
                 overall. */
@@ -466,14 +523,14 @@ prim_record_minimal_symbol_and_info (name, address, ms_type, info, section,
       if (name[0] == 'g'
          && (strcmp (name, GCC_COMPILED_FLAG_SYMBOL) == 0
              || strcmp (name, GCC2_COMPILED_FLAG_SYMBOL) == 0))
-       return;
+       return (NULL);
 
       {
        const char *tempstring = name;
        if (tempstring[0] == get_symbol_leading_char (objfile->obfd))
          ++tempstring;
        if (STREQN (tempstring, "__gnu_compiled", 14))
-         return;
+         return (NULL);
       }
     }
 
@@ -495,6 +552,7 @@ prim_record_minimal_symbol_and_info (name, address, ms_type, info, section,
   MSYMBOL_INFO (msymbol) = info; /* FIXME! */
   msym_bunch_index++;
   msym_count++;
+  OBJSTAT (objfile, n_minsyms++);
   return msymbol;
 }