/* Symbol table lookup for the GNU debugger, GDB.
- Copyright (C) 1986, 1987, 1988, 1989 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1987, 1988, 1989, 1990 Free Software Foundation, Inc.
This file is part of GDB.
along with GDB; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+#include <stdio.h>
#include "defs.h"
#include "symtab.h"
#include "param.h"
+#include "gdbcore.h"
+#include "frame.h"
+#include "target.h"
+#include "value.h"
+#include "symfile.h"
+#include "gdbcmd.h"
-#include <stdio.h>
#include <obstack.h>
#include <assert.h>
-char *index ();
-
-/* Allocate an obstack to hold objects that should be freed
- when we load a new symbol table.
- This includes the symbols made by dbxread
- and the types that are not permanent. */
+#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/stat.h>
-struct obstack obstack1;
+extern int close ();
+extern void qsort ();
+extern char *getenv ();
-struct obstack *symbol_obstack = &obstack1;
+extern char *cplus_demangle ();
+extern struct value *value_of_this ();
+extern void break_command ();
+extern void select_source_symtab ();
-/* This obstack will be used for partial_symbol objects. It can
- probably actually be the same as the symbol_obstack above, but I'd
- like to keep them seperate for now. If I want to later, I'll
- replace one with the other. */
-
-struct obstack obstack2;
-
-struct obstack *psymbol_obstack = &obstack2;
+/* Functions this file defines */
+static int find_line_common ();
+struct partial_symtab *lookup_partial_symtab ();
+static struct partial_symbol *lookup_partial_symbol ();
+static struct partial_symbol *lookup_demangled_partial_symbol ();
+static struct symbol *lookup_demangled_block_symbol ();
/* These variables point to the objects
representing the predefined C data types. */
struct type *builtin_type_short;
struct type *builtin_type_int;
struct type *builtin_type_long;
-#ifdef LONG_LONG
struct type *builtin_type_long_long;
-#endif
struct type *builtin_type_unsigned_char;
struct type *builtin_type_unsigned_short;
struct type *builtin_type_unsigned_int;
struct type *builtin_type_unsigned_long;
-#ifdef LONG_LONG
struct type *builtin_type_unsigned_long_long;
-#endif
struct type *builtin_type_float;
struct type *builtin_type_double;
+struct type *builtin_type_error;
/* Block in which the most recently searched-for symbol was found.
Might be better to make this a parameter to lookup_symbol and
value_of_this. */
struct block *block_found;
-/* Functions */
-static int find_line_common ();
-static int lookup_misc_func ();
-struct partial_symtab *lookup_partial_symtab ();
-struct symtab *psymtab_to_symtab ();
-static struct partial_symbol *lookup_partial_symbol ();
+char no_symtab_msg[] = "No symbol table is loaded. Use the \"file\" command.";
/* Check for a symtab of a specific name; first in symtabs, then in
psymtabs. *If* there is no '/' in the name, a match after a '/'
{
register struct symtab *s;
register struct partial_symtab *ps;
- register char *slash = index (name, '/');
+ register char *slash = strchr (name, '/');
register int len = strlen (name);
for (s = symtab_list; s; s = s->next)
{
if (ps->readin)
fatal ("Internal: readin pst found when no symtab found.");
- s = psymtab_to_symtab (ps);
- return s;
+ return PSYMTAB_TO_SYMTAB (ps);
}
if (!slash)
{
if (ps->readin)
fatal ("Internal: readin pst found when no symtab found.");
- s = psymtab_to_symtab (ps);
- return s;
+ return PSYMTAB_TO_SYMTAB (ps);
}
}
}
char *name;
{
register struct partial_symtab *s;
- register char *copy;
for (s = partial_symtab_list; s; s = s->next)
if (!strcmp (name, s->filename))
return 0;
}
\f
+/* Return a typename for a struct/union/enum type
+ without the tag qualifier. If the type has a NULL name,
+ NULL is returned. */
+char *
+type_name_no_tag (type)
+ register struct type *type;
+{
+ register char *name = TYPE_NAME (type);
+ char *strchr ();
+ if (name == 0)
+ return 0;
+
+#if 0
+ switch (TYPE_CODE (type))
+ {
+ case TYPE_CODE_STRUCT:
+ return name + 7;
+ case TYPE_CODE_UNION:
+ return name + 6;
+ case TYPE_CODE_ENUM:
+ return name + 5;
+ }
+#endif
+
+ name = strchr (name, ' ');
+ if (name)
+ return name + 1;
+
+ return TYPE_NAME (type);
+}
+
+/* Added by Bryan Boreham, Kewill, Sun Sep 17 18:07:17 1989.
+
+ If this is a stubbed struct (i.e. declared as struct foo *), see if
+ we can find a full definition in some other file. If so, copy this
+ definition, so we can use it in future. If not, set a flag so we
+ don't waste too much time in future.
+
+ This used to be coded as a macro, but I don't think it is called
+ often enough to merit such treatment.
+*/
+
+struct complaint stub_noname_complaint =
+ {"stub type has NULL name", 0, 0};
+
+void
+check_stub_type(type)
+ struct type *type;
+{
+ if (TYPE_FLAGS(type) & TYPE_FLAG_STUB)
+ {
+ char* name= type_name_no_tag (type);
+ struct symbol *sym;
+ if (name == 0)
+ {
+ complain (&stub_noname_complaint, 0);
+ return;
+ }
+ if (sym = lookup_symbol (name, 0, STRUCT_NAMESPACE, 0,
+ (struct symtab **)NULL) )
+ bcopy (SYMBOL_TYPE(sym), type, sizeof (struct type));
+ }
+}
+
+/* Demangle a GDB method stub type. */
+char *
+gdb_mangle_typename (type)
+ struct type *type;
+{
+ static struct type *last_type;
+ static char *mangled_typename;
+
+ if (type != last_type)
+ {
+ /* Need a new type prefix. */
+ char *strchr ();
+ char *newname = type_name_no_tag (type);
+ char buf[20];
+ int len;
+
+ if (mangled_typename)
+ free (mangled_typename);
+
+ len = strlen (newname);
+ sprintf (buf, "__%d", len);
+ mangled_typename = (char *)xmalloc (strlen (buf) + len + 1);
+ strcpy (mangled_typename, buf);
+ strcat (mangled_typename, newname);
+ /* Now we have built "__#newname". */
+ }
+ return mangled_typename;
+}
+
+/* Lookup a primitive type named NAME.
+ Return zero if NAME is not a primitive type.*/
+
+struct type *
+lookup_primitive_typename (name)
+ char *name;
+{
+ if (!strcmp (name, "int"))
+ return builtin_type_int;
+ if (!strcmp (name, "long"))
+ return builtin_type_long;
+ if (!strcmp (name, "short"))
+ return builtin_type_short;
+ if (!strcmp (name, "char"))
+ return builtin_type_char;
+ if (!strcmp (name, "float"))
+ return builtin_type_float;
+ if (!strcmp (name, "double"))
+ return builtin_type_double;
+ if (!strcmp (name, "void"))
+ return builtin_type_void;
+ return 0;
+}
+
/* Lookup a typedef or primitive type named NAME,
visible in lexical block BLOCK.
If NOERR is nonzero, return zero if NAME is not suitably defined. */
struct block *block;
int noerr;
{
- register struct symbol *sym = lookup_symbol (name, block, VAR_NAMESPACE, 0);
+ register struct symbol *sym =
+ lookup_symbol (name, block, VAR_NAMESPACE, 0, (struct symtab **)NULL);
if (sym == 0 || SYMBOL_CLASS (sym) != LOC_TYPEDEF)
{
- if (!strcmp (name, "int"))
- return builtin_type_int;
- if (!strcmp (name, "long"))
- return builtin_type_long;
- if (!strcmp (name, "short"))
- return builtin_type_short;
- if (!strcmp (name, "char"))
- return builtin_type_char;
- if (!strcmp (name, "float"))
- return builtin_type_float;
- if (!strcmp (name, "double"))
- return builtin_type_double;
- if (!strcmp (name, "void"))
- return builtin_type_void;
-
- if (noerr)
+ struct type *tmp;
+ tmp = lookup_primitive_typename (name);
+ if (!tmp && noerr)
return 0;
error ("No type named %s.", name);
}
if (!strcmp (name, "char"))
return builtin_type_unsigned_char;
error ("No type named unsigned %s.", name);
+ return (struct type *)-1; /* for lint */
}
/* Lookup a structure type named "struct NAME",
struct block *block;
{
register struct symbol *sym
- = lookup_symbol (name, block, STRUCT_NAMESPACE, 0);
+ = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, (struct symtab **)NULL);
if (sym == 0)
error ("No struct type named %s.", name);
struct block *block;
{
register struct symbol *sym
- = lookup_symbol (name, block, STRUCT_NAMESPACE, 0);
+ = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, (struct symtab **)NULL);
if (sym == 0)
error ("No union type named %s.", name);
struct block *block;
{
register struct symbol *sym
- = lookup_symbol (name, block, STRUCT_NAMESPACE, 0);
+ = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, (struct symtab **)NULL);
if (sym == 0)
error ("No enum type named %s.", name);
if (TYPE_CODE (SYMBOL_TYPE (sym)) != TYPE_CODE_ENUM)
}
/* Given a type TYPE, lookup the type of the component of type named
- NAME. */
+ NAME.
+ If NOERR is nonzero, return zero if NAME is not suitably defined. */
struct type *
-lookup_struct_elt_type (type, name)
+lookup_struct_elt_type (type, name, noerr)
struct type *type;
char *name;
+ int noerr;
{
- struct type *t;
int i;
- char *errmsg;
if (TYPE_CODE (type) != TYPE_CODE_STRUCT
&& TYPE_CODE (type) != TYPE_CODE_UNION)
{
- terminal_ours ();
+ target_terminal_ours ();
fflush (stdout);
fprintf (stderr, "Type ");
type_print (type, "", stderr, -1);
- fprintf (stderr, " is not a structure or union type.\n");
- return_to_top_level ();
+ error (" is not a structure or union type.");
}
- for (i = TYPE_NFIELDS (type) - 1; i >= 0; i--)
- if (!strcmp (TYPE_FIELD_NAME (type, i), name))
- return TYPE_FIELD_TYPE (type, i);
+ check_stub_type (type);
+
+ for (i = TYPE_NFIELDS (type) - 1; i >= TYPE_N_BASECLASSES (type); i--)
+ {
+ char *t_field_name = TYPE_FIELD_NAME (type, i);
- terminal_ours ();
+ if (t_field_name && !strcmp (t_field_name, name))
+ return TYPE_FIELD_TYPE (type, i);
+ }
+ /* OK, it's not in this class. Recursively check the baseclasses. */
+ for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
+ {
+ struct type *t = lookup_struct_elt_type (TYPE_BASECLASS (type, i),
+ name, 0);
+ if (t != NULL)
+ return t;
+ }
+
+ if (noerr)
+ return NULL;
+
+ target_terminal_ours ();
fflush (stdout);
fprintf (stderr, "Type ");
type_print (type, "", stderr, -1);
- fprintf (stderr, " has no component named %s\n", name);
- return_to_top_level ();
+ fprintf (stderr, " has no component named ");
+ fputs_filtered (name, stderr);
+ error (".");
+ return (struct type *)-1; /* For lint */
}
/* Given a type TYPE, return a type of pointers to that type.
return mtype;
}
+/* Allocate a stub method whose return type is
+ TYPE. We will fill in arguments later. This always
+ returns a fresh type. If we unify this type with
+ an existing type later, the storage allocated
+ here can be freed. */
+struct type *
+allocate_stub_method (type)
+ struct type *type;
+{
+ struct type *mtype = (struct type *)xmalloc (sizeof (struct type));
+ bzero (mtype, sizeof (struct type));
+ TYPE_MAIN_VARIANT (mtype) = mtype;
+ TYPE_TARGET_TYPE (mtype) = type;
+ TYPE_FLAGS (mtype) = TYPE_FLAG_STUB;
+ TYPE_CODE (mtype) = TYPE_CODE_METHOD;
+ TYPE_LENGTH (mtype) = 1;
+ return mtype;
+}
+
+/* Lookup a method type returning type TYPE, belonging
+ to class DOMAIN, and taking a list of arguments ARGS.
+ If one is not found, allocate a new one. */
+
struct type *
lookup_method_type (type, domain, args)
struct type *type, *domain, **args;
return mtype;
}
+#if 0
/* Given a type TYPE, return a type which has offset OFFSET,
via_virtual VIA_VIRTUAL, and via_public VIA_PUBLIC.
May need to construct such a type if none exists. */
return btype;
}
+#endif
/* Given a type TYPE, return a type of functions that return that type.
May need to construct such a type if this is the first use. */
}
\f
-/* Smash TYPE to be a type of pointers to TO_TYPE.
- If TO_TYPE is not permanent and has no pointer-type yet,
- record TYPE as its pointer-type. */
-
-void
-smash_to_pointer_type (type, to_type)
- struct type *type, *to_type;
-{
- int type_permanent = (TYPE_FLAGS (type) & TYPE_FLAG_PERM);
-
- bzero (type, sizeof (struct type));
- TYPE_TARGET_TYPE (type) = to_type;
- /* We assume the machine has only one representation for pointers! */
- TYPE_LENGTH (type) = sizeof (char *);
- TYPE_CODE (type) = TYPE_CODE_PTR;
-
- TYPE_MAIN_VARIANT (type) = type;
-
- if (type_permanent)
- TYPE_FLAGS (type) |= TYPE_FLAG_PERM;
-
- if (TYPE_POINTER_TYPE (to_type) == 0
- && (!(TYPE_FLAGS (to_type) & TYPE_FLAG_PERM)
- || type_permanent))
- {
- TYPE_POINTER_TYPE (to_type) = type;
- }
-}
-
/* Smash TYPE to be a type of members of DOMAIN with type TO_TYPE. */
void
TYPE_MAIN_VARIANT (type) = lookup_method_type (domain, to_type, args);
}
-
-/* Smash TYPE to be a type of reference to TO_TYPE.
- If TO_TYPE is not permanent and has no pointer-type yet,
- record TYPE as its pointer-type. */
-
-void
-smash_to_reference_type (type, to_type)
- struct type *type, *to_type;
-{
- int type_permanent = (TYPE_FLAGS (type) & TYPE_FLAG_PERM);
-
- bzero (type, sizeof (struct type));
- TYPE_TARGET_TYPE (type) = to_type;
- /* We assume the machine has only one representation for pointers! */
- TYPE_LENGTH (type) = sizeof (char *);
- TYPE_CODE (type) = TYPE_CODE_REF;
-
- TYPE_MAIN_VARIANT (type) = type;
-
- if (type_permanent)
- TYPE_FLAGS (type) |= TYPE_FLAG_PERM;
-
- if (TYPE_REFERENCE_TYPE (to_type) == 0
- && (!(TYPE_FLAGS (to_type) & TYPE_FLAG_PERM)
- || type_permanent))
- {
- TYPE_REFERENCE_TYPE (to_type) = type;
- }
-}
-
-/* Smash TYPE to be a type of functions returning TO_TYPE.
- If TO_TYPE is not permanent and has no function-type yet,
- record TYPE as its function-type. */
-
-void
-smash_to_function_type (type, to_type)
- struct type *type, *to_type;
-{
- int type_permanent = (TYPE_FLAGS (type) & TYPE_FLAG_PERM);
-
- bzero (type, sizeof (struct type));
- TYPE_TARGET_TYPE (type) = to_type;
- TYPE_LENGTH (type) = 1;
- TYPE_CODE (type) = TYPE_CODE_FUNC;
- TYPE_NFIELDS (type) = 0;
-
- if (type_permanent)
- TYPE_FLAGS (type) |= TYPE_FLAG_PERM;
-
- if (TYPE_FUNCTION_TYPE (to_type) == 0
- && (!(TYPE_FLAGS (to_type) & TYPE_FLAG_PERM)
- || type_permanent))
- {
- TYPE_FUNCTION_TYPE (to_type) = type;
- }
-}
\f
/* Find which partial symtab on the partial_symtab_list contains
PC. Return 0 if none. */
CORE_ADDR pc;
{
struct partial_symbol *best, *p;
- int best_pc;
+ CORE_ADDR best_pc;
if (!psymtab)
psymtab = find_pc_psymtab (pc);
p++)
if (SYMBOL_NAMESPACE (p) == VAR_NAMESPACE
&& SYMBOL_CLASS (p) == LOC_BLOCK
- && pc >= SYMBOL_VALUE (p)
- && SYMBOL_VALUE (p) > best_pc)
+ && pc >= SYMBOL_VALUE_ADDRESS (p)
+ && SYMBOL_VALUE_ADDRESS (p) > best_pc)
{
- best_pc = SYMBOL_VALUE (p);
+ best_pc = SYMBOL_VALUE_ADDRESS (p);
best = p;
}
if (best_pc == psymtab->textlow - 1)
}
\f
-static struct symbol *lookup_block_symbol ();
-
/* Find the definition for a specified symbol name NAME
in namespace NAMESPACE, visible from lexical block BLOCK.
- Returns the struct symbol pointer, or zero if no symbol is found.
+ Returns the struct symbol pointer, or zero if no symbol is found.
+ If SYMTAB is non-NULL, store the symbol table in which the
+ symbol was found there, or NULL if not found.
C++: if IS_A_FIELD_OF_THIS is nonzero on entry, check to see if
NAME is a field of the current implied argument `this'. If so set
*IS_A_FIELD_OF_THIS to 1, otherwise set it to zero.
a field of `this', value_of_this sets BLOCK_FOUND to the proper value.) */
struct symbol *
-lookup_symbol (name, block, namespace, is_a_field_of_this)
+lookup_symbol (name, block, namespace, is_a_field_of_this, symtab)
char *name;
register struct block *block;
enum namespace namespace;
int *is_a_field_of_this;
+ struct symtab **symtab;
{
- register int i, n;
register struct symbol *sym;
register struct symtab *s;
register struct partial_symtab *ps;
if (sym)
{
block_found = block;
+ if (symtab != NULL)
+ {
+ /* Search the list of symtabs for one which contains the
+ address of the start of this block. */
+ struct block *b;
+ for (s = symtab_list; s; s = s->next)
+ {
+ bv = BLOCKVECTOR (s);
+ b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+ if (BLOCK_START (b) <= BLOCK_START (block)
+ && BLOCK_END (b) > BLOCK_START (block))
+ break;
+ }
+ *symtab = s;
+ }
+
return sym;
}
block = BLOCK_SUPERBLOCK (block);
}
+ /* But that doesn't do any demangling for the STATIC_BLOCK.
+ I'm not sure whether demangling is needed in the case of
+ nested function in inner blocks; if so this needs to be changed.
+
+ 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. */
+ if (namespace == VAR_NAMESPACE && block != NULL)
+ {
+ struct block *b;
+ /* Find the right symtab. */
+ for (s = symtab_list; s; s = s->next)
+ {
+ bv = BLOCKVECTOR (s);
+ b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+ if (BLOCK_START (b) <= BLOCK_START (block)
+ && BLOCK_END (b) > BLOCK_START (block))
+ {
+ sym = lookup_demangled_block_symbol (b, name);
+ if (sym)
+ {
+ block_found = b;
+ if (symtab != NULL)
+ *symtab = s;
+ return sym;
+ }
+ }
+ }
+ }
+
+
/* C++: If requested to do so by the caller,
check to see if NAME is a field of `this'. */
if (is_a_field_of_this)
{
- int v = (int) value_of_this (0);
+ struct value *v = value_of_this (0);
*is_a_field_of_this = 0;
if (v && check_field (v, name))
{
- *is_a_field_of_this = 1;
+ *is_a_field_of_this = 1;
+ if (symtab != NULL)
+ *symtab = NULL;
return 0;
}
}
for (s = symtab_list; s; s = s->next)
{
bv = BLOCKVECTOR (s);
- block = BLOCKVECTOR_BLOCK (bv, 0);
+ block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
sym = lookup_block_symbol (block, name, namespace);
if (sym)
{
block_found = block;
+ if (symtab != NULL)
+ *symtab = s;
return sym;
}
}
if (namespace == VAR_NAMESPACE)
{
- int index = lookup_misc_func (name);
+ int ind = lookup_misc_func (name);
+
+ /* Look for a mangled C++ name for NAME. */
+ if (ind == -1)
+ {
+ int name_len = strlen (name);
+
+ for (ind = misc_function_count; --ind >= 0; )
+ /* Assume orginal name is prefix of mangled name. */
+ if (!strncmp (misc_function_vector[ind].name, name, name_len))
+ {
+ char *demangled =
+ cplus_demangle(misc_function_vector[ind].name, -1);
+ if (demangled != NULL)
+ {
+ int cond = strcmp (demangled, name);
+ free (demangled);
+ if (!cond)
+ break;
+ }
+ }
+ /* Loop terminates on no match with ind == -1. */
+ }
- if (index != -1)
+ if (ind != -1)
{
- ps = find_pc_psymtab (misc_function_vector[index].address);
- if (ps && !ps->readin)
+ s = find_pc_symtab (misc_function_vector[ind].address);
+ if (s)
{
- s = psymtab_to_symtab (ps);
bv = BLOCKVECTOR (s);
- block = BLOCKVECTOR_BLOCK (bv, 0);
- sym = lookup_block_symbol (block, name, namespace);
- /* sym == 0 if symbol was found in the psymtab but not
- in the symtab.
+ block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+ sym = lookup_block_symbol (block, misc_function_vector[ind].name,
+ namespace);
+ /* sym == 0 if symbol was found in the misc_function_vector
+ but not in the symtab.
Return 0 to use the misc_function definition of "foo_".
This happens for Fortran "foo_" symbols,
asm(".globl _main");
asm("_main:");
*/
-
+
+ if (symtab != NULL)
+ *symtab = s;
return sym;
}
}
for (ps = partial_symtab_list; ps; ps = ps->next)
if (!ps->readin && lookup_partial_symbol (ps, name, 1, namespace))
{
- s = psymtab_to_symtab(ps);
+ s = PSYMTAB_TO_SYMTAB(ps);
bv = BLOCKVECTOR (s);
- block = BLOCKVECTOR_BLOCK (bv, 0);
+ block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
sym = lookup_block_symbol (block, name, namespace);
if (!sym)
fatal ("Internal: global symbol found in psymtab but not in symtab");
+ if (symtab != NULL)
+ *symtab = s;
return sym;
}
for (s = symtab_list; s; s = s->next)
{
bv = BLOCKVECTOR (s);
- block = BLOCKVECTOR_BLOCK (bv, 1);
+ block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
sym = lookup_block_symbol (block, name, namespace);
if (sym)
{
block_found = block;
+ if (symtab != NULL)
+ *symtab = s;
return sym;
}
}
for (ps = partial_symtab_list; ps; ps = ps->next)
if (!ps->readin && lookup_partial_symbol (ps, name, 0, namespace))
{
- s = psymtab_to_symtab(ps);
+ s = PSYMTAB_TO_SYMTAB(ps);
bv = BLOCKVECTOR (s);
- block = BLOCKVECTOR_BLOCK (bv, 1);
+ block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
sym = lookup_block_symbol (block, name, namespace);
if (!sym)
fatal ("Internal: static symbol found in psymtab but not in symtab");
+ if (symtab != NULL)
+ *symtab = s;
return sym;
}
+ /* Now search all per-file blocks for static mangled symbols.
+ Do the symtabs first, then check the psymtabs. */
+
+ if (namespace == VAR_NAMESPACE)
+ {
+ for (s = symtab_list; s; s = s->next)
+ {
+ bv = BLOCKVECTOR (s);
+ block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+ sym = lookup_demangled_block_symbol (block, name);
+ if (sym)
+ {
+ block_found = block;
+ if (symtab != NULL)
+ *symtab = s;
+ return sym;
+ }
+ }
+
+ for (ps = partial_symtab_list; ps; ps = ps->next)
+ if (!ps->readin && lookup_demangled_partial_symbol (ps, name))
+ {
+ s = PSYMTAB_TO_SYMTAB(ps);
+ bv = BLOCKVECTOR (s);
+ block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+ sym = lookup_demangled_block_symbol (block, name);
+ if (!sym)
+ fatal ("Internal: static symbol found in psymtab but not in symtab");
+ if (symtab != NULL)
+ *symtab = s;
+ return sym;
+ }
+ }
+
+ if (symtab != NULL)
+ *symtab = NULL;
+ return 0;
+}
+
+/* Look for a static demangled symbol in block BLOCK. */
+
+static struct symbol *
+lookup_demangled_block_symbol (block, name)
+ register struct block *block;
+ char *name;
+{
+ register int bot, top, inc;
+ register struct symbol *sym;
+
+ bot = 0;
+ top = BLOCK_NSYMS (block);
+ inc = name[0];
+
+ while (bot < top)
+ {
+ sym = BLOCK_SYM (block, bot);
+ if (SYMBOL_NAME (sym)[0] == inc
+ && SYMBOL_NAMESPACE (sym) == VAR_NAMESPACE)
+ {
+ char *demangled = cplus_demangle(SYMBOL_NAME (sym), -1);
+ if (demangled != NULL)
+ {
+ int cond = strcmp (demangled, name);
+ free (demangled);
+ if (!cond)
+ return sym;
+ }
+ }
+ bot++;
+ }
+
return 0;
}
+/* Look, in partial_symtab PST, for static mangled symbol NAME. */
+
+static struct partial_symbol *
+lookup_demangled_partial_symbol (pst, name)
+ struct partial_symtab *pst;
+ char *name;
+{
+ struct partial_symbol *start, *psym;
+ int length = pst->n_static_syms;
+ register int inc = name[0];
+
+ if (!length)
+ return (struct partial_symbol *) 0;
+
+ start = static_psymbols.list + pst->statics_offset;
+ for (psym = start; psym < start + length; psym++)
+ {
+ if (SYMBOL_NAME (psym)[0] == inc
+ && SYMBOL_NAMESPACE (psym) == VAR_NAMESPACE)
+ {
+ char *demangled = cplus_demangle(SYMBOL_NAME (psym), -1);
+ if (demangled != NULL)
+ {
+ int cond = strcmp (demangled, name);
+ free (demangled);
+ if (!cond)
+ return psym;
+ }
+ }
+ }
+
+ return (struct partial_symbol *) 0;
+}
+
/* Look, in partial_symtab PST, for symbol NAME. Check the global
symbols if GLOBAL, the static symbols if not */
struct partial_symbol *start, *psym;
int length = (global ? pst->n_global_syms : pst->n_static_syms);
+ if (!length)
+ return (struct partial_symbol *) 0;
+
start = (global ?
global_psymbols.list + pst->globals_offset :
static_psymbols.list + pst->statics_offset );
- if (!length)
- return (struct partial_symbol *) 0;
-
if (global) /* This means we can use a binary */
/* search. */
{
struct partial_symbol *top, *bottom, *center;
- /* Binary search. This search is guarranteed to end with center
+ /* 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. */
/* Look for a symbol in block BLOCK. */
-static struct symbol *
+struct symbol *
lookup_block_symbol (block, name, namespace)
register struct block *block;
char *name;
&& SYMBOL_NAMESPACE (sym) == namespace)
{
if (SYMBOL_CLASS (sym) == LOC_ARG
+ || SYMBOL_CLASS (sym) == LOC_LOCAL_ARG
|| SYMBOL_CLASS (sym) == LOC_REF_ARG
|| SYMBOL_CLASS (sym) == LOC_REGPARM)
parameter_sym = sym;
for (s = symtab_list; s; s = s->next)
{
bv = BLOCKVECTOR (s);
- b = BLOCKVECTOR_BLOCK (bv, 0);
+ b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
if (BLOCK_START (b) <= pc
&& BLOCK_END (b) > pc)
break;
fatal ("Internal error: pc in read in psymtab, but not in symtab.");
if (ps)
- s = psymtab_to_symtab (ps);
+ s = PSYMTAB_TO_SYMTAB (ps);
}
return s;
register int len;
register int i;
register struct linetable_entry *item;
- struct symtab_and_line value;
+ struct symtab_and_line val;
struct blockvector *bv;
/* Info on best line seen so far, and where it starts, and its file. */
s = find_pc_symtab (pc);
if (s == 0)
{
- value.symtab = 0;
- value.line = 0;
- value.pc = pc;
- value.end = 0;
- return value;
+ val.symtab = 0;
+ val.line = 0;
+ val.pc = pc;
+ val.end = 0;
+ return val;
}
bv = BLOCKVECTOR (s);
}
if (best_symtab == 0)
{
- value.symtab = alt_symtab;
- value.line = alt_line - 1;
- value.pc = BLOCK_END (BLOCKVECTOR_BLOCK (bv, 0));
- value.end = alt_pc;
+ val.symtab = alt_symtab;
+ val.line = alt_line - 1;
+ val.pc = BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK));
+ val.end = alt_pc;
}
else
{
- value.symtab = best_symtab;
- value.line = best_line;
- value.pc = best_pc;
- value.end = (best_end ? best_end
+ val.symtab = best_symtab;
+ val.line = best_line;
+ val.pc = best_pc;
+ val.end = (best_end ? best_end
: (alt_pc ? alt_pc
- : BLOCK_END (BLOCKVECTOR_BLOCK (bv, 0))));
+ : BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK))));
}
- return value;
+ return val;
}
\f
/* Find the PC value for a given source file and line number.
int line;
{
register struct linetable *l;
- register int index;
+ register int ind;
int dummy;
if (symtab == 0)
return 0;
l = LINETABLE (symtab);
- index = find_line_common(l, line, &dummy);
- return index ? l->item[index].pc : 0;
+ ind = find_line_common(l, line, &dummy);
+ return (ind >= 0) ? l->item[ind].pc : 0;
}
/* Find the range of pc values in a line.
CORE_ADDR *startptr, *endptr;
{
register struct linetable *l;
- register int index;
+ register int ind;
int exact_match; /* did we get an exact linenumber match */
- register CORE_ADDR prev_pc;
- CORE_ADDR last_pc;
if (symtab == 0)
return 0;
l = LINETABLE (symtab);
- index = find_line_common (l, thisline, &exact_match);
- if (index)
+ ind = find_line_common (l, thisline, &exact_match);
+ if (ind >= 0)
{
- *startptr = l->item[index].pc;
+ *startptr = l->item[ind].pc;
/* If we have not seen an entry for the specified line,
assume that means the specified line has zero bytes. */
- if (!exact_match || index == l->nitems-1)
+ if (!exact_match || ind == l->nitems-1)
*endptr = *startptr;
else
/* Perhaps the following entry is for the following line.
It's worth a try. */
- if (l->item[index+1].line == thisline + 1)
- *endptr = l->item[index+1].pc;
+ if (ind+1 < l->nitems
+ && l->item[ind+1].line == thisline + 1)
+ *endptr = l->item[ind+1].pc;
else
*endptr = find_line_pc (symtab, thisline+1);
return 1;
/* Given a line table and a line number, return the index into the line
table for the pc of the nearest line whose number is >= the specified one.
- Return 0 if none is found. The value is never zero is it is an index.
+ Return -1 if none is found. The value is >= 0 if it is an index.
Set *EXACT_MATCH nonzero if the value returned is an exact match. */
or 0 if none has been seen so far.
BEST_INDEX identifies the item for it. */
- int best_index = 0;
+ int best_index = -1;
int best = 0;
- int nextline = -1;
-
if (lineno <= 0)
- return 0;
+ return -1;
len = l->nitems;
for (i = 0; i < len; i++)
return sal.symtab != 0;
}
\f
+/* If P is of the form "operator[ \t]+..." where `...' is
+ some legitimate operator text, return a pointer to the
+ beginning of the substring of the operator text.
+ Otherwise, return "". */
+static char *
+operator_chars (p, end)
+ char *p;
+ char **end;
+{
+ *end = "";
+ if (strncmp (p, "operator", 8))
+ return *end;
+ p += 8;
+
+ /* Don't get faked out by `operator' being part of a longer
+ identifier. */
+ if ((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z')
+ || *p == '_' || *p == '$' || *p == '\0')
+ return *end;
+
+ /* Allow some whitespace between `operator' and the operator symbol. */
+ while (*p == ' ' || *p == '\t')
+ p++;
+
+ switch (*p)
+ {
+ case '!':
+ case '=':
+ case '*':
+ case '/':
+ case '%':
+ case '^':
+ if (p[1] == '=')
+ *end = p+2;
+ else
+ *end = p+1;
+ return p;
+ case '<':
+ case '>':
+ case '+':
+ case '-':
+ case '&':
+ case '|':
+ if (p[1] == '=' || p[1] == p[0])
+ *end = p+2;
+ else
+ *end = p+1;
+ return p;
+ case '~':
+ case ',':
+ *end = p+1;
+ return p;
+ case '(':
+ if (p[1] != ')')
+ error ("`operator ()' must be specified without whitespace in `()'");
+ *end = p+2;
+ return p;
+ case '?':
+ if (p[1] != ':')
+ error ("`operator ?:' must be specified without whitespace in `?:'");
+ *end = p+2;
+ return p;
+ case '[':
+ if (p[1] != ']')
+ error ("`operator []' must be specified without whitespace in `[]'");
+ *end = p+2;
+ return p;
+ default:
+ error ("`operator %s' not supported", p);
+ break;
+ }
+ *end = "";
+ return *end;
+}
+
+/* Recursive helper function for decode_line_1.
+ * Look for methods named NAME in type T.
+ * Return number of matches.
+ * Put matches in PHYSNAMES and SYM_ARR (which better be big enough!).
+ * These allocations seem to define "big enough":
+ * sym_arr = (struct symbol **) alloca(TYPE_NFN_FIELDS_TOTAL (t) * sizeof(struct symbol*));
+ * physnames = (char **) alloca (TYPE_NFN_FIELDS_TOTAL (t) * sizeof(char*));
+ */
+
+int
+find_methods(t, name, physnames, sym_arr)
+ struct type *t;
+ char *name;
+ char **physnames;
+ struct symbol **sym_arr;
+{
+ 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 prevents core dumps, but is just a workaround
+ because we might not find the function in
+ certain cases, such as
+ struct D {virtual int f();}
+ struct C : D {virtual int g();}
+ (in this case g++ 1.35.1- does not put out a name
+ for D as such, it defines type 19 (for example) in
+ the same stab as C, and then does a
+ .stabs "D:T19" and a .stabs "D:t19".
+ Thus
+ "break C::f" should not be looking for field f in
+ the class named D,
+ but just for the field f in the baseclasses of C
+ (no matter what their names).
+
+ However, I don't know how to replace the code below
+ that depends on knowing the name of D. */
+ if (class_name
+ && (sym_class = lookup_symbol (class_name,
+ (struct block *)NULL,
+ STRUCT_NAMESPACE,
+ (int *)NULL,
+ (struct symtab **)NULL)))
+ {
+ int method_counter;
+ t = SYMBOL_TYPE (sym_class);
+ 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);
+ if (!strcmp (name, method_name))
+ /* Find all the fields with that name. */
+ for (field_counter = TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1;
+ field_counter >= 0;
+ --field_counter)
+ {
+ char *phys_name;
+ if (TYPE_FLAGS (TYPE_FN_FIELD_TYPE (f, field_counter)) & TYPE_FLAG_STUB)
+ check_stub_method (t, method_counter, field_counter);
+ phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
+ physnames[i1] = (char*) alloca (strlen (phys_name) + 1);
+ strcpy (physnames[i1], phys_name);
+ sym_arr[i1] = lookup_symbol (phys_name,
+ SYMBOL_BLOCK_VALUE (sym_class),
+ VAR_NAMESPACE,
+ (int *) NULL,
+ (struct symtab **) NULL);
+ if (sym_arr[i1]) i1++;
+ }
+ }
+ }
+ /* Only search baseclasses if there is no match yet,
+ * since names in derived classes override those in baseclasses.
+ */
+ if (i1)
+ return i1;
+ for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
+ i1 += find_methods(TYPE_BASECLASS(t, ibase), name,
+ physnames + i1, sym_arr + i1);
+ return i1;
+}
+
/* 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.
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.
+ VARIABLE -- line number of definition of that variable.
+ PC returned is 0.
FILE:FUNCTION -- likewise, but prefer functions in that file.
*EXPR -- line in which address EXPR appears.
{
struct symtabs_and_lines decode_line_2 ();
struct symtabs_and_lines values;
- struct symtab_and_line value;
+ struct symtab_and_line val;
register char *p, *p1;
+ char *q, *q1;
register struct symtab *s;
+
register struct symbol *sym;
+ /* The symtab that SYM was found in. */
+ struct symtab *sym_symtab;
+
register CORE_ADDR pc;
register int i;
char *copy;
struct symbol *sym_class;
- char *class_name, *method_name, *phys_name;
- int method_counter;
int i1;
struct symbol **sym_arr;
- struct type *t, *field;
+ struct type *t;
char **physnames;
/* Defaults have defaults. */
(*argptr)++;
pc = parse_and_eval_address_1 (argptr);
values.sals = (struct symtab_and_line *)
- malloc (sizeof (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;
}
while (p[0] == ' ' || p[0] == '\t') p++;
+ q = operator_chars (*argptr, &q1);
if (p[0] == ':')
{
while (*p == ' ' || *p == '\t') p++;
*argptr = p;
- sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0);
+ sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0,
+ (struct symtab **)NULL);
if (sym_class &&
(TYPE_CODE (SYMBOL_TYPE (sym_class)) == TYPE_CODE_STRUCT
Find the next token (everything up to end or next whitespace). */
p = *argptr;
while (*p && *p != ' ' && *p != '\t' && *p != ',' && *p !=':') p++;
- copy = (char *) alloca (p - *argptr + 1);
- bcopy (*argptr, copy, p - *argptr);
- copy[p - *argptr] = '\0';
+ q = operator_chars (*argptr, &q1);
+
+ copy = (char *) alloca (p - *argptr + 1 + (q1 - q));
+ if (q1 - q)
+ {
+ copy[0] = 'o';
+ copy[1] = 'p';
+ copy[2] = CPLUS_MARKER;
+ bcopy (q, copy + 3, q1 - q);
+ copy[3 + (q1 - q)] = '\0';
+ p = q1;
+ }
+ else
+ {
+ bcopy (*argptr, copy, p - *argptr);
+ copy[p - *argptr] = '\0';
+ }
/* no line number may be specified */
while (*p == ' ' || *p == '\t') p++;
/* destructors are a special case. */
struct fn_field *f = TYPE_FN_FIELDLIST1 (t, 0);
int len = TYPE_FN_FIELDLIST_LENGTH (t, 0) - 1;
- phys_name = TYPE_FN_FIELD_PHYSNAME (f, len);
+ char *phys_name = TYPE_FN_FIELD_PHYSNAME (f, len);
physnames[i1] = (char *)alloca (strlen (phys_name) + 1);
strcpy (physnames[i1], phys_name);
- sym_arr[i1] = lookup_symbol (phys_name, SYMBOL_BLOCK_VALUE (sym_class), VAR_NAMESPACE, 0);
+ sym_arr[i1] =
+ lookup_symbol (phys_name, SYMBOL_BLOCK_VALUE (sym_class),
+ VAR_NAMESPACE, 0, (struct symtab **)NULL);
if (sym_arr[i1]) i1++;
}
- else while (t)
- {
- class_name = TYPE_NAME (t);
- /* Ignore this class if it doesn't have a name.
- This prevents core dumps, but is just a workaround
- because we might not find the function in
- certain cases, such as
- struct D {virtual int f();}
- struct C : D {virtual int g();}
- (in this case g++ 1.35.1- does not put out a name
- for D as such, it defines type 19 (for example) in
- the same stab as C, and then does a
- .stabs "D:T19" and a .stabs "D:t19".
- Thus
- "break C::f" should not be looking for field f in
- the class named D,
- but just for the field f in the baseclasses of C
- (no matter what their names).
-
- However, I don't know how to replace the code below
- that depends on knowing the name of D. */
- if (class_name)
- {
- /* We just want the class name. In the context
- of C++, stripping off "struct " is always
- sensible. */
- if (strncmp("struct ", class_name, 7) == 0)
- class_name += 7;
- if (strncmp("union ", class_name, 6) == 0)
- class_name += 6;
-
- sym_class = lookup_symbol (class_name, 0, STRUCT_NAMESPACE, 0);
- for (method_counter = TYPE_NFN_FIELDS (SYMBOL_TYPE (sym_class)) - 1;
- method_counter >= 0;
- --method_counter)
- {
- int field_counter;
- struct fn_field *f =
- TYPE_FN_FIELDLIST1 (SYMBOL_TYPE (sym_class), method_counter);
-
- method_name = TYPE_FN_FIELDLIST_NAME (SYMBOL_TYPE (sym_class), method_counter);
- if (!strcmp (copy, method_name))
- /* Find all the fields with that name. */
- for (field_counter = TYPE_FN_FIELDLIST_LENGTH (SYMBOL_TYPE (sym_class), method_counter) - 1;
- field_counter >= 0;
- --field_counter)
- {
- phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
- physnames[i1] = (char*) alloca (strlen (phys_name) + 1);
- strcpy (physnames[i1], phys_name);
- sym_arr[i1] = lookup_symbol (phys_name, SYMBOL_BLOCK_VALUE (sym_class), VAR_NAMESPACE, 0);
- if (sym_arr[i1]) i1++;
- }
- }
- }
- if (TYPE_N_BASECLASSES (t))
- t = TYPE_BASECLASS(t, 1);
- else
- break;
- }
-
+ else
+ i1 = find_methods (t, copy, physnames, sym_arr);
if (i1 == 1)
{
/* There is exactly one field with that name. */
pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)) + FUNCTION_START_OFFSET;
if (funfirstline)
SKIP_PROLOGUE (pc);
- values.sals = (struct symtab_and_line *)malloc (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 = (values.sals[0].end && values.sals[0].pc != pc) ? values.sals[0].end : pc;
{
/* There is more than one field with that name
(overloaded). Ask the user which one to use. */
- return decode_line_2 (argptr, sym_arr, physnames,
- i1, funfirstline);
+ return decode_line_2 (sym_arr, i1, funfirstline);
}
else
- error ("that class does not have any method named %s",copy);
+ {
+ 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 ("that class does not have any method named %s", tmp);
+ }
}
else
- error("no class, struct, or union named %s", copy );
+ /* The quotes are important if copy is empty. */
+ error("No class, struct, or union named \"%s\"", copy );
}
/* end of C++ */
/* Extract the file name. */
p1 = p;
while (p != *argptr && p[-1] == ' ') --p;
- copy = (char *) alloca (p - *argptr + 1);
- bcopy (*argptr, copy, p - *argptr);
- copy[p - *argptr] = 0;
+ copy = (char *) alloca (p - *argptr + 1 + (q1 - q));
+ if (q1 - q)
+ {
+ copy[0] = 'o';
+ copy[1] = 'p';
+ copy[2] = CPLUS_MARKER;
+ bcopy (q, copy + 3, q1-q);
+ copy[3 + (q1-q)] = 0;
+ p = q1;
+ }
+ else
+ {
+ bcopy (*argptr, copy, p - *argptr);
+ copy[p - *argptr] = 0;
+ }
/* Find that file's data. */
s = lookup_symtab (copy);
if (s == 0)
{
if (symtab_list == 0 && partial_symtab_list == 0)
- error ("No symbol table is loaded. Use the \"symbol-file\" command.");
+ error (no_symtab_msg);
error ("No source file named %s.", copy);
}
enum sign {none, plus, minus} sign = none;
/* This is where we need to make sure that we have good defaults.
- We must guarrantee that this section of code is never executed
+ 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 (symtab_list == 0 && partial_symtab_list == 0)
- error ("No symbol table is loaded. Use the \"symbol-file\" command.");
+ error (no_symtab_msg);
select_source_symtab (0);
default_symtab = current_source_symtab;
default_line = current_source_line;
sign = plus, (*argptr)++;
else if (**argptr == '-')
sign = minus, (*argptr)++;
- value.line = atoi (*argptr);
+ val.line = atoi (*argptr);
switch (sign)
{
case plus:
if (p == *argptr)
- value.line = 5;
+ val.line = 5;
if (s == 0)
- value.line = default_line + value.line;
+ val.line = default_line + val.line;
break;
case minus:
if (p == *argptr)
- value.line = 15;
+ val.line = 15;
if (s == 0)
- value.line = default_line - value.line;
+ val.line = default_line - val.line;
else
- value.line = 1;
+ val.line = 1;
break;
+ case none:
+ break; /* No need to adjust val.line. */
}
while (*p == ' ' || *p == '\t') p++;
*argptr = p;
if (s == 0)
s = default_symtab;
- value.symtab = s;
- value.pc = 0;
- values.sals = (struct symtab_and_line *)malloc (sizeof (struct symtab_and_line));
- values.sals[0] = value;
+ val.symtab = s;
+ val.pc = 0;
+ values.sals = (struct symtab_and_line *)xmalloc (sizeof (struct symtab_and_line));
+ values.sals[0] = val;
values.nelts = 1;
return values;
}
- /* Arg token is not digits => try it as a function name
+ /* Arg token is not digits => try it as a variable name
Find the next token (everything up to end or next whitespace). */
p = *argptr;
while (*p && *p != ' ' && *p != '\t' && *p != ',') p++;
while (*p == ' ' || *p == '\t') p++;
*argptr = p;
- /* Look up that token as a function.
+ /* Look up that token as a variable.
If file specified, use that file's per-file block to start with. */
- sym = lookup_symbol (copy, s ? BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), 1) : 0,
- VAR_NAMESPACE, 0);
+ sym = lookup_symbol (copy,
+ (s ? BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK)
+ : get_selected_block ()),
+ VAR_NAMESPACE, 0, &sym_symtab);
- if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
+ if (sym != NULL)
{
- /* Arg is the name of a function */
- pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)) + FUNCTION_START_OFFSET;
- if (funfirstline)
- SKIP_PROLOGUE (pc);
- value = find_pc_line (pc, 0);
+ if (SYMBOL_CLASS (sym) == LOC_BLOCK)
+ {
+ /* Arg is the name of a function */
+ pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)) + FUNCTION_START_OFFSET;
+ if (funfirstline)
+ SKIP_PROLOGUE (pc);
+ val = find_pc_line (pc, 0);
#ifdef PROLOGUE_FIRSTLINE_OVERLAP
- /* Convex: no need to suppress code on first line, if any */
- value.pc = pc;
+ /* Convex: no need to suppress code on first line, if any */
+ val.pc = pc;
#else
- value.pc = (value.end && value.pc != pc) ? value.end : pc;
+ val.pc = (val.end && val.pc != pc) ? val.end : pc;
#endif
- values.sals = (struct symtab_and_line *)malloc (sizeof (struct symtab_and_line));
- values.sals[0] = value;
- values.nelts = 1;
- return values;
+ values.sals = (struct symtab_and_line *)xmalloc (sizeof (struct symtab_and_line));
+ values.sals[0] = val;
+ values.nelts = 1;
+
+ /* I think this is always the same as the line that
+ we calculate above, but the general principle is
+ "trust the symbols more than stuff like
+ SKIP_PROLOGUE". */
+ if (SYMBOL_LINE (sym) != 0)
+ values.sals[0].line = SYMBOL_LINE (sym);
+
+ return values;
+ }
+ else if (SYMBOL_LINE (sym) != 0)
+ {
+ /* We know its line number. */
+ values.sals = (struct symtab_and_line *)
+ xmalloc (sizeof (struct symtab_and_line));
+ values.nelts = 1;
+ bzero (&values.sals[0], sizeof (values.sals[0]));
+ values.sals[0].symtab = sym_symtab;
+ values.sals[0].line = SYMBOL_LINE (sym);
+ return values;
+ }
+ else
+ /* This can happen if it is compiled with a compiler which doesn't
+ put out line numbers for variables. */
+ error ("Line number not known for symbol \"%s\"", copy);
}
- if (sym)
- error ("%s is not a function.", copy);
+ if (symtab_list == 0 && partial_symtab_list == 0)
+ error (no_symtab_msg);
- if ((i = lookup_misc_func (copy)) < 0)
- error ("Function %s not defined.", copy);
- else
+ if ((i = lookup_misc_func (copy)) >= 0)
{
- value.symtab = 0;
- value.line = 0;
- value.pc = misc_function_vector[i].address + FUNCTION_START_OFFSET;
+ val.symtab = 0;
+ val.line = 0;
+ val.pc = misc_function_vector[i].address + FUNCTION_START_OFFSET;
if (funfirstline)
- SKIP_PROLOGUE (value.pc);
- values.sals = (struct symtab_and_line *)malloc (sizeof (struct symtab_and_line));
- values.sals[0] = value;
+ SKIP_PROLOGUE (val.pc);
+ values.sals = (struct symtab_and_line *)xmalloc (sizeof (struct symtab_and_line));
+ values.sals[0] = val;
values.nelts = 1;
return values;
}
- if (symtab_list == 0 && partial_symtab_list == 0)
- error ("No symbol table is loaded. Use the \"symbol-file\" command.");
error ("Function %s not defined.", copy);
+ return values; /* for lint */
}
struct symtabs_and_lines
return sals;
}
+/* Given a list of NELTS symbols in sym_arr (with corresponding
+ mangled names in physnames), return a list of lines to operate on
+ (ask user if necessary). */
struct symtabs_and_lines
-decode_line_2 (argptr, sym_arr, physnames, nelts, funfirstline)
- char **argptr;
+decode_line_2 (sym_arr, nelts, funfirstline)
struct symbol *sym_arr[];
- char *physnames[];
int nelts;
int funfirstline;
{
char *prompt;
values.sals = (struct symtab_and_line *) alloca (nelts * sizeof(struct symtab_and_line));
- return_values.sals = (struct symtab_and_line *) malloc (nelts * sizeof(struct symtab_and_line));
+ return_values.sals = (struct symtab_and_line *) xmalloc (nelts * sizeof(struct symtab_and_line));
i = 0;
printf("[0] cancel\n[1] all\n");
if (funfirstline)
SKIP_PROLOGUE (pc);
values.sals[i] = find_pc_line (pc, 0);
+ values.sals[i].pc = (values.sals[i].end && values.sals[i].pc != pc) ?
+ values.sals[i].end : pc;
printf("[%d] file:%s; line number:%d\n",
(i+2), values.sals[i].symtab->filename, values.sals[i].line);
}
/* Return the index of misc function named NAME. */
-static int
+int
lookup_misc_func (name)
register char *name;
{
return -1; /* not found */
}
\f
-/*
- * Slave routine for sources_info. Force line breaks at ,'s.
- */
+/* 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, next)
-char *name;
-int next;
+output_source_filename (name, first)
+ char *name;
+ int *first;
{
- static int column = 0;
-
+ static int column;
+ /* Table of files printed so far. Since a single source file can
+ result in several partial symbol tables, we need to avoid printing
+ it more than once. Note: if some of the psymtabs are read in and
+ some are not, it gets printed both under "Source files for which
+ symbols have been read" and "Source files for which symbols will
+ be read in on demand". I consider this a reasonable way to deal
+ with the situation. I'm not sure whether this can also happen for
+ symtabs; it doesn't hurt to check. */
+ static char **tab = NULL;
+ /* Allocated size of tab in elements.
+ Start with one 256-byte block (when using GNU malloc.c).
+ 24 is the malloc overhead when range checking is in effect. */
+ static int tab_alloc_size = (256 - 24) / sizeof (char *);
+ /* Current size of tab in elements. */
+ static int tab_cur_size;
+
+ char **p;
+
+ if (*first)
+ {
+ if (tab == NULL)
+ tab = (char **) xmalloc (tab_alloc_size * sizeof (*tab));
+ tab_cur_size = 0;
+ }
+
+ /* Is NAME in tab? */
+ for (p = tab; p < tab + tab_cur_size; p++)
+ if (strcmp (*p, name) == 0)
+ /* Yes; don't print it again. */
+ return;
+ /* No; add it to tab. */
+ if (tab_cur_size == tab_alloc_size)
+ {
+ tab_alloc_size *= 2;
+ tab = (char **) xrealloc (tab, tab_alloc_size * sizeof (*tab));
+ }
+ tab[tab_cur_size++] = name;
+
+ if (*first)
+ {
+ column = 0;
+ *first = 0;
+ }
+ else
+ {
+ printf_filtered (",");
+ column++;
+ }
+
if (column != 0 && column + strlen (name) >= 70)
{
printf_filtered ("\n");
printf_filtered (" ");
column++;
}
- printf_filtered ("%s", name);
+ fputs_filtered (name, stdout);
column += strlen (name);
- if (next)
- {
- printf_filtered (",");
- column++;
- }
-
- if (!next) column = 0;
}
static void
{
register struct symtab *s;
register struct partial_symtab *ps;
- register int column = 0;
-
+ int first;
+
if (symtab_list == 0 && partial_symtab_list == 0)
{
- printf ("No symbol table is loaded.\n");
+ printf (no_symtab_msg);
return;
}
printf_filtered ("Source files for which symbols have been read in:\n\n");
+ first = 1;
for (s = symtab_list; s; s = s->next)
- output_source_filename (s->filename, s->next);
+ output_source_filename (s->filename, &first);
printf_filtered ("\n\n");
printf_filtered ("Source files for which symbols will be read in on demand:\n\n");
+ first = 1;
for (ps = partial_symtab_list; ps; ps = ps->next)
if (!ps->readin)
- output_source_filename (ps->filename, ps->next);
+ output_source_filename (ps->filename, &first);
printf_filtered ("\n");
}
/* List all symbols (if REGEXP is 0) or all symbols matching REGEXP.
If CLASS is zero, list all symbols except functions and type names.
If CLASS is 1, list only functions.
- If CLASS is 2, list only type names. */
+ If CLASS is 2, list only type names.
-static void sort_block_syms ();
+ BPT is non-zero if we should set a breakpoint at the functions
+ we find. */
static void
-list_symbols (regexp, class)
+list_symbols (regexp, class, bpt)
char *regexp;
int class;
+ int bpt;
{
register struct symtab *s;
register struct partial_symtab *ps;
char *val;
static char *classnames[]
= {"variable", "function", "type", "method"};
- int print_count = 0;
int found_in_file = 0;
if (regexp)
- if (val = (char *) re_comp (regexp))
- error ("Invalid regexp: %s", val);
+ if (0 != (val = (char *) re_comp (regexp)))
+ error ("Invalid regexp (%s): %s", val, regexp);
/* Search through the partial_symtab_list *first* for all symbols
matching the regexp. That way we don't have to reproduce all of
}
else
keep_going = 0;
+ continue;
}
else
{
|| (class == 2 && SYMBOL_CLASS (psym) == LOC_TYPEDEF)
|| (class == 3 && SYMBOL_CLASS (psym) == LOC_BLOCK)))
{
- psymtab_to_symtab(ps);
+ (void) PSYMTAB_TO_SYMTAB(ps);
keep_going = 0;
}
}
}
}
- /* Printout here so as to get after the "Reading in symbols"
- messages which will be generated above. */
- printf_filtered (regexp
- ? "All %ss matching regular expression \"%s\":\n"
- : "All defined %ss:\n",
- classnames[class],
- regexp);
-
/* Here, *if* the class is correct (function only, right now), we
- should search through the misc function vector for symbols that
- match and call find_pc_psymtab on them. If find_pc_psymtab returns
- 0, don't worry about it (already read in or no debugging info). */
+ search through the misc function vector for symbols that
+ match, and call find_pc_symtab on them to force their symbols to
+ be read. The symbol will then be found during the scan of symtabs
+ below. */
if (class == 1)
{
for (i = 0; i < misc_function_count; i++)
if (regexp == 0 || re_exec (misc_function_vector[i].name))
{
- ps = find_pc_psymtab (misc_function_vector[i].address);
- if (ps && !ps->readin)
- psymtab_to_symtab (ps);
+ (void) find_pc_symtab (misc_function_vector[i].address);
}
}
+ /* 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);
+
for (s = symtab_list; s; s = s->next)
{
found_in_file = 0;
It happens that the first symtab in the list
for any given blockvector is the main file. */
if (bv != prev_bv)
- for (i = 0; i < 2; i++)
+ for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
{
b = BLOCKVECTOR_BLOCK (bv, i);
/* Skip the sort if this block is always sorted. */
|| (class == 2 && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
|| (class == 3 && SYMBOL_CLASS (sym) == LOC_BLOCK)))
{
- if (!found_in_file)
+ if (bpt)
+ {
+ /* Set a breakpoint here, if it's a function */
+ if (class == 1)
+ break_command (SYMBOL_NAME(sym), 0);
+ }
+ else if (!found_in_file)
{
- printf_filtered ("\nFile %s:\n", s->filename);
- print_count += 2;
+ fputs_filtered ("\nFile ", stdout);
+ fputs_filtered (s->filename, stdout);
+ fputs_filtered (":\n", stdout);
}
found_in_file = 1;
- if (class != 2 && i == 1)
+
+ if (class != 2 && i == STATIC_BLOCK)
printf_filtered ("static ");
if (class == 2
&& SYMBOL_NAMESPACE (sym) != STRUCT_NAMESPACE)
&& (TYPE_NAME ((SYMBOL_TYPE (sym))) == 0
|| 0 != strcmp (TYPE_NAME ((SYMBOL_TYPE (sym))),
SYMBOL_NAME (sym))))
- printf_filtered (" %s", SYMBOL_NAME (sym));
+ {
+ fputs_filtered (" ", stdout);
+ fprint_symbol (stdout, SYMBOL_NAME (sym));
+ }
printf_filtered (";\n");
}
else
{
- char buf[1024];
# if 0
+ char buf[1024];
type_print_base (TYPE_FN_FIELD_TYPE(t, i), stdout, 0, 0);
type_print_varspec_prefix (TYPE_FN_FIELD_TYPE(t, i), stdout, 0);
- sprintf (buf, " %s::", TYPE_NAME (t));
+ sprintf (buf, " %s::", type_name_no_tag (t));
type_print_method_args (TYPE_FN_FIELD_ARGS (t, i), buf, name, stdout);
# endif
}
variables_info (regexp)
char *regexp;
{
- list_symbols (regexp, 0);
+ list_symbols (regexp, 0, 0);
}
static void
functions_info (regexp)
char *regexp;
{
- list_symbols (regexp, 1);
+ list_symbols (regexp, 1, 0);
}
static void
types_info (regexp)
char *regexp;
{
- list_symbols (regexp, 2);
+ list_symbols (regexp, 2, 0);
}
+#if 0
+/* Tiemann says: "info methods was never implemented." */
static void
methods_info (regexp)
char *regexp;
{
- list_symbols (regexp, 3);
-}
-\f
-/* Call sort_block_syms to sort alphabetically the symbols of one block. */
-
-static int
-compare_symbols (s1, s2)
- struct symbol **s1, **s2;
-{
- /* Names that are less should come first. */
- register int namediff = strcmp (SYMBOL_NAME (*s1), SYMBOL_NAME (*s2));
- if (namediff != 0) return namediff;
- /* For symbols of the same name, registers should come first. */
- return ((SYMBOL_CLASS (*s2) == LOC_REGISTER)
- - (SYMBOL_CLASS (*s1) == LOC_REGISTER));
+ list_symbols (regexp, 3, 0);
}
+#endif /* 0 */
+/* Breakpoint all functions matching regular expression. */
static void
-sort_block_syms (b)
- register struct block *b;
+rbreak_command (regexp)
+ char *regexp;
{
- qsort (&BLOCK_SYM (b, 0), BLOCK_NSYMS (b),
- sizeof (struct symbol *), compare_symbols);
+ list_symbols (regexp, 1, 1);
}
\f
/* Initialize the standard C scalar types. */
/* C++ fancies. */
TYPE_NFN_FIELDS (type) = 0;
TYPE_N_BASECLASSES (type) = 0;
- TYPE_BASECLASSES (type) = 0;
return type;
}
{
if (!a || !b)
return 0;
- return a->startaddr >= b->startaddr && a->endaddr <= b->endaddr;
+ return BLOCK_START (a) >= BLOCK_START (b)
+ && BLOCK_END (a) <= BLOCK_END (b);
}
\f
{
register struct symtab *s;
register struct partial_symtab *ps;
- register struct blockvector *bv;
- struct blockvector *prev_bv = 0;
- register struct block *b, *surrounding_static_block;
+ register struct block *b, *surrounding_static_block = 0;
extern struct block *get_selected_block ();
register int i, j;
- register struct symbol *sym;
struct partial_symbol *psym;
int text_len = strlen (text);
/* At this point scan through the misc function vector and add each
symbol you find to the list. Eventually we want to ignore
- anything that isn't a text symbol (everything else will be
- handled by the psymtab code above). */
+ anything that isn't a text symbol (everything else will be
+ handled by the psymtab code above). */
for (i = 0; i < misc_function_count; i++)
if (!strncmp (text, misc_function_vector[i].name, text_len))
enum type_code c = TYPE_CODE (t);
if (c == TYPE_CODE_UNION || c == TYPE_CODE_STRUCT)
- for (j = 0; j < TYPE_NFIELDS (t); j++)
+ for (j = TYPE_N_BASECLASSES (t); j < TYPE_NFIELDS (t); j++)
if (TYPE_FIELD_NAME (t, j) &&
!strncmp (TYPE_FIELD_NAME (t, j), text, text_len))
completion_list_add_symbol (TYPE_FIELD_NAME (t, j));
for (s = symtab_list; s; s = s->next)
{
- struct block *b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), 0);
+ b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
for (i = 0; i < BLOCK_NSYMS (b); i++)
if (!strncmp (SYMBOL_NAME (BLOCK_SYM (b, i)), text, text_len))
for (s = symtab_list; s; s = s->next)
{
- struct block *b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), 1);
+ b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
/* Don't do this block twice. */
if (b == surrounding_static_block) continue;
"All global and static variable 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
+ 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,
"All types names, or those matching REGEXP.");
+
+#if 0
add_info ("methods", methods_info,
"All method names, or those matching REGEXP::REGEXP.\n\
If the class qualifier is ommited, it is assumed to be the current scope.\n\
If the first REGEXP is ommited, then all methods matching the second REGEXP\n\
are listed.");
+#endif
add_info ("sources", sources_info,
"Source files in the program.");
- obstack_init (symbol_obstack);
- obstack_init (psymbol_obstack);
+ add_com ("rbreak", no_class, rbreak_command,
+ "Set a breakpoint for all functions matching REGEXP.");
+
+ /* FIXME: The code below assumes that the sizes of the basic data
+ types are the same on the host and target machines!!! */
builtin_type_void = init_type (TYPE_CODE_VOID, 1, 0, "void");
builtin_type_unsigned_short = init_type (TYPE_CODE_INT, sizeof (short), 1, "unsigned short");
builtin_type_unsigned_long = init_type (TYPE_CODE_INT, sizeof (long), 1, "unsigned long");
builtin_type_unsigned_int = init_type (TYPE_CODE_INT, sizeof (int), 1, "unsigned int");
-#ifdef LONG_LONG
+
builtin_type_long_long =
- init_type (TYPE_CODE_INT, sizeof (long long), 0, "long long");
+ init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT,
+ 0, "long long");
builtin_type_unsigned_long_long =
- init_type (TYPE_CODE_INT, sizeof (long long), 1, "unsigned long long");
-#endif
+ init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT,
+ 1, "unsigned long long");
+
+ builtin_type_error = init_type (TYPE_CODE_ERROR, 0, 0, "<unknown type>");
}
projects / deliverable / binutils-gdb.git / blobdiff