* config/m68k/monitor.mt (TDEPFILE): Add remote-es.o.

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

diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 3665380f27b55b5319bdaa93c1da9bd4f43eba73..8f1992c9374d7d16dfda10aaee61cc76193e70e8 100644 (file)
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -183,7 +183,9 @@ lookup_minimal_symbol (name, objf)
    equal to PC.  Returns a pointer to the minimal symbol if such a symbol
    is found, or NULL if PC is not in a suitable range.  Note that we need
    to look through ALL the minimal symbol tables before deciding on the
-   symbol that comes closest to the specified PC. */
+   symbol that comes closest to the specified PC.  This is because objfiles
+   can overlap, for example objfile A has .text at 0x100 and .data at 0x40000
+   and objfile B has .text at 0x234 and .data at 0x40048.  */
 
 struct minimal_symbol *
 lookup_minimal_symbol_by_pc (pc)
@@ -210,7 +212,7 @@ lookup_minimal_symbol_by_pc (pc)
        {
          lo = 0;
          hi = objfile -> minimal_symbol_count - 1;
-         
+
          /* This code assumes that the minimal symbols are sorted by
             ascending address values.  If the pc value is greater than or
             equal to the first symbol's address, then some symbol in this
@@ -251,14 +253,28 @@ lookup_minimal_symbol_by_pc (pc)
                 objfile's minimal symbol table.  See if it is the best one
                 overall. */
 
-             if ((best_symbol == NULL) ||
-                 (SYMBOL_VALUE_ADDRESS (best_symbol) < 
-                  SYMBOL_VALUE_ADDRESS (&msymbol[hi])))
+             /* Skip any absolute symbols.  This is apparently what adb
+                and dbx do, and is needed for the CM-5.  There are two
+                known possible problems: (1) on ELF, apparently end, edata,
+                etc. are absolute.  Not sure ignoring them here is a big
+                deal, but if we want to use them, the fix would go in
+                elfread.c.  (2) I think shared library entry points on the
+                NeXT are absolute.  If we want special handling for this
+                it probably should be triggered by a special
+                mst_abs_or_lib or some such.  */
+             while (hi >= 0
+                    && msymbol[hi].type == mst_abs)
+               --hi;
+
+             if (hi >= 0
+                 && ((best_symbol == NULL) ||
+                     (SYMBOL_VALUE_ADDRESS (best_symbol) < 
+                      SYMBOL_VALUE_ADDRESS (&msymbol[hi]))))
                {
                  best_symbol = &msymbol[hi];
                }
            }
-       }      
+       }
     }
   return (best_symbol);
 }
@@ -276,47 +292,50 @@ init_minimal_symbol_collection ()
 }
 
 void
-prim_record_minimal_symbol (name, address, ms_type)
+prim_record_minimal_symbol (name, address, ms_type, objfile)
      const char *name;
      CORE_ADDR address;
      enum minimal_symbol_type ms_type;
+     struct objfile *objfile;
 {
-  register struct msym_bunch *new;
-  register struct minimal_symbol *msymbol;
-
-  if (msym_bunch_index == BUNCH_SIZE)
-    {
-      new = (struct msym_bunch *) xmalloc (sizeof (struct msym_bunch));
-      msym_bunch_index = 0;
-      new -> next = msym_bunch;
-      msym_bunch = new;
-    }
-  msymbol = &msym_bunch -> contents[msym_bunch_index];
-  SYMBOL_NAME (msymbol) = (char *) name;
-  SYMBOL_INIT_LANGUAGE_SPECIFIC (msymbol, language_unknown);
-  SYMBOL_VALUE_ADDRESS (msymbol) = address;
-  SYMBOL_SECTION (msymbol) = -1;
-  MSYMBOL_TYPE (msymbol) = ms_type;
-  /* FIXME:  This info, if it remains, needs its own field.  */
-  MSYMBOL_INFO (msymbol) = NULL; /* FIXME! */
-  msym_bunch_index++;
-  msym_count++;
+  prim_record_minimal_symbol_and_info (name, address, ms_type,
+                                      NULL, -1, objfile);
 }
 
-/* FIXME:  Why don't we just combine this function with the one above
-   and pass it a NULL info pointer value if info is not needed? */
-
 void
-prim_record_minimal_symbol_and_info (name, address, ms_type, info, section)
+prim_record_minimal_symbol_and_info (name, address, ms_type, info, section,
+                                    objfile)
      const char *name;
      CORE_ADDR address;
      enum minimal_symbol_type ms_type;
      char *info;
      int section;
+     struct objfile *objfile;
 {
   register struct msym_bunch *new;
   register struct minimal_symbol *msymbol;
 
+  if (ms_type == mst_file_text)
+    {
+      /* Don't put gcc_compiled, __gnu_compiled_cplus, and friends into
+        the minimal symbols, because if there is also another symbol
+        at the same address (e.g. the first function of the file),
+        lookup_minimal_symbol_by_pc would have no way of getting the
+        right one.  */
+      if (name[0] == 'g'
+         && (strcmp (name, GCC_COMPILED_FLAG_SYMBOL) == 0
+             || strcmp (name, GCC2_COMPILED_FLAG_SYMBOL) == 0))
+       return;
+
+      {
+       const char *tempstring = name;
+       if (tempstring[0] == bfd_get_symbol_leading_char (objfile->obfd))
+         ++tempstring;
+       if (STREQN (tempstring, "__gnu_compiled", 14))
+         return;
+      }
+    }
+
   if (msym_bunch_index == BUNCH_SIZE)
     {
       new = (struct msym_bunch *) xmalloc (sizeof (struct msym_bunch));