/* Support for printing C++ values for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991 Free Software Foundation, Inc.
+ Copyright 1986, 1988, 1989, 1991, 1994, 1995
+ Free Software Foundation, Inc.
This file is part of GDB.
int objectprint; /* Controls looking up an object's derived type
using what we find in its vtables. */
static int static_field_print; /* Controls printing of static fields. */
-struct obstack dont_print_obstack;
+
+static struct obstack dont_print_vb_obstack;
+static struct obstack dont_print_statmem_obstack;
+
+static void
+cp_print_static_field PARAMS ((struct type *, value_ptr, GDB_FILE *, int, int,
+ enum val_prettyprint));
static void
cplus_print_value PARAMS ((struct type *, char *, GDB_FILE *, int, int,
cp_type_print_method_args PARAMS ((struct type **, char *, char *, int,
GDB_FILE *));
-extern struct obstack dont_print_obstack;
-
/* END-FIXME */
void
void
cp_print_value_fields (type, valaddr, stream, format, recurse, pretty,
- dont_print)
+ dont_print_vb, dont_print_statmem)
struct type *type;
char *valaddr;
GDB_FILE *stream;
int format;
int recurse;
enum val_prettyprint pretty;
- struct type **dont_print;
+ struct type **dont_print_vb;
+ int dont_print_statmem;
{
int i, len, n_baseclasses;
+ struct obstack tmp_obstack;
+ char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
check_stub_type (type);
duplicates of virtual baseclasses. */
if (n_baseclasses > 0)
cplus_print_value (type, valaddr, stream, format, recurse+1, pretty,
- dont_print);
+ dont_print_vb);
if (!len && n_baseclasses == 1)
fprintf_filtered (stream, "<No data fields>");
extern int inspect_it;
int fields_seen = 0;
+ if (dont_print_statmem == 0)
+ {
+ /* If we're at top level, carve out a completely fresh
+ chunk of the obstack and use that until this particular
+ invocation returns. */
+ tmp_obstack = dont_print_statmem_obstack;
+ obstack_finish (&dont_print_statmem_obstack);
+ }
+
for (i = n_baseclasses; i < len; i++)
{
/* If requested, skip printing of static fields. */
{
v = value_at (TYPE_FIELD_TYPE (type, i),
(CORE_ADDR)SYMBOL_BLOCK_VALUE (sym));
- val_print (TYPE_FIELD_TYPE (type, i),
- VALUE_CONTENTS_RAW (v),
- VALUE_ADDRESS (v),
- stream, format, 0, recurse + 1, pretty);
+ cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
+ stream, format, recurse + 1,
+ pretty);
}
}
else
annotate_field_end ();
}
+ if (dont_print_statmem == 0)
+ {
+ /* Free the space used to deal with the printing
+ of the members from top level. */
+ obstack_free (&dont_print_statmem_obstack, last_dont_print);
+ dont_print_statmem_obstack = tmp_obstack;
+ }
+
if (pretty)
{
fprintf_filtered (stream, "\n");
baseclasses. */
static void
-cplus_print_value (type, valaddr, stream, format, recurse, pretty, dont_print)
+cplus_print_value (type, valaddr, stream, format, recurse, pretty,
+ dont_print_vb)
struct type *type;
char *valaddr;
GDB_FILE *stream;
int format;
int recurse;
enum val_prettyprint pretty;
- struct type **dont_print;
+ struct type **dont_print_vb;
{
struct obstack tmp_obstack;
struct type **last_dont_print
- = (struct type **)obstack_next_free (&dont_print_obstack);
+ = (struct type **)obstack_next_free (&dont_print_vb_obstack);
int i, n_baseclasses = TYPE_N_BASECLASSES (type);
- if (dont_print == 0)
+ if (dont_print_vb == 0)
{
/* If we're at top level, carve out a completely fresh
chunk of the obstack and use that until this particular
invocation returns. */
- tmp_obstack = dont_print_obstack;
+ tmp_obstack = dont_print_vb_obstack;
/* Bump up the high-water mark. Now alpha is omega. */
- obstack_finish (&dont_print_obstack);
+ obstack_finish (&dont_print_vb_obstack);
}
for (i = 0; i < n_baseclasses; i++)
if (BASETYPE_VIA_VIRTUAL (type, i))
{
struct type **first_dont_print
- = (struct type **)obstack_base (&dont_print_obstack);
+ = (struct type **)obstack_base (&dont_print_vb_obstack);
- int j = (struct type **)obstack_next_free (&dont_print_obstack)
+ int j = (struct type **)obstack_next_free (&dont_print_vb_obstack)
- first_dont_print;
while (--j >= 0)
if (TYPE_BASECLASS (type, i) == first_dont_print[j])
goto flush_it;
- obstack_ptr_grow (&dont_print_obstack, TYPE_BASECLASS (type, i));
+ obstack_ptr_grow (&dont_print_vb_obstack, TYPE_BASECLASS (type, i));
}
/* Fix to use baseclass_offset instead. FIXME */
else
cp_print_value_fields (TYPE_BASECLASS (type, i), baddr, stream, format,
recurse, pretty,
- (struct type **) obstack_base (&dont_print_obstack));
+ (struct type **) obstack_base (&dont_print_vb_obstack),
+ 0);
fputs_filtered (", ", stream);
flush_it:
;
}
- if (dont_print == 0)
+ if (dont_print_vb == 0)
{
/* Free the space used to deal with the printing
of this type from top level. */
- obstack_free (&dont_print_obstack, last_dont_print);
+ obstack_free (&dont_print_vb_obstack, last_dont_print);
/* Reset watermark so that we can continue protecting
ourselves from whatever we were protecting ourselves. */
- dont_print_obstack = tmp_obstack;
+ dont_print_vb_obstack = tmp_obstack;
+ }
+}
+
+/* Print value of a static member.
+ To avoid infinite recursion when printing a class that contains
+ a static instance of the class, we keep the addresses of all printed
+ static member classes in an obstack and refuse to print them more
+ than once.
+
+ VAL contains the value to print, TYPE, STREAM, RECURSE, and PRETTY
+ have the same meanings as in c_val_print. */
+
+static void
+cp_print_static_field (type, val, stream, format, recurse, pretty)
+ struct type *type;
+ value_ptr val;
+ GDB_FILE *stream;
+ int format;
+ int recurse;
+ enum val_prettyprint pretty;
+{
+ if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ {
+ CORE_ADDR *first_dont_print;
+ int i;
+
+ first_dont_print
+ = (CORE_ADDR *)obstack_base (&dont_print_statmem_obstack);
+ i = (CORE_ADDR *)obstack_next_free (&dont_print_statmem_obstack)
+ - first_dont_print;
+
+ while (--i >= 0)
+ {
+ if (VALUE_ADDRESS (val) == first_dont_print[i])
+ {
+ fputs_filtered ("<same as static member of an already seen type>",
+ stream);
+ return;
+ }
+ }
+
+ obstack_grow (&dont_print_statmem_obstack, &VALUE_ADDRESS (val),
+ sizeof (CORE_ADDR));
+
+ check_stub_type (type);
+ cp_print_value_fields (type, VALUE_CONTENTS (val),
+ stream, format, recurse, pretty,
+ NULL, 1);
+ return;
}
+ val_print (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val),
+ stream, format, 0, recurse, pretty);
}
void
/* Give people the defaults which they are used to. */
objectprint = 0;
vtblprint = 0;
- obstack_begin (&dont_print_obstack, 32 * sizeof (struct type *));
+ obstack_begin (&dont_print_vb_obstack, 32 * sizeof (struct type *));
+ obstack_specify_allocation (&dont_print_statmem_obstack,
+ 32 * sizeof (CORE_ADDR), sizeof (CORE_ADDR),
+ xmalloc, free);
}
SYNOPSIS
void elf_symtab_read (bfd *abfd, CORE_ADDR addr,
- struct objfile *objfile)
+ struct objfile *objfile, int dynamic)
DESCRIPTION
asymbol *filesym = 0;
#ifdef SOFUN_ADDRESS_MAYBE_MISSING
/* Name of filesym, as saved on the symbol_obstack. */
- char *filesymname;
+ char *filesymname = obsavestring ("", 0, &objfile->symbol_obstack);
#endif
struct dbx_symfile_info *dbx = (struct dbx_symfile_info *)
objfile->sym_stab_info;
continue;
}
- if (sym -> section == &bfd_und_section
+ if (dynamic
+ && sym -> section == &bfd_und_section
&& (sym -> flags & BSF_FUNCTION))
{
+ struct minimal_symbol *msym;
+
/* Symbol is a reference to a function defined in
a shared library.
If its value is non zero then it is usually the address
relative to the base address.
If its value is zero then the dynamic linker has to resolve
the symbol. We are unable to find any meaningful address
- for this symbol in the executable file, so we skip it.
- Irix 5 has a zero value for all shared library functions
- in the main symbol table, but the dynamic symbol table
- provides the right values. */
+ for this symbol in the executable file, so we skip it. */
symaddr = sym -> value;
if (symaddr == 0)
continue;
symaddr += addr;
- record_minimal_symbol_and_info ((char *) sym -> name, symaddr,
- mst_solib_trampoline, NULL,
- objfile);
+ msym = record_minimal_symbol_and_info
+ ((char *) sym -> name, symaddr,
+ mst_solib_trampoline, NULL, objfile);
+#ifdef SOFUN_ADDRESS_MAYBE_MISSING
+ msym->filename = filesymname;
+#endif
continue;
}
projects / binutils-gdb.git / commitdiff