2000-10-12 Elena Zannoni <ezannoni@kwikemart.cygnus.com>

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

diff --git a/gdb/symtab.c b/gdb/symtab.c
index e79b9b5a30fb4509648484c12b8b6aca7b0e58bc..3a97e10281b8d72cbf0339ed9735a9e7071afa24 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1,22 +1,23 @@
 /* Symbol table lookup for the GNU debugger, GDB.
 /* Symbol table lookup for the GNU debugger, GDB.

-   Copyright 1986, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 1997
-             Free Software Foundation, Inc.
+   Copyright 1986, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 1998
+   Free Software Foundation, Inc.

 
 

-This file is part of GDB.
+   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
-(at your option) any later version.
+   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
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
+   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.  */

 
 #include "defs.h"
 #include "symtab.h"
 
 #include "defs.h"
 #include "symtab.h"


@@ -29,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "objfiles.h"
 #include "gdbcmd.h"
 #include "call-cmds.h"
 #include "objfiles.h"
 #include "gdbcmd.h"
 #include "call-cmds.h"

-#include "gnu-regex.h"
+#include "gdb_regex.h"

 #include "expression.h"
 #include "language.h"
 #include "demangle.h"
 #include "expression.h"
 #include "language.h"
 #include "demangle.h"


@@ -43,58 +44,74 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "gdb_stat.h"
 #include <ctype.h>
 
 #include "gdb_stat.h"
 #include <ctype.h>
 

+/* Prototype for one function in parser-defs.h,
+   instead of including that entire file. */
+
+extern char *find_template_name_end (char *);
+

 /* Prototypes for local functions */
 
 /* Prototypes for local functions */
 

-extern int
-find_methods PARAMS ((struct type *, char *, struct symbol **));
+static int find_methods (struct type *, char *, struct symbol **);

 
 

-static void
-completion_list_add_name PARAMS ((char *, char *, int, char *, char *));
+static void completion_list_add_name (char *, char *, int, char *, char *);

 
 

-static void
-build_canonical_line_spec PARAMS ((struct symtab_and_line *, char *, char ***));
+static void build_canonical_line_spec (struct symtab_and_line *,
+                                      char *, char ***);

 
 

-static struct symtabs_and_lines
-decode_line_2 PARAMS ((struct symbol *[], int, int, char ***));
+static struct symtabs_and_lines decode_line_2 (struct symbol *[],
+                                              int, int, char ***);

 
 

-static void
-rbreak_command PARAMS ((char *, int));
+static void rbreak_command (char *, int);

 
 

-static void
-types_info PARAMS ((char *, int));
+static void types_info (char *, int);

 
 

-static void
-functions_info PARAMS ((char *, int));
+static void functions_info (char *, int);

 
 

-static void
-variables_info PARAMS ((char *, int));
+static void variables_info (char *, int);

 
 

-static void
-sources_info PARAMS ((char *, int));
+static void sources_info (char *, int);

 
 

-static void
-list_symbols PARAMS ((char *, int, int, int));
+static void output_source_filename (char *, int *);

 
 

-static void
-output_source_filename PARAMS ((char *, int *));
+char *operator_chars (char *, char **);

 
 

-char *
-operator_chars PARAMS ((char *, char **));
+static int find_line_common (struct linetable *, int, int *);

 
 

-static int find_line_common PARAMS ((struct linetable *, int, int *));
+static struct partial_symbol *lookup_partial_symbol (struct partial_symtab *,
+                                                    const char *, int,
+                                                    namespace_enum);

 
 

-static struct partial_symbol *
-lookup_partial_symbol PARAMS ((struct partial_symtab *, const char *,
-                              int, namespace_enum));
+static struct symtab *lookup_symtab_1 (char *);

 
 

-static struct symtab *
-lookup_symtab_1 PARAMS ((char *));
+static struct symbol *lookup_symbol_aux (const char *name, const
+                                        struct block *block, const
+                                        namespace_enum namespace, int
+                                        *is_a_field_of_this, struct
+                                        symtab **symtab);

 
 

-static void
-cplusplus_hint PARAMS ((char *));

 
 

-static struct symbol *
-find_active_alias PARAMS ((struct symbol *sym, CORE_ADDR addr));
+static void cplusplus_hint (char *);
+
+static struct symbol *find_active_alias (struct symbol *sym, CORE_ADDR addr);
+
+/* This flag is used in hppa-tdep.c, and set in hp-symtab-read.c */
+/* Signals the presence of objects compiled by HP compilers */
+int hp_som_som_object_present = 0;
+
+static void fixup_section (struct general_symbol_info *, struct objfile *);
+
+static int file_matches (char *, char **, int);
+
+static void print_symbol_info (namespace_enum,
+                              struct symtab *, struct symbol *, int, char *);
+
+static void print_msymbol_info (struct minimal_symbol *);
+
+static void symtab_symbol_info (char *, namespace_enum, int);
+
+static void overload_list_add_symbol (struct symbol *sym, char *oload_name);
+
+void _initialize_symtab (void);

 
 /* */
 
 
 /* */
 


@@ -114,8 +131,7 @@ char no_symtab_msg[] = "No symbol table is loaded.  Use the \"file\" command.";
    symbols.  Remove when loose ends are cleaned up.   FIXME -fnf */
 
 static void
    symbols.  Remove when loose ends are cleaned up.   FIXME -fnf */
 
 static void

-cplusplus_hint (name)
-     char *name;
+cplusplus_hint (char *name)

 {
   while (*name == '\'')
     name++;
 {
   while (*name == '\'')
     name++;


@@ -128,21 +144,20 @@ cplusplus_hint (name)
    in the symtab filename will also work.  */
 
 static struct symtab *
    in the symtab filename will also work.  */
 
 static struct symtab *

-lookup_symtab_1 (name)
-     char *name;
+lookup_symtab_1 (char *name)

 {
   register struct symtab *s;
   register struct partial_symtab *ps;
   register char *slash;
   register struct objfile *objfile;
 
 {
   register struct symtab *s;
   register struct partial_symtab *ps;
   register char *slash;
   register struct objfile *objfile;
 

- got_symtab:
+got_symtab:

 
   /* First, search for an exact match */
 
   ALL_SYMTABS (objfile, s)
     if (STREQ (name, s->filename))
 
   /* First, search for an exact match */
 
   ALL_SYMTABS (objfile, s)
     if (STREQ (name, s->filename))

-      return s;
+    return s;

 
   slash = strchr (name, '/');
 
 
   slash = strchr (name, '/');
 


@@ -150,16 +165,16 @@ lookup_symtab_1 (name)
 
   if (!slash)
     ALL_SYMTABS (objfile, s)
 
   if (!slash)
     ALL_SYMTABS (objfile, s)

-      {
-       char *p = s -> filename;
-       char *tail = strrchr (p, '/');
+    {
+      char *p = s->filename;
+      char *tail = strrchr (p, '/');

 
 

-       if (tail)
-         p = tail + 1;
+      if (tail)
+       p = tail + 1;

 
 

-       if (STREQ (p, name))
-         return s;
-      }
+      if (STREQ (p, name))
+       return s;
+    }

 
   /* Same search rules as above apply here, but now we look thru the
      psymtabs.  */
 
   /* Same search rules as above apply here, but now we look thru the
      psymtabs.  */


@@ -168,9 +183,9 @@ lookup_symtab_1 (name)
   if (!ps)
     return (NULL);
 
   if (!ps)
     return (NULL);
 

-  if (ps -> readin)
+  if (ps->readin)

     error ("Internal: readin %s pst for `%s' found when no symtab found.",
     error ("Internal: readin %s pst for `%s' found when no symtab found.",

-          ps -> filename, name);
+          ps->filename, name);

 
   s = PSYMTAB_TO_SYMTAB (ps);
 
 
   s = PSYMTAB_TO_SYMTAB (ps);
 


@@ -192,8 +207,7 @@ lookup_symtab_1 (name)
    of variations if the first lookup doesn't work.  */
 
 struct symtab *
    of variations if the first lookup doesn't work.  */
 
 struct symtab *

-lookup_symtab (name)
-     char *name;
+lookup_symtab (char *name)

 {
   register struct symtab *s;
 #if 0
 {
   register struct symtab *s;
 #if 0


@@ -201,7 +215,8 @@ lookup_symtab (name)
 #endif
 
   s = lookup_symtab_1 (name);
 #endif
 
   s = lookup_symtab_1 (name);

-  if (s) return s;
+  if (s)
+    return s;

 
 #if 0
   /* This screws c-exp.y:yylex if there is both a type "tree" and a symtab
 
 #if 0
   /* This screws c-exp.y:yylex if there is both a type "tree" and a symtab


@@ -216,7 +231,8 @@ lookup_symtab (name)
   strcpy (copy, name);
   strcat (copy, ".c");
   s = lookup_symtab_1 (copy);
   strcpy (copy, name);
   strcat (copy, ".c");
   s = lookup_symtab_1 (copy);

-  if (s) return s;
+  if (s)
+    return s;

 #endif /* 0 */
 
   /* We didn't find anything; die.  */
 #endif /* 0 */
 
   /* We didn't find anything; die.  */


@@ -228,52 +244,51 @@ lookup_symtab (name)
    in the psymtab filename will also work.  */
 
 struct partial_symtab *
    in the psymtab filename will also work.  */
 
 struct partial_symtab *

-lookup_partial_symtab (name)
-char *name;
+lookup_partial_symtab (char *name)

 {
   register struct partial_symtab *pst;
   register struct objfile *objfile;
 {
   register struct partial_symtab *pst;
   register struct objfile *objfile;

-  
+

   ALL_PSYMTABS (objfile, pst)
   ALL_PSYMTABS (objfile, pst)

-    {
-      if (STREQ (name, pst -> filename))
-       {
-         return (pst);
-       }
-    }
+  {
+    if (STREQ (name, pst->filename))
+      {
+       return (pst);
+      }
+  }

 
   /* Now, search for a matching tail (only if name doesn't have any dirs) */
 
   if (!strchr (name, '/'))
     ALL_PSYMTABS (objfile, pst)
 
   /* Now, search for a matching tail (only if name doesn't have any dirs) */
 
   if (!strchr (name, '/'))
     ALL_PSYMTABS (objfile, pst)

-      {
-       char *p = pst -> filename;
-       char *tail = strrchr (p, '/');
+    {
+      char *p = pst->filename;
+      char *tail = strrchr (p, '/');

 
 

-       if (tail)
-         p = tail + 1;
+      if (tail)
+       p = tail + 1;

 
 

-       if (STREQ (p, name))
-         return (pst);
-      }
+      if (STREQ (p, name))
+       return (pst);
+    }

 
   return (NULL);
 }
 \f
 
   return (NULL);
 }
 \f

-/* Demangle a GDB method stub type.
-   Note that this function is g++ specific. */
+/* Mangle a GDB method stub type.  This actually reassembles the pieces of the
+   full method name, which consist of the class name (from T), the unadorned
+   method name from METHOD_ID, and the signature for the specific overload,
+   specified by SIGNATURE_ID.  Note that this function is g++ specific. */

 
 char *
 
 char *

-gdb_mangle_name (type, i, j)
-     struct type *type;
-     int i, j;
+gdb_mangle_name (struct type *type, int method_id, int signature_id)

 {
   int mangled_name_len;
   char *mangled_name;
 {
   int mangled_name_len;
   char *mangled_name;

-  struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
-  struct fn_field *method = &f[j];
-  char *field_name = TYPE_FN_FIELDLIST_NAME (type, i);
-  char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
+  struct fn_field *f = TYPE_FN_FIELDLIST1 (type, method_id);
+  struct fn_field *method = &f[signature_id];
+  char *field_name = TYPE_FN_FIELDLIST_NAME (type, method_id);
+  char *physname = TYPE_FN_FIELD_PHYSNAME (f, signature_id);

   char *newname = type_name_no_tag (type);
 
   /* Does the form of physname indicate that it is the full mangled name
   char *newname = type_name_no_tag (type);
 
   /* Does the form of physname indicate that it is the full mangled name


@@ -288,21 +303,21 @@ gdb_mangle_name (type, i, j)
   char buf[20];
   int len = (newname == NULL ? 0 : strlen (newname));
 
   char buf[20];
   int len = (newname == NULL ? 0 : strlen (newname));
 

-  is_full_physname_constructor = 
-    ((physname[0]=='_' && physname[1]=='_' && 
-      (isdigit(physname[2]) || physname[2]=='Q' || physname[2]=='t'))
-     || (strncmp(physname, "__ct", 4) == 0));
+  is_full_physname_constructor =
+    ((physname[0] == '_' && physname[1] == '_' &&
+      (isdigit (physname[2]) || physname[2] == 'Q' || physname[2] == 't'))
+     || (strncmp (physname, "__ct", 4) == 0));

 
   is_constructor =
 
   is_constructor =

-    is_full_physname_constructor || (newname && STREQ(field_name, newname));
+    is_full_physname_constructor || (newname && STREQ (field_name, newname));

 
   if (!is_destructor)
 
   if (!is_destructor)

-    is_destructor = (strncmp(physname, "__dt", 4) == 0); 
+    is_destructor = (strncmp (physname, "__dt", 4) == 0);

 
   if (is_destructor || is_full_physname_constructor)
     {
 
   if (is_destructor || is_full_physname_constructor)
     {

-      mangled_name = (char*) xmalloc(strlen(physname)+1);
-      strcpy(mangled_name, physname);
+      mangled_name = (char *) xmalloc (strlen (physname) + 1);
+      strcpy (mangled_name, physname);

       return mangled_name;
     }
 
       return mangled_name;
     }
 


@@ -313,7 +328,7 @@ gdb_mangle_name (type, i, j)
   else if (physname[0] == 't' || physname[0] == 'Q')
     {
       /* The physname for template and qualified methods already includes
   else if (physname[0] == 't' || physname[0] == 'Q')
     {
       /* The physname for template and qualified methods already includes

-        the class name.  */
+         the class name.  */

       sprintf (buf, "__%s%s", const_prefix, volatile_prefix);
       newname = NULL;
       len = 0;
       sprintf (buf, "__%s%s", const_prefix, volatile_prefix);
       newname = NULL;
       len = 0;


@@ -323,9 +338,9 @@ gdb_mangle_name (type, i, j)
       sprintf (buf, "__%s%s%d", const_prefix, volatile_prefix, len);
     }
   mangled_name_len = ((is_constructor ? 0 : strlen (field_name))
       sprintf (buf, "__%s%s%d", const_prefix, volatile_prefix, len);
     }
   mangled_name_len = ((is_constructor ? 0 : strlen (field_name))

-                         + strlen (buf) + len
-                         + strlen (physname)
-                         + 1);
+                     + strlen (buf) + len
+                     + strlen (physname)
+                     + 1);

 
   /* Only needed for GNU-mangled names.  ANSI-mangled names
      work with the normal mechanisms.  */
 
   /* Only needed for GNU-mangled names.  ANSI-mangled names
      work with the normal mechanisms.  */


@@ -335,7 +350,7 @@ gdb_mangle_name (type, i, j)
       if (opname == NULL)
        error ("No mangling for \"%s\"", field_name);
       mangled_name_len += strlen (opname);
       if (opname == NULL)
        error ("No mangling for \"%s\"", field_name);
       mangled_name_len += strlen (opname);

-      mangled_name = (char *)xmalloc (mangled_name_len);
+      mangled_name = (char *) xmalloc (mangled_name_len);

 
       strncpy (mangled_name, field_name, 3);
       mangled_name[3] = '\0';
 
       strncpy (mangled_name, field_name, 3);
       mangled_name[3] = '\0';


@@ -343,7 +358,7 @@ gdb_mangle_name (type, i, j)
     }
   else
     {
     }
   else
     {

-      mangled_name = (char *)xmalloc (mangled_name_len);
+      mangled_name = (char *) xmalloc (mangled_name_len);

       if (is_constructor)
        mangled_name[0] = '\0';
       else
       if (is_constructor)
        mangled_name[0] = '\0';
       else


@@ -352,65 +367,59 @@ gdb_mangle_name (type, i, j)
   strcat (mangled_name, buf);
   /* If the class doesn't have a name, i.e. newname NULL, then we just
      mangle it using 0 for the length of the class.  Thus it gets mangled
   strcat (mangled_name, buf);
   /* If the class doesn't have a name, i.e. newname NULL, then we just
      mangle it using 0 for the length of the class.  Thus it gets mangled

-     as something starting with `::' rather than `classname::'. */ 
+     as something starting with `::' rather than `classname::'. */

   if (newname != NULL)
     strcat (mangled_name, newname);
 
   strcat (mangled_name, physname);
   return (mangled_name);
 }
   if (newname != NULL)
     strcat (mangled_name, newname);
 
   strcat (mangled_name, physname);
   return (mangled_name);
 }

-

 \f
 
 \f
 

-struct partial_symbol * fixup_psymbol_section PARAMS ((struct partial_symbol *,
-                                                      struct objfile *));
-

 
 /* Find which partial symtab on contains PC and SECTION.  Return 0 if none.  */
 
 struct partial_symtab *
 
 /* Find which partial symtab on contains PC and SECTION.  Return 0 if none.  */
 
 struct partial_symtab *

-find_pc_sect_psymtab (pc, section)
-     CORE_ADDR pc;
-     asection *section;
+find_pc_sect_psymtab (CORE_ADDR pc, asection *section)

 {
   register struct partial_symtab *pst;
   register struct objfile *objfile;
 
   ALL_PSYMTABS (objfile, pst)
 {
   register struct partial_symtab *pst;
   register struct objfile *objfile;
 
   ALL_PSYMTABS (objfile, pst)

-    {
-      if (pc >= pst->textlow && pc < pst->texthigh)
-       {
-         struct minimal_symbol *msymbol;
-         struct partial_symtab *tpst;
-
-         /* An objfile that has its functions reordered might have
-            many partial symbol tables containing the PC, but
-            we want the partial symbol table that contains the
-            function containing the PC.  */
-         if (!(objfile->flags & OBJF_REORDERED) &&
-             section == 0)     /* can't validate section this way */
-           return (pst);
-
-         msymbol = lookup_minimal_symbol_by_pc_section (pc, section);
-         if (msymbol == NULL)
-           return (pst);
-
-         for (tpst = pst; tpst != NULL; tpst = tpst->next)
-           {
-             if (pc >= tpst->textlow && pc < tpst->texthigh)
-               {
-                 struct partial_symbol *p;
+  {
+    if (pc >= pst->textlow && pc < pst->texthigh)
+      {
+       struct minimal_symbol *msymbol;
+       struct partial_symtab *tpst;
+
+       /* An objfile that has its functions reordered might have
+          many partial symbol tables containing the PC, but
+          we want the partial symbol table that contains the
+          function containing the PC.  */
+       if (!(objfile->flags & OBJF_REORDERED) &&
+           section == 0)       /* can't validate section this way */
+         return (pst);

 
 

-                 p = find_pc_sect_psymbol (tpst, pc, section);
-                 if (p != NULL
-                     && SYMBOL_VALUE_ADDRESS(p)
-                        == SYMBOL_VALUE_ADDRESS (msymbol))
-                   return (tpst);
-               }
-           }
+       msymbol = lookup_minimal_symbol_by_pc_section (pc, section);
+       if (msymbol == NULL)

          return (pst);
          return (pst);

-       }
-    }
+
+       for (tpst = pst; tpst != NULL; tpst = tpst->next)
+         {
+           if (pc >= tpst->textlow && pc < tpst->texthigh)
+             {
+               struct partial_symbol *p;
+
+               p = find_pc_sect_psymbol (tpst, pc, section);
+               if (p != NULL
+                   && SYMBOL_VALUE_ADDRESS (p)
+                   == SYMBOL_VALUE_ADDRESS (msymbol))
+                 return (tpst);
+             }
+         }
+       return (pst);
+      }
+  }

   return (NULL);
 }
 
   return (NULL);
 }
 


@@ -418,8 +427,7 @@ find_pc_sect_psymtab (pc, section)
    Backward compatibility, no section */
 
 struct partial_symtab *
    Backward compatibility, no section */
 
 struct partial_symtab *

-find_pc_psymtab (pc)
-     CORE_ADDR pc;
+find_pc_psymtab (CORE_ADDR pc)

 {
   return find_pc_sect_psymtab (pc, find_pc_mapped_section (pc));
 }
 {
   return find_pc_sect_psymtab (pc, find_pc_mapped_section (pc));
 }


@@ -428,36 +436,37 @@ find_pc_psymtab (pc)
    Return 0 if none.  Check all psymtabs if PSYMTAB is 0.  */
 
 struct partial_symbol *
    Return 0 if none.  Check all psymtabs if PSYMTAB is 0.  */
 
 struct partial_symbol *

-find_pc_sect_psymbol (psymtab, pc, section)
-     struct partial_symtab *psymtab;
-     CORE_ADDR pc;
-     asection *section;
+find_pc_sect_psymbol (struct partial_symtab *psymtab, CORE_ADDR pc,
+                     asection *section)

 {
   struct partial_symbol *best = NULL, *p, **pp;
   CORE_ADDR best_pc;
 {
   struct partial_symbol *best = NULL, *p, **pp;
   CORE_ADDR best_pc;

-  
+

   if (!psymtab)
     psymtab = find_pc_sect_psymtab (pc, section);
   if (!psymtab)
     return 0;
 
   if (!psymtab)
     psymtab = find_pc_sect_psymtab (pc, section);
   if (!psymtab)
     return 0;
 

-  best_pc = psymtab->textlow - 1;
+  /* Cope with programs that start at address 0 */
+  best_pc = (psymtab->textlow != 0) ? psymtab->textlow - 1 : 0;

 
   /* Search the global symbols as well as the static symbols, so that
      find_pc_partial_function doesn't use a minimal symbol and thus
      cache a bad endaddr.  */
   for (pp = psymtab->objfile->global_psymbols.list + psymtab->globals_offset;
 
   /* Search the global symbols as well as the static symbols, so that
      find_pc_partial_function doesn't use a minimal symbol and thus
      cache a bad endaddr.  */
   for (pp = psymtab->objfile->global_psymbols.list + psymtab->globals_offset;

-       (pp - (psymtab->objfile->global_psymbols.list + psymtab->globals_offset)
-       < psymtab->n_global_syms);
+    (pp - (psymtab->objfile->global_psymbols.list + psymtab->globals_offset)
+     < psymtab->n_global_syms);

        pp++)
     {
       p = *pp;
       if (SYMBOL_NAMESPACE (p) == VAR_NAMESPACE
          && SYMBOL_CLASS (p) == LOC_BLOCK
          && pc >= SYMBOL_VALUE_ADDRESS (p)
        pp++)
     {
       p = *pp;
       if (SYMBOL_NAMESPACE (p) == VAR_NAMESPACE
          && SYMBOL_CLASS (p) == LOC_BLOCK
          && pc >= SYMBOL_VALUE_ADDRESS (p)

-         && SYMBOL_VALUE_ADDRESS (p) > best_pc)
+         && (SYMBOL_VALUE_ADDRESS (p) > best_pc
+             || (psymtab->textlow == 0
+                 && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0)))

        {
        {

-         if (section)  /* match on a specific section */
+         if (section)          /* match on a specific section */

            {
              fixup_psymbol_section (p, psymtab->objfile);
              if (SYMBOL_BFD_SECTION (p) != section)
            {
              fixup_psymbol_section (p, psymtab->objfile);
              if (SYMBOL_BFD_SECTION (p) != section)


@@ -467,18 +476,21 @@ find_pc_sect_psymbol (psymtab, pc, section)
          best = p;
        }
     }
          best = p;
        }
     }

+

   for (pp = psymtab->objfile->static_psymbols.list + psymtab->statics_offset;
   for (pp = psymtab->objfile->static_psymbols.list + psymtab->statics_offset;

-       (pp - (psymtab->objfile->static_psymbols.list + psymtab->statics_offset)
-       < psymtab->n_static_syms);
+    (pp - (psymtab->objfile->static_psymbols.list + psymtab->statics_offset)
+     < psymtab->n_static_syms);

        pp++)
     {
       p = *pp;
       if (SYMBOL_NAMESPACE (p) == VAR_NAMESPACE
          && SYMBOL_CLASS (p) == LOC_BLOCK
          && pc >= SYMBOL_VALUE_ADDRESS (p)
        pp++)
     {
       p = *pp;
       if (SYMBOL_NAMESPACE (p) == VAR_NAMESPACE
          && SYMBOL_CLASS (p) == LOC_BLOCK
          && pc >= SYMBOL_VALUE_ADDRESS (p)

-         && SYMBOL_VALUE_ADDRESS (p) > best_pc)
+         && (SYMBOL_VALUE_ADDRESS (p) > best_pc
+             || (psymtab->textlow == 0
+                 && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0)))

        {
        {

-         if (section)  /* match on a specific section */
+         if (section)          /* match on a specific section */

            {
              fixup_psymbol_section (p, psymtab->objfile);
              if (SYMBOL_BFD_SECTION (p) != section)
            {
              fixup_psymbol_section (p, psymtab->objfile);
              if (SYMBOL_BFD_SECTION (p) != section)


@@ -488,8 +500,7 @@ find_pc_sect_psymbol (psymtab, pc, section)
          best = p;
        }
     }
          best = p;
        }
     }

-  if (best_pc == psymtab->textlow - 1)
-    return 0;
+

   return best;
 }
 
   return best;
 }
 


@@ -497,9 +508,7 @@ find_pc_sect_psymbol (psymtab, pc, section)
    Check all psymtabs if PSYMTAB is 0.  Backwards compatibility, no section. */
 
 struct partial_symbol *
    Check all psymtabs if PSYMTAB is 0.  Backwards compatibility, no section. */
 
 struct partial_symbol *

-find_pc_psymbol (psymtab, pc)
-     struct partial_symtab *psymtab;
-     CORE_ADDR pc;
+find_pc_psymbol (struct partial_symtab *psymtab, CORE_ADDR pc)

 {
   return find_pc_sect_psymbol (psymtab, pc, find_pc_mapped_section (pc));
 }
 {
   return find_pc_sect_psymbol (psymtab, pc, find_pc_mapped_section (pc));
 }


@@ -508,21 +517,20 @@ find_pc_psymbol (psymtab, pc)
    out of the minimal symbols and stash that in the debug symbol.  */
 
 static void
    out of the minimal symbols and stash that in the debug symbol.  */
 
 static void

-fixup_section (ginfo, objfile)
-     struct general_symbol_info *ginfo;
-     struct objfile *objfile;
+fixup_section (struct general_symbol_info *ginfo, struct objfile *objfile)

 {
   struct minimal_symbol *msym;
   msym = lookup_minimal_symbol (ginfo->name, NULL, objfile);
 
   if (msym)
 {
   struct minimal_symbol *msym;
   msym = lookup_minimal_symbol (ginfo->name, NULL, objfile);
 
   if (msym)

-    ginfo->bfd_section = SYMBOL_BFD_SECTION (msym);
+    {
+      ginfo->bfd_section = SYMBOL_BFD_SECTION (msym);
+      ginfo->section = SYMBOL_SECTION (msym);
+    }

 }
 
 struct symbol *
 }
 
 struct symbol *

-fixup_symbol_section (sym, objfile)
-     struct symbol *sym;
-     struct objfile *objfile;
+fixup_symbol_section (struct symbol *sym, struct objfile *objfile)

 {
   if (!sym)
     return NULL;
 {
   if (!sym)
     return NULL;


@@ -536,9 +544,7 @@ fixup_symbol_section (sym, objfile)
 }
 
 struct partial_symbol *
 }
 
 struct partial_symbol *

-fixup_psymbol_section (psym, objfile)
-     struct partial_symbol *psym;
-     struct objfile *objfile;
+fixup_psymbol_section (struct partial_symbol *psym, struct objfile *objfile)

 {
   if (!psym)
     return NULL;
 {
   if (!psym)
     return NULL;


@@ -573,42 +579,85 @@ fixup_psymbol_section (psym, objfile)
    can probably assume it will never hit the C++ code).  */
 
 struct symbol *
    can probably assume it will never hit the C++ code).  */
 
 struct symbol *

-lookup_symbol (name, block, namespace, is_a_field_of_this, symtab)
-     const char *name;
-     register const struct block *block;
-     const namespace_enum namespace;
-     int *is_a_field_of_this;
-     struct symtab **symtab;
+lookup_symbol (const char *name, const struct block *block,
+              const namespace_enum namespace, int *is_a_field_of_this,
+              struct symtab **symtab)
+{
+  char *modified_name = NULL;
+  char *modified_name2 = NULL;
+  int needtofreename = 0;
+  struct symbol *returnval;
+
+  if (case_sensitivity == case_sensitive_off)
+    {
+      char *copy;
+      int len, i;
+
+      len = strlen (name);
+      copy = (char *) alloca (len + 1);
+      for (i= 0; i < len; i++)
+        copy[i] = tolower (name[i]);
+      copy[len] = 0;
+      modified_name = copy;
+    }
+  else 
+      modified_name = (char *) name;
+
+  /* If we are using C++ language, demangle the name before doing a lookup, so
+     we can always binary search. */
+  if (current_language->la_language == language_cplus)
+    {
+      modified_name2 = cplus_demangle (modified_name, DMGL_ANSI | DMGL_PARAMS);
+      if (modified_name2)
+       {
+         modified_name = modified_name2;
+         needtofreename = 1;
+       }
+    }
+
+  returnval = lookup_symbol_aux (modified_name, block, namespace,
+                                is_a_field_of_this, symtab);
+  if (needtofreename)
+    free (modified_name2);
+
+  return returnval;     
+}
+
+static struct symbol *
+lookup_symbol_aux (const char *name, const struct block *block,
+              const namespace_enum namespace, int *is_a_field_of_this,
+              struct symtab **symtab)

 {
   register struct symbol *sym;
   register struct symtab *s = NULL;
   register struct partial_symtab *ps;
 {
   register struct symbol *sym;
   register struct symtab *s = NULL;
   register struct partial_symtab *ps;

-  struct blockvector *bv;
+  register struct blockvector *bv;

   register struct objfile *objfile = NULL;
   register struct block *b;
   register struct minimal_symbol *msymbol;
 
   register struct objfile *objfile = NULL;
   register struct block *b;
   register struct minimal_symbol *msymbol;
 

+

   /* Search specified block and its superiors.  */
 
   while (block != 0)
     {
       sym = lookup_block_symbol (block, name, namespace);
   /* Search specified block and its superiors.  */
 
   while (block != 0)
     {
       sym = lookup_block_symbol (block, name, namespace);

-      if (sym) 
+      if (sym)

        {
          block_found = block;
          if (symtab != NULL)
            {
              /* Search the list of symtabs for one which contains the
        {
          block_found = block;
          if (symtab != NULL)
            {
              /* Search the list of symtabs for one which contains the

-                address of the start of this block.  */
+                address of the start of this block.  */

              ALL_SYMTABS (objfile, s)
              ALL_SYMTABS (objfile, s)

-               {
-                 bv = BLOCKVECTOR (s);
-                 b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-                 if (BLOCK_START (b) <= BLOCK_START (block)
-                     && BLOCK_END (b) > BLOCK_START (block))
-                   goto found;
-               }
-found:
+             {
+               bv = BLOCKVECTOR (s);
+               b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+               if (BLOCK_START (b) <= BLOCK_START (block)
+                   && BLOCK_END (b) > BLOCK_START (block))
+                 goto found;
+             }
+           found:

              *symtab = s;
            }
 
              *symtab = s;
            }
 


@@ -624,27 +673,37 @@ found:
   /* Don't need to mess with the psymtabs; if we have a block,
      that file is read in.  If we don't, then we deal later with
      all the psymtab stuff that needs checking.  */
   /* Don't need to mess with the psymtabs; if we have a block,
      that file is read in.  If we don't, then we deal later with
      all the psymtab stuff that needs checking.  */

+  /* Note (RT): The following never-executed code looks unnecessary to me also.
+   * If we change the code to use the original (passed-in)
+   * value of 'block', we could cause it to execute, but then what
+   * would it do? The STATIC_BLOCK of the symtab containing the passed-in
+   * 'block' was already searched by the above code. And the STATIC_BLOCK's
+   * of *other* symtabs (those files not containing 'block' lexically)
+   * should not contain 'block' address-wise. So we wouldn't expect this
+   * code to find any 'sym''s that were not found above. I vote for 
+   * deleting the following paragraph of code.
+   */

   if (namespace == VAR_NAMESPACE && block != NULL)
     {
       struct block *b;
       /* Find the right symtab.  */
       ALL_SYMTABS (objfile, s)
   if (namespace == VAR_NAMESPACE && block != NULL)
     {
       struct block *b;
       /* Find the right symtab.  */
       ALL_SYMTABS (objfile, s)

-       {
-         bv = BLOCKVECTOR (s);
-         b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-         if (BLOCK_START (b) <= BLOCK_START (block)
-             && BLOCK_END (b) > BLOCK_START (block))
-           {
-             sym = lookup_block_symbol (b, name, VAR_NAMESPACE);
-             if (sym)
-               {
-                 block_found = b;
-                 if (symtab != NULL)
-                   *symtab = s;
-                 return fixup_symbol_section (sym, objfile);
-               }
-           }
-       }
+      {
+       bv = BLOCKVECTOR (s);
+       b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+       if (BLOCK_START (b) <= BLOCK_START (block)
+           && BLOCK_END (b) > BLOCK_START (block))
+         {
+           sym = lookup_block_symbol (b, name, VAR_NAMESPACE);
+           if (sym)
+             {
+               block_found = b;
+               if (symtab != NULL)
+                 *symtab = s;
+               return fixup_symbol_section (sym, objfile);
+             }
+         }
+      }

     }
 
 
     }
 
 


@@ -653,7 +712,7 @@ found:
   if (is_a_field_of_this)
     {
       struct value *v = value_of_this (0);
   if (is_a_field_of_this)
     {
       struct value *v = value_of_this (0);

-      
+

       *is_a_field_of_this = 0;
       if (v && check_field (v, name))
        {
       *is_a_field_of_this = 0;
       if (v && check_field (v, name))
        {


@@ -665,33 +724,37 @@ found:
     }
 
   /* Now search all global blocks.  Do the symtab's first, then
     }
 
   /* Now search all global blocks.  Do the symtab's first, then

-     check the psymtab's */
-  
+     check the psymtab's. If a psymtab indicates the existence
+     of the desired name as a global, then do psymtab-to-symtab
+     conversion on the fly and return the found symbol. */
+

   ALL_SYMTABS (objfile, s)
   ALL_SYMTABS (objfile, s)

-    {
-      bv = BLOCKVECTOR (s);
-      block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-      sym = lookup_block_symbol (block, name, namespace);
-      if (sym) 
-       {
-         block_found = block;
-         if (symtab != NULL)
-           *symtab = s;
-         return fixup_symbol_section (sym, objfile);
-       }
-    }
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+    sym = lookup_block_symbol (block, name, namespace);
+    if (sym)
+      {
+       block_found = block;
+       if (symtab != NULL)
+         *symtab = s;
+       return fixup_symbol_section (sym, objfile);
+      }
+  }
+
+#ifndef HPUXHPPA

 
   /* Check for the possibility of the symbol being a function or
      a mangled variable that is stored in one of the minimal symbol tables.
      Eventually, all global symbols might be resolved in this way.  */
 
   /* Check for the possibility of the symbol being a function or
      a mangled variable that is stored in one of the minimal symbol tables.
      Eventually, all global symbols might be resolved in this way.  */

-  
+

   if (namespace == VAR_NAMESPACE)
     {
       msymbol = lookup_minimal_symbol (name, NULL, NULL);
       if (msymbol != NULL)
        {
          s = find_pc_sect_symtab (SYMBOL_VALUE_ADDRESS (msymbol),
   if (namespace == VAR_NAMESPACE)
     {
       msymbol = lookup_minimal_symbol (name, NULL, NULL);
       if (msymbol != NULL)
        {
          s = find_pc_sect_symtab (SYMBOL_VALUE_ADDRESS (msymbol),

-                                 SYMBOL_BFD_SECTION (msymbol));
+                                  SYMBOL_BFD_SECTION (msymbol));

          if (s != NULL)
            {
              /* This is a function which has a symtab for its address.  */
          if (s != NULL)
            {
              /* This is a function which has a symtab for its address.  */


@@ -699,26 +762,27 @@ found:
              block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
              sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
                                         namespace);
              block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
              sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
                                         namespace);

-              /* We kept static functions in minimal symbol table as well as
-                in static scope. We want to find them in the symbol table. */
-               if (!sym) {
+             /* We kept static functions in minimal symbol table as well as
+                in static scope. We want to find them in the symbol table. */
+             if (!sym)
+               {

                  block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
                  sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
                                             namespace);
                }
 
              /* sym == 0 if symbol was found in the minimal symbol table
                  block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
                  sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
                                             namespace);
                }
 
              /* sym == 0 if symbol was found in the minimal symbol table

-                but not in the symtab.
-                Return 0 to use the msymbol definition of "foo_".
+                but not in the symtab.
+                Return 0 to use the msymbol definition of "foo_".

 
 

-                This happens for Fortran  "foo_" symbols,
-                which are "foo" in the symtab.
+                This happens for Fortran  "foo_" symbols,
+                which are "foo" in the symtab.

 
 

-                This can also happen if "asm" is used to make a
-                regular symbol but not a debugging symbol, e.g.
-                asm(".globl _main");
-                asm("_main:");
-                */
+                This can also happen if "asm" is used to make a
+                regular symbol but not a debugging symbol, e.g.
+                asm(".globl _main");
+                asm("_main:");
+              */

 
              if (symtab != NULL)
                *symtab = s;
 
              if (symtab != NULL)
                *symtab = s;


@@ -729,8 +793,8 @@ found:
                   && !STREQ (name, SYMBOL_NAME (msymbol)))
            {
              /* This is a mangled variable, look it up by its
                   && !STREQ (name, SYMBOL_NAME (msymbol)))
            {
              /* This is a mangled variable, look it up by its

-                mangled name.  */
-             return lookup_symbol (SYMBOL_NAME (msymbol), block, 
+                mangled name.  */
+             return lookup_symbol (SYMBOL_NAME (msymbol), block,

                                    namespace, is_a_field_of_this, symtab);
            }
          /* There are no debug symbols for this file, or we are looking
                                    namespace, is_a_field_of_this, symtab);
            }
          /* There are no debug symbols for this file, or we are looking


@@ -738,94 +802,218 @@ found:
             Try to find a matching static symbol below. */
        }
     }
             Try to find a matching static symbol below. */
        }
     }

-      
+
+#endif
+

   ALL_PSYMTABS (objfile, ps)
   ALL_PSYMTABS (objfile, ps)

-    {
-      if (!ps->readin && lookup_partial_symbol (ps, name, 1, namespace))
-       {
-         s = PSYMTAB_TO_SYMTAB(ps);
-         bv = BLOCKVECTOR (s);
-         block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-         sym = lookup_block_symbol (block, name, namespace);
-         if (!sym)
-           error ("Internal: global symbol `%s' found in %s psymtab but not in symtab", name, ps->filename);
-         if (symtab != NULL)
-           *symtab = s;
-         return fixup_symbol_section (sym, objfile);
-       }
-    }
+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 1, namespace))
+      {
+       s = PSYMTAB_TO_SYMTAB (ps);
+       bv = BLOCKVECTOR (s);
+       block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+       sym = lookup_block_symbol (block, name, namespace);
+       if (!sym)
+         {
+           /* This shouldn't be necessary, but as a last resort
+            * try looking in the statics even though the psymtab
+            * claimed the symbol was global. It's possible that
+            * the psymtab gets it wrong in some cases.
+            */
+           block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+           sym = lookup_block_symbol (block, name, namespace);
+           if (!sym)
+             error ("Internal: global symbol `%s' found in %s psymtab but not in symtab.\n\
+%s may be an inlined function, or may be a template function\n\
+(if a template, try specifying an instantiation: %s<type>).",
+                    name, ps->filename, name, name);
+         }
+       if (symtab != NULL)
+         *symtab = s;
+       return fixup_symbol_section (sym, objfile);
+      }
+  }

 
 

-  /* Now search all per-file blocks.
+  /* Now search all static file-level symbols.

      Not strictly correct, but more useful than an error.
      Not strictly correct, but more useful than an error.

-     Do the symtabs first, then check the psymtabs */
+     Do the symtabs first, then check the psymtabs.
+     If a psymtab indicates the existence
+     of the desired name as a file-level static, then do psymtab-to-symtab
+     conversion on the fly and return the found symbol. */

 
   ALL_SYMTABS (objfile, s)
 
   ALL_SYMTABS (objfile, s)

-    {
-      bv = BLOCKVECTOR (s);
-      block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-      sym = lookup_block_symbol (block, name, namespace);
-      if (sym) 
-       {
-         block_found = block;
-         if (symtab != NULL)
-           *symtab = s;
-         return fixup_symbol_section (sym, objfile);
-       }
-    }
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+    sym = lookup_block_symbol (block, name, namespace);
+    if (sym)
+      {
+       block_found = block;
+       if (symtab != NULL)
+         *symtab = s;
+       return fixup_symbol_section (sym, objfile);
+      }
+  }

 
   ALL_PSYMTABS (objfile, ps)
 
   ALL_PSYMTABS (objfile, ps)

+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 0, namespace))
+      {
+       s = PSYMTAB_TO_SYMTAB (ps);
+       bv = BLOCKVECTOR (s);
+       block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+       sym = lookup_block_symbol (block, name, namespace);
+       if (!sym)
+         {
+           /* This shouldn't be necessary, but as a last resort
+            * try looking in the globals even though the psymtab
+            * claimed the symbol was static. It's possible that
+            * the psymtab gets it wrong in some cases.
+            */
+           block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+           sym = lookup_block_symbol (block, name, namespace);
+           if (!sym)
+             error ("Internal: static symbol `%s' found in %s psymtab but not in symtab.\n\
+%s may be an inlined function, or may be a template function\n\
+(if a template, try specifying an instantiation: %s<type>).",
+                    name, ps->filename, name, name);
+         }
+       if (symtab != NULL)
+         *symtab = s;
+       return fixup_symbol_section (sym, objfile);
+      }
+  }
+
+#ifdef HPUXHPPA
+
+  /* Check for the possibility of the symbol being a function or
+     a global variable that is stored in one of the minimal symbol tables.
+     The "minimal symbol table" is built from linker-supplied info.
+
+     RT: I moved this check to last, after the complete search of
+     the global (p)symtab's and static (p)symtab's. For HP-generated
+     symbol tables, this check was causing a premature exit from
+     lookup_symbol with NULL return, and thus messing up symbol lookups
+     of things like "c::f". It seems to me a check of the minimal
+     symbol table ought to be a last resort in any case. I'm vaguely
+     worried about the comment below which talks about FORTRAN routines "foo_"
+     though... is it saying we need to do the "minsym" check before
+     the static check in this case? 
+   */
+
+  if (namespace == VAR_NAMESPACE)

     {
     {

-      if (!ps->readin && lookup_partial_symbol (ps, name, 0, namespace))
+      msymbol = lookup_minimal_symbol (name, NULL, NULL);
+      if (msymbol != NULL)

        {
        {

-         s = PSYMTAB_TO_SYMTAB(ps);
-         bv = BLOCKVECTOR (s);
-         block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-         sym = lookup_block_symbol (block, name, namespace);
-         if (!sym)
-           error ("Internal: static symbol `%s' found in %s psymtab but not in symtab", name, ps->filename);
-         if (symtab != NULL)
-           *symtab = s;
-         return fixup_symbol_section (sym, objfile);
+         /* OK, we found a minimal symbol in spite of not
+          * finding any symbol. There are various possible
+          * explanations for this. One possibility is the symbol
+          * exists in code not compiled -g. Another possibility
+          * is that the 'psymtab' isn't doing its job.
+          * A third possibility, related to #2, is that we were confused 
+          * by name-mangling. For instance, maybe the psymtab isn't
+          * doing its job because it only know about demangled
+          * names, but we were given a mangled name...
+          */
+
+         /* We first use the address in the msymbol to try to
+          * locate the appropriate symtab. Note that find_pc_symtab()
+          * has a side-effect of doing psymtab-to-symtab expansion,
+          * for the found symtab.
+          */
+         s = find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol));
+         if (s != NULL)
+           {
+             bv = BLOCKVECTOR (s);
+             block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+             sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
+                                        namespace);
+             /* We kept static functions in minimal symbol table as well as
+                in static scope. We want to find them in the symbol table. */
+             if (!sym)
+               {
+                 block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+                 sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
+                                            namespace);
+               }
+             /* If we found one, return it */
+             if (sym)
+               {
+                 if (symtab != NULL)
+                   *symtab = s;
+                 return sym;
+               }
+
+             /* If we get here with sym == 0, the symbol was 
+                found in the minimal symbol table
+                but not in the symtab.
+                Fall through and return 0 to use the msymbol 
+                definition of "foo_".
+                (Note that outer code generally follows up a call
+                to this routine with a call to lookup_minimal_symbol(),
+                so a 0 return means we'll just flow into that other routine).
+
+                This happens for Fortran  "foo_" symbols,
+                which are "foo" in the symtab.
+
+                This can also happen if "asm" is used to make a
+                regular symbol but not a debugging symbol, e.g.
+                asm(".globl _main");
+                asm("_main:");
+              */
+           }
+
+         /* If the lookup-by-address fails, try repeating the
+          * entire lookup process with the symbol name from
+          * the msymbol (if different from the original symbol name).
+          */
+         else if (MSYMBOL_TYPE (msymbol) != mst_text
+                  && MSYMBOL_TYPE (msymbol) != mst_file_text
+                  && !STREQ (name, SYMBOL_NAME (msymbol)))
+           {
+             return lookup_symbol (SYMBOL_NAME (msymbol), block,
+                                   namespace, is_a_field_of_this, symtab);
+           }

        }
     }
 
        }
     }
 

+#endif
+

   if (symtab != NULL)
     *symtab = NULL;
   return 0;
 }
   if (symtab != NULL)
     *symtab = NULL;
   return 0;
 }

-
+                                                               

 /* Look, in partial_symtab PST, for symbol NAME.  Check the global
    symbols if GLOBAL, the static symbols if not */
 
 static struct partial_symbol *
 /* Look, in partial_symtab PST, for symbol NAME.  Check the global
    symbols if GLOBAL, the static symbols if not */
 
 static struct partial_symbol *

-lookup_partial_symbol (pst, name, global, namespace)
-     struct partial_symtab *pst;
-     const char *name;
-     int global;
-     namespace_enum namespace;
+lookup_partial_symbol (struct partial_symtab *pst, const char *name, int global,
+                      namespace_enum namespace)

 {
 {

+  struct partial_symbol *temp;

   struct partial_symbol **start, **psym;
   struct partial_symbol **top, **bottom, **center;
   int length = (global ? pst->n_global_syms : pst->n_static_syms);
   int do_linear_search = 1;
   struct partial_symbol **start, **psym;
   struct partial_symbol **top, **bottom, **center;
   int length = (global ? pst->n_global_syms : pst->n_static_syms);
   int do_linear_search = 1;

-
+  

   if (length == 0)
     {
       return (NULL);
     }
   if (length == 0)
     {
       return (NULL);
     }

-  

   start = (global ?
           pst->objfile->global_psymbols.list + pst->globals_offset :
   start = (global ?
           pst->objfile->global_psymbols.list + pst->globals_offset :

-          pst->objfile->static_psymbols.list + pst->statics_offset  );
-
-  if (global)          /* This means we can use a binary search. */
+          pst->objfile->static_psymbols.list + pst->statics_offset);
+  
+  if (global)                  /* This means we can use a binary search. */

     {
       do_linear_search = 0;
 
       /* Binary search.  This search is guaranteed to end with center
          pointing at the earliest partial symbol with the correct
     {
       do_linear_search = 0;
 
       /* Binary search.  This search is guaranteed to end with center
          pointing at the earliest partial symbol with the correct

-        name.  At that point *all* partial symbols with that name
-        will be checked against the correct namespace. */
+         name.  At that point *all* partial symbols with that name
+         will be checked against the correct namespace. */

 
       bottom = start;
       top = start + length - 1;
 
       bottom = start;
       top = start + length - 1;


@@ -834,11 +1022,12 @@ lookup_partial_symbol (pst, name, global, namespace)
          center = bottom + (top - bottom) / 2;
          if (!(center < top))
            abort ();
          center = bottom + (top - bottom) / 2;
          if (!(center < top))
            abort ();

-         if (!do_linear_search && SYMBOL_LANGUAGE (*center) == language_cplus)
+         if (!do_linear_search
+             && (SYMBOL_LANGUAGE (*center) == language_java))

            {
              do_linear_search = 1;
            }
            {
              do_linear_search = 1;
            }

-         if (STRCMP (SYMBOL_NAME (*center), name) >= 0)
+         if (STRCMP (SYMBOL_SOURCE_NAME (*center), name) >= 0)

            {
              top = center;
            }
            {
              top = center;
            }


@@ -849,13 +1038,17 @@ lookup_partial_symbol (pst, name, global, namespace)
        }
       if (!(top == bottom))
        abort ();
        }
       if (!(top == bottom))
        abort ();

-      while (STREQ (SYMBOL_NAME (*top), name))
+
+      /* djb - 2000-06-03 - Use SYMBOL_MATCHES_NAME, not a strcmp, so
+        we don't have to force a linear search on C++. Probably holds true
+        for JAVA as well, no way to check.*/
+      while (SYMBOL_MATCHES_NAME (*top,name))

        {
          if (SYMBOL_NAMESPACE (*top) == namespace)
            {
        {
          if (SYMBOL_NAMESPACE (*top) == namespace)
            {

-             return (*top);
+                 return (*top);

            }
            }

-         top ++;
+         top++;

        }
     }
 
        }
     }
 


@@ -863,7 +1056,7 @@ lookup_partial_symbol (pst, name, global, namespace)
      we should also do a linear search. */
 
   if (do_linear_search)
      we should also do a linear search. */
 
   if (do_linear_search)

-    {
+    {                  

       for (psym = start; psym < start + length; psym++)
        {
          if (namespace == SYMBOL_NAMESPACE (*psym))
       for (psym = start; psym < start + length; psym++)
        {
          if (namespace == SYMBOL_NAMESPACE (*psym))


@@ -879,23 +1072,135 @@ lookup_partial_symbol (pst, name, global, namespace)
   return (NULL);
 }
 
   return (NULL);
 }
 

+/* Look up a type named NAME in the struct_namespace.  The type returned
+   must not be opaque -- i.e., must have at least one field defined
+
+   This code was modelled on lookup_symbol -- the parts not relevant to looking
+   up types were just left out.  In particular it's assumed here that types
+   are available in struct_namespace and only at file-static or global blocks. */
+
+
+struct type *
+lookup_transparent_type (const char *name)
+{
+  register struct symbol *sym;
+  register struct symtab *s = NULL;
+  register struct partial_symtab *ps;
+  struct blockvector *bv;
+  register struct objfile *objfile;
+  register struct block *block;
+
+  /* Now search all the global symbols.  Do the symtab's first, then
+     check the psymtab's. If a psymtab indicates the existence
+     of the desired name as a global, then do psymtab-to-symtab
+     conversion on the fly and return the found symbol.  */
+
+  ALL_SYMTABS (objfile, s)
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+    sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+    if (sym && !TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+      {
+       return SYMBOL_TYPE (sym);
+      }
+  }
+
+  ALL_PSYMTABS (objfile, ps)
+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 1, STRUCT_NAMESPACE))
+      {
+       s = PSYMTAB_TO_SYMTAB (ps);
+       bv = BLOCKVECTOR (s);
+       block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+       sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+       if (!sym)
+         {
+           /* This shouldn't be necessary, but as a last resort
+            * try looking in the statics even though the psymtab
+            * claimed the symbol was global. It's possible that
+            * the psymtab gets it wrong in some cases.
+            */
+           block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+           sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+           if (!sym)
+             error ("Internal: global symbol `%s' found in %s psymtab but not in symtab.\n\
+%s may be an inlined function, or may be a template function\n\
+(if a template, try specifying an instantiation: %s<type>).",
+                    name, ps->filename, name, name);
+         }
+       if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+         return SYMBOL_TYPE (sym);
+      }
+  }
+
+  /* Now search the static file-level symbols.
+     Not strictly correct, but more useful than an error.
+     Do the symtab's first, then
+     check the psymtab's. If a psymtab indicates the existence
+     of the desired name as a file-level static, then do psymtab-to-symtab
+     conversion on the fly and return the found symbol.
+   */
+
+  ALL_SYMTABS (objfile, s)
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+    sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+    if (sym && !TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+      {
+       return SYMBOL_TYPE (sym);
+      }
+  }
+
+  ALL_PSYMTABS (objfile, ps)
+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 0, STRUCT_NAMESPACE))
+      {
+       s = PSYMTAB_TO_SYMTAB (ps);
+       bv = BLOCKVECTOR (s);
+       block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+       sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+       if (!sym)
+         {
+           /* This shouldn't be necessary, but as a last resort
+            * try looking in the globals even though the psymtab
+            * claimed the symbol was static. It's possible that
+            * the psymtab gets it wrong in some cases.
+            */
+           block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+           sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+           if (!sym)
+             error ("Internal: static symbol `%s' found in %s psymtab but not in symtab.\n\
+%s may be an inlined function, or may be a template function\n\
+(if a template, try specifying an instantiation: %s<type>).",
+                    name, ps->filename, name, name);
+         }
+       if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+         return SYMBOL_TYPE (sym);
+      }
+  }
+  return (struct type *) 0;
+}
+
+

 /* Find the psymtab containing main(). */
 /* FIXME:  What about languages without main() or specially linked
    executables that have no main() ? */
 
 struct partial_symtab *
 /* Find the psymtab containing main(). */
 /* FIXME:  What about languages without main() or specially linked
    executables that have no main() ? */
 
 struct partial_symtab *

-find_main_psymtab ()
+find_main_psymtab (void)

 {
   register struct partial_symtab *pst;
   register struct objfile *objfile;
 
   ALL_PSYMTABS (objfile, pst)
 {
   register struct partial_symtab *pst;
   register struct objfile *objfile;
 
   ALL_PSYMTABS (objfile, pst)

-    {
-      if (lookup_partial_symbol (pst, "main", 1, VAR_NAMESPACE))
-       {
-         return (pst);
-       }
-    }
+  {
+    if (lookup_partial_symbol (pst, "main", 1, VAR_NAMESPACE))
+      {
+       return (pst);
+      }
+  }

   return (NULL);
 }
 
   return (NULL);
 }
 


@@ -911,10 +1216,8 @@ find_main_psymtab ()
    tested for a match. */
 
 struct symbol *
    tested for a match. */
 
 struct symbol *

-lookup_block_symbol (block, name, namespace)
-     register const struct block *block;
-     const char *name;
-     const namespace_enum namespace;
+lookup_block_symbol (register const struct block *block, const char *name,
+                    const namespace_enum namespace)

 {
   register int bot, top, inc;
   register struct symbol *sym;
 {
   register int bot, top, inc;
   register struct symbol *sym;


@@ -926,10 +1229,8 @@ lookup_block_symbol (block, name, namespace)
   if (BLOCK_SHOULD_SORT (block))
     {
       /* Reset the linear search flag so if the binary search fails, we
   if (BLOCK_SHOULD_SORT (block))
     {
       /* Reset the linear search flag so if the binary search fails, we

-        won't do the linear search once unless we find some reason to
-        do so, such as finding a C++ symbol during the binary search.
-        Note that for C++ modules, ALL the symbols in a block should
-        end up marked as C++ symbols. */
+         won't do the linear search once unless we find some reason to
+         do so */

 
       do_linear_search = 0;
       top = BLOCK_NSYMS (block);
 
       do_linear_search = 0;
       top = BLOCK_NSYMS (block);


@@ -947,19 +1248,19 @@ lookup_block_symbol (block, name, namespace)
            }
          inc = (inc >> 1) + bot;
          sym = BLOCK_SYM (block, inc);
            }
          inc = (inc >> 1) + bot;
          sym = BLOCK_SYM (block, inc);

-         if (!do_linear_search && SYMBOL_LANGUAGE (sym) == language_cplus)
+         if (!do_linear_search && (SYMBOL_LANGUAGE (sym) == language_java))

            {
              do_linear_search = 1;
            }
            {
              do_linear_search = 1;
            }

-         if (SYMBOL_NAME (sym)[0] < name[0])
+         if (SYMBOL_SOURCE_NAME (sym)[0] < name[0])

            {
              bot = inc;
            }
            {
              bot = inc;
            }

-         else if (SYMBOL_NAME (sym)[0] > name[0])
+         else if (SYMBOL_SOURCE_NAME (sym)[0] > name[0])

            {
              top = inc;
            }
            {
              top = inc;
            }

-         else if (STRCMP (SYMBOL_NAME (sym), name) < 0)
+         else if (STRCMP (SYMBOL_SOURCE_NAME (sym), name) < 0)

            {
              bot = inc;
            }
            {
              bot = inc;
            }


@@ -970,30 +1271,19 @@ lookup_block_symbol (block, name, namespace)
        }
 
       /* Now scan forward until we run out of symbols, find one whose
        }
 
       /* Now scan forward until we run out of symbols, find one whose

-        name is greater than NAME, or find one we want.  If there is
-        more than one symbol with the right name and namespace, we
-        return the first one; I believe it is now impossible for us
-        to encounter two symbols with the same name and namespace
-        here, because blocks containing argument symbols are no
-        longer sorted.  */
+         name is greater than NAME, or find one we want.  If there is
+         more than one symbol with the right name and namespace, we
+         return the first one; I believe it is now impossible for us
+         to encounter two symbols with the same name and namespace
+         here, because blocks containing argument symbols are no
+         longer sorted.  */

 
       top = BLOCK_NSYMS (block);
       while (bot < top)
        {
          sym = BLOCK_SYM (block, bot);
 
       top = BLOCK_NSYMS (block);
       while (bot < top)
        {
          sym = BLOCK_SYM (block, bot);

-         inc = SYMBOL_NAME (sym)[0] - name[0];
-         if (inc == 0)
-           {
-             inc = STRCMP (SYMBOL_NAME (sym), name);
-           }
-         if (inc == 0 && SYMBOL_NAMESPACE (sym) == namespace)
-           {
-             return (sym);
-           }
-         if (inc > 0)
-           {
-             break;
-           }
+         if (SYMBOL_MATCHES_NAME (sym, name))
+           return sym;

          bot++;
        }
     }
          bot++;
        }
     }


@@ -1022,13 +1312,27 @@ lookup_block_symbol (block, name, namespace)
              SYMBOL_MATCHES_NAME (sym, name))
            {
              /* If SYM has aliases, then use any alias that is active
              SYMBOL_MATCHES_NAME (sym, name))
            {
              /* If SYM has aliases, then use any alias that is active

-                at the current PC.  If no alias is active at the current
-                PC, then use the main symbol.
+                at the current PC.  If no alias is active at the current
+                PC, then use the main symbol.

 
 

-                ?!? Is checking the current pc correct?  Is this routine
-                ever called to look up a symbol from another context?  */
-              if (SYMBOL_ALIASES (sym))
-                sym = find_active_alias (sym, read_pc ());
+                ?!? Is checking the current pc correct?  Is this routine
+                ever called to look up a symbol from another context?
+
+                FIXME: No, it's not correct.  If someone sets a
+                conditional breakpoint at an address, then the
+                breakpoint's `struct expression' should refer to the
+                `struct symbol' appropriate for the breakpoint's
+                address, which may not be the PC.
+
+                Even if it were never called from another context,
+                it's totally bizarre for lookup_symbol's behavior to
+                depend on the value of the inferior's current PC.  We
+                should pass in the appropriate PC as well as the
+                block.  The interface to lookup_symbol should change
+                to require the caller to provide a PC.  */
+
+             if (SYMBOL_ALIASES (sym))
+               sym = find_active_alias (sym, read_pc ());

 
              sym_found = sym;
              if (SYMBOL_CLASS (sym) != LOC_ARG &&
 
              sym_found = sym;
              if (SYMBOL_CLASS (sym) != LOC_ARG &&


@@ -1054,9 +1358,7 @@ lookup_block_symbol (block, name, namespace)
    If no alias is active, then return SYM.  */
 
 static struct symbol *
    If no alias is active, then return SYM.  */
 
 static struct symbol *

-find_active_alias (sym, addr)
-  struct symbol *sym;
-  CORE_ADDR addr;
+find_active_alias (struct symbol *sym, CORE_ADDR addr)

 {
   struct range_list *r;
   struct alias_list *aliases;
 {
   struct range_list *r;
   struct alias_list *aliases;


@@ -1067,7 +1369,7 @@ find_active_alias (sym, addr)
   while (aliases)
     {
       if (!SYMBOL_RANGES (aliases->sym))
   while (aliases)
     {
       if (!SYMBOL_RANGES (aliases->sym))

-        return aliases->sym;
+       return aliases->sym;

       for (r = SYMBOL_RANGES (aliases->sym); r; r = r->next)
        {
          if (r->start <= addr && r->end > addr)
       for (r = SYMBOL_RANGES (aliases->sym); r; r = r->next)
        {
          if (r->start <= addr && r->end > addr)


@@ -1079,14 +1381,13 @@ find_active_alias (sym, addr)
   /* Nothing found, return the main symbol.  */
   return sym;
 }
   /* Nothing found, return the main symbol.  */
   return sym;
 }

-

 \f
 \f

+

 /* Return the symbol for the function which contains a specified
    lexical block, described by a struct block BL.  */
 
 struct symbol *
 /* Return the symbol for the function which contains a specified
    lexical block, described by a struct block BL.  */
 
 struct symbol *

-block_function (bl)
-     struct block *bl;
+block_function (struct block *bl)

 {
   while (BLOCK_FUNCTION (bl) == 0 && BLOCK_SUPERBLOCK (bl) != 0)
     bl = BLOCK_SUPERBLOCK (bl);
 {
   while (BLOCK_FUNCTION (bl) == 0 && BLOCK_SUPERBLOCK (bl) != 0)
     bl = BLOCK_SUPERBLOCK (bl);


@@ -1098,9 +1399,7 @@ block_function (bl)
    psymtabs and read in another symtab if necessary. */
 
 struct symtab *
    psymtabs and read in another symtab if necessary. */
 
 struct symtab *

-find_pc_sect_symtab (pc, section)
-     CORE_ADDR pc;
-     asection *section;
+find_pc_sect_symtab (CORE_ADDR pc, asection *section)

 {
   register struct block *b;
   struct blockvector *bv;
 {
   register struct block *b;
   struct blockvector *bv;


@@ -1126,46 +1425,47 @@ find_pc_sect_symtab (pc, section)
      For these, the symtab we are looking for is not necessarily read in.  */
 
   ALL_SYMTABS (objfile, s)
      For these, the symtab we are looking for is not necessarily read in.  */
 
   ALL_SYMTABS (objfile, s)

-    {
-      bv = BLOCKVECTOR (s);
-      b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-      if (BLOCK_START (b) <= pc
-         && BLOCK_END (b) > pc
-         && (distance == 0
-             || BLOCK_END (b) - BLOCK_START (b) < distance))
-       {
-         /* For an objfile that has its functions reordered,
-            find_pc_psymtab will find the proper partial symbol table
-            and we simply return its corresponding symtab.  */
-         /* In order to better support objfiles that contain both
-            stabs and coff debugging info, we continue on if a psymtab
-            can't be found. */
-         if ((objfile->flags & OBJF_REORDERED) && objfile->psymtabs)
-           {
-             ps = find_pc_sect_psymtab (pc, section);
-             if (ps)
-               return PSYMTAB_TO_SYMTAB (ps);
-           }
-         if (section != 0)
-           {
-             int i;
+  {
+    bv = BLOCKVECTOR (s);
+    b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);

 
 

-             for (i = 0; i < b->nsyms; i++)
-               {
-                 fixup_symbol_section (b->sym[i], objfile);
-                 if (section == SYMBOL_BFD_SECTION (b->sym[i]))
-                   break;
-               }
-             if (i >= b->nsyms)
-               continue;       /* no symbol in this symtab matches section */
-           }
-         distance = BLOCK_END (b) - BLOCK_START (b);
-         best_s = s;
-       }
-    }
+    if (BLOCK_START (b) <= pc
+       && BLOCK_END (b) > pc
+       && (distance == 0
+           || BLOCK_END (b) - BLOCK_START (b) < distance))
+      {
+       /* For an objfile that has its functions reordered,
+          find_pc_psymtab will find the proper partial symbol table
+          and we simply return its corresponding symtab.  */
+       /* In order to better support objfiles that contain both
+          stabs and coff debugging info, we continue on if a psymtab
+          can't be found. */
+       if ((objfile->flags & OBJF_REORDERED) && objfile->psymtabs)
+         {
+           ps = find_pc_sect_psymtab (pc, section);
+           if (ps)
+             return PSYMTAB_TO_SYMTAB (ps);
+         }
+       if (section != 0)
+         {
+           int i;
+
+           for (i = 0; i < b->nsyms; i++)
+             {
+               fixup_symbol_section (b->sym[i], objfile);
+               if (section == SYMBOL_BFD_SECTION (b->sym[i]))
+                 break;
+             }
+           if (i >= b->nsyms)
+             continue;         /* no symbol in this symtab matches section */
+         }
+       distance = BLOCK_END (b) - BLOCK_START (b);
+       best_s = s;
+      }
+  }

 
   if (best_s != NULL)
 
   if (best_s != NULL)

-    return(best_s);
+    return (best_s);

 
   s = NULL;
   ps = find_pc_sect_psymtab (pc, section);
 
   s = NULL;
   ps = find_pc_sect_psymtab (pc, section);


@@ -1175,10 +1475,9 @@ find_pc_sect_symtab (pc, section)
        /* Might want to error() here (in case symtab is corrupt and
           will cause a core dump), but maybe we can successfully
           continue, so let's not.  */
        /* Might want to error() here (in case symtab is corrupt and
           will cause a core dump), but maybe we can successfully
           continue, so let's not.  */

-       /* FIXME-32x64: assumes pc fits in a long */

        warning ("\
        warning ("\

-(Internal error: pc 0x%lx in read in psymtab, but not in symtab.)\n",
-                (unsigned long) pc);
+(Internal error: pc 0x%s in read in psymtab, but not in symtab.)\n",
+                paddr_nz (pc));

       s = PSYMTAB_TO_SYMTAB (ps);
     }
   return (s);
       s = PSYMTAB_TO_SYMTAB (ps);
     }
   return (s);


@@ -1188,13 +1487,12 @@ find_pc_sect_symtab (pc, section)
    read in another symtab if necessary.  Backward compatibility, no section */
 
 struct symtab *
    read in another symtab if necessary.  Backward compatibility, no section */
 
 struct symtab *

-find_pc_symtab (pc)
-     CORE_ADDR pc;
+find_pc_symtab (CORE_ADDR pc)

 {
   return find_pc_sect_symtab (pc, find_pc_mapped_section (pc));
 }
 {
   return find_pc_sect_symtab (pc, find_pc_mapped_section (pc));
 }

-

 \f
 \f

+

 #if 0
 
 /* Find the closest symbol value (of any sort -- function or variable)
 #if 0
 
 /* Find the closest symbol value (of any sort -- function or variable)


@@ -1205,10 +1503,7 @@ find_pc_symtab (pc)
    line *0x2345" cause psymtabs to be converted to symtabs).  */
 
 struct symbol *
    line *0x2345" cause psymtabs to be converted to symtabs).  */
 
 struct symbol *

-find_addr_symbol (addr, symtabp, symaddrp)
-     CORE_ADDR addr;
-     struct symtab **symtabp;
-     CORE_ADDR *symaddrp;
+find_addr_symbol (CORE_ADDR addr, struct symtab **symtabp, CORE_ADDR *symaddrp)

 {
   struct symtab *symtab, *best_symtab;
   struct objfile *objfile;
 {
   struct symtab *symtab, *best_symtab;
   struct objfile *objfile;


@@ -1225,48 +1520,61 @@ find_addr_symbol (addr, symtabp, symaddrp)
 
   /* FIXME -- we should pull in all the psymtabs, too!  */
   ALL_SYMTABS (objfile, symtab)
 
   /* FIXME -- we should pull in all the psymtabs, too!  */
   ALL_SYMTABS (objfile, symtab)

-    {
-      /* Search the global and static blocks in this symtab for
-        the closest symbol-address to the desired address.  */
+  {
+    /* Search the global and static blocks in this symtab for
+       the closest symbol-address to the desired address.  */

 
 

-      for (blocknum = GLOBAL_BLOCK; blocknum <= STATIC_BLOCK; blocknum++)
-       {
-         QUIT;
-         block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), blocknum);
-         top = BLOCK_NSYMS (block);
-         for (bot = 0; bot < top; bot++)
-           {
-             sym = BLOCK_SYM (block, bot);
-             switch (SYMBOL_CLASS (sym))
-               {
-               case LOC_STATIC:        
-               case LOC_LABEL: 
-                 sym_addr = SYMBOL_VALUE_ADDRESS (sym);
-                 break;
+    for (blocknum = GLOBAL_BLOCK; blocknum <= STATIC_BLOCK; blocknum++)
+      {
+       QUIT;
+       block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), blocknum);
+       top = BLOCK_NSYMS (block);
+       for (bot = 0; bot < top; bot++)
+         {
+           sym = BLOCK_SYM (block, bot);
+           switch (SYMBOL_CLASS (sym))
+             {
+             case LOC_STATIC:
+             case LOC_LABEL:
+               sym_addr = SYMBOL_VALUE_ADDRESS (sym);
+               break;
+
+             case LOC_INDIRECT:
+               sym_addr = SYMBOL_VALUE_ADDRESS (sym);
+               /* An indirect symbol really lives at *sym_addr,
+                * so an indirection needs to be done.
+                * However, I am leaving this commented out because it's
+                * expensive, and it's possible that symbolization
+                * could be done without an active process (in
+                * case this read_memory will fail). RT
+                sym_addr = read_memory_unsigned_integer
+                (sym_addr, TARGET_PTR_BIT / TARGET_CHAR_BIT);
+                */
+               break;

 
 

-               case LOC_BLOCK:
-                 sym_addr = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
-                 break;
+             case LOC_BLOCK:
+               sym_addr = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
+               break;

 
 

-               default:
-                 continue;
-               }
+             default:
+               continue;
+             }

 
 

-               if (sym_addr <= addr)
-                 if (sym_addr > best_sym_addr)
-                   {
-                     /* Quit if we found an exact match.  */
-                     best_sym = sym;
-                     best_sym_addr = sym_addr;
-                     best_symtab = symtab;
-                     if (sym_addr == addr)
-                       goto done;
-                   }
-           }
-       }
-    }
+           if (sym_addr <= addr)
+             if (sym_addr > best_sym_addr)
+               {
+                 /* Quit if we found an exact match.  */
+                 best_sym = sym;
+                 best_sym_addr = sym_addr;
+                 best_symtab = symtab;
+                 if (sym_addr == addr)
+                   goto done;
+               }
+         }
+      }
+  }

 
 

- done:
+done:

   if (symtabp)
     *symtabp = best_symtab;
   if (symaddrp)
   if (symtabp)
     *symtabp = best_symtab;
   if (symaddrp)


@@ -1293,10 +1601,7 @@ find_addr_symbol (addr, symtabp, symaddrp)
 /* If it's worth the effort, we could be using a binary search.  */
 
 struct symtab_and_line
 /* If it's worth the effort, we could be using a binary search.  */
 
 struct symtab_and_line

-find_pc_sect_line (pc, section, notcurrent)
-     CORE_ADDR pc;
-     struct sec *section;
-     int notcurrent;
+find_pc_sect_line (CORE_ADDR pc, struct sec *section, int notcurrent)

 {
   struct symtab *s;
   register struct linetable *l;
 {
   struct symtab *s;
   register struct linetable *l;


@@ -1305,6 +1610,8 @@ find_pc_sect_line (pc, section, notcurrent)
   register struct linetable_entry *item;
   struct symtab_and_line val;
   struct blockvector *bv;
   register struct linetable_entry *item;
   struct symtab_and_line val;
   struct blockvector *bv;

+  struct minimal_symbol *msymbol;
+  struct minimal_symbol *mfunsym;

 
   /* Info on best line seen so far, and where it starts, and its file.  */
 
 
   /* Info on best line seen so far, and where it starts, and its file.  */
 


@@ -1330,14 +1637,88 @@ find_pc_sect_line (pc, section, notcurrent)
      But what we want is the statement containing the instruction.
      Fudge the pc to make sure we get that.  */
 
      But what we want is the statement containing the instruction.
      Fudge the pc to make sure we get that.  */
 

-  INIT_SAL (&val);     /* initialize to zeroes */
+  INIT_SAL (&val);             /* initialize to zeroes */

 
   if (notcurrent)
     pc -= 1;
 
 
   if (notcurrent)
     pc -= 1;
 

+  /* elz: added this because this function returned the wrong
+     information if the pc belongs to a stub (import/export)
+     to call a shlib function. This stub would be anywhere between
+     two functions in the target, and the line info was erroneously 
+     taken to be the one of the line before the pc. 
+   */
+  /* RT: Further explanation:
+
+   * We have stubs (trampolines) inserted between procedures.
+   *
+   * Example: "shr1" exists in a shared library, and a "shr1" stub also
+   * exists in the main image.
+   *
+   * In the minimal symbol table, we have a bunch of symbols
+   * sorted by start address. The stubs are marked as "trampoline",
+   * the others appear as text. E.g.:
+   *
+   *  Minimal symbol table for main image 
+   *     main:  code for main (text symbol)
+   *     shr1: stub  (trampoline symbol)
+   *     foo:   code for foo (text symbol)
+   *     ...
+   *  Minimal symbol table for "shr1" image:
+   *     ...
+   *     shr1: code for shr1 (text symbol)
+   *     ...
+   *
+   * So the code below is trying to detect if we are in the stub
+   * ("shr1" stub), and if so, find the real code ("shr1" trampoline),
+   * and if found,  do the symbolization from the real-code address
+   * rather than the stub address.
+   *
+   * Assumptions being made about the minimal symbol table:
+   *   1. lookup_minimal_symbol_by_pc() will return a trampoline only
+   *      if we're really in the trampoline. If we're beyond it (say
+   *      we're in "foo" in the above example), it'll have a closer 
+   *      symbol (the "foo" text symbol for example) and will not
+   *      return the trampoline.
+   *   2. lookup_minimal_symbol_text() will find a real text symbol
+   *      corresponding to the trampoline, and whose address will
+   *      be different than the trampoline address. I put in a sanity
+   *      check for the address being the same, to avoid an
+   *      infinite recursion.
+   */
+  msymbol = lookup_minimal_symbol_by_pc (pc);
+  if (msymbol != NULL)
+    if (MSYMBOL_TYPE (msymbol) == mst_solib_trampoline)
+      {
+       mfunsym = lookup_minimal_symbol_text (SYMBOL_NAME (msymbol), NULL, NULL);
+       if (mfunsym == NULL)
+         /* I eliminated this warning since it is coming out
+          * in the following situation:
+          * gdb shmain // test program with shared libraries
+          * (gdb) break shr1  // function in shared lib
+          * Warning: In stub for ...
+          * In the above situation, the shared lib is not loaded yet, 
+          * so of course we can't find the real func/line info,
+          * but the "break" still works, and the warning is annoying.
+          * So I commented out the warning. RT */
+         /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_NAME(msymbol)) */ ;
+       /* fall through */
+       else if (SYMBOL_VALUE (mfunsym) == SYMBOL_VALUE (msymbol))
+         /* Avoid infinite recursion */
+         /* See above comment about why warning is commented out */
+         /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_NAME(msymbol)) */ ;
+       /* fall through */
+       else
+         return find_pc_line (SYMBOL_VALUE (mfunsym), 0);
+      }
+
+

   s = find_pc_sect_symtab (pc, section);
   if (!s)
     {
   s = find_pc_sect_symtab (pc, section);
   if (!s)
     {

+      /* if no symbol information, return previous pc */
+      if (notcurrent)
+       pc++;

       val.pc = pc;
       return val;
     }
       val.pc = pc;
       return val;
     }


@@ -1353,7 +1734,7 @@ find_pc_sect_line (pc, section, notcurrent)
       /* Find the best line in this symtab.  */
       l = LINETABLE (s);
       if (!l)
       /* Find the best line in this symtab.  */
       l = LINETABLE (s);
       if (!l)

-        continue;
+       continue;

       len = l->nitems;
       if (len <= 0)
        {
       len = l->nitems;
       if (len <= 0)
        {


@@ -1368,7 +1749,7 @@ find_pc_sect_line (pc, section, notcurrent)
       item = l->item;          /* Get first line info */
 
       /* Is this file's first line closer than the first lines of other files?
       item = l->item;          /* Get first line info */
 
       /* Is this file's first line closer than the first lines of other files?

-        If so, record this file, and its first line, as best alternate.  */
+         If so, record this file, and its first line, as best alternate.  */

       if (item->pc > pc && (!alt || item->pc < alt->pc))
        {
          alt = item;
       if (item->pc > pc && (!alt || item->pc < alt->pc))
        {
          alt = item;


@@ -1386,12 +1767,12 @@ find_pc_sect_line (pc, section, notcurrent)
        }
 
       /* At this point, prev points at the line whose start addr is <= pc, and
        }
 
       /* At this point, prev points at the line whose start addr is <= pc, and

-        item points at the next line.  If we ran off the end of the linetable
-        (pc >= start of the last line), then prev == item.  If pc < start of
-        the first line, prev will not be set.  */
+         item points at the next line.  If we ran off the end of the linetable
+         (pc >= start of the last line), then prev == item.  If pc < start of
+         the first line, prev will not be set.  */

 
       /* Is this file's best line closer than the best in the other files?
 
       /* Is this file's best line closer than the best in the other files?

-        If so, record this file, and its best line, as best so far.  */
+         If so, record this file, and its best line, as best so far.  */

 
       if (prev && (!best || prev->pc > best->pc))
        {
 
       if (prev && (!best || prev->pc > best->pc))
        {


@@ -1417,7 +1798,8 @@ find_pc_sect_line (pc, section, notcurrent)
          val.line = alt->line - 1;
 
          /* Don't return line 0, that means that we didn't find the line.  */
          val.line = alt->line - 1;
 
          /* Don't return line 0, that means that we didn't find the line.  */

-         if (val.line == 0) ++val.line;
+         if (val.line == 0)
+           ++val.line;

 
          val.pc = BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK));
          val.end = alt->pc;
 
          val.pc = BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK));
          val.end = alt->pc;


@@ -1442,39 +1824,31 @@ find_pc_sect_line (pc, section, notcurrent)
 /* Backward compatibility (no section) */
 
 struct symtab_and_line
 /* Backward compatibility (no section) */
 
 struct symtab_and_line

-find_pc_line (pc, notcurrent)
-     CORE_ADDR pc;
-     int notcurrent;
+find_pc_line (CORE_ADDR pc, int notcurrent)

 {
 {

-  asection     *section;
+  asection *section;

 
   section = find_pc_overlay (pc);
   if (pc_in_unmapped_range (pc, section))
     pc = overlay_mapped_address (pc, section);
   return find_pc_sect_line (pc, section, notcurrent);
 }
 
   section = find_pc_overlay (pc);
   if (pc_in_unmapped_range (pc, section))
     pc = overlay_mapped_address (pc, section);
   return find_pc_sect_line (pc, section, notcurrent);
 }

-

 \f
 \f

-static int find_line_symtab PARAMS ((struct symtab *, int, struct linetable **,
-                                    int *, int *));
+
+static struct symtab *find_line_symtab (struct symtab *, int, int *, int *);

 
 /* Find line number LINE in any symtab whose name is the same as
    SYMTAB.
 
 
 /* Find line number LINE in any symtab whose name is the same as
    SYMTAB.
 

-   If found, return 1, set *LINETABLE to the linetable in which it was
+   If found, return the symtab that contains the linetable in which it was

    found, set *INDEX to the index in the linetable of the best entry
    found, and set *EXACT_MATCH nonzero if the value returned is an
    exact match.
 
    found, set *INDEX to the index in the linetable of the best entry
    found, and set *EXACT_MATCH nonzero if the value returned is an
    exact match.
 

-   If not found, return 0.  */
+   If not found, return NULL.  */

 
 

-static int
-find_line_symtab (symtab, line, linetable, index, exact_match)
-     struct symtab *symtab;
-     int line;
-     struct linetable **linetable;
-     int *index;
-     int *exact_match;
+static struct symtab *
+find_line_symtab (struct symtab *symtab, int line, int *index, int *exact_match)

 {
   int exact;
 
 {
   int exact;
 


@@ -1483,22 +1857,24 @@ find_line_symtab (symtab, line, linetable, index, exact_match)
 
   int best_index;
   struct linetable *best_linetable;
 
   int best_index;
   struct linetable *best_linetable;

+  struct symtab *best_symtab;

 
   /* First try looking it up in the given symtab.  */
   best_linetable = LINETABLE (symtab);
 
   /* First try looking it up in the given symtab.  */
   best_linetable = LINETABLE (symtab);

+  best_symtab = symtab;

   best_index = find_line_common (best_linetable, line, &exact);
   if (best_index < 0 || !exact)
     {
       /* Didn't find an exact match.  So we better keep looking for
   best_index = find_line_common (best_linetable, line, &exact);
   if (best_index < 0 || !exact)
     {
       /* Didn't find an exact match.  So we better keep looking for

-        another symtab with the same name.  In the case of xcoff,
-        multiple csects for one source file (produced by IBM's FORTRAN
-        compiler) produce multiple symtabs (this is unavoidable
-        assuming csects can be at arbitrary places in memory and that
-        the GLOBAL_BLOCK of a symtab has a begin and end address).  */
+         another symtab with the same name.  In the case of xcoff,
+         multiple csects for one source file (produced by IBM's FORTRAN
+         compiler) produce multiple symtabs (this is unavoidable
+         assuming csects can be at arbitrary places in memory and that
+         the GLOBAL_BLOCK of a symtab has a begin and end address).  */

 
       /* BEST is the smallest linenumber > LINE so far seen,
 
       /* BEST is the smallest linenumber > LINE so far seen,

-        or 0 if none has been seen so far.
-        BEST_INDEX and BEST_LINETABLE identify the item for it.  */
+         or 0 if none has been seen so far.
+         BEST_INDEX and BEST_LINETABLE identify the item for it.  */

       int best;
 
       struct objfile *objfile;
       int best;
 
       struct objfile *objfile;


@@ -1510,60 +1886,66 @@ find_line_symtab (symtab, line, linetable, index, exact_match)
        best = 0;
 
       ALL_SYMTABS (objfile, s)
        best = 0;
 
       ALL_SYMTABS (objfile, s)

-       {
-         struct linetable *l;
-         int ind;
+      {
+       struct linetable *l;
+       int ind;

 
 

-         if (!STREQ (symtab->filename, s->filename))
-           continue;
-         l = LINETABLE (s);
-         ind = find_line_common (l, line, &exact);
-         if (ind >= 0)
-           {
-             if (exact)
-               {
-                 best_index = ind;
-                 best_linetable = l;
-                 goto done;
-               }
-             if (best == 0 || l->item[ind].line < best)
-               {
-                 best = l->item[ind].line;
-                 best_index = ind;
-                 best_linetable = l;
-               }
-           }
-       }
+       if (!STREQ (symtab->filename, s->filename))
+         continue;
+       l = LINETABLE (s);
+       ind = find_line_common (l, line, &exact);
+       if (ind >= 0)
+         {
+           if (exact)
+             {
+               best_index = ind;
+               best_linetable = l;
+               best_symtab = s;
+               goto done;
+             }
+           if (best == 0 || l->item[ind].line < best)
+             {
+               best = l->item[ind].line;
+               best_index = ind;
+               best_linetable = l;
+               best_symtab = s;
+             }
+         }
+      }

     }
     }

- done:
+done:

   if (best_index < 0)
   if (best_index < 0)

-    return 0;
+    return NULL;

 
   if (index)
     *index = best_index;
 
   if (index)
     *index = best_index;

-  if (linetable)
-    *linetable = best_linetable;

   if (exact_match)
     *exact_match = exact;
   if (exact_match)
     *exact_match = exact;

-  return 1;
+
+  return best_symtab;

 }
 \f
 }
 \f

-/* Find the PC value for a given source file and line number.
-   Returns zero for invalid line number.
+/* Set the PC value for a given source file and line number and return true.
+   Returns zero for invalid line number (and sets the PC to 0).

    The source file is specified with a struct symtab.  */
 
    The source file is specified with a struct symtab.  */
 

-CORE_ADDR
-find_line_pc (symtab, line)
-     struct symtab *symtab;
-     int line;
+int
+find_line_pc (struct symtab *symtab, int line, CORE_ADDR *pc)

 {
   struct linetable *l;
   int ind;
 
 {
   struct linetable *l;
   int ind;
 

+  *pc = 0;

   if (symtab == 0)
     return 0;
   if (symtab == 0)
     return 0;

-  if (find_line_symtab (symtab, line, &l, &ind, NULL))
-    return l->item[ind].pc;
+
+  symtab = find_line_symtab (symtab, line, &ind, NULL);
+  if (symtab != NULL)
+    {
+      l = LINETABLE (symtab);
+      *pc = l->item[ind].pc;
+      return 1;
+    }

   else
     return 0;
 }
   else
     return 0;
 }


@@ -1575,19 +1957,14 @@ find_line_pc (symtab, line)
    Returns 0 if could not find the specified line.  */
 
 int
    Returns 0 if could not find the specified line.  */
 
 int

-find_line_pc_range (sal, startptr, endptr)
-     struct symtab_and_line sal;
-     CORE_ADDR *startptr, *endptr;
+find_line_pc_range (struct symtab_and_line sal, CORE_ADDR *startptr,
+                   CORE_ADDR *endptr)

 {
   CORE_ADDR startaddr;
   struct symtab_and_line found_sal;
 
   startaddr = sal.pc;
 {
   CORE_ADDR startaddr;
   struct symtab_and_line found_sal;
 
   startaddr = sal.pc;

-  if (startaddr == 0)
-    {
-      startaddr = find_line_pc (sal.symtab, sal.line);
-    }
-  if (startaddr == 0)
+  if (startaddr == 0 && !find_line_pc (sal.symtab, sal.line, &startaddr))

     return 0;
 
   /* This whole function is based on address.  For example, if line 10 has
     return 0;
 
   /* This whole function is based on address.  For example, if line 10 has


@@ -1619,10 +1996,8 @@ find_line_pc_range (sal, startptr, endptr)
    Set *EXACT_MATCH nonzero if the value returned is an exact match.  */
 
 static int
    Set *EXACT_MATCH nonzero if the value returned is an exact match.  */
 
 static int

-find_line_common (l, lineno, exact_match)
-     register struct linetable *l;
-     register int lineno;
-     int *exact_match;
+find_line_common (register struct linetable *l, register int lineno,
+                 int *exact_match)

 {
   register int i;
   register int len;
 {
   register int i;
   register int len;


@@ -1665,9 +2040,7 @@ find_line_common (l, lineno, exact_match)
 }
 
 int
 }
 
 int

-find_pc_line_pc_range (pc, startptr, endptr)
-     CORE_ADDR pc;
-     CORE_ADDR *startptr, *endptr;
+find_pc_line_pc_range (CORE_ADDR pc, CORE_ADDR *startptr, CORE_ADDR *endptr)

 {
   struct symtab_and_line sal;
   sal = find_pc_line (pc, 0);
 {
   struct symtab_and_line sal;
   sal = find_pc_line (pc, 0);


@@ -1682,12 +2055,10 @@ find_pc_line_pc_range (pc, startptr, endptr)
    of real code inside the function.  */
 
 static struct symtab_and_line
    of real code inside the function.  */
 
 static struct symtab_and_line

-find_function_start_sal PARAMS ((struct symbol *sym, int));
+find_function_start_sal (struct symbol *sym, int);

 
 static struct symtab_and_line
 
 static struct symtab_and_line

-find_function_start_sal (sym, funfirstline)
-     struct symbol *sym;
-     int funfirstline;
+find_function_start_sal (struct symbol *sym, int funfirstline)

 {
   CORE_ADDR pc;
   struct symtab_and_line sal;
 {
   CORE_ADDR pc;
   struct symtab_and_line sal;


@@ -1695,16 +2066,16 @@ find_function_start_sal (sym, funfirstline)
   pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
   fixup_symbol_section (sym, NULL);
   if (funfirstline)
   pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
   fixup_symbol_section (sym, NULL);
   if (funfirstline)

-    { /* skip "first line" of function (which is actually its prologue) */
+    {                          /* skip "first line" of function (which is actually its prologue) */

       asection *section = SYMBOL_BFD_SECTION (sym);
       /* If function is in an unmapped overlay, use its unmapped LMA
       asection *section = SYMBOL_BFD_SECTION (sym);
       /* If function is in an unmapped overlay, use its unmapped LMA

-        address, so that SKIP_PROLOGUE has something unique to work on */
+         address, so that SKIP_PROLOGUE has something unique to work on */

       if (section_is_overlay (section) &&
          !section_is_mapped (section))
        pc = overlay_unmapped_address (pc, section);
 
       pc += FUNCTION_START_OFFSET;
       if (section_is_overlay (section) &&
          !section_is_mapped (section))
        pc = overlay_unmapped_address (pc, section);
 
       pc += FUNCTION_START_OFFSET;

-      SKIP_PROLOGUE (pc);
+      pc = SKIP_PROLOGUE (pc);

 
       /* For overlays, map pc back into its mapped VMA range */
       pc = overlay_mapped_address (pc, section);
 
       /* For overlays, map pc back into its mapped VMA range */
       pc = overlay_mapped_address (pc, section);


@@ -1737,9 +2108,7 @@ find_function_start_sal (sym, funfirstline)
    beginning of the substring of the operator text.
    Otherwise, return "".  */
 char *
    beginning of the substring of the operator text.
    Otherwise, return "".  */
 char *

-operator_chars (p, end)
-     char *p;
-     char **end;
+operator_chars (char *p, char **end)

 {
   *end = "";
   if (strncmp (p, "operator", 8))
 {
   *end = "";
   if (strncmp (p, "operator", 8))


@@ -1748,7 +2117,7 @@ operator_chars (p, end)
 
   /* Don't get faked out by `operator' being part of a longer
      identifier.  */
 
   /* Don't get faked out by `operator' being part of a longer
      identifier.  */

-  if (isalpha(*p) || *p == '_' || *p == '$' || *p == '\0')
+  if (isalpha (*p) || *p == '_' || *p == '$' || *p == '\0')

     return *end;
 
   /* Allow some whitespace between `operator' and the operator symbol.  */
     return *end;
 
   /* Allow some whitespace between `operator' and the operator symbol.  */


@@ -1757,10 +2126,10 @@ operator_chars (p, end)
 
   /* Recognize 'operator TYPENAME'. */
 
 
   /* Recognize 'operator TYPENAME'. */
 

-  if (isalpha(*p) || *p == '_' || *p == '$')
+  if (isalpha (*p) || *p == '_' || *p == '$')

     {
     {

-      register char *q = p+1;
-      while (isalnum(*q) || *q == '_' || *q == '$')
+      register char *q = p + 1;
+      while (isalnum (*q) || *q == '_' || *q == '$')

        q++;
       *end = q;
       return p;
        q++;
       *end = q;
       return p;


@@ -1775,9 +2144,9 @@ operator_chars (p, end)
     case '%':
     case '^':
       if (p[1] == '=')
     case '%':
     case '^':
       if (p[1] == '=')

-       *end = p+2;
+       *end = p + 2;

       else
       else

-       *end = p+1;
+       *end = p + 1;

       return p;
     case '<':
     case '>':
       return p;
     case '<':
     case '>':


@@ -1786,28 +2155,28 @@ operator_chars (p, end)
     case '&':
     case '|':
       if (p[1] == '=' || p[1] == p[0])
     case '&':
     case '|':
       if (p[1] == '=' || p[1] == p[0])

-       *end = p+2;
+       *end = p + 2;

       else
       else

-       *end = p+1;
+       *end = p + 1;

       return p;
     case '~':
     case ',':
       return p;
     case '~':
     case ',':

-      *end = p+1;
+      *end = p + 1;

       return p;
     case '(':
       if (p[1] != ')')
        error ("`operator ()' must be specified without whitespace in `()'");
       return p;
     case '(':
       if (p[1] != ')')
        error ("`operator ()' must be specified without whitespace in `()'");

-      *end = p+2;
+      *end = p + 2;

       return p;
     case '?':
       if (p[1] != ':')
        error ("`operator ?:' must be specified without whitespace in `?:'");
       return p;
     case '?':
       if (p[1] != ':')
        error ("`operator ?:' must be specified without whitespace in `?:'");

-      *end = p+2;
+      *end = p + 2;

       return p;
     case '[':
       if (p[1] != ']')
        error ("`operator []' must be specified without whitespace in `[]'");
       return p;
     case '[':
       if (p[1] != ']')
        error ("`operator []' must be specified without whitespace in `[]'");

-      *end = p+2;
+      *end = p + 2;

       return p;
     default:
       error ("`operator %s' not supported", p);
       return p;
     default:
       error ("`operator %s' not supported", p);


@@ -1822,11 +2191,10 @@ operator_chars (p, end)
    reader because the type of the baseclass might still be stubbed
    when the definition of the derived class is parsed.  */
 
    reader because the type of the baseclass might still be stubbed
    when the definition of the derived class is parsed.  */
 

-static int total_number_of_methods PARAMS ((struct type *type));
+static int total_number_of_methods (struct type *type);

 
 static int
 
 static int

-total_number_of_methods (type)
-     struct type *type;
+total_number_of_methods (struct type *type)

 {
   int n;
   int count;
 {
   int n;
   int count;


@@ -1849,57 +2217,76 @@ total_number_of_methods (type)
    a size of total_number_of_methods (T) * sizeof (struct symbol *).
    Note that this function is g++ specific.  */
 
    a size of total_number_of_methods (T) * sizeof (struct symbol *).
    Note that this function is g++ specific.  */
 

-int
-find_methods (t, name, sym_arr)
-     struct type *t;
-     char *name;
-     struct symbol **sym_arr;
+static int
+find_methods (struct type *t, char *name, struct symbol **sym_arr)

 {
   int i1 = 0;
   int ibase;
   struct symbol *sym_class;
   char *class_name = type_name_no_tag (t);
 {
   int i1 = 0;
   int ibase;
   struct symbol *sym_class;
   char *class_name = type_name_no_tag (t);

+

   /* Ignore this class if it doesn't have a name.  This is ugly, but
      unless we figure out how to get the physname without the name of
      the class, then the loop can't do any good.  */
   if (class_name
       && (sym_class = lookup_symbol (class_name,
   /* Ignore this class if it doesn't have a name.  This is ugly, but
      unless we figure out how to get the physname without the name of
      the class, then the loop can't do any good.  */
   if (class_name
       && (sym_class = lookup_symbol (class_name,

-                                    (struct block *)NULL,
+                                    (struct block *) NULL,

                                     STRUCT_NAMESPACE,
                                     STRUCT_NAMESPACE,

-                                    (int *)NULL,
-                                    (struct symtab **)NULL)))
+                                    (int *) NULL,
+                                    (struct symtab **) NULL)))

     {
       int method_counter;
     {
       int method_counter;

+

       /* FIXME: Shouldn't this just be CHECK_TYPEDEF (t)?  */
       t = SYMBOL_TYPE (sym_class);
       /* FIXME: Shouldn't this just be CHECK_TYPEDEF (t)?  */
       t = SYMBOL_TYPE (sym_class);

+
+      /* Loop over each method name.  At this level, all overloads of a name
+         are counted as a single name.  There is an inner loop which loops over
+         each overload.  */
+

       for (method_counter = TYPE_NFN_FIELDS (t) - 1;
           method_counter >= 0;
           --method_counter)
        {
          int field_counter;
       for (method_counter = TYPE_NFN_FIELDS (t) - 1;
           method_counter >= 0;
           --method_counter)
        {
          int field_counter;

-         struct fn_field *f = TYPE_FN_FIELDLIST1 (t, method_counter);

          char *method_name = TYPE_FN_FIELDLIST_NAME (t, method_counter);
          char dem_opname[64];
 
          char *method_name = TYPE_FN_FIELDLIST_NAME (t, method_counter);
          char dem_opname[64];
 

-          if (strncmp(method_name, "__", 2)==0 ||
-           strncmp(method_name, "op", 2)==0 ||
-           strncmp(method_name, "type", 4)==0 )
+         if (strncmp (method_name, "__", 2) == 0 ||
+             strncmp (method_name, "op", 2) == 0 ||
+             strncmp (method_name, "type", 4) == 0)

            {
            {

-             if (cplus_demangle_opname(method_name, dem_opname, DMGL_ANSI))
-               method_name = dem_opname;
-             else if (cplus_demangle_opname(method_name, dem_opname, 0))
-               method_name = dem_opname; 
+             if (cplus_demangle_opname (method_name, dem_opname, DMGL_ANSI))
+               method_name = dem_opname;
+             else if (cplus_demangle_opname (method_name, dem_opname, 0))
+               method_name = dem_opname;

            }
            }

+

          if (STREQ (name, method_name))
          if (STREQ (name, method_name))

-           /* Find all the fields with that name.  */
+           /* Find all the overloaded methods with that name.  */

            for (field_counter = TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1;
                 field_counter >= 0;
                 --field_counter)
              {
            for (field_counter = TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1;
                 field_counter >= 0;
                 --field_counter)
              {

+               struct fn_field *f;

                char *phys_name;
                char *phys_name;

+
+               f = TYPE_FN_FIELDLIST1 (t, method_counter);
+

                if (TYPE_FN_FIELD_STUB (f, field_counter))
                if (TYPE_FN_FIELD_STUB (f, field_counter))

-                 check_stub_method (t, method_counter, field_counter);
-               phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
+                 {
+                   char *tmp_name;
+
+                   tmp_name = gdb_mangle_name (t,
+                                               method_counter,
+                                               field_counter);
+                   phys_name = alloca (strlen (tmp_name) + 1);
+                   strcpy (phys_name, tmp_name);
+                   free (tmp_name);
+                 }
+               else
+                 phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
+

                /* Destructor is handled by caller, dont add it to the list */
                if (DESTRUCTOR_PREFIX_P (phys_name))
                  continue;
                /* Destructor is handled by caller, dont add it to the list */
                if (DESTRUCTOR_PREFIX_P (phys_name))
                  continue;


@@ -1912,11 +2299,14 @@ find_methods (t, name, sym_arr)
                  i1++;
                else
                  {
                  i1++;
                else
                  {

-                   fputs_filtered("(Cannot find method ", gdb_stdout);
-                   fprintf_symbol_filtered (gdb_stdout, phys_name,
-                                            language_cplus,
-                                            DMGL_PARAMS | DMGL_ANSI);
-                   fputs_filtered(" - possibly inlined.)\n", gdb_stdout);
+                   /* This error message gets printed, but the method
+                      still seems to be found
+                      fputs_filtered("(Cannot find method ", gdb_stdout);
+                      fprintf_symbol_filtered (gdb_stdout, phys_name,
+                      language_cplus,
+                      DMGL_PARAMS | DMGL_ANSI);
+                      fputs_filtered(" - possibly inlined.)\n", gdb_stdout);
+                    */

                  }
              }
        }
                  }
              }
        }


@@ -1933,11 +2323,10 @@ find_methods (t, name, sym_arr)
      rather than hiding without any problem, and gcc 2.4.5 does overload
      rather than hiding in this case).  */
 
      rather than hiding without any problem, and gcc 2.4.5 does overload
      rather than hiding in this case).  */
 

-  if (i1)
-    return i1;
-  for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
-    i1 += find_methods(TYPE_BASECLASS(t, ibase), name,
-                      sym_arr + i1);
+  if (i1 == 0)
+    for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
+      i1 += find_methods (TYPE_BASECLASS (t, ibase), name, sym_arr + i1);
+

   return i1;
 }
 
   return i1;
 }
 


@@ -1949,21 +2338,19 @@ find_methods (t, name, sym_arr)
    line spec is `filename:linenum'.  */
 
 static void
    line spec is `filename:linenum'.  */
 
 static void

-build_canonical_line_spec (sal, symname, canonical)
-     struct symtab_and_line *sal;
-     char *symname;
-     char ***canonical;
+build_canonical_line_spec (struct symtab_and_line *sal, char *symname,
+                          char ***canonical)

 {
   char **canonical_arr;
   char *canonical_name;
   char *filename;
   struct symtab *s = sal->symtab;
 
 {
   char **canonical_arr;
   char *canonical_name;
   char *filename;
   struct symtab *s = sal->symtab;
 

-  if (s == (struct symtab *)NULL
-      || s->filename == (char *)NULL
-      || canonical == (char ***)NULL)
+  if (s == (struct symtab *) NULL
+      || s->filename == (char *) NULL
+      || canonical == (char ***) NULL)

     return;
     return;

- 
+

   canonical_arr = (char **) xmalloc (sizeof (char *));
   *canonical = canonical_arr;
 
   canonical_arr = (char **) xmalloc (sizeof (char *));
   *canonical = canonical_arr;
 


@@ -1981,6 +2368,43 @@ build_canonical_line_spec (sal, symname, canonical)
   canonical_arr[0] = canonical_name;
 }
 
   canonical_arr[0] = canonical_name;
 }
 

+
+
+/* Find an instance of the character C in the string S that is outside
+   of all parenthesis pairs, single-quoted strings, and double-quoted
+   strings.  */
+static char *
+find_toplevel_char (char *s, char c)
+{
+  int quoted = 0;              /* zero if we're not in quotes;
+                                  '"' if we're in a double-quoted string;
+                                  '\'' if we're in a single-quoted string.  */
+  int depth = 0;               /* number of unclosed parens we've seen */
+  char *scan;
+
+  for (scan = s; *scan; scan++)
+    {
+      if (quoted)
+       {
+         if (*scan == quoted)
+           quoted = 0;
+         else if (*scan == '\\' && *(scan + 1))
+           scan++;
+       }
+      else if (*scan == c && ! quoted && depth == 0)
+       return scan;
+      else if (*scan == '"' || *scan == '\'')
+       quoted = *scan;
+      else if (*scan == '(')
+       depth++;
+      else if (*scan == ')' && depth > 0)
+       depth--;
+    }
+
+  return 0;
+}
+
+

 /* Parse a string that specifies a line number.
    Pass the address of a char * variable; that variable will be
    advanced over the characters actually parsed.
 /* Parse a string that specifies a line number.
    Pass the address of a char * variable; that variable will be
    advanced over the characters actually parsed.


@@ -1990,12 +2414,14 @@ build_canonical_line_spec (sal, symname, canonical)
    LINENUM -- that line number in current file.  PC returned is 0.
    FILE:LINENUM -- that line in that file.  PC returned is 0.
    FUNCTION -- line number of openbrace of that function.
    LINENUM -- that line number in current file.  PC returned is 0.
    FILE:LINENUM -- that line in that file.  PC returned is 0.
    FUNCTION -- line number of openbrace of that function.

-      PC returned is the start of the function.
+   PC returned is the start of the function.

    VARIABLE -- line number of definition of that variable.
    VARIABLE -- line number of definition of that variable.

-      PC returned is 0.
+   PC returned is 0.

    FILE:FUNCTION -- likewise, but prefer functions in that file.
    *EXPR -- line in which address EXPR appears.
 
    FILE:FUNCTION -- likewise, but prefer functions in that file.
    *EXPR -- line in which address EXPR appears.
 

+   This may all be followed by an "if EXPR", which we ignore.
+

    FUNCTION may be an undebuggable function found in minimal symbol table.
 
    If the argument FUNFIRSTLINE is nonzero, we want the first line
    FUNCTION may be an undebuggable function found in minimal symbol table.
 
    If the argument FUNFIRSTLINE is nonzero, we want the first line


@@ -2022,12 +2448,8 @@ build_canonical_line_spec (sal, symname, canonical)
    can use as appropriate instead of make_symbol_completion_list.  */
 
 struct symtabs_and_lines
    can use as appropriate instead of make_symbol_completion_list.  */
 
 struct symtabs_and_lines

-decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
-     char **argptr;
-     int funfirstline;
-     struct symtab *default_symtab;
-     int default_line;
-     char ***canonical;
+decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
+              int default_line, char ***canonical)

 {
   struct symtabs_and_lines values;
 #ifdef HPPA_COMPILER_BUG
 {
   struct symtabs_and_lines values;
 #ifdef HPPA_COMPILER_BUG


@@ -2056,12 +2478,12 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
      will have been defined away in defs.h.  */
 #undef volatile
   volatile struct symtab_and_line val;
      will have been defined away in defs.h.  */
 #undef volatile
   volatile struct symtab_and_line val;

-#define volatile /*nothing*/
+#define volatile               /*nothing */

 #else
   struct symtab_and_line val;
 #endif
   register char *p, *p1;
 #else
   struct symtab_and_line val;
 #endif
   register char *p, *p1;

-  char *q, *pp;
+  char *q, *pp, *ii, *p2;

 #if 0
   char *q1;
 #endif
 #if 0
   char *q1;
 #endif


@@ -2076,13 +2498,17 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   char *copy;
   struct symbol *sym_class;
   int i1;
   char *copy;
   struct symbol *sym_class;
   int i1;

-  int is_quoted, has_parens;
+  int is_quoted;
+  int is_quote_enclosed;
+  int has_parens;
+  int has_if = 0;
+  int has_comma = 0;

   struct symbol **sym_arr;
   struct type *t;
   char *saved_arg = *argptr;
   extern char *gdb_completer_quote_characters;
   struct symbol **sym_arr;
   struct type *t;
   char *saved_arg = *argptr;
   extern char *gdb_completer_quote_characters;

-  
-  INIT_SAL (&val);     /* initialize to zeroes */
+
+  INIT_SAL (&val);             /* initialize to zeroes */

 
   /* Defaults have defaults.  */
 
 
   /* Defaults have defaults.  */
 


@@ -2098,38 +2524,111 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
     {
       (*argptr)++;
       pc = parse_and_eval_address_1 (argptr);
     {
       (*argptr)++;
       pc = parse_and_eval_address_1 (argptr);

+

       values.sals = (struct symtab_and_line *)
        xmalloc (sizeof (struct symtab_and_line));
       values.sals = (struct symtab_and_line *)
        xmalloc (sizeof (struct symtab_and_line));

+

       values.nelts = 1;
       values.sals[0] = find_pc_line (pc, 0);
       values.sals[0].pc = pc;
       values.nelts = 1;
       values.sals[0] = find_pc_line (pc, 0);
       values.sals[0].pc = pc;

+      values.sals[0].section = find_pc_overlay (pc);
+

       return values;
     }
 
       return values;
     }
 

+  /* 'has_if' is for the syntax:
+   *     (gdb) break foo if (a==b)
+   */
+  if ((ii = strstr (*argptr, " if ")) != NULL ||
+      (ii = strstr (*argptr, "\tif ")) != NULL ||
+      (ii = strstr (*argptr, " if\t")) != NULL ||
+      (ii = strstr (*argptr, "\tif\t")) != NULL ||
+      (ii = strstr (*argptr, " if(")) != NULL ||
+      (ii = strstr (*argptr, "\tif( ")) != NULL)
+    has_if = 1;
+  /* Temporarily zap out "if (condition)" to not
+   * confuse the parenthesis-checking code below.
+   * This is undone below. Do not change ii!!
+   */
+  if (has_if)
+    {
+      *ii = '\0';
+    }
+
+  /* Set various flags.
+   * 'has_parens' is important for overload checking, where
+   * we allow things like: 
+   *     (gdb) break c::f(int)
+   */
+

   /* Maybe arg is FILE : LINENUM or FILE : FUNCTION */
 
   /* Maybe arg is FILE : LINENUM or FILE : FUNCTION */
 

-  s = NULL;

   is_quoted = (**argptr
               && strchr (gdb_completer_quote_characters, **argptr) != NULL);
   is_quoted = (**argptr
               && strchr (gdb_completer_quote_characters, **argptr) != NULL);

+

   has_parens = ((pp = strchr (*argptr, '(')) != NULL
   has_parens = ((pp = strchr (*argptr, '(')) != NULL

-                && (pp = strchr (pp, ')')) != NULL);
+               && (pp = strrchr (pp, ')')) != NULL);
+
+  /* Now that we're safely past the has_parens check,
+   * put back " if (condition)" so outer layers can see it 
+   */
+  if (has_if)
+    *ii = ' ';
+
+  /* Maybe we were called with a line range FILENAME:LINENUM,FILENAME:LINENUM
+     and we must isolate the first half.  Outer layers will call again later
+     for the second half.
+
+     Don't count commas that appear in argument lists of overloaded
+     functions, or in quoted strings.  It's stupid to go to this much
+     trouble when the rest of the function is such an obvious roach hotel.  */
+  ii = find_toplevel_char (*argptr, ',');
+  has_comma = (ii != 0);
+
+  /* Temporarily zap out second half to not
+   * confuse the code below.
+   * This is undone below. Do not change ii!!
+   */
+  if (has_comma)
+    {
+      *ii = '\0';
+    }
+
+  /* Maybe arg is FILE : LINENUM or FILE : FUNCTION */
+  /* May also be CLASS::MEMBER, or NAMESPACE::NAME */
+  /* Look for ':', but ignore inside of <> */

 
 

-  for (p = *argptr; *p; p++)
+  s = NULL;
+  p = *argptr;
+  if (p[0] == '"')
+    {
+      is_quote_enclosed = 1;
+      p++;
+    }
+  else
+    is_quote_enclosed = 0;
+  for (; *p; p++)

     {
     {

-      if (p[0] == '<') 
+      if (p[0] == '<')

        {
        {

-         while(++p && *p != '>');
-         if (!p)
-           {
-             error ("non-matching '<' and '>' in command");
-           }
+         char *temp_end = find_template_name_end (p);
+         if (!temp_end)
+           error ("malformed template specification in command");
+         p = temp_end;

        }
        }

-      if (p[0] == ':' || p[0] == ' ' || p[0] == '\t')
+      /* Check for the end of the first half of the linespec.  End of line,
+         a tab, a double colon or the last single colon, or a space.  But
+         if enclosed in double quotes we do not break on enclosed spaces */
+      if (!*p
+         || p[0] == '\t'
+         || ((p[0] == ':')
+             && ((p[1] == ':') || (strchr (p + 1, ':') == NULL)))
+         || ((p[0] == ' ') && !is_quote_enclosed))

        break;
        break;

-      if (p[0] == '.' && strchr (p, ':') == NULL) /* Java qualified method. */
+      if (p[0] == '.' && strchr (p, ':') == NULL)      /* Java qualified method. */

        {
          /* Find the *last* '.', since the others are package qualifiers. */
        {
          /* Find the *last* '.', since the others are package qualifiers. */

-         for (p1 = p;  *p1;  p1++)
+         for (p1 = p; *p1; p1++)

            {
              if (*p1 == '.')
                p = p1;
            {
              if (*p1 == '.')
                p = p1;


@@ -2137,178 +2636,292 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
          break;
        }
     }
          break;
        }
     }

-  while (p[0] == ' ' || p[0] == '\t') p++;
+  while (p[0] == ' ' || p[0] == '\t')
+    p++;

 
 

-  if ((p[0] == ':' || p[0] == '.') && !has_parens)
+  /* if the closing double quote was left at the end, remove it */
+  if (is_quote_enclosed)

     {
     {

+      char *closing_quote = strchr (p, '"');
+      if (closing_quote && closing_quote[1] == '\0')
+       *closing_quote = '\0';
+    }

 
 

-      /*  C++ or Java */
-      if (is_quoted) *argptr = *argptr+1;
-      if (p[0] == '.' || p[1] ==':')
-       {
-         /* Extract the class name.  */
-         p1 = p;
-         while (p != *argptr && p[-1] == ' ') --p;
-         copy = (char *) alloca (p - *argptr + 1);
-         memcpy (copy, *argptr, p - *argptr);
-         copy[p - *argptr] = 0;
+  /* Now that we've safely parsed the first half,
+   * put back ',' so outer layers can see it 
+   */
+  if (has_comma)
+    *ii = ',';

 
 

-         /* Discard the class name from the arg.  */
-         p = p1 + (p1[0] == ':' ? 2 : 1);
-         while (*p == ' ' || *p == '\t') p++;
-         *argptr = p;
-
-         sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0, 
-                                    (struct symtab **)NULL);
-       
-         if (sym_class &&
-             (t = check_typedef (SYMBOL_TYPE (sym_class)),
-              (TYPE_CODE (t) == TYPE_CODE_STRUCT
-               || TYPE_CODE (t) == TYPE_CODE_UNION)))
+  if ((p[0] == ':' || p[0] == '.') && !has_parens)
+    {
+      /*  C++ */
+      /*  ... or Java */
+      if (is_quoted)
+       *argptr = *argptr + 1;
+      if (p[0] == '.' || p[1] == ':')
+       {
+         char *saved_arg2 = *argptr;
+         char *temp_end;
+         /* First check for "global" namespace specification,
+            of the form "::foo". If found, skip over the colons
+            and jump to normal symbol processing */
+         if (p[0] == ':' 
+             && ((*argptr == p) || (p[-1] == ' ') || (p[-1] == '\t')))
+           saved_arg2 += 2;
+
+         /* We have what looks like a class or namespace
+            scope specification (A::B), possibly with many
+            levels of namespaces or classes (A::B::C::D).
+
+            Some versions of the HP ANSI C++ compiler (as also possibly
+            other compilers) generate class/function/member names with
+            embedded double-colons if they are inside namespaces. To
+            handle this, we loop a few times, considering larger and
+            larger prefixes of the string as though they were single
+            symbols.  So, if the initially supplied string is
+            A::B::C::D::foo, we have to look up "A", then "A::B",
+            then "A::B::C", then "A::B::C::D", and finally
+            "A::B::C::D::foo" as single, monolithic symbols, because
+            A, B, C or D may be namespaces.
+
+            Note that namespaces can nest only inside other
+            namespaces, and not inside classes.  So we need only
+            consider *prefixes* of the string; there is no need to look up
+            "B::C" separately as a symbol in the previous example. */
+
+         p2 = p;               /* save for restart */
+         while (1)

            {
            {

-             /* Arg token is not digits => try it as a function name
-                Find the next token(everything up to end or next blank). */
-             if (**argptr
-                 && strchr (gdb_completer_quote_characters, **argptr) != NULL)
-               {
-                 p = skip_quoted(*argptr);
-                 *argptr = *argptr + 1;
-               }
-             else
-               {
-                 p = *argptr;
-                 while (*p && *p!=' ' && *p!='\t' && *p!=',' && *p!=':') p++;
-               }
-/*
-             q = operator_chars (*argptr, &q1);
-             if (q1 - q)
+             /* Extract the class name.  */
+             p1 = p;
+             while (p != *argptr && p[-1] == ' ')
+               --p;
+             copy = (char *) alloca (p - *argptr + 1);
+             memcpy (copy, *argptr, p - *argptr);
+             copy[p - *argptr] = 0;
+
+             /* Discard the class name from the arg.  */
+             p = p1 + (p1[0] == ':' ? 2 : 1);
+             while (*p == ' ' || *p == '\t')
+               p++;
+             *argptr = p;
+
+             sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0,
+                                        (struct symtab **) NULL);
+
+             if (sym_class &&
+                 (t = check_typedef (SYMBOL_TYPE (sym_class)),
+                  (TYPE_CODE (t) == TYPE_CODE_STRUCT
+                   || TYPE_CODE (t) == TYPE_CODE_UNION)))

                {
                {

-                 char *opname;
-                 char *tmp = alloca (q1 - q + 1);
-                 memcpy (tmp, q, q1 - q);
-                 tmp[q1 - q] = '\0';
-                 opname = cplus_mangle_opname (tmp, DMGL_ANSI);
-                 if (opname == NULL)
+                 /* Arg token is not digits => try it as a function name
+                    Find the next token(everything up to end or next blank). */
+                 if (**argptr
+                     && strchr (gdb_completer_quote_characters, **argptr) != NULL)

                    {
                    {

-                     error_begin ();
-                     printf_filtered ("no mangling for \"%s\"\n", tmp);
-                     cplusplus_hint (saved_arg);
-                     return_to_top_level (RETURN_ERROR);
+                     p = skip_quoted (*argptr);
+                     *argptr = *argptr + 1;

                    }
                    }

-                 copy = (char*) alloca (3 + strlen(opname));
-                 sprintf (copy, "__%s", opname);
-                 p = q1;
-               }
-             else
-*/
-               {
-                 copy = (char *) alloca (p - *argptr + 1 );
-                 memcpy (copy, *argptr, p - *argptr);
-                 copy[p - *argptr] = '\0';
-                 if (p != *argptr
-                     && copy[p - *argptr - 1]
-                     && strchr (gdb_completer_quote_characters,
-                                copy[p - *argptr - 1]) != NULL)
-                   copy[p - *argptr - 1] = '\0';
-               }
-
-             /* no line number may be specified */
-             while (*p == ' ' || *p == '\t') p++;
-             *argptr = p;
+                 else
+                   {
+                     p = *argptr;
+                     while (*p && *p != ' ' && *p != '\t' && *p != ',' && *p != ':')
+                       p++;
+                   }
+/*
+   q = operator_chars (*argptr, &q1);
+   if (q1 - q)
+   {
+   char *opname;
+   char *tmp = alloca (q1 - q + 1);
+   memcpy (tmp, q, q1 - q);
+   tmp[q1 - q] = '\0';
+   opname = cplus_mangle_opname (tmp, DMGL_ANSI);
+   if (opname == NULL)
+   {
+   error_begin ();
+   printf_filtered ("no mangling for \"%s\"\n", tmp);
+   cplusplus_hint (saved_arg);
+   return_to_top_level (RETURN_ERROR);
+   }
+   copy = (char*) alloca (3 + strlen(opname));
+   sprintf (copy, "__%s", opname);
+   p = q1;
+   }
+   else
+ */
+                 {
+                   copy = (char *) alloca (p - *argptr + 1);
+                   memcpy (copy, *argptr, p - *argptr);
+                   copy[p - *argptr] = '\0';
+                   if (p != *argptr
+                       && copy[p - *argptr - 1]
+                       && strchr (gdb_completer_quote_characters,
+                                  copy[p - *argptr - 1]) != NULL)
+                     copy[p - *argptr - 1] = '\0';
+                 }

 
 

-             sym = 0;
-             i1 = 0;           /*  counter for the symbol array */
-             sym_arr = (struct symbol **) alloca(total_number_of_methods (t)
-                                                 * sizeof(struct symbol *));
+                 /* no line number may be specified */
+                 while (*p == ' ' || *p == '\t')
+                   p++;
+                 *argptr = p;

 
 

-             if (destructor_name_p (copy, t))
-               {
-                 /* Destructors are a special case.  */
-                 int m_index, f_index;
+                 sym = 0;
+                 i1 = 0;       /*  counter for the symbol array */
+                 sym_arr = (struct symbol **) alloca (total_number_of_methods (t)
+                                               * sizeof (struct symbol *));

 
 

-                 if (get_destructor_fn_field (t, &m_index, &f_index))
+                 if (destructor_name_p (copy, t))

                    {
                    {

-                     struct fn_field *f = TYPE_FN_FIELDLIST1 (t, m_index);
-
-                     sym_arr[i1] =
-                       lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, f_index),
-                                      NULL, VAR_NAMESPACE, (int *) NULL,
-                                      (struct symtab **)NULL);
-                     if (sym_arr[i1])
-                       i1++;
+                     /* Destructors are a special case.  */
+                     int m_index, f_index;
+
+                     if (get_destructor_fn_field (t, &m_index, &f_index))
+                       {
+                         struct fn_field *f = TYPE_FN_FIELDLIST1 (t, m_index);
+
+                         sym_arr[i1] =
+                           lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, f_index),
+                                          NULL, VAR_NAMESPACE, (int *) NULL,
+                                          (struct symtab **) NULL);
+                         if (sym_arr[i1])
+                           i1++;
+                       }

                    }
                    }

-               }
-             else
-               i1 = find_methods (t, copy, sym_arr);
-             if (i1 == 1)
-               {
-                 /* There is exactly one field with that name.  */
-                 sym = sym_arr[0];
+                 else
+                   i1 = find_methods (t, copy, sym_arr);
+                 if (i1 == 1)
+                   {
+                     /* There is exactly one field with that name.  */
+                     sym = sym_arr[0];

 
 

-                 if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
+                     if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
+                       {
+                         values.sals = (struct symtab_and_line *)
+                           xmalloc (sizeof (struct symtab_and_line));
+                         values.nelts = 1;
+                         values.sals[0] = find_function_start_sal (sym,
+                                                             funfirstline);
+                       }
+                     else
+                       {
+                         values.nelts = 0;
+                       }
+                     return values;
+                   }
+                 if (i1 > 0)

                    {
                    {

-                     values.sals = (struct symtab_and_line *)
-                       xmalloc (sizeof (struct symtab_and_line));
-                     values.nelts = 1;
-                     values.sals[0] = find_function_start_sal (sym,
-                                                               funfirstline);
+                     /* There is more than one field with that name
+                        (overloaded).  Ask the user which one to use.  */
+                     return decode_line_2 (sym_arr, i1, funfirstline, canonical);

                    }
                  else
                    {
                    }
                  else
                    {

-                     values.nelts = 0;
+                     char *tmp;
+
+                     if (OPNAME_PREFIX_P (copy))
+                       {
+                         tmp = (char *) alloca (strlen (copy + 3) + 9);
+                         strcpy (tmp, "operator ");
+                         strcat (tmp, copy + 3);
+                       }
+                     else
+                       tmp = copy;
+                     error_begin ();
+                     if (tmp[0] == '~')
+                       printf_filtered
+                         ("the class `%s' does not have destructor defined\n",
+                          SYMBOL_SOURCE_NAME (sym_class));
+                     else
+                       printf_filtered
+                         ("the class %s does not have any method named %s\n",
+                          SYMBOL_SOURCE_NAME (sym_class), tmp);
+                     cplusplus_hint (saved_arg);
+                     return_to_top_level (RETURN_ERROR);

                    }
                    }

-                 return values;
-               }
-             if (i1 > 0)
-               {
-                 /* There is more than one field with that name
-                    (overloaded).  Ask the user which one to use.  */
-                 return decode_line_2 (sym_arr, i1, funfirstline, canonical);

                }
                }

-             else
-               {
-                 char *tmp;

 
 

-                 if (OPNAME_PREFIX_P (copy))
+             /* Move pointer up to next possible class/namespace token */
+             p = p2 + 1;       /* restart with old value +1 */
+             /* Move pointer ahead to next double-colon */
+             while (*p && (p[0] != ' ') && (p[0] != '\t') && (p[0] != '\''))
+               {
+                 if (p[0] == '<')

                    {
                    {

-                     tmp = (char *)alloca (strlen (copy+3) + 9);
-                     strcpy (tmp, "operator ");
-                     strcat (tmp, copy+3);
+                     temp_end = find_template_name_end (p);
+                     if (!temp_end)
+                       error ("malformed template specification in command");
+                     p = temp_end;

                    }
                    }

+                 else if ((p[0] == ':') && (p[1] == ':'))
+                   break;      /* found double-colon */

                  else
                  else

-                   tmp = copy;
-                 error_begin ();
-                 if (tmp[0] == '~')
-                   printf_filtered
-                     ("the class `%s' does not have destructor defined\n",
-                      SYMBOL_SOURCE_NAME(sym_class));
-                 else
-                   printf_filtered
-                     ("the class %s does not have any method named %s\n",
-                      SYMBOL_SOURCE_NAME(sym_class), tmp);
-                 cplusplus_hint (saved_arg);
-                 return_to_top_level (RETURN_ERROR);
+                   p++;

                }
                }

-           }
-         else
-           {
-             error_begin ();
-             /* The quotes are important if copy is empty.  */
-             printf_filtered
-               ("can't find class, struct, or union named \"%s\"\n", copy);
-             cplusplus_hint (saved_arg);
-             return_to_top_level (RETURN_ERROR);
-           }
+
+             if (*p != ':')
+               break;          /* out of the while (1) */
+
+             p2 = p;           /* save restart for next time around */
+             *argptr = saved_arg2;     /* restore argptr */
+           }                   /* while (1) */
+
+         /* Last chance attempt -- check entire name as a symbol */
+         /* Use "copy" in preparation for jumping out of this block,
+            to be consistent with usage following the jump target */
+         copy = (char *) alloca (p - saved_arg2 + 1);
+         memcpy (copy, saved_arg2, p - saved_arg2);
+         /* Note: if is_quoted should be true, we snuff out quote here anyway */
+         copy[p - saved_arg2] = '\000';
+         /* Set argptr to skip over the name */
+         *argptr = (*p == '\'') ? p + 1 : p;
+         /* Look up entire name */
+         sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
+         s = (struct symtab *) 0;
+         /* Prepare to jump: restore the " if (condition)" so outer layers see it */
+         /* Symbol was found --> jump to normal symbol processing.
+            Code following "symbol_found" expects "copy" to have the
+            symbol name, "sym" to have the symbol pointer, "s" to be
+            a specified file's symtab, and sym_symtab to be the symbol's
+            symtab. */
+         /* By jumping there we avoid falling through the FILE:LINE and
+            FILE:FUNC processing stuff below */
+         if (sym)
+           goto symbol_found;
+
+         /* Couldn't find any interpretation as classes/namespaces, so give up */
+         error_begin ();
+         /* The quotes are important if copy is empty.  */
+         printf_filtered
+           ("Can't find member of namespace, class, struct, or union named \"%s\"\n", copy);
+         cplusplus_hint (saved_arg);
+         return_to_top_level (RETURN_ERROR);

        }
       /*  end of C++  */
 
 
       /* Extract the file name.  */
       p1 = p;
        }
       /*  end of C++  */
 
 
       /* Extract the file name.  */
       p1 = p;

-      while (p != *argptr && p[-1] == ' ') --p;
+      while (p != *argptr && p[-1] == ' ')
+       --p;
+      if ((*p == '"') && is_quote_enclosed)
+       --p;

       copy = (char *) alloca (p - *argptr + 1);
       copy = (char *) alloca (p - *argptr + 1);

-      memcpy (copy, *argptr, p - *argptr);
-      copy[p - *argptr] = 0;
+      if ((**argptr == '"') && is_quote_enclosed)
+       {
+         memcpy (copy, *argptr + 1, p - *argptr - 1);
+         /* It may have the ending quote right after the file name */
+         if (copy[p - *argptr - 2] == '"')
+           copy[p - *argptr - 2] = 0;
+         else
+           copy[p - *argptr - 1] = 0;
+       }
+      else
+       {
+         memcpy (copy, *argptr, p - *argptr);
+         copy[p - *argptr] = 0;
+       }

 
       /* Find that file's data.  */
       s = lookup_symtab (copy);
 
       /* Find that file's data.  */
       s = lookup_symtab (copy);


@@ -2321,9 +2934,47 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
 
       /* Discard the file name from the arg.  */
       p = p1 + 1;
 
       /* Discard the file name from the arg.  */
       p = p1 + 1;

-      while (*p == ' ' || *p == '\t') p++;
+      while (*p == ' ' || *p == '\t')
+       p++;

       *argptr = p;
     }
       *argptr = p;
     }

+#if 0
+  /* No one really seems to know why this was added. It certainly
+     breaks the command line, though, whenever the passed
+     name is of the form ClassName::Method. This bit of code
+     singles out the class name, and if funfirstline is set (for
+     example, you are setting a breakpoint at this function),
+     you get an error. This did not occur with earlier
+     verions, so I am ifdef'ing this out. 3/29/99 */
+  else
+    {
+      /* Check if what we have till now is a symbol name */
+
+      /* We may be looking at a template instantiation such
+         as "foo<int>".  Check here whether we know about it,
+         instead of falling through to the code below which
+         handles ordinary function names, because that code
+         doesn't like seeing '<' and '>' in a name -- the
+         skip_quoted call doesn't go past them.  So see if we
+         can figure it out right now. */
+
+      copy = (char *) alloca (p - *argptr + 1);
+      memcpy (copy, *argptr, p - *argptr);
+      copy[p - *argptr] = '\000';
+      sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
+      if (sym)
+       {
+         /* Yes, we have a symbol; jump to symbol processing */
+         /* Code after symbol_found expects S, SYM_SYMTAB, SYM, 
+            and COPY to be set correctly */
+         *argptr = (*p == '\'') ? p + 1 : p;
+         s = (struct symtab *) 0;
+         goto symbol_found;
+       }
+      /* Otherwise fall out from here and go to file/line spec
+         processing, etc. */
+    }
+#endif

 
   /* S is specified file's symtab, or 0 if no file specified.
      arg no longer contains the file name.  */
 
   /* S is specified file's symtab, or 0 if no file specified.
      arg no longer contains the file name.  */


@@ -2331,22 +2982,27 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   /* Check whether arg is all digits (and sign) */
 
   q = *argptr;
   /* Check whether arg is all digits (and sign) */
 
   q = *argptr;

-  if (*q == '-' || *q == '+') q++;
+  if (*q == '-' || *q == '+')
+    q++;

   while (*q >= '0' && *q <= '9')
     q++;
 
   if (q != *argptr && (*q == 0 || *q == ' ' || *q == '\t' || *q == ','))
     {
       /* We found a token consisting of all digits -- at least one digit.  */
   while (*q >= '0' && *q <= '9')
     q++;
 
   if (q != *argptr && (*q == 0 || *q == ' ' || *q == '\t' || *q == ','))
     {
       /* We found a token consisting of all digits -- at least one digit.  */

-      enum sign {none, plus, minus} sign = none;
+      enum sign
+       {
+         none, plus, minus
+       }
+      sign = none;

 
       /* We might need a canonical line spec if no file was specified.  */
       int need_canonical = (s == 0) ? 1 : 0;
 
       /* This is where we need to make sure that we have good defaults.
 
       /* We might need a canonical line spec if no file was specified.  */
       int need_canonical = (s == 0) ? 1 : 0;
 
       /* This is where we need to make sure that we have good defaults.

-        We must guarantee that this section of code is never executed
-        when we are called with just a function name, since
-        select_source_symtab calls us with such an argument  */
+         We must guarantee that this section of code is never executed
+         when we are called with just a function name, since
+         select_source_symtab calls us with such an argument  */

 
       if (s == 0 && default_symtab == 0)
        {
 
       if (s == 0 && default_symtab == 0)
        {


@@ -2377,14 +3033,22 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
            val.line = 1;
          break;
        case none:
            val.line = 1;
          break;
        case none:

-         break;        /* No need to adjust val.line.  */
+         break;                /* No need to adjust val.line.  */

        }
 
        }
 

-      while (*q == ' ' || *q == '\t') q++;
+      while (*q == ' ' || *q == '\t')
+       q++;

       *argptr = q;
       if (s == 0)
        s = default_symtab;
       *argptr = q;
       if (s == 0)
        s = default_symtab;

-      val.symtab = s;
+
+      /* It is possible that this source file has more than one symtab, 
+         and that the new line number specification has moved us from the
+         default (in s) to a new one.  */
+      val.symtab = find_line_symtab (s, val.line, NULL, NULL);
+      if (val.symtab == 0)
+       val.symtab = s;
+

       val.pc = 0;
       values.sals = (struct symtab_and_line *)
        xmalloc (sizeof (struct symtab_and_line));
       val.pc = 0;
       values.sals = (struct symtab_and_line *)
        xmalloc (sizeof (struct symtab_and_line));


@@ -2398,53 +3062,98 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   /* Arg token is not digits => try it as a variable name
      Find the next token (everything up to end or next whitespace).  */
 
   /* Arg token is not digits => try it as a variable name
      Find the next token (everything up to end or next whitespace).  */
 

-  if (**argptr == '$')         /* Convenience variable */
-    p = skip_quoted (*argptr + 1);
+  if (**argptr == '$')         /* May be a convenience variable */
+    p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));       /* One or two $ chars possible */

   else if (is_quoted)
     {
       p = skip_quoted (*argptr);
       if (p[-1] != '\'')
   else if (is_quoted)
     {
       p = skip_quoted (*argptr);
       if (p[-1] != '\'')

-        error ("Unmatched single quote.");
+       error ("Unmatched single quote.");

     }
   else if (has_parens)
     {
     }
   else if (has_parens)
     {

-      p = pp+1;
+      p = pp + 1;

     }
     }

-  else 
+  else

     {
     {

-      p = skip_quoted(*argptr);
+      p = skip_quoted (*argptr);

     }
 
     }
 

+  if (is_quote_enclosed && **argptr == '"')
+    (*argptr)++;
+

   copy = (char *) alloca (p - *argptr + 1);
   memcpy (copy, *argptr, p - *argptr);
   copy[p - *argptr] = '\0';
   if (p != *argptr
       && copy[0]
   copy = (char *) alloca (p - *argptr + 1);
   memcpy (copy, *argptr, p - *argptr);
   copy[p - *argptr] = '\0';
   if (p != *argptr
       && copy[0]

-      && copy[0] == copy [p - *argptr - 1]
+      && copy[0] == copy[p - *argptr - 1]

       && strchr (gdb_completer_quote_characters, copy[0]) != NULL)
     {
       && strchr (gdb_completer_quote_characters, copy[0]) != NULL)
     {

-      copy [p - *argptr - 1] = '\0';
+      copy[p - *argptr - 1] = '\0';

       copy++;
     }
       copy++;
     }

-  while (*p == ' ' || *p == '\t') p++;
+  while (*p == ' ' || *p == '\t')
+    p++;

   *argptr = p;
 
   *argptr = p;
 

-  /* See if it's a convenience variable */
+  /* If it starts with $: may be a legitimate variable or routine name
+     (e.g. HP-UX millicode routines such as $$dyncall), or it may
+     be history value, or it may be a convenience variable */

 
   if (*copy == '$')
     {
       value_ptr valx;
 
   if (*copy == '$')
     {
       value_ptr valx;

-      int need_canonical = (s == 0) ? 1 : 0;
+      int index = 0;
+      int need_canonical = 0;

 
 

-      valx = value_of_internalvar (lookup_internalvar (copy + 1));
-      if (TYPE_CODE (VALUE_TYPE (valx)) != TYPE_CODE_INT)
-       error ("Convenience variables used in line specs must have integer values.");
+      p = (copy[1] == '$') ? copy + 2 : copy + 1;
+      while (*p >= '0' && *p <= '9')
+       p++;
+      if (!*p)                 /* reached end of token without hitting non-digit */
+       {
+         /* We have a value history reference */
+         sscanf ((copy[1] == '$') ? copy + 2 : copy + 1, "%d", &index);
+         valx = access_value_history ((copy[1] == '$') ? -index : index);
+         if (TYPE_CODE (VALUE_TYPE (valx)) != TYPE_CODE_INT)
+           error ("History values used in line specs must have integer values.");
+       }
+      else
+       {
+         /* Not all digits -- may be user variable/function or a
+            convenience variable */
+
+         /* Look up entire name as a symbol first */
+         sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
+         s = (struct symtab *) 0;
+         need_canonical = 1;
+         /* Symbol was found --> jump to normal symbol processing.
+            Code following "symbol_found" expects "copy" to have the
+            symbol name, "sym" to have the symbol pointer, "s" to be
+            a specified file's symtab, and sym_symtab to be the symbol's
+            symtab. */
+         if (sym)
+           goto symbol_found;
+
+         /* If symbol was not found, look in minimal symbol tables */
+         msymbol = lookup_minimal_symbol (copy, 0, 0);
+         /* Min symbol was found --> jump to minsym processing. */
+         if (msymbol)
+           goto minimal_symbol_found;
+
+         /* Not a user variable or function -- must be convenience variable */
+         need_canonical = (s == 0) ? 1 : 0;
+         valx = value_of_internalvar (lookup_internalvar (copy + 1));
+         if (TYPE_CODE (VALUE_TYPE (valx)) != TYPE_CODE_INT)
+           error ("Convenience variables used in line specs must have integer values.");
+       }

 
 

+      /* Either history value or convenience value from above, in valx */

       val.symtab = s ? s : default_symtab;
       val.line = value_as_long (valx);
       val.pc = 0;
 
       val.symtab = s ? s : default_symtab;
       val.line = value_as_long (valx);
       val.pc = 0;
 

-      values.sals = (struct symtab_and_line *)xmalloc (sizeof val);
+      values.sals = (struct symtab_and_line *) xmalloc (sizeof val);

       values.sals[0] = val;
       values.nelts = 1;
 
       values.sals[0] = val;
       values.nelts = 1;
 


@@ -2463,6 +3172,9 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
                        : get_selected_block ()),
                       VAR_NAMESPACE, 0, &sym_symtab);
 
                        : get_selected_block ()),
                       VAR_NAMESPACE, 0, &sym_symtab);
 

+symbol_found:                  /* We also jump here from inside the C++ class/namespace 
+                                  code on finding a symbol of the form "A::B::C" */
+

   if (sym != NULL)
     {
       if (SYMBOL_CLASS (sym) == LOC_BLOCK)
   if (sym != NULL)
     {
       if (SYMBOL_CLASS (sym) == LOC_BLOCK)


@@ -2514,18 +3226,22 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
     }
 
   msymbol = lookup_minimal_symbol (copy, NULL, NULL);
     }
 
   msymbol = lookup_minimal_symbol (copy, NULL, NULL);

+
+minimal_symbol_found:          /* We also jump here from the case for variables
+                                  that begin with '$' */
+

   if (msymbol != NULL)
     {
   if (msymbol != NULL)
     {

-      val.pc      = SYMBOL_VALUE_ADDRESS (msymbol);
-      val.section = SYMBOL_BFD_SECTION (msymbol);
+      values.sals = (struct symtab_and_line *)
+       xmalloc (sizeof (struct symtab_and_line));
+      values.sals[0] = find_pc_sect_line (SYMBOL_VALUE_ADDRESS (msymbol),
+                                         (struct sec *) 0, 0);
+      values.sals[0].section = SYMBOL_BFD_SECTION (msymbol);

       if (funfirstline)
        {
       if (funfirstline)
        {

-         val.pc += FUNCTION_START_OFFSET;
-         SKIP_PROLOGUE (val.pc);
+         values.sals[0].pc += FUNCTION_START_OFFSET;
+         values.sals[0].pc = SKIP_PROLOGUE (values.sals[0].pc);

        }
        }

-      values.sals = (struct symtab_and_line *)
-       xmalloc (sizeof (struct symtab_and_line));
-      values.sals[0] = val;

       values.nelts = 1;
       return values;
     }
       values.nelts = 1;
       return values;
     }


@@ -2535,20 +3251,18 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
     error (no_symtab_msg);
 
   error ("Function \"%s\" not defined.", copy);
     error (no_symtab_msg);
 
   error ("Function \"%s\" not defined.", copy);

-  return values;       /* for lint */
+  return values;               /* for lint */

 }
 
 struct symtabs_and_lines
 }
 
 struct symtabs_and_lines

-decode_line_spec (string, funfirstline)
-     char *string;
-     int funfirstline;
+decode_line_spec (char *string, int funfirstline)

 {
   struct symtabs_and_lines sals;
   if (string == 0)
     error ("Empty line specification.");
   sals = decode_line_1 (&string, funfirstline,
                        current_source_symtab, current_source_line,
 {
   struct symtabs_and_lines sals;
   if (string == 0)
     error ("Empty line specification.");
   sals = decode_line_1 (&string, funfirstline,
                        current_source_symtab, current_source_line,

-                       (char ***)NULL);
+                       (char ***) NULL);

   if (*string)
     error ("Junk at end of line specification: %s", string);
   return sals;
   if (*string)
     error ("Junk at end of line specification: %s", string);
   return sals;


@@ -2572,12 +3286,12 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
   char *prompt;
   char *symname;
   struct cleanup *old_chain;
   char *prompt;
   char *symname;
   struct cleanup *old_chain;

-  char **canonical_arr = (char **)NULL;
+  char **canonical_arr = (char **) NULL;

 
 

-  values.sals = (struct symtab_and_line *) 
-    alloca (nelts * sizeof(struct symtab_and_line));
-  return_values.sals = (struct symtab_and_line *) 
-    xmalloc (nelts * sizeof(struct symtab_and_line));
+  values.sals = (struct symtab_and_line *)
+    alloca (nelts * sizeof (struct symtab_and_line));
+  return_values.sals = (struct symtab_and_line *)
+    xmalloc (nelts * sizeof (struct symtab_and_line));

   old_chain = make_cleanup (free, return_values.sals);
 
   if (canonical)
   old_chain = make_cleanup (free, return_values.sals);
 
   if (canonical)


@@ -2589,7 +3303,7 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
     }
 
   i = 0;
     }
 
   i = 0;

-  printf_unfiltered("[0] cancel\n[1] all\n");
+  printf_unfiltered ("[0] cancel\n[1] all\n");

   while (i < nelts)
     {
       INIT_SAL (&return_values.sals[i]);       /* initialize to zeroes */
   while (i < nelts)
     {
       INIT_SAL (&return_values.sals[i]);       /* initialize to zeroes */


@@ -2598,7 +3312,7 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
        {
          values.sals[i] = find_function_start_sal (sym_arr[i], funfirstline);
          printf_unfiltered ("[%d] %s at %s:%d\n",
        {
          values.sals[i] = find_function_start_sal (sym_arr[i], funfirstline);
          printf_unfiltered ("[%d] %s at %s:%d\n",

-                            (i+2),
+                            (i + 2),

                             SYMBOL_SOURCE_NAME (sym_arr[i]),
                             values.sals[i].symtab->filename,
                             values.sals[i].line);
                             SYMBOL_SOURCE_NAME (sym_arr[i]),
                             values.sals[i].symtab->filename,
                             values.sals[i].line);


@@ -2607,16 +3321,13 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
        printf_unfiltered ("?HERE\n");
       i++;
     }
        printf_unfiltered ("?HERE\n");
       i++;
     }

-  
+

   if ((prompt = getenv ("PS2")) == NULL)
     {
   if ((prompt = getenv ("PS2")) == NULL)
     {

-      prompt = ">";
+      prompt = "> ";

     }
     }

-  printf_unfiltered("%s ",prompt);
-  gdb_flush(gdb_stdout);
+  args = command_line_input (prompt, 0, "overload-choice");

 
 

-  args = command_line_input ((char *) NULL, 0, "overload-choice");
-  

   if (args == 0 || *args == 0)
     error_no_arg ("one or more choice numbers");
 
   if (args == 0 || *args == 0)
     error_no_arg ("one or more choice numbers");
 


@@ -2626,7 +3337,8 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
       int num;
 
       arg1 = args;
       int num;
 
       arg1 = args;

-      while (*arg1 >= '0' && *arg1 <= '9') arg1++;
+      while (*arg1 >= '0' && *arg1 <= '9')
+       arg1++;

       if (*arg1 && *arg1 != ' ' && *arg1 != '\t')
        error ("Arguments must be choice numbers.");
 
       if (*arg1 && *arg1 != ' ' && *arg1 != '\t')
        error ("Arguments must be choice numbers.");
 


@@ -2640,15 +3352,15 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
            {
              for (i = 0; i < nelts; i++)
                {
            {
              for (i = 0; i < nelts; i++)
                {

-                 if (canonical_arr[i] == NULL)
+                 if (canonical_arr[i] == NULL)

                    {
                      symname = SYMBOL_NAME (sym_arr[i]);
                    {
                      symname = SYMBOL_NAME (sym_arr[i]);

-                     canonical_arr[i] = savestring (symname, strlen (symname));
+                     canonical_arr[i] = savestring (symname, strlen (symname));

                    }
                }
            }
          memcpy (return_values.sals, values.sals,
                    }
                }
            }
          memcpy (return_values.sals, values.sals,

-                 (nelts * sizeof(struct symtab_and_line)));
+                 (nelts * sizeof (struct symtab_and_line)));

          return_values.nelts = nelts;
          discard_cleanups (old_chain);
          return return_values;
          return_values.nelts = nelts;
          discard_cleanups (old_chain);
          return return_values;


@@ -2679,21 +3391,20 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
        }
 
       args = arg1;
        }
 
       args = arg1;

-      while (*args == ' ' || *args == '\t') args++;
+      while (*args == ' ' || *args == '\t')
+       args++;

     }
   return_values.nelts = i;
   discard_cleanups (old_chain);
   return return_values;
 }
     }
   return_values.nelts = i;
   discard_cleanups (old_chain);
   return return_values;
 }

-

 \f
 \f

+

 /* Slave routine for sources_info.  Force line breaks at ,'s.
    NAME is the name to print and *FIRST is nonzero if this is the first
    name printed.  Set *FIRST to zero.  */
 static void
 /* Slave routine for sources_info.  Force line breaks at ,'s.
    NAME is the name to print and *FIRST is nonzero if this is the first
    name printed.  Set *FIRST to zero.  */
 static void

-output_source_filename (name, first)
-     char *name;
-     int *first;
+output_source_filename (char *name, int *first)

 {
   /* Table of files printed so far.  Since a single source file can
      result in several partial symbol tables, we need to avoid printing
 {
   /* Table of files printed so far.  Since a single source file can
      result in several partial symbol tables, we need to avoid printing


@@ -2744,122 +3455,189 @@ output_source_filename (name, first)
 
   wrap_here ("");
   fputs_filtered (name, gdb_stdout);
 
   wrap_here ("");
   fputs_filtered (name, gdb_stdout);

-}  
+}

 
 static void
 
 static void

-sources_info (ignore, from_tty)
-     char *ignore;
-     int from_tty;
+sources_info (char *ignore, int from_tty)

 {
   register struct symtab *s;
   register struct partial_symtab *ps;
   register struct objfile *objfile;
   int first;
 {
   register struct symtab *s;
   register struct partial_symtab *ps;
   register struct objfile *objfile;
   int first;

-  
+

   if (!have_full_symbols () && !have_partial_symbols ())
     {
       error (no_symtab_msg);
     }
   if (!have_full_symbols () && !have_partial_symbols ())
     {
       error (no_symtab_msg);
     }

-  
+

   printf_filtered ("Source files for which symbols have been read in:\n\n");
 
   first = 1;
   ALL_SYMTABS (objfile, s)
   printf_filtered ("Source files for which symbols have been read in:\n\n");
 
   first = 1;
   ALL_SYMTABS (objfile, s)

-    {
-      output_source_filename (s -> filename, &first);
-    }
+  {
+    output_source_filename (s->filename, &first);
+  }

   printf_filtered ("\n\n");
   printf_filtered ("\n\n");

-  
+

   printf_filtered ("Source files for which symbols will be read in on demand:\n\n");
 
   first = 1;
   ALL_PSYMTABS (objfile, ps)
   printf_filtered ("Source files for which symbols will be read in on demand:\n\n");
 
   first = 1;
   ALL_PSYMTABS (objfile, ps)

+  {
+    if (!ps->readin)
+      {
+       output_source_filename (ps->filename, &first);
+      }
+  }
+  printf_filtered ("\n");
+}
+
+static int
+file_matches (file, files, nfiles)
+     char *file;
+     char *files[];
+     int nfiles;
+{
+  int i;
+
+  if (file != NULL && nfiles != 0)

     {
     {

-      if (!ps->readin)
+      for (i = 0; i < nfiles; i++)

        {
        {

-         output_source_filename (ps -> filename, &first);
+         if (strcmp (files[i], basename (file)) == 0)
+           return 1;

        }
     }
        }
     }

-  printf_filtered ("\n");
+  else if (nfiles == 0)
+    return 1;
+  return 0;

 }
 
 }
 

-/* List all symbols (if REGEXP is NULL) or all symbols matching REGEXP.
-   If CLASS is zero, list all symbols except functions, type names, and
-                    constants (enums).
-   If CLASS is 1, list only functions.
-   If CLASS is 2, list only type names.
-   If CLASS is 3, list only method names.
+/* Free any memory associated with a search. */
+void
+free_search_symbols (struct symbol_search *symbols)
+{
+  struct symbol_search *p;
+  struct symbol_search *next;

 
 

-   BPT is non-zero if we should set a breakpoint at the functions
-   we find.  */
+  for (p = symbols; p != NULL; p = next)
+    {
+      next = p->next;
+      free (p);
+    }
+}

 
 static void
 
 static void

-list_symbols (regexp, class, bpt, from_tty)
+do_free_search_symbols_cleanup (void *symbols)
+{
+  free_search_symbols (symbols);
+}
+
+struct cleanup *
+make_cleanup_free_search_symbols (struct symbol_search *symbols)
+{
+  return make_cleanup (do_free_search_symbols_cleanup, symbols);
+}
+
+
+/* Search the symbol table for matches to the regular expression REGEXP,
+   returning the results in *MATCHES.
+
+   Only symbols of KIND are searched:
+   FUNCTIONS_NAMESPACE - search all functions
+   TYPES_NAMESPACE     - search all type names
+   METHODS_NAMESPACE   - search all methods NOT IMPLEMENTED
+   VARIABLES_NAMESPACE - search all symbols, excluding functions, type names,
+   and constants (enums)
+
+   free_search_symbols should be called when *MATCHES is no longer needed.
+ */
+void
+search_symbols (regexp, kind, nfiles, files, matches)

      char *regexp;
      char *regexp;

-     int class;
-     int bpt;
-     int from_tty;
+     namespace_enum kind;
+     int nfiles;
+     char *files[];
+     struct symbol_search **matches;
+

 {
   register struct symtab *s;
   register struct partial_symtab *ps;
   register struct blockvector *bv;
   struct blockvector *prev_bv = 0;
   register struct block *b;
 {
   register struct symtab *s;
   register struct partial_symtab *ps;
   register struct blockvector *bv;
   struct blockvector *prev_bv = 0;
   register struct block *b;

-  register int i, j;
+  register int i = 0;
+  register int j;

   register struct symbol *sym;
   struct partial_symbol **psym;
   struct objfile *objfile;
   struct minimal_symbol *msymbol;
   char *val;
   register struct symbol *sym;
   struct partial_symbol **psym;
   struct objfile *objfile;
   struct minimal_symbol *msymbol;
   char *val;

-  static char *classnames[]
-    = {"variable", "function", "type", "method"};
-  int found_in_file = 0;

   int found_misc = 0;
   static enum minimal_symbol_type types[]
   int found_misc = 0;
   static enum minimal_symbol_type types[]

-    = {mst_data, mst_text, mst_abs, mst_unknown};
+  =
+  {mst_data, mst_text, mst_abs, mst_unknown};

   static enum minimal_symbol_type types2[]
   static enum minimal_symbol_type types2[]

-    = {mst_bss,  mst_file_text, mst_abs, mst_unknown};
+  =
+  {mst_bss, mst_file_text, mst_abs, mst_unknown};

   static enum minimal_symbol_type types3[]
   static enum minimal_symbol_type types3[]

-    = {mst_file_data,  mst_solib_trampoline, mst_abs, mst_unknown};
+  =
+  {mst_file_data, mst_solib_trampoline, mst_abs, mst_unknown};

   static enum minimal_symbol_type types4[]
   static enum minimal_symbol_type types4[]

-    = {mst_file_bss,   mst_text, mst_abs, mst_unknown};
-  enum minimal_symbol_type ourtype = types[class];
-  enum minimal_symbol_type ourtype2 = types2[class];
-  enum minimal_symbol_type ourtype3 = types3[class];
-  enum minimal_symbol_type ourtype4 = types4[class];
+  =
+  {mst_file_bss, mst_text, mst_abs, mst_unknown};
+  enum minimal_symbol_type ourtype;
+  enum minimal_symbol_type ourtype2;
+  enum minimal_symbol_type ourtype3;
+  enum minimal_symbol_type ourtype4;
+  struct symbol_search *sr;
+  struct symbol_search *psr;
+  struct symbol_search *tail;
+  struct cleanup *old_chain = NULL;
+
+  if (kind < LABEL_NAMESPACE)
+    error ("must search on specific namespace");
+
+  ourtype = types[(int) (kind - VARIABLES_NAMESPACE)];
+  ourtype2 = types2[(int) (kind - VARIABLES_NAMESPACE)];
+  ourtype3 = types3[(int) (kind - VARIABLES_NAMESPACE)];
+  ourtype4 = types4[(int) (kind - VARIABLES_NAMESPACE)];
+
+  sr = *matches = NULL;
+  tail = NULL;

 
   if (regexp != NULL)
     {
       /* Make sure spacing is right for C++ operators.
 
   if (regexp != NULL)
     {
       /* Make sure spacing is right for C++ operators.

-        This is just a courtesy to make the matching less sensitive
-        to how many spaces the user leaves between 'operator'
-        and <TYPENAME> or <OPERATOR>. */
+         This is just a courtesy to make the matching less sensitive
+         to how many spaces the user leaves between 'operator'
+         and <TYPENAME> or <OPERATOR>. */

       char *opend;
       char *opname = operator_chars (regexp, &opend);
       if (*opname)
        {
       char *opend;
       char *opname = operator_chars (regexp, &opend);
       if (*opname)
        {

-          int fix = -1; /* -1 means ok; otherwise number of spaces needed. */
-         if (isalpha(*opname) || *opname == '_' || *opname == '$')
+         int fix = -1;         /* -1 means ok; otherwise number of spaces needed. */
+         if (isalpha (*opname) || *opname == '_' || *opname == '$')

            {
              /* There should 1 space between 'operator' and 'TYPENAME'. */
              if (opname[-1] != ' ' || opname[-2] == ' ')
            {
              /* There should 1 space between 'operator' and 'TYPENAME'. */
              if (opname[-1] != ' ' || opname[-2] == ' ')

-               fix = 1;
+               fix = 1;

            }
          else
            {
              /* There should 0 spaces between 'operator' and 'OPERATOR'. */
              if (opname[-1] == ' ')
            }
          else
            {
              /* There should 0 spaces between 'operator' and 'OPERATOR'. */
              if (opname[-1] == ' ')

-               fix = 0;
+               fix = 0;

            }
          /* If wrong number of spaces, fix it. */
          if (fix >= 0)
            {
            }
          /* If wrong number of spaces, fix it. */
          if (fix >= 0)
            {

-             char *tmp = (char*) alloca(opend-opname+10);
-             sprintf(tmp, "operator%.*s%s", fix, " ", opname);
+             char *tmp = (char *) alloca (opend - opname + 10);
+             sprintf (tmp, "operator%.*s%s", fix, " ", opname);

              regexp = tmp;
            }
              regexp = tmp;
            }

-        }
-      
+       }
+

       if (0 != (val = re_comp (regexp)))
        error ("Invalid regexp (%s): %s", val, regexp);
     }
       if (0 != (val = re_comp (regexp)))
        error ("Invalid regexp (%s): %s", val, regexp);
     }


@@ -2869,52 +3647,54 @@ list_symbols (regexp, class, bpt, from_tty)
      the machinery below. */
 
   ALL_PSYMTABS (objfile, ps)
      the machinery below. */
 
   ALL_PSYMTABS (objfile, ps)

-    {
-      struct partial_symbol **bound, **gbound, **sbound;
-      int keep_going = 1;
-      
-      if (ps->readin) continue;
-      
-      gbound = objfile->global_psymbols.list + ps->globals_offset + ps->n_global_syms;
-      sbound = objfile->static_psymbols.list + ps->statics_offset + ps->n_static_syms;
-      bound = gbound;
-      
-      /* Go through all of the symbols stored in a partial
-        symtab in one loop. */
-      psym = objfile->global_psymbols.list + ps->globals_offset;
-      while (keep_going)
-       {
-         if (psym >= bound)
-           {
-             if (bound == gbound && ps->n_static_syms != 0)
-               {
-                 psym = objfile->static_psymbols.list + ps->statics_offset;
-                 bound = sbound;
-               }
-             else
-               keep_going = 0;
-             continue;
-           }
-         else
-           {
-             QUIT;
+  {
+    struct partial_symbol **bound, **gbound, **sbound;
+    int keep_going = 1;

 
 

-             /* If it would match (logic taken from loop below)
-                load the file and go on to the next one */
-             if ((regexp == NULL || SYMBOL_MATCHES_REGEXP (*psym))
-                 && ((class == 0 && SYMBOL_CLASS (*psym) != LOC_TYPEDEF
-                      && SYMBOL_CLASS (*psym) != LOC_BLOCK)
-                     || (class == 1 && SYMBOL_CLASS (*psym) == LOC_BLOCK)
-                     || (class == 2 && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)
-                     || (class == 3 && SYMBOL_CLASS (*psym) == LOC_BLOCK)))
-               {
-                 PSYMTAB_TO_SYMTAB(ps);
-                 keep_going = 0;
-               }
-           }
-         psym++;
-       }
-    }
+    if (ps->readin)
+      continue;
+
+    gbound = objfile->global_psymbols.list + ps->globals_offset + ps->n_global_syms;
+    sbound = objfile->static_psymbols.list + ps->statics_offset + ps->n_static_syms;
+    bound = gbound;
+
+    /* Go through all of the symbols stored in a partial
+       symtab in one loop. */
+    psym = objfile->global_psymbols.list + ps->globals_offset;
+    while (keep_going)
+      {
+       if (psym >= bound)
+         {
+           if (bound == gbound && ps->n_static_syms != 0)
+             {
+               psym = objfile->static_psymbols.list + ps->statics_offset;
+               bound = sbound;
+             }
+           else
+             keep_going = 0;
+           continue;
+         }
+       else
+         {
+           QUIT;
+
+           /* If it would match (logic taken from loop below)
+              load the file and go on to the next one */
+           if (file_matches (ps->filename, files, nfiles)
+               && ((regexp == NULL || SYMBOL_MATCHES_REGEXP (*psym))
+                   && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (*psym) != LOC_TYPEDEF
+                        && SYMBOL_CLASS (*psym) != LOC_BLOCK)
+                       || (kind == FUNCTIONS_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_BLOCK)
+                       || (kind == TYPES_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)
+                       || (kind == METHODS_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_BLOCK))))
+             {
+               PSYMTAB_TO_SYMTAB (ps);
+               keep_going = 0;
+             }
+         }
+       psym++;
+      }
+  }

 
   /* Here, we search through the minimal symbol tables for functions
      and variables that match, and force their symbols to be read.
 
   /* Here, we search through the minimal symbol tables for functions
      and variables that match, and force their symbols to be read.


@@ -2927,239 +3707,329 @@ list_symbols (regexp, class, bpt, from_tty)
      to determine if the variable has debug info.
      If the lookup fails, set found_misc so that we will rescan to print
      any matching symbols without debug info.
      to determine if the variable has debug info.
      If the lookup fails, set found_misc so that we will rescan to print
      any matching symbols without debug info.

-  */
+   */

 
 

-  if (class == 0 || class == 1)
+  if (nfiles == 0 && (kind == VARIABLES_NAMESPACE || kind == FUNCTIONS_NAMESPACE))

     {
       ALL_MSYMBOLS (objfile, msymbol)
     {
       ALL_MSYMBOLS (objfile, msymbol)

+      {
+       if (MSYMBOL_TYPE (msymbol) == ourtype ||
+           MSYMBOL_TYPE (msymbol) == ourtype2 ||
+           MSYMBOL_TYPE (msymbol) == ourtype3 ||
+           MSYMBOL_TYPE (msymbol) == ourtype4)
+         {
+           if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))
+             {
+               if (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)))
+                 {
+                   if (kind == FUNCTIONS_NAMESPACE
+                       || lookup_symbol (SYMBOL_NAME (msymbol),
+                                         (struct block *) NULL,
+                                         VAR_NAMESPACE,
+                                       0, (struct symtab **) NULL) == NULL)
+                     found_misc = 1;
+                 }
+             }
+         }
+      }
+    }
+
+  ALL_SYMTABS (objfile, s)
+  {
+    bv = BLOCKVECTOR (s);
+    /* Often many files share a blockvector.
+       Scan each blockvector only once so that
+       we don't get every symbol many times.
+       It happens that the first symtab in the list
+       for any given blockvector is the main file.  */
+    if (bv != prev_bv)
+      for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)

        {
        {

-         if (MSYMBOL_TYPE (msymbol) == ourtype ||
-             MSYMBOL_TYPE (msymbol) == ourtype2 ||
-             MSYMBOL_TYPE (msymbol) == ourtype3 ||
-             MSYMBOL_TYPE (msymbol) == ourtype4)
+         b = BLOCKVECTOR_BLOCK (bv, i);
+         /* Skip the sort if this block is always sorted.  */
+         if (!BLOCK_SHOULD_SORT (b))
+           sort_block_syms (b);
+         for (j = 0; j < BLOCK_NSYMS (b); j++)

            {
            {

-             if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))
+             QUIT;
+             sym = BLOCK_SYM (b, j);
+             if (file_matches (s->filename, files, nfiles)
+                 && ((regexp == NULL || SYMBOL_MATCHES_REGEXP (sym))
+                     && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (sym) != LOC_TYPEDEF
+                          && SYMBOL_CLASS (sym) != LOC_BLOCK
+                          && SYMBOL_CLASS (sym) != LOC_CONST)
+                         || (kind == FUNCTIONS_NAMESPACE && SYMBOL_CLASS (sym) == LOC_BLOCK)
+                         || (kind == TYPES_NAMESPACE && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
+                         || (kind == METHODS_NAMESPACE && SYMBOL_CLASS (sym) == LOC_BLOCK))))

                {
                {

-                 if (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)))
+                 /* match */
+                 psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search));
+                 psr->block = i;
+                 psr->symtab = s;
+                 psr->symbol = sym;
+                 psr->msymbol = NULL;
+                 psr->next = NULL;
+                 if (tail == NULL)

                    {
                    {

-                     if (class == 1
-                         || lookup_symbol (SYMBOL_NAME (msymbol), 
-                                           (struct block *) NULL,
-                                           VAR_NAMESPACE,
-                                           0, (struct symtab **) NULL) == NULL)
-                       found_misc = 1;
+                     sr = psr;
+                     old_chain = make_cleanup_free_search_symbols (sr);

                    }
                    }

+                 else
+                   tail->next = psr;
+                 tail = psr;

                }
            }
        }
                }
            }
        }

-    }
+    prev_bv = bv;
+  }

 
 

-  /* Printout here so as to get after the "Reading in symbols"
-     messages which will be generated above.  */
-  if (!bpt)
-    printf_filtered (regexp
-         ? "All %ss matching regular expression \"%s\":\n"
-         : "All defined %ss:\n",
-         classnames[class],
-         regexp);
+  /* If there are no eyes, avoid all contact.  I mean, if there are
+     no debug symbols, then print directly from the msymbol_vector.  */

 
 

-  ALL_SYMTABS (objfile, s)
+  if (found_misc || kind != FUNCTIONS_NAMESPACE)

     {
     {

-      found_in_file = 0;
-      bv = BLOCKVECTOR (s);
-      /* Often many files share a blockvector.
-        Scan each blockvector only once so that
-        we don't get every symbol many times.
-        It happens that the first symtab in the list
-        for any given blockvector is the main file.  */
-      if (bv != prev_bv)
-       for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
+      ALL_MSYMBOLS (objfile, msymbol)
+      {
+       if (MSYMBOL_TYPE (msymbol) == ourtype ||
+           MSYMBOL_TYPE (msymbol) == ourtype2 ||
+           MSYMBOL_TYPE (msymbol) == ourtype3 ||
+           MSYMBOL_TYPE (msymbol) == ourtype4)

          {
          {

-           b = BLOCKVECTOR_BLOCK (bv, i);
-           /* Skip the sort if this block is always sorted.  */
-           if (!BLOCK_SHOULD_SORT (b))
-             sort_block_syms (b);
-           for (j = 0; j < BLOCK_NSYMS (b); j++)
+           if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))

              {
              {

-               QUIT;
-               sym = BLOCK_SYM (b, j);
-               if ((regexp == NULL || SYMBOL_MATCHES_REGEXP (sym))
-                   && ((class == 0 && SYMBOL_CLASS (sym) != LOC_TYPEDEF
-                        && SYMBOL_CLASS (sym) != LOC_BLOCK
-                        && SYMBOL_CLASS (sym) != LOC_CONST)
-                       || (class == 1 && SYMBOL_CLASS (sym) == LOC_BLOCK)
-                       || (class == 2 && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
-                       || (class == 3 && SYMBOL_CLASS (sym) == LOC_BLOCK)))
+               /* Functions:  Look up by address. */
+               if (kind != FUNCTIONS_NAMESPACE ||
+                   (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol))))

                  {
                  {

-                   if (bpt)
+                   /* Variables/Absolutes:  Look up by name */
+                   if (lookup_symbol (SYMBOL_NAME (msymbol),
+                                      (struct block *) NULL, VAR_NAMESPACE,
+                                      0, (struct symtab **) NULL) == NULL)

                      {
                      {

-                       /* Set a breakpoint here, if it's a function */
-                       if (class == 1)
+                       /* match */
+                       psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search));
+                       psr->block = i;
+                       psr->msymbol = msymbol;
+                       psr->symtab = NULL;
+                       psr->symbol = NULL;
+                       psr->next = NULL;
+                       if (tail == NULL)

                          {
                          {

-                           /* There may be more than one function with the
-                              same name but in different files.  In order to
-                              set breakpoints on all of them, we must give
-                              both the file name and the function name to
-                              break_command.
-                              Quoting the symbol name gets rid of problems
-                              with mangled symbol names that contain
-                              CPLUS_MARKER characters.  */
-                           char *string =
-                             (char *) alloca (strlen (s->filename)
-                                              + strlen (SYMBOL_NAME(sym))
-                                              + 4);
-                           strcpy (string, s->filename);
-                           strcat (string, ":'");
-                           strcat (string, SYMBOL_NAME(sym));
-                           strcat (string, "'");
-                           break_command (string, from_tty);
+                           sr = psr;
+                           old_chain = make_cleanup_free_search_symbols (sr);

                          }
                          }

-                     }
-                   else if (!found_in_file)
-                     {
-                       fputs_filtered ("\nFile ", gdb_stdout);
-                       fputs_filtered (s->filename, gdb_stdout);
-                       fputs_filtered (":\n", gdb_stdout);
-                     }
-                   found_in_file = 1;
-                   
-                   if (class != 2 && i == STATIC_BLOCK)
-                     printf_filtered ("static ");
-                   
-                   /* Typedef that is not a C++ class */
-                   if (class == 2
-                       && SYMBOL_NAMESPACE (sym) != STRUCT_NAMESPACE)
-                     c_typedef_print (SYMBOL_TYPE(sym), sym, gdb_stdout);
-                   /* variable, func, or typedef-that-is-c++-class */
-                   else if (class < 2 || 
-                            (class == 2 && 
-                             SYMBOL_NAMESPACE(sym) == STRUCT_NAMESPACE))
-                     {
-                       type_print (SYMBOL_TYPE (sym),
-                                   (SYMBOL_CLASS (sym) == LOC_TYPEDEF
-                                    ? "" : SYMBOL_SOURCE_NAME (sym)),
-                                   gdb_stdout, 0);
-                       
-                       printf_filtered (";\n");
-                     }
-                   else
-                     {
-# if 0
-/* Tiemann says: "info methods was never implemented."  */
-                       char *demangled_name;
-                       c_type_print_base (TYPE_FN_FIELD_TYPE(t, i),
-                                          gdb_stdout, 0, 0); 
-                       c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE(t, i),
-                                                    gdb_stdout, 0); 
-                       if (TYPE_FN_FIELD_STUB (t, i))
-                         check_stub_method (TYPE_DOMAIN_TYPE (type), j, i);
-                       demangled_name =
-                         cplus_demangle (TYPE_FN_FIELD_PHYSNAME (t, i),
-                                         DMGL_ANSI | DMGL_PARAMS);
-                       if (demangled_name == NULL)
-                         fprintf_filtered (stream, "<badly mangled name %s>",
-                                           TYPE_FN_FIELD_PHYSNAME (t, i));

                        else
                        else

-                         {
-                           fputs_filtered (demangled_name, stream);
-                           free (demangled_name);
-                         }
-# endif
+                         tail->next = psr;
+                       tail = psr;

                      }
                  }
              }
          }
                      }
                  }
              }
          }

-      prev_bv = bv;
+      }

     }
 
     }
 

-  /* If there are no eyes, avoid all contact.  I mean, if there are
-     no debug symbols, then print directly from the msymbol_vector.  */
+  *matches = sr;
+  if (sr != NULL)
+    discard_cleanups (old_chain);
+}

 
 

-  if (found_misc || class != 1)
+/* Helper function for symtab_symbol_info, this function uses
+   the data returned from search_symbols() to print information
+   regarding the match to gdb_stdout.
+ */
+static void
+print_symbol_info (namespace_enum kind, struct symtab *s, struct symbol *sym,
+                  int block, char *last)
+{
+  if (last == NULL || strcmp (last, s->filename) != 0)

     {
     {

-      found_in_file = 0;
-      ALL_MSYMBOLS (objfile, msymbol)
+      fputs_filtered ("\nFile ", gdb_stdout);
+      fputs_filtered (s->filename, gdb_stdout);
+      fputs_filtered (":\n", gdb_stdout);
+    }
+
+  if (kind != TYPES_NAMESPACE && block == STATIC_BLOCK)
+    printf_filtered ("static ");
+
+  /* Typedef that is not a C++ class */
+  if (kind == TYPES_NAMESPACE
+      && SYMBOL_NAMESPACE (sym) != STRUCT_NAMESPACE)
+    typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout);
+  /* variable, func, or typedef-that-is-c++-class */
+  else if (kind < TYPES_NAMESPACE ||
+          (kind == TYPES_NAMESPACE &&
+           SYMBOL_NAMESPACE (sym) == STRUCT_NAMESPACE))
+    {
+      type_print (SYMBOL_TYPE (sym),
+                 (SYMBOL_CLASS (sym) == LOC_TYPEDEF
+                  ? "" : SYMBOL_SOURCE_NAME (sym)),
+                 gdb_stdout, 0);
+
+      printf_filtered (";\n");
+    }
+  else
+    {
+#if 0
+      /* Tiemann says: "info methods was never implemented."  */
+      char *demangled_name;
+      c_type_print_base (TYPE_FN_FIELD_TYPE (t, block),
+                        gdb_stdout, 0, 0);
+      c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE (t, block),
+                                  gdb_stdout, 0);
+      if (TYPE_FN_FIELD_STUB (t, block))
+       check_stub_method (TYPE_DOMAIN_TYPE (type), j, block);
+      demangled_name =
+       cplus_demangle (TYPE_FN_FIELD_PHYSNAME (t, block),
+                       DMGL_ANSI | DMGL_PARAMS);
+      if (demangled_name == NULL)
+       fprintf_filtered (stream, "<badly mangled name %s>",
+                         TYPE_FN_FIELD_PHYSNAME (t, block));
+      else
+       {
+         fputs_filtered (demangled_name, stream);
+         free (demangled_name);
+       }
+#endif
+    }
+}
+
+/* This help function for symtab_symbol_info() prints information
+   for non-debugging symbols to gdb_stdout.
+ */
+static void
+print_msymbol_info (struct minimal_symbol *msymbol)
+{
+  printf_filtered ("   %08lx  %s\n",
+                  (unsigned long) SYMBOL_VALUE_ADDRESS (msymbol),
+                  SYMBOL_SOURCE_NAME (msymbol));
+}
+
+/* This is the guts of the commands "info functions", "info types", and
+   "info variables". It calls search_symbols to find all matches and then
+   print_[m]symbol_info to print out some useful information about the
+   matches.
+ */
+static void
+symtab_symbol_info (char *regexp, namespace_enum kind, int from_tty)
+{
+  static char *classnames[]
+  =
+  {"variable", "function", "type", "method"};
+  struct symbol_search *symbols;
+  struct symbol_search *p;
+  struct cleanup *old_chain;
+  char *last_filename = NULL;
+  int first = 1;
+
+  /* must make sure that if we're interrupted, symbols gets freed */
+  search_symbols (regexp, kind, 0, (char **) NULL, &symbols);
+  old_chain = make_cleanup_free_search_symbols (symbols);
+
+  printf_filtered (regexp
+                  ? "All %ss matching regular expression \"%s\":\n"
+                  : "All defined %ss:\n",
+                  classnames[(int) (kind - VARIABLES_NAMESPACE)], regexp);
+
+  for (p = symbols; p != NULL; p = p->next)
+    {
+      QUIT;
+
+      if (p->msymbol != NULL)

        {
        {

-         if (MSYMBOL_TYPE (msymbol) == ourtype ||
-             MSYMBOL_TYPE (msymbol) == ourtype2 ||
-             MSYMBOL_TYPE (msymbol) == ourtype3 ||
-             MSYMBOL_TYPE (msymbol) == ourtype4)
+         if (first)

            {
            {

-             if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))
-               {
-                 /* Functions:  Look up by address. */
-                 if (class != 1 ||
-                     (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol))))
-                   {
-                     /* Variables/Absolutes:  Look up by name */
-                     if (lookup_symbol (SYMBOL_NAME (msymbol), 
-                                        (struct block *) NULL, VAR_NAMESPACE,
-                                        0, (struct symtab **) NULL) == NULL)
-                       {
-                          if (bpt)
-                            {
-                              break_command (SYMBOL_NAME (msymbol), from_tty);
-                              printf_filtered ("<function, no debug info> %s;\n",
-                                               SYMBOL_SOURCE_NAME (msymbol));
-                              continue;
-                            }
-                         if (!found_in_file)
-                           {
-                             printf_filtered ("\nNon-debugging symbols:\n");
-                             found_in_file = 1;
-                           }
-                         printf_filtered ("    %08lx  %s\n",
-                                          (unsigned long) SYMBOL_VALUE_ADDRESS (msymbol),
-                                          SYMBOL_SOURCE_NAME (msymbol));
-                       }
-                   }
-               }
+             printf_filtered ("\nNon-debugging symbols:\n");
+             first = 0;

            }
            }

+         print_msymbol_info (p->msymbol);
+       }
+      else
+       {
+         print_symbol_info (kind,
+                            p->symtab,
+                            p->symbol,
+                            p->block,
+                            last_filename);
+         last_filename = p->symtab->filename;

        }
     }
        }
     }

+
+  do_cleanups (old_chain);

 }
 
 static void
 }
 
 static void

-variables_info (regexp, from_tty)
-     char *regexp;
-     int from_tty;
+variables_info (char *regexp, int from_tty)

 {
 {

-  list_symbols (regexp, 0, 0, from_tty);
+  symtab_symbol_info (regexp, VARIABLES_NAMESPACE, from_tty);

 }
 
 static void
 }
 
 static void

-functions_info (regexp, from_tty)
-     char *regexp;
-     int from_tty;
+functions_info (char *regexp, int from_tty)

 {
 {

-  list_symbols (regexp, 1, 0, from_tty);
+  symtab_symbol_info (regexp, FUNCTIONS_NAMESPACE, from_tty);

 }
 
 }
 

+

 static void
 static void

-types_info (regexp, from_tty)
-     char *regexp;
-     int from_tty;
+types_info (char *regexp, int from_tty)

 {
 {

-  list_symbols (regexp, 2, 0, from_tty);
+  symtab_symbol_info (regexp, TYPES_NAMESPACE, from_tty);

 }
 
 #if 0
 /* Tiemann says: "info methods was never implemented."  */
 static void
 }
 
 #if 0
 /* Tiemann says: "info methods was never implemented."  */
 static void

-methods_info (regexp)
-     char *regexp;
+methods_info (char *regexp)

 {
 {

-  list_symbols (regexp, 3, 0, from_tty);
+  symtab_symbol_info (regexp, METHODS_NAMESPACE, 0, from_tty);

 }
 #endif /* 0 */
 
 /* Breakpoint all functions matching regular expression. */
 }
 #endif /* 0 */
 
 /* Breakpoint all functions matching regular expression. */

+#ifdef UI_OUT
+void
+rbreak_command_wrapper (char *regexp, int from_tty)
+{
+  rbreak_command (regexp, from_tty);
+}
+#endif

 static void
 static void

-rbreak_command (regexp, from_tty)
-     char *regexp;
-     int from_tty;
+rbreak_command (char *regexp, int from_tty)

 {
 {

-  list_symbols (regexp, 1, 1, from_tty);
+  struct symbol_search *ss;
+  struct symbol_search *p;
+  struct cleanup *old_chain;
+
+  search_symbols (regexp, FUNCTIONS_NAMESPACE, 0, (char **) NULL, &ss);
+  old_chain = make_cleanup_free_search_symbols (ss);
+
+  for (p = ss; p != NULL; p = p->next)
+    {
+      if (p->msymbol == NULL)
+       {
+         char *string = (char *) alloca (strlen (p->symtab->filename)
+                                         + strlen (SYMBOL_NAME (p->symbol))
+                                         + 4);
+         strcpy (string, p->symtab->filename);
+         strcat (string, ":'");
+         strcat (string, SYMBOL_NAME (p->symbol));
+         strcat (string, "'");
+         break_command (string, from_tty);
+         print_symbol_info (FUNCTIONS_NAMESPACE,
+                            p->symtab,
+                            p->symbol,
+                            p->block,
+                            p->symtab->filename);
+       }
+      else
+       {
+         break_command (SYMBOL_NAME (p->msymbol), from_tty);
+         printf_filtered ("<function, no debug info> %s;\n",
+                          SYMBOL_SOURCE_NAME (p->msymbol));
+       }
+    }
+
+  do_cleanups (old_chain);

 }
 \f
 
 }
 \f
 


@@ -3167,16 +4037,15 @@ rbreak_command (regexp, from_tty)
    or if a and b have the same pc range.
    Return zero otherwise. */
 int
    or if a and b have the same pc range.
    Return zero otherwise. */
 int

-contained_in (a, b)
-     struct block *a, *b;
+contained_in (struct block *a, struct block *b)

 {
   if (!a || !b)
     return 0;
   return BLOCK_START (a) >= BLOCK_START (b)
 {
   if (!a || !b)
     return 0;
   return BLOCK_START (a) >= BLOCK_START (b)

-      && BLOCK_END (a)   <= BLOCK_END (b);
+    && BLOCK_END (a) <= BLOCK_END (b);

 }
 }

-

 \f
 \f

+

 /* Helper routine for make_symbol_completion_list.  */
 
 static int return_val_size;
 /* Helper routine for make_symbol_completion_list.  */
 
 static int return_val_size;


@@ -3197,16 +4066,12 @@ static char **return_val;
   } while (0)
 
 /*  Test to see if the symbol specified by SYMNAME (which is already
   } while (0)
 
 /*  Test to see if the symbol specified by SYMNAME (which is already

-    demangled for C++ symbols) matches SYM_TEXT in the first SYM_TEXT_LEN
-    characters.  If so, add it to the current completion list. */
+   demangled for C++ symbols) matches SYM_TEXT in the first SYM_TEXT_LEN
+   characters.  If so, add it to the current completion list. */

 
 static void
 
 static void

-completion_list_add_name (symname, sym_text, sym_text_len, text, word)
-     char *symname;
-     char *sym_text;
-     int sym_text_len;
-     char *text;
-     char *word;
+completion_list_add_name (char *symname, char *sym_text, int sym_text_len,
+                         char *text, char *word)

 {
   int newsize;
   int i;
 {
   int newsize;
   int i;


@@ -3228,7 +4093,7 @@ completion_list_add_name (symname, sym_text, sym_text_len, text, word)
          return;
        }
     }
          return;
        }
     }

-  
+

   /* We have a match for a completion, so add SYMNAME to the current list
      of matches. Note that the name is moved to freshly malloc'd space. */
 
   /* We have a match for a completion, so add SYMNAME to the current list
      of matches. Note that the name is moved to freshly malloc'd space. */
 


@@ -3285,9 +4150,7 @@ completion_list_add_name (symname, sym_text, sym_text_len, text, word)
    I'm not going to worry about this; hopefully there won't be that many.  */
 
 char **
    I'm not going to worry about this; hopefully there won't be that many.  */
 
 char **

-make_symbol_completion_list (text, word)
-     char *text;
-     char *word;
+make_symbol_completion_list (char *text, char *word)

 {
   register struct symbol *sym;
   register struct symtab *s;
 {
   register struct symbol *sym;
   register struct symtab *s;


@@ -3320,7 +4183,7 @@ make_symbol_completion_list (text, word)
              quote_found = '\0';
            else if (*p == '\\' && p[1] == quote_found)
              /* A backslash followed by the quote character
              quote_found = '\0';
            else if (*p == '\\' && p[1] == quote_found)
              /* A backslash followed by the quote character

-                doesn't end the string.  */
+                doesn't end the string.  */

              ++p;
          }
        else if (*p == '\'' || *p == '"')
              ++p;
          }
        else if (*p == '\'' || *p == '"')


@@ -3334,7 +4197,7 @@ make_symbol_completion_list (text, word)
       sym_text = quote_pos + 1;
     else if (quote_found == '"')
       /* A double-quoted string is never a symbol, nor does it make sense
       sym_text = quote_pos + 1;
     else if (quote_found == '"')
       /* A double-quoted string is never a symbol, nor does it make sense

-        to complete it any other way.  */
+         to complete it any other way.  */

       return NULL;
     else
       {
       return NULL;
     else
       {


@@ -3362,30 +4225,31 @@ make_symbol_completion_list (text, word)
      by matching SYM_TEXT.  Add each one that you find to the list.  */
 
   ALL_PSYMTABS (objfile, ps)
      by matching SYM_TEXT.  Add each one that you find to the list.  */
 
   ALL_PSYMTABS (objfile, ps)

-    {
-      /* If the psymtab's been read in we'll get it when we search
-        through the blockvector.  */
-      if (ps->readin) continue;
-      
-      for (psym = objfile->global_psymbols.list + ps->globals_offset;
-          psym < (objfile->global_psymbols.list + ps->globals_offset
-                  + ps->n_global_syms);
-          psym++)
-       {
-         /* If interrupted, then quit. */
-         QUIT;
-         COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
-       }
-      
-      for (psym = objfile->static_psymbols.list + ps->statics_offset;
-          psym < (objfile->static_psymbols.list + ps->statics_offset
-                  + ps->n_static_syms);
-          psym++)
-       {
-         QUIT;
-         COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
-       }
-    }
+  {
+    /* If the psymtab's been read in we'll get it when we search
+       through the blockvector.  */
+    if (ps->readin)
+      continue;
+
+    for (psym = objfile->global_psymbols.list + ps->globals_offset;
+        psym < (objfile->global_psymbols.list + ps->globals_offset
+                + ps->n_global_syms);
+        psym++)
+      {
+       /* If interrupted, then quit. */
+       QUIT;
+       COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
+      }
+
+    for (psym = objfile->static_psymbols.list + ps->statics_offset;
+        psym < (objfile->static_psymbols.list + ps->statics_offset
+                + ps->n_static_syms);
+        psym++)
+      {
+       QUIT;
+       COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
+      }
+  }

 
   /* At this point scan through the misc symbol vectors and add each
      symbol you find to the list.  Eventually we want to ignore
 
   /* At this point scan through the misc symbol vectors and add each
      symbol you find to the list.  Eventually we want to ignore


@@ -3393,10 +4257,10 @@ make_symbol_completion_list (text, word)
      handled by the psymtab code above).  */
 
   ALL_MSYMBOLS (objfile, msymbol)
      handled by the psymtab code above).  */
 
   ALL_MSYMBOLS (objfile, msymbol)

-    {
-      QUIT;
-      COMPLETION_LIST_ADD_SYMBOL (msymbol, sym_text, sym_text_len, text, word);
-    }
+  {
+    QUIT;
+    COMPLETION_LIST_ADD_SYMBOL (msymbol, sym_text, sym_text_len, text, word);
+  }

 
   /* Search upwards from currently selected frame (so that we can
      complete on local vars.  */
 
   /* Search upwards from currently selected frame (so that we can
      complete on local vars.  */


@@ -3405,11 +4269,11 @@ make_symbol_completion_list (text, word)
     {
       if (!BLOCK_SUPERBLOCK (b))
        {
     {
       if (!BLOCK_SUPERBLOCK (b))
        {

-         surrounding_static_block = b;         /* For elmin of dups */
+         surrounding_static_block = b;         /* For elmin of dups */

        }
        }

-      
+

       /* Also catch fields of types defined in this places which match our
       /* Also catch fields of types defined in this places which match our

-        text string.  Only complete on types visible from current context. */
+         text string.  Only complete on types visible from current context. */

 
       for (i = 0; i < BLOCK_NSYMS (b); i++)
        {
 
       for (i = 0; i < BLOCK_NSYMS (b); i++)
        {


@@ -3427,7 +4291,7 @@ make_symbol_completion_list (text, word)
                      if (TYPE_FIELD_NAME (t, j))
                        {
                          completion_list_add_name (TYPE_FIELD_NAME (t, j),
                      if (TYPE_FIELD_NAME (t, j))
                        {
                          completion_list_add_name (TYPE_FIELD_NAME (t, j),

-                                                     sym_text, sym_text_len, text, word);
+                                       sym_text, sym_text_len, text, word);

                        }
                    }
                }
                        }
                    }
                }


@@ -3439,28 +4303,29 @@ make_symbol_completion_list (text, word)
      symbols which match.  */
 
   ALL_SYMTABS (objfile, s)
      symbols which match.  */
 
   ALL_SYMTABS (objfile, s)

-    {
-      QUIT;
-      b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
-      for (i = 0; i < BLOCK_NSYMS (b); i++)
-       {
-         sym = BLOCK_SYM (b, i);
-         COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
-       }
-    }
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+       sym = BLOCK_SYM (b, i);
+       COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
+      }
+  }

 
   ALL_SYMTABS (objfile, s)
 
   ALL_SYMTABS (objfile, s)

-    {
-      QUIT;
-      b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
-      /* Don't do this block twice.  */
-      if (b == surrounding_static_block) continue;
-      for (i = 0; i < BLOCK_NSYMS (b); i++)
-       {
-         sym = BLOCK_SYM (b, i);
-         COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
-       }
-    }
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
+    /* Don't do this block twice.  */
+    if (b == surrounding_static_block)
+      continue;
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+       sym = BLOCK_SYM (b, i);
+       COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
+      }
+  }

 
   return (return_val);
 }
 
   return (return_val);
 }


@@ -3474,65 +4339,271 @@ make_symbol_completion_list (text, word)
  */
 
 int
  */
 
 int

-in_prologue (pc, func_start)
-     CORE_ADDR pc;
-     CORE_ADDR func_start;
+in_prologue (CORE_ADDR pc, CORE_ADDR func_start)

 {
   struct symtab_and_line sal;
   CORE_ADDR func_addr, func_end;
 
 {
   struct symtab_and_line sal;
   CORE_ADDR func_addr, func_end;
 

-  if (!find_pc_partial_function (pc, NULL, &func_addr, &func_end))
-    goto nosyms;               /* Might be in prologue */
+  /* We have several sources of information we can consult to figure
+     this out.
+     - Compilers usually emit line number info that marks the prologue
+       as its own "source line".  So the ending address of that "line"
+       is the end of the prologue.  If available, this is the most
+       reliable method.
+     - The minimal symbols and partial symbols, which can usually tell
+       us the starting and ending addresses of a function.
+     - If we know the function's start address, we can call the
+       architecture-defined SKIP_PROLOGUE function to analyze the
+       instruction stream and guess where the prologue ends.
+     - Our `func_start' argument; if non-zero, this is the caller's
+       best guess as to the function's entry point.  At the time of
+       this writing, handle_inferior_event doesn't get this right, so
+       it should be our last resort.  */
+
+  /* Consult the partial symbol table, to find which function
+     the PC is in.  */
+  if (! find_pc_partial_function (pc, NULL, &func_addr, &func_end))
+    {
+      CORE_ADDR prologue_end;

 
 

+      /* We don't even have minsym information, so fall back to using
+         func_start, if given.  */
+      if (! func_start)
+       return 1;               /* We *might* be in a prologue.  */
+
+      prologue_end = SKIP_PROLOGUE (func_start);
+
+      return func_start <= pc && pc < prologue_end;
+    }
+
+  /* If we have line number information for the function, that's
+     usually pretty reliable.  */

   sal = find_pc_line (func_addr, 0);
 
   sal = find_pc_line (func_addr, 0);
 

-  if (sal.line == 0)
-    goto nosyms;
+  /* Now sal describes the source line at the function's entry point,
+     which (by convention) is the prologue.  The end of that "line",
+     sal.end, is the end of the prologue.
+
+     Note that, for functions whose source code is all on a single
+     line, the line number information doesn't always end up this way.
+     So we must verify that our purported end-of-prologue address is
+     *within* the function, not at its start or end.  */
+  if (sal.line == 0
+      || sal.end <= func_addr
+      || func_end <= sal.end)
+    {
+      /* We don't have any good line number info, so use the minsym
+        information, together with the architecture-specific prologue
+        scanning code.  */
+      CORE_ADDR prologue_end = SKIP_PROLOGUE (func_addr);
+
+      return func_addr <= pc && pc < prologue_end;
+    }

 
 

-  if (sal.end > func_addr
-      && sal.end <= func_end)  /* Is prologue in function? */
-    return pc < sal.end;       /* Yes, is pc in prologue? */
+  /* We have line number info, and it looks good.  */
+  return func_addr <= pc && pc < sal.end;
+}

 
 

-  /* The line after the prologue seems to be outside the function.  In this
-     case, tell the caller to find the prologue the hard way.  */

 
 

-  return 1;
+/* Begin overload resolution functions */
+/* Helper routine for make_symbol_completion_list.  */

 
 

-/* Come here when symtabs don't contain line # info.  In this case, it is
-   likely that the user has stepped into a library function w/o symbols, or
-   is doing a stepi/nexti through code without symbols.  */
+static int sym_return_val_size;
+static int sym_return_val_index;
+static struct symbol **sym_return_val;

 
 

- nosyms:
+/*  Test to see if the symbol specified by SYMNAME (which is already
+   demangled for C++ symbols) matches SYM_TEXT in the first SYM_TEXT_LEN
+   characters.  If so, add it to the current completion list. */
+
+static void
+overload_list_add_symbol (struct symbol *sym, char *oload_name)
+{
+  int newsize;
+  int i;

 
 

-/* If func_start is zero (meaning unknown) then we don't know whether pc is
-   in the prologue or not.  I.E. it might be. */
+  /* Get the demangled name without parameters */
+  char *sym_name = cplus_demangle (SYMBOL_NAME (sym), DMGL_ARM | DMGL_ANSI);
+  if (!sym_name)
+    {
+      sym_name = (char *) xmalloc (strlen (SYMBOL_NAME (sym)) + 1);
+      strcpy (sym_name, SYMBOL_NAME (sym));
+    }
+
+  /* skip symbols that cannot match */
+  if (strcmp (sym_name, oload_name) != 0)
+    {
+      free (sym_name);
+      return;
+    }

 
 

-  if (!func_start) return 1;
+  /* If there is no type information, we can't do anything, so skip */
+  if (SYMBOL_TYPE (sym) == NULL)
+    return;

 
 

-/* We need to call the target-specific prologue skipping functions with the
-   function's start address because PC may be pointing at an instruction that
-   could be mistakenly considered part of the prologue.  */
+  /* skip any symbols that we've already considered. */
+  for (i = 0; i < sym_return_val_index; ++i)
+    if (!strcmp (SYMBOL_NAME (sym), SYMBOL_NAME (sym_return_val[i])))
+      return;

 
 

-  SKIP_PROLOGUE (func_start);
+  /* We have a match for an overload instance, so add SYM to the current list
+   * of overload instances */
+  if (sym_return_val_index + 3 > sym_return_val_size)
+    {
+      newsize = (sym_return_val_size *= 2) * sizeof (struct symbol *);
+      sym_return_val = (struct symbol **) xrealloc ((char *) sym_return_val, newsize);
+    }
+  sym_return_val[sym_return_val_index++] = sym;
+  sym_return_val[sym_return_val_index] = NULL;

 
 

-  return pc < func_start;
+  free (sym_name);

 }
 
 }
 

+/* Return a null-terminated list of pointers to function symbols that
+ * match name of the supplied symbol FSYM.
+ * This is used in finding all overloaded instances of a function name.
+ * This has been modified from make_symbol_completion_list.  */
+
+
+struct symbol **
+make_symbol_overload_list (struct symbol *fsym)
+{
+  register struct symbol *sym;
+  register struct symtab *s;
+  register struct partial_symtab *ps;
+  register struct objfile *objfile;
+  register struct block *b, *surrounding_static_block = 0;
+  register int i;
+  /* The name we are completing on. */
+  char *oload_name = NULL;
+  /* Length of name.  */
+  int oload_name_len = 0;
+
+  /* Look for the symbol we are supposed to complete on.
+   * FIXME: This should be language-specific.  */
+
+  oload_name = cplus_demangle (SYMBOL_NAME (fsym), DMGL_ARM | DMGL_ANSI);
+  if (!oload_name)
+    {
+      oload_name = (char *) xmalloc (strlen (SYMBOL_NAME (fsym)) + 1);
+      strcpy (oload_name, SYMBOL_NAME (fsym));
+    }
+  oload_name_len = strlen (oload_name);
+
+  sym_return_val_size = 100;
+  sym_return_val_index = 0;
+  sym_return_val = (struct symbol **) xmalloc ((sym_return_val_size + 1) * sizeof (struct symbol *));
+  sym_return_val[0] = NULL;
+
+  /* Look through the partial symtabs for all symbols which begin
+     by matching OLOAD_NAME.  Make sure we read that symbol table in. */
+
+  ALL_PSYMTABS (objfile, ps)
+  {
+    struct partial_symbol **psym;
+
+    /* If the psymtab's been read in we'll get it when we search
+       through the blockvector.  */
+    if (ps->readin)
+      continue;
+
+    for (psym = objfile->global_psymbols.list + ps->globals_offset;
+        psym < (objfile->global_psymbols.list + ps->globals_offset
+                + ps->n_global_syms);
+        psym++)
+      {
+       /* If interrupted, then quit. */
+       QUIT;
+        /* This will cause the symbol table to be read if it has not yet been */
+        s = PSYMTAB_TO_SYMTAB (ps);
+      }
+
+    for (psym = objfile->static_psymbols.list + ps->statics_offset;
+        psym < (objfile->static_psymbols.list + ps->statics_offset
+                + ps->n_static_syms);
+        psym++)
+      {
+       QUIT;
+        /* This will cause the symbol table to be read if it has not yet been */
+        s = PSYMTAB_TO_SYMTAB (ps);
+      }
+  }
+
+  /* Search upwards from currently selected frame (so that we can
+     complete on local vars.  */
+
+  for (b = get_selected_block (); b != NULL; b = BLOCK_SUPERBLOCK (b))
+    {
+      if (!BLOCK_SUPERBLOCK (b))
+       {
+         surrounding_static_block = b;         /* For elimination of dups */
+       }
+
+      /* Also catch fields of types defined in this places which match our
+         text string.  Only complete on types visible from current context. */
+
+      for (i = 0; i < BLOCK_NSYMS (b); i++)
+       {
+         sym = BLOCK_SYM (b, i);
+         overload_list_add_symbol (sym, oload_name);
+       }
+    }
+
+  /* Go through the symtabs and check the externs and statics for
+     symbols which match.  */
+
+  ALL_SYMTABS (objfile, s)
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+       sym = BLOCK_SYM (b, i);
+       overload_list_add_symbol (sym, oload_name);
+      }
+  }
+
+  ALL_SYMTABS (objfile, s)
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
+    /* Don't do this block twice.  */
+    if (b == surrounding_static_block)
+      continue;
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+       sym = BLOCK_SYM (b, i);
+       overload_list_add_symbol (sym, oload_name);
+      }
+  }
+
+  free (oload_name);
+
+  return (sym_return_val);
+}
+
+/* End of overload resolution functions */

 \f
 \f

+

 void
 void

-_initialize_symtab ()
+_initialize_symtab (void)

 {
   add_info ("variables", variables_info,
 {
   add_info ("variables", variables_info,

-           "All global and static variable names, or those matching REGEXP.");
+        "All global and static variable names, or those matching REGEXP.");
+  if (dbx_commands)
+    add_com ("whereis", class_info, variables_info,
+        "All global and static variable names, or those matching REGEXP.");
+

   add_info ("functions", functions_info,
            "All function names, or those matching REGEXP.");
 
   add_info ("functions", functions_info,
            "All function names, or those matching REGEXP.");
 

+  

   /* FIXME:  This command has at least the following problems:
      1.  It prints builtin types (in a very strange and confusing fashion).
      2.  It doesn't print right, e.g. with
   /* FIXME:  This command has at least the following problems:
      1.  It prints builtin types (in a very strange and confusing fashion).
      2.  It doesn't print right, e.g. with

-         typedef struct foo *FOO
-        type_print prints "FOO" when we want to make it (in this situation)
-        print "struct foo *".
+     typedef struct foo *FOO
+     type_print prints "FOO" when we want to make it (in this situation)
+     print "struct foo *".

      I also think "ptype" or "whatis" is more likely to be useful (but if
      there is much disagreement "info types" can be fixed).  */
   add_info ("types", types_info,
      I also think "ptype" or "whatis" is more likely to be useful (but if
      there is much disagreement "info types" can be fixed).  */
   add_info ("types", types_info,


@@ -3549,7 +4620,14 @@ are listed.");
            "Source files in the program.");
 
   add_com ("rbreak", class_breakpoint, rbreak_command,
            "Source files in the program.");
 
   add_com ("rbreak", class_breakpoint, rbreak_command,

-           "Set a breakpoint for all functions matching REGEXP.");
+          "Set a breakpoint for all functions matching REGEXP.");
+
+  if (xdb_commands)
+    {
+      add_com ("lf", class_info, sources_info, "Source files in the program");
+      add_com ("lg", class_info, variables_info,
+        "All global and static variable names, or those matching REGEXP.");
+    }

 
   /* Initialize the one built-in type that isn't language dependent... */
   builtin_type_error = init_type (TYPE_CODE_ERROR, 0, 0,
 
   /* Initialize the one built-in type that isn't language dependent... */
   builtin_type_error = init_type (TYPE_CODE_ERROR, 0, 0,