2000-06-14 12:27:59 +00:00
|
|
|
|
/* Support for printing Pascal values for GDB, the GNU debugger.
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 17:17:25 +00:00
|
|
|
|
Copyright 2000, 2001, 2003
|
2000-06-14 12:27:59 +00:00
|
|
|
|
Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
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 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. */
|
|
|
|
|
|
|
|
|
|
/* This file is derived from c-valprint.c */
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
2002-07-29 Andrew Cagney <ac131313@redhat.com>
* gdb_obstack.h: New file.
* symtab.h: Include "gdb_obstack.h" instead of "obstack.h".
(obstack_chunk_alloc, obstack_chunk_free): Delete macros.
* objfiles.h: Include "gdb_obstack.h".
* Makefile.in (gdb_obstack_h): Define.
(symtab_h): Add $(gdb_obstack_h).
(objfiles_h): Add $(gdb_obstack_h).
* objfiles.c: Include "gdb_obstack.h" instead of "obstack.h".
* macrotab.c, cp-valprint.c, dbxread.c: Ditto.
* ch-typeprint.c, ch-valprint.c, dstread.c: Ditto.
* macroexp.c, p-typeprint.c, stabsread.c: Ditto.
* symtab.c, f-typeprint.c, mdebugread.c: Ditto.
* p-valprint.c, symmisc.c, typeprint.c: Ditto.
* symfile.c, coffread.c, c-typeprint.c: Ditto.
* buildsym.c, bcache.c, ada-typeprint.c: Ditto.
* Makefile.in (bcache.o): Update dependencies.
(buildsym.o, c-typeprint.o, ch-typeprint.o): Ditto.
(ch-valprint.o, coffread.o, cp-valprint.o): Ditto.
(dbxread.o, dstread.o, f-typeprint.o): Ditto.
(objfiles.o, p-typeprint.o, p-valprint.o): Ditto.
(stabsread.o, symfile.o, symmisc.o): Ditto.
(symtab.o, typeprint.o, macroexp.o): Ditto.
(macrotab.o, mdebugread.o): Ditto.
(f_lang_h, coff_sym_h, coff_symconst_h): Define.
(coff_ecoff_h, aout_aout64_h): Define.
(aout_stabs_gnu_h, libaout_h): Define.
2002-07-29 22:55:26 +00:00
|
|
|
|
#include "gdb_obstack.h"
|
2000-06-14 12:27:59 +00:00
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "command.h"
|
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "gdbcore.h"
|
|
|
|
|
#include "demangle.h"
|
|
|
|
|
#include "valprint.h"
|
2001-03-27 20:36:24 +00:00
|
|
|
|
#include "typeprint.h"
|
2000-06-14 12:27:59 +00:00
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "target.h"
|
|
|
|
|
#include "annotate.h"
|
|
|
|
|
#include "p-lang.h"
|
2002-01-04 19:16:28 +00:00
|
|
|
|
#include "cp-abi.h"
|
2000-06-14 12:27:59 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Print data of type TYPE located at VALADDR (within GDB), which came from
|
|
|
|
|
the inferior at address ADDRESS, onto stdio stream STREAM according to
|
|
|
|
|
FORMAT (a letter or 0 for natural format). The data at VALADDR is in
|
|
|
|
|
target byte order.
|
|
|
|
|
|
|
|
|
|
If the data are a string pointer, returns the number of string characters
|
|
|
|
|
printed.
|
|
|
|
|
|
|
|
|
|
If DEREF_REF is nonzero, then dereference references, otherwise just print
|
|
|
|
|
them like pointers.
|
|
|
|
|
|
|
|
|
|
The PRETTY parameter controls prettyprinting. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
|
pascal_val_print (struct type *type, char *valaddr, int embedded_offset,
|
|
|
|
|
CORE_ADDR address, struct ui_file *stream, int format,
|
|
|
|
|
int deref_ref, int recurse, enum val_prettyprint pretty)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 16:32:14 +00:00
|
|
|
|
unsigned int i = 0; /* Number of characters printed */
|
2000-06-14 12:27:59 +00:00
|
|
|
|
unsigned len;
|
|
|
|
|
struct type *elttype;
|
|
|
|
|
unsigned eltlen;
|
2001-11-09 09:48:09 +00:00
|
|
|
|
int length_pos, length_size, string_pos;
|
|
|
|
|
int char_size;
|
2000-06-14 12:27:59 +00:00
|
|
|
|
LONGEST val;
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case TYPE_CODE_ARRAY:
|
|
|
|
|
if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0)
|
|
|
|
|
{
|
|
|
|
|
elttype = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
eltlen = TYPE_LENGTH (elttype);
|
|
|
|
|
len = TYPE_LENGTH (type) / eltlen;
|
|
|
|
|
if (prettyprint_arrays)
|
|
|
|
|
{
|
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
/* For an array of chars, print with string syntax. */
|
|
|
|
|
if (eltlen == 1 &&
|
|
|
|
|
((TYPE_CODE (elttype) == TYPE_CODE_INT)
|
|
|
|
|
|| ((current_language->la_language == language_m2)
|
|
|
|
|
&& (TYPE_CODE (elttype) == TYPE_CODE_CHAR)))
|
|
|
|
|
&& (format == 0 || format == 's'))
|
|
|
|
|
{
|
|
|
|
|
/* If requested, look for the first null char and only print
|
|
|
|
|
elements up to it. */
|
|
|
|
|
if (stop_print_at_null)
|
|
|
|
|
{
|
|
|
|
|
unsigned int temp_len;
|
|
|
|
|
|
|
|
|
|
/* Look for a NULL char. */
|
|
|
|
|
for (temp_len = 0;
|
|
|
|
|
(valaddr + embedded_offset)[temp_len]
|
|
|
|
|
&& temp_len < len && temp_len < print_max;
|
|
|
|
|
temp_len++);
|
|
|
|
|
len = temp_len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
LA_PRINT_STRING (stream, valaddr + embedded_offset, len, 1, 0);
|
|
|
|
|
i = len;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "{");
|
|
|
|
|
/* If this is a virtual function table, print the 0th
|
|
|
|
|
entry specially, and the rest of the members normally. */
|
|
|
|
|
if (pascal_object_is_vtbl_ptr_type (elttype))
|
|
|
|
|
{
|
|
|
|
|
i = 1;
|
|
|
|
|
fprintf_filtered (stream, "%d vtable entries", len - 1);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
i = 0;
|
|
|
|
|
}
|
|
|
|
|
val_print_array_elements (type, valaddr + embedded_offset, address, stream,
|
|
|
|
|
format, deref_ref, recurse, pretty, i);
|
|
|
|
|
fprintf_filtered (stream, "}");
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Array of unspecified length: treat like pointer to first elt. */
|
|
|
|
|
addr = address;
|
|
|
|
|
goto print_unpacked_pointer;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_PTR:
|
|
|
|
|
if (format && format != 's')
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (vtblprint && pascal_object_is_vtbl_ptr_type (type))
|
|
|
|
|
{
|
|
|
|
|
/* Print the unmangled name if desired. */
|
|
|
|
|
/* Print vtable entry - we only get here if we ARE using
|
|
|
|
|
-fvtable_thunks. (Otherwise, look under TYPE_CODE_STRUCT.) */
|
2003-05-24 03:21:42 +00:00
|
|
|
|
/* Extract the address, assume that it is unsigned. */
|
|
|
|
|
print_address_demangle (extract_unsigned_integer (valaddr + embedded_offset, TYPE_LENGTH (type)),
|
2000-06-14 12:27:59 +00:00
|
|
|
|
stream, demangle);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
elttype = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
if (TYPE_CODE (elttype) == TYPE_CODE_METHOD)
|
|
|
|
|
{
|
|
|
|
|
pascal_object_print_class_method (valaddr + embedded_offset, type, stream);
|
|
|
|
|
}
|
|
|
|
|
else if (TYPE_CODE (elttype) == TYPE_CODE_MEMBER)
|
|
|
|
|
{
|
|
|
|
|
pascal_object_print_class_member (valaddr + embedded_offset,
|
|
|
|
|
TYPE_DOMAIN_TYPE (TYPE_TARGET_TYPE (type)),
|
|
|
|
|
stream, "&");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
addr = unpack_pointer (type, valaddr + embedded_offset);
|
|
|
|
|
print_unpacked_pointer:
|
|
|
|
|
elttype = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
|
|
|
|
|
if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
|
|
|
|
|
{
|
|
|
|
|
/* Try to print what function it points to. */
|
|
|
|
|
print_address_demangle (addr, stream, demangle);
|
|
|
|
|
/* Return value is irrelevant except for string pointers. */
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (addressprint && format != 's')
|
|
|
|
|
{
|
|
|
|
|
print_address_numeric (addr, 1, stream);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* For a pointer to char or unsigned char, also print the string
|
|
|
|
|
pointed to, unless pointer is null. */
|
|
|
|
|
if (TYPE_LENGTH (elttype) == 1
|
|
|
|
|
&& TYPE_CODE (elttype) == TYPE_CODE_INT
|
|
|
|
|
&& (format == 0 || format == 's')
|
|
|
|
|
&& addr != 0)
|
|
|
|
|
{
|
|
|
|
|
/* no wide string yet */
|
|
|
|
|
i = val_print_string (addr, -1, 1, stream);
|
|
|
|
|
}
|
|
|
|
|
/* also for pointers to pascal strings */
|
|
|
|
|
/* Note: this is Free Pascal specific:
|
|
|
|
|
as GDB does not recognize stabs pascal strings
|
|
|
|
|
Pascal strings are mapped to records
|
|
|
|
|
with lowercase names PM */
|
2002-05-02 11:18:07 +00:00
|
|
|
|
if (is_pascal_string_type (elttype, &length_pos, &length_size,
|
|
|
|
|
&string_pos, &char_size, NULL)
|
2001-11-09 09:48:09 +00:00
|
|
|
|
&& addr != 0)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
2001-11-09 09:48:09 +00:00
|
|
|
|
ULONGEST string_length;
|
|
|
|
|
void *buffer;
|
|
|
|
|
buffer = xmalloc (length_size);
|
|
|
|
|
read_memory (addr + length_pos, buffer, length_size);
|
|
|
|
|
string_length = extract_unsigned_integer (buffer, length_size);
|
|
|
|
|
xfree (buffer);
|
|
|
|
|
i = val_print_string (addr + string_pos, string_length, char_size, stream);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
}
|
|
|
|
|
else if (pascal_object_is_vtbl_member (type))
|
|
|
|
|
{
|
|
|
|
|
/* print vtbl's nicely */
|
|
|
|
|
CORE_ADDR vt_address = unpack_pointer (type, valaddr + embedded_offset);
|
|
|
|
|
|
|
|
|
|
struct minimal_symbol *msymbol =
|
|
|
|
|
lookup_minimal_symbol_by_pc (vt_address);
|
2001-11-09 09:48:09 +00:00
|
|
|
|
if ((msymbol != NULL)
|
|
|
|
|
&& (vt_address == SYMBOL_VALUE_ADDRESS (msymbol)))
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
fputs_filtered (" <", stream);
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 17:17:25 +00:00
|
|
|
|
fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
fputs_filtered (">", stream);
|
|
|
|
|
}
|
|
|
|
|
if (vt_address && vtblprint)
|
|
|
|
|
{
|
2001-11-10 20:44:38 +00:00
|
|
|
|
struct value *vt_val;
|
2000-06-14 12:27:59 +00:00
|
|
|
|
struct symbol *wsym = (struct symbol *) NULL;
|
|
|
|
|
struct type *wtype;
|
|
|
|
|
struct block *block = (struct block *) NULL;
|
|
|
|
|
int is_this_fld;
|
|
|
|
|
|
|
|
|
|
if (msymbol != NULL)
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 21:36:23 +00:00
|
|
|
|
wsym = lookup_symbol (DEPRECATED_SYMBOL_NAME (msymbol), block,
|
2003-06-02 18:08:16 +00:00
|
|
|
|
VAR_DOMAIN, &is_this_fld, NULL);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
|
|
|
|
|
if (wsym)
|
|
|
|
|
{
|
|
|
|
|
wtype = SYMBOL_TYPE (wsym);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
wtype = TYPE_TARGET_TYPE (type);
|
|
|
|
|
}
|
|
|
|
|
vt_val = value_at (wtype, vt_address, NULL);
|
|
|
|
|
val_print (VALUE_TYPE (vt_val), VALUE_CONTENTS (vt_val), 0,
|
|
|
|
|
VALUE_ADDRESS (vt_val), stream, format,
|
|
|
|
|
deref_ref, recurse + 1, pretty);
|
|
|
|
|
if (pretty)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return number of characters printed, including the terminating
|
|
|
|
|
'\0' if we reached the end. val_print_string takes care including
|
|
|
|
|
the terminating '\0' if necessary. */
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_MEMBER:
|
|
|
|
|
error ("not implemented: member type in pascal_val_print");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_REF:
|
|
|
|
|
elttype = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
if (TYPE_CODE (elttype) == TYPE_CODE_MEMBER)
|
|
|
|
|
{
|
|
|
|
|
pascal_object_print_class_member (valaddr + embedded_offset,
|
|
|
|
|
TYPE_DOMAIN_TYPE (elttype),
|
|
|
|
|
stream, "");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (addressprint)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "@");
|
2003-05-24 03:21:42 +00:00
|
|
|
|
/* Extract the address, assume that it is unsigned. */
|
2000-06-14 12:27:59 +00:00
|
|
|
|
print_address_numeric
|
2003-05-24 03:21:42 +00:00
|
|
|
|
(extract_unsigned_integer (valaddr + embedded_offset,
|
|
|
|
|
TARGET_PTR_BIT / HOST_CHAR_BIT),
|
|
|
|
|
1, stream);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
if (deref_ref)
|
|
|
|
|
fputs_filtered (": ", stream);
|
|
|
|
|
}
|
|
|
|
|
/* De-reference the reference. */
|
|
|
|
|
if (deref_ref)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
|
|
|
|
|
{
|
2001-11-10 20:44:38 +00:00
|
|
|
|
struct value *deref_val =
|
2000-06-14 12:27:59 +00:00
|
|
|
|
value_at
|
|
|
|
|
(TYPE_TARGET_TYPE (type),
|
|
|
|
|
unpack_pointer (lookup_pointer_type (builtin_type_void),
|
|
|
|
|
valaddr + embedded_offset),
|
|
|
|
|
NULL);
|
|
|
|
|
val_print (VALUE_TYPE (deref_val),
|
|
|
|
|
VALUE_CONTENTS (deref_val), 0,
|
|
|
|
|
VALUE_ADDRESS (deref_val), stream, format,
|
|
|
|
|
deref_ref, recurse + 1, pretty);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("???", stream);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_UNION:
|
|
|
|
|
if (recurse && !unionprint)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "{...}");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
|
if (vtblprint && pascal_object_is_vtbl_ptr_type (type))
|
|
|
|
|
{
|
|
|
|
|
/* Print the unmangled name if desired. */
|
|
|
|
|
/* Print vtable entry - we only get here if NOT using
|
|
|
|
|
-fvtable_thunks. (Otherwise, look under TYPE_CODE_PTR.) */
|
2003-05-24 03:21:42 +00:00
|
|
|
|
/* Extract the address, assume that it is unsigned. */
|
|
|
|
|
print_address_demangle
|
|
|
|
|
(extract_unsigned_integer (valaddr + embedded_offset + TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8,
|
|
|
|
|
TYPE_LENGTH (TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET))),
|
|
|
|
|
stream, demangle);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2001-11-09 09:48:09 +00:00
|
|
|
|
if (is_pascal_string_type (type, &length_pos, &length_size,
|
2002-05-02 11:18:07 +00:00
|
|
|
|
&string_pos, &char_size, NULL))
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
2001-11-09 09:48:09 +00:00
|
|
|
|
len = extract_unsigned_integer (valaddr + embedded_offset + length_pos, length_size);
|
|
|
|
|
LA_PRINT_STRING (stream, valaddr + embedded_offset + string_pos, len, char_size, 0);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
pascal_object_print_value_fields (type, valaddr + embedded_offset, address, stream, format,
|
|
|
|
|
recurse, pretty, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_ENUM:
|
|
|
|
|
if (format)
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
len = TYPE_NFIELDS (type);
|
|
|
|
|
val = unpack_long (type, valaddr + embedded_offset);
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
{
|
|
|
|
|
QUIT;
|
|
|
|
|
if (val == TYPE_FIELD_BITPOS (type, i))
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i < len)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
print_longest (stream, 'd', 0, val);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_FUNC:
|
|
|
|
|
if (format)
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* FIXME, we should consider, at least for ANSI C language, eliminating
|
|
|
|
|
the distinction made between FUNCs and POINTERs to FUNCs. */
|
|
|
|
|
fprintf_filtered (stream, "{");
|
|
|
|
|
type_print (type, "", stream, -1);
|
|
|
|
|
fprintf_filtered (stream, "} ");
|
|
|
|
|
/* Try to print what function it points to, and its address. */
|
|
|
|
|
print_address_demangle (address, stream, demangle);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_BOOL:
|
|
|
|
|
format = format ? format : output_format;
|
|
|
|
|
if (format)
|
|
|
|
|
print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
val = unpack_long (type, valaddr + embedded_offset);
|
|
|
|
|
if (val == 0)
|
|
|
|
|
fputs_filtered ("false", stream);
|
|
|
|
|
else if (val == 1)
|
|
|
|
|
fputs_filtered ("true", stream);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered ("true (", stream);
|
|
|
|
|
fprintf_filtered (stream, "%ld)", (long int) val);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_RANGE:
|
|
|
|
|
/* FIXME: create_range_type does not set the unsigned bit in a
|
|
|
|
|
range type (I think it probably should copy it from the target
|
|
|
|
|
type), so we won't print values which are too large to
|
|
|
|
|
fit in a signed integer correctly. */
|
|
|
|
|
/* FIXME: Doesn't handle ranges of enums correctly. (Can't just
|
|
|
|
|
print with the target type, though, because the size of our type
|
|
|
|
|
and the target type might differ). */
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_INT:
|
|
|
|
|
format = format ? format : output_format;
|
|
|
|
|
if (format)
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
val_print_type_code_int (type, valaddr + embedded_offset, stream);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_CHAR:
|
|
|
|
|
format = format ? format : output_format;
|
|
|
|
|
if (format)
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
val = unpack_long (type, valaddr + embedded_offset);
|
|
|
|
|
if (TYPE_UNSIGNED (type))
|
|
|
|
|
fprintf_filtered (stream, "%u", (unsigned int) val);
|
|
|
|
|
else
|
|
|
|
|
fprintf_filtered (stream, "%d", (int) val);
|
|
|
|
|
fputs_filtered (" ", stream);
|
|
|
|
|
LA_PRINT_CHAR ((unsigned char) val, stream);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_FLT:
|
|
|
|
|
if (format)
|
|
|
|
|
{
|
|
|
|
|
print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
print_floating (valaddr + embedded_offset, type, stream);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_BITSTRING:
|
|
|
|
|
case TYPE_CODE_SET:
|
|
|
|
|
elttype = TYPE_INDEX_TYPE (type);
|
|
|
|
|
CHECK_TYPEDEF (elttype);
|
2001-12-12 02:11:52 +00:00
|
|
|
|
if (TYPE_STUB (elttype))
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "<incomplete type>");
|
|
|
|
|
gdb_flush (stream);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
struct type *range = elttype;
|
|
|
|
|
LONGEST low_bound, high_bound;
|
|
|
|
|
int i;
|
|
|
|
|
int is_bitstring = TYPE_CODE (type) == TYPE_CODE_BITSTRING;
|
|
|
|
|
int need_comma = 0;
|
|
|
|
|
|
|
|
|
|
if (is_bitstring)
|
|
|
|
|
fputs_filtered ("B'", stream);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("[", stream);
|
|
|
|
|
|
|
|
|
|
i = get_discrete_bounds (range, &low_bound, &high_bound);
|
|
|
|
|
maybe_bad_bstring:
|
|
|
|
|
if (i < 0)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered ("<error value>", stream);
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = low_bound; i <= high_bound; i++)
|
|
|
|
|
{
|
|
|
|
|
int element = value_bit_index (type, valaddr + embedded_offset, i);
|
|
|
|
|
if (element < 0)
|
|
|
|
|
{
|
|
|
|
|
i = element;
|
|
|
|
|
goto maybe_bad_bstring;
|
|
|
|
|
}
|
|
|
|
|
if (is_bitstring)
|
|
|
|
|
fprintf_filtered (stream, "%d", element);
|
|
|
|
|
else if (element)
|
|
|
|
|
{
|
|
|
|
|
if (need_comma)
|
|
|
|
|
fputs_filtered (", ", stream);
|
|
|
|
|
print_type_scalar (range, i, stream);
|
|
|
|
|
need_comma = 1;
|
|
|
|
|
|
|
|
|
|
if (i + 1 <= high_bound && value_bit_index (type, valaddr + embedded_offset, ++i))
|
|
|
|
|
{
|
|
|
|
|
int j = i;
|
|
|
|
|
fputs_filtered ("..", stream);
|
|
|
|
|
while (i + 1 <= high_bound
|
|
|
|
|
&& value_bit_index (type, valaddr + embedded_offset, ++i))
|
|
|
|
|
j = i;
|
|
|
|
|
print_type_scalar (range, j, stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
done:
|
|
|
|
|
if (is_bitstring)
|
|
|
|
|
fputs_filtered ("'", stream);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("]", stream);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_VOID:
|
|
|
|
|
fprintf_filtered (stream, "void");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_ERROR:
|
|
|
|
|
fprintf_filtered (stream, "<error type>");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_CODE_UNDEF:
|
|
|
|
|
/* This happens (without TYPE_FLAG_STUB set) on systems which don't use
|
|
|
|
|
dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
|
|
|
|
|
and no complete type for struct foo in that file. */
|
|
|
|
|
fprintf_filtered (stream, "<incomplete type>");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
error ("Invalid pascal type code %d in symbol table.", TYPE_CODE (type));
|
|
|
|
|
}
|
|
|
|
|
gdb_flush (stream);
|
|
|
|
|
return (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2001-11-10 20:44:38 +00:00
|
|
|
|
pascal_value_print (struct value *val, struct ui_file *stream, int format,
|
2000-07-30 01:48:28 +00:00
|
|
|
|
enum val_prettyprint pretty)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct type *type = VALUE_TYPE (val);
|
|
|
|
|
|
|
|
|
|
/* If it is a pointer, indicate what it points to.
|
|
|
|
|
|
|
|
|
|
Print type also if it is a reference.
|
|
|
|
|
|
|
|
|
|
Object pascal: if it is a member pointer, we will take care
|
|
|
|
|
of that when we print it. */
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR ||
|
|
|
|
|
TYPE_CODE (type) == TYPE_CODE_REF)
|
|
|
|
|
{
|
|
|
|
|
/* Hack: remove (char *) for char strings. Their
|
|
|
|
|
type is indicated by the quoted string anyway. */
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR &&
|
|
|
|
|
TYPE_NAME (type) == NULL &&
|
|
|
|
|
TYPE_NAME (TYPE_TARGET_TYPE (type)) != NULL &&
|
|
|
|
|
STREQ (TYPE_NAME (TYPE_TARGET_TYPE (type)), "char"))
|
|
|
|
|
{
|
|
|
|
|
/* Print nothing */
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
type_print (type, "", stream, -1);
|
|
|
|
|
fprintf_filtered (stream, ") ");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return val_print (type, VALUE_CONTENTS (val), VALUE_EMBEDDED_OFFSET (val),
|
|
|
|
|
VALUE_ADDRESS (val) + VALUE_OFFSET (val),
|
|
|
|
|
stream, format, 1, 0, pretty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
Inserted from cp-valprint
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
extern int vtblprint; /* Controls printing of vtbl's */
|
|
|
|
|
extern int objectprint; /* Controls looking up an object's derived type
|
|
|
|
|
using what we find in its vtables. */
|
|
|
|
|
static int pascal_static_field_print; /* Controls printing of static fields. */
|
|
|
|
|
|
|
|
|
|
static struct obstack dont_print_vb_obstack;
|
|
|
|
|
static struct obstack dont_print_statmem_obstack;
|
|
|
|
|
|
2001-11-10 20:44:38 +00:00
|
|
|
|
static void pascal_object_print_static_field (struct type *, struct value *,
|
|
|
|
|
struct ui_file *, int, int,
|
|
|
|
|
enum val_prettyprint);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
pascal_object_print_value (struct type *, char *, CORE_ADDR, struct ui_file *,
|
|
|
|
|
int, int, enum val_prettyprint, struct type **);
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
pascal_object_print_class_method (char *valaddr, struct type *type,
|
|
|
|
|
struct ui_file *stream)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct type *domain;
|
|
|
|
|
struct fn_field *f = NULL;
|
|
|
|
|
int j = 0;
|
|
|
|
|
int len2;
|
|
|
|
|
int offset;
|
|
|
|
|
char *kind = "";
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
unsigned len;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
|
|
|
|
|
|
domain = TYPE_DOMAIN_TYPE (target_type);
|
|
|
|
|
if (domain == (struct type *) NULL)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "<unknown>");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
addr = unpack_pointer (lookup_pointer_type (builtin_type_void), valaddr);
|
|
|
|
|
if (METHOD_PTR_IS_VIRTUAL (addr))
|
|
|
|
|
{
|
|
|
|
|
offset = METHOD_PTR_TO_VOFFSET (addr);
|
|
|
|
|
len = TYPE_NFN_FIELDS (domain);
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
{
|
|
|
|
|
f = TYPE_FN_FIELDLIST1 (domain, i);
|
|
|
|
|
len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
|
|
|
|
|
|
2002-09-14 02:09:39 +00:00
|
|
|
|
check_stub_method_group (domain, i);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
for (j = 0; j < len2; j++)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_FN_FIELD_VOFFSET (f, j) == offset)
|
|
|
|
|
{
|
|
|
|
|
kind = "virtual ";
|
|
|
|
|
goto common;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
sym = find_pc_function (addr);
|
|
|
|
|
if (sym == 0)
|
|
|
|
|
{
|
|
|
|
|
error ("invalid pointer to member function");
|
|
|
|
|
}
|
|
|
|
|
len = TYPE_NFN_FIELDS (domain);
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
{
|
|
|
|
|
f = TYPE_FN_FIELDLIST1 (domain, i);
|
|
|
|
|
len2 = TYPE_FN_FIELDLIST_LENGTH (domain, i);
|
|
|
|
|
|
2002-09-14 02:09:39 +00:00
|
|
|
|
check_stub_method_group (domain, i);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
for (j = 0; j < len2; j++)
|
|
|
|
|
{
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 21:36:23 +00:00
|
|
|
|
if (STREQ (DEPRECATED_SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j)))
|
2002-09-14 02:09:39 +00:00
|
|
|
|
goto common;
|
2000-06-14 12:27:59 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
common:
|
|
|
|
|
if (i < len)
|
|
|
|
|
{
|
|
|
|
|
char *demangled_name;
|
|
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "&");
|
2003-08-04 David Carlton <carlton@kealia.com>
* charset.c (cached_iconv_convert): Add __FILE__ and __LINE__ args
to internal_error call.
* source.c (forward_search_command): Add "%s" format argument.
(reverse_search_command): Ditto.
* top.c (quit_confirm): Ditto.
* cli/cli-setshow.c (do_setshow_command): Ditto.
* cp-valprint.c (cp_print_class_method): Replace
{f,}printf_{un,}filtered by {f,}puts_{un,}filtered.
(cp_print_class_member): Ditto.
* event-top.c (command_line_handler): Ditto.
* linux-proc.c (linux_info_proc_cmd): Ditto.
* p-typeprint.c (pascal_type_print_base): Ditto.
* p-valprint.c (pascal_object_print_class_method): Ditto.
(pascal_object_print_class_member): Ditto.
* printcmd.c (print_scalar_formatted,printf_command): Ditto.
* remote.c (remote_cisco_section_offsets): Ditto.
* top.c (command_line_input): Ditto.
* utils.c (vwarning,error_stream,quit): Ditto.
* valprint.c (print_floating,print_binary_chars)
(print_octal_chars,print_decimal_chars,print_hex_chars): Ditto.
2003-08-04 David Carlton <carlton@kealia.com>
* mi-main.c (mi_error_last_message): Add "%s" second argument to
xasprintf call.
2003-08-04 David Carlton <carlton@kealia.com>
* generic/gdbtk.c (gdbtk_source_start_file): Add "%s" first
argument to error call.
(tk_command): Ditto.
(view_command): Ditto.
2003-08-04 17:08:24 +00:00
|
|
|
|
fputs_filtered (kind, stream);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
demangled_name = cplus_demangle (TYPE_FN_FIELD_PHYSNAME (f, j),
|
|
|
|
|
DMGL_ANSI | DMGL_PARAMS);
|
|
|
|
|
if (demangled_name == NULL)
|
|
|
|
|
fprintf_filtered (stream, "<badly mangled name %s>",
|
|
|
|
|
TYPE_FN_FIELD_PHYSNAME (f, j));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered (demangled_name, stream);
|
2000-12-15 01:01:51 +00:00
|
|
|
|
xfree (demangled_name);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "(");
|
|
|
|
|
type_print (type, "", stream, -1);
|
|
|
|
|
fprintf_filtered (stream, ") %d", (int) addr >> 3);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* It was changed to this after 2.4.5. */
|
|
|
|
|
const char pascal_vtbl_ptr_name[] =
|
|
|
|
|
{'_', '_', 'v', 't', 'b', 'l', '_', 'p', 't', 'r', '_', 't', 'y', 'p', 'e', 0};
|
|
|
|
|
|
|
|
|
|
/* Return truth value for assertion that TYPE is of the type
|
|
|
|
|
"pointer to virtual function". */
|
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
|
pascal_object_is_vtbl_ptr_type (struct type *type)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
char *typename = type_name_no_tag (type);
|
|
|
|
|
|
|
|
|
|
return (typename != NULL
|
|
|
|
|
&& (STREQ (typename, pascal_vtbl_ptr_name)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return truth value for the assertion that TYPE is of the type
|
|
|
|
|
"pointer to virtual function table". */
|
|
|
|
|
|
|
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
|
pascal_object_is_vtbl_member (struct type *type)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
|
|
|
{
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
|
|
|
|
{
|
|
|
|
|
type = TYPE_TARGET_TYPE (type);
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT /* if not using thunks */
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_PTR) /* if using thunks */
|
|
|
|
|
{
|
|
|
|
|
/* Virtual functions tables are full of pointers
|
|
|
|
|
to virtual functions. */
|
|
|
|
|
return pascal_object_is_vtbl_ptr_type (type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Mutually recursive subroutines of pascal_object_print_value and c_val_print to
|
|
|
|
|
print out a structure's fields: pascal_object_print_value_fields and pascal_object_print_value.
|
|
|
|
|
|
|
|
|
|
TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the
|
|
|
|
|
same meanings as in pascal_object_print_value and c_val_print.
|
|
|
|
|
|
|
|
|
|
DONT_PRINT is an array of baseclass types that we
|
|
|
|
|
should not print, or zero if called from top level. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
pascal_object_print_value_fields (struct type *type, char *valaddr,
|
|
|
|
|
CORE_ADDR address, struct ui_file *stream,
|
|
|
|
|
int format, int recurse,
|
|
|
|
|
enum val_prettyprint pretty,
|
|
|
|
|
struct type **dont_print_vb,
|
|
|
|
|
int dont_print_statmem)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
int i, len, n_baseclasses;
|
|
|
|
|
struct obstack tmp_obstack;
|
|
|
|
|
char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
|
|
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "{");
|
|
|
|
|
len = TYPE_NFIELDS (type);
|
|
|
|
|
n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
|
|
|
|
|
|
|
|
/* Print out baseclasses such that we don't print
|
|
|
|
|
duplicates of virtual baseclasses. */
|
|
|
|
|
if (n_baseclasses > 0)
|
|
|
|
|
pascal_object_print_value (type, valaddr, address, stream,
|
|
|
|
|
format, recurse + 1, pretty, dont_print_vb);
|
|
|
|
|
|
|
|
|
|
if (!len && n_baseclasses == 1)
|
|
|
|
|
fprintf_filtered (stream, "<No data fields>");
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
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. */
|
|
|
|
|
if (!pascal_static_field_print && TYPE_FIELD_STATIC (type, i))
|
|
|
|
|
continue;
|
|
|
|
|
if (fields_seen)
|
|
|
|
|
fprintf_filtered (stream, ", ");
|
|
|
|
|
else if (n_baseclasses > 0)
|
|
|
|
|
{
|
|
|
|
|
if (pretty)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
|
fputs_filtered ("members of ", stream);
|
|
|
|
|
fputs_filtered (type_name_no_tag (type), stream);
|
|
|
|
|
fputs_filtered (": ", stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fields_seen = 1;
|
|
|
|
|
|
|
|
|
|
if (pretty)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
print_spaces_filtered (2 + 2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
wrap_here (n_spaces (2 + 2 * recurse));
|
|
|
|
|
}
|
|
|
|
|
if (inspect_it)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR)
|
|
|
|
|
fputs_filtered ("\"( ptr \"", stream);
|
|
|
|
|
else
|
|
|
|
|
fputs_filtered ("\"( nodef \"", stream);
|
|
|
|
|
if (TYPE_FIELD_STATIC (type, i))
|
|
|
|
|
fputs_filtered ("static ", stream);
|
|
|
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
|
|
|
language_cplus,
|
|
|
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
|
|
|
fputs_filtered ("\" \"", stream);
|
|
|
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
|
|
|
language_cplus,
|
|
|
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
|
|
|
fputs_filtered ("\") \"", stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
annotate_field_begin (TYPE_FIELD_TYPE (type, i));
|
|
|
|
|
|
|
|
|
|
if (TYPE_FIELD_STATIC (type, i))
|
|
|
|
|
fputs_filtered ("static ", stream);
|
|
|
|
|
fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
|
|
|
|
|
language_cplus,
|
|
|
|
|
DMGL_PARAMS | DMGL_ANSI);
|
|
|
|
|
annotate_field_name_end ();
|
|
|
|
|
fputs_filtered (" = ", stream);
|
|
|
|
|
annotate_field_value ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i))
|
|
|
|
|
{
|
2001-11-10 20:44:38 +00:00
|
|
|
|
struct value *v;
|
2000-06-14 12:27:59 +00:00
|
|
|
|
|
|
|
|
|
/* Bitfields require special handling, especially due to byte
|
|
|
|
|
order problems. */
|
|
|
|
|
if (TYPE_FIELD_IGNORE (type, i))
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered ("<optimized out or zero length>", stream);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
v = value_from_longest (TYPE_FIELD_TYPE (type, i),
|
|
|
|
|
unpack_field_as_long (type, valaddr, i));
|
|
|
|
|
|
|
|
|
|
val_print (TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS (v), 0, 0,
|
|
|
|
|
stream, format, 0, recurse + 1, pretty);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_FIELD_IGNORE (type, i))
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered ("<optimized out or zero length>", stream);
|
|
|
|
|
}
|
|
|
|
|
else if (TYPE_FIELD_STATIC (type, i))
|
|
|
|
|
{
|
2001-11-10 20:44:38 +00:00
|
|
|
|
/* struct value *v = value_static_field (type, i); v4.17 specific */
|
|
|
|
|
struct value *v;
|
2000-06-14 12:27:59 +00:00
|
|
|
|
v = value_from_longest (TYPE_FIELD_TYPE (type, i),
|
|
|
|
|
unpack_field_as_long (type, valaddr, i));
|
|
|
|
|
|
|
|
|
|
if (v == NULL)
|
|
|
|
|
fputs_filtered ("<optimized out>", stream);
|
|
|
|
|
else
|
|
|
|
|
pascal_object_print_static_field (TYPE_FIELD_TYPE (type, i), v,
|
|
|
|
|
stream, format, recurse + 1,
|
|
|
|
|
pretty);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* val_print (TYPE_FIELD_TYPE (type, i),
|
|
|
|
|
valaddr + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
|
|
|
address + TYPE_FIELD_BITPOS (type, i) / 8, 0,
|
|
|
|
|
stream, format, 0, recurse + 1, pretty); */
|
|
|
|
|
val_print (TYPE_FIELD_TYPE (type, i),
|
|
|
|
|
valaddr, TYPE_FIELD_BITPOS (type, i) / 8,
|
|
|
|
|
address + TYPE_FIELD_BITPOS (type, i) / 8,
|
|
|
|
|
stream, format, 0, recurse + 1, pretty);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
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");
|
|
|
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fprintf_filtered (stream, "}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Special val_print routine to avoid printing multiple copies of virtual
|
|
|
|
|
baseclasses. */
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
pascal_object_print_value (struct type *type, char *valaddr, CORE_ADDR address,
|
|
|
|
|
struct ui_file *stream, int format, int recurse,
|
|
|
|
|
enum val_prettyprint pretty,
|
|
|
|
|
struct type **dont_print_vb)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
struct obstack tmp_obstack;
|
|
|
|
|
struct type **last_dont_print
|
|
|
|
|
= (struct type **) obstack_next_free (&dont_print_vb_obstack);
|
|
|
|
|
int i, n_baseclasses = TYPE_N_BASECLASSES (type);
|
|
|
|
|
|
|
|
|
|
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_vb_obstack;
|
|
|
|
|
/* Bump up the high-water mark. Now alpha is omega. */
|
|
|
|
|
obstack_finish (&dont_print_vb_obstack);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n_baseclasses; i++)
|
|
|
|
|
{
|
|
|
|
|
int boffset;
|
|
|
|
|
struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
|
|
|
|
|
char *basename = TYPE_NAME (baseclass);
|
|
|
|
|
char *base_valaddr;
|
|
|
|
|
|
|
|
|
|
if (BASETYPE_VIA_VIRTUAL (type, i))
|
|
|
|
|
{
|
|
|
|
|
struct type **first_dont_print
|
|
|
|
|
= (struct type **) obstack_base (&dont_print_vb_obstack);
|
|
|
|
|
|
|
|
|
|
int j = (struct type **) obstack_next_free (&dont_print_vb_obstack)
|
|
|
|
|
- first_dont_print;
|
|
|
|
|
|
|
|
|
|
while (--j >= 0)
|
|
|
|
|
if (baseclass == first_dont_print[j])
|
|
|
|
|
goto flush_it;
|
|
|
|
|
|
|
|
|
|
obstack_ptr_grow (&dont_print_vb_obstack, baseclass);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
boffset = baseclass_offset (type, i, valaddr, address);
|
|
|
|
|
|
|
|
|
|
if (pretty)
|
|
|
|
|
{
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
|
print_spaces_filtered (2 * recurse, stream);
|
|
|
|
|
}
|
|
|
|
|
fputs_filtered ("<", stream);
|
|
|
|
|
/* Not sure what the best notation is in the case where there is no
|
|
|
|
|
baseclass name. */
|
|
|
|
|
|
|
|
|
|
fputs_filtered (basename ? basename : "", stream);
|
|
|
|
|
fputs_filtered ("> = ", stream);
|
|
|
|
|
|
|
|
|
|
/* The virtual base class pointer might have been clobbered by the
|
|
|
|
|
user program. Make sure that it still points to a valid memory
|
|
|
|
|
location. */
|
|
|
|
|
|
|
|
|
|
if (boffset != -1 && (boffset < 0 || boffset >= TYPE_LENGTH (type)))
|
|
|
|
|
{
|
2002-01-08 02:09:31 +00:00
|
|
|
|
/* FIXME (alloc): not safe is baseclass is really really big. */
|
2000-06-14 12:27:59 +00:00
|
|
|
|
base_valaddr = (char *) alloca (TYPE_LENGTH (baseclass));
|
|
|
|
|
if (target_read_memory (address + boffset, base_valaddr,
|
|
|
|
|
TYPE_LENGTH (baseclass)) != 0)
|
|
|
|
|
boffset = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
base_valaddr = valaddr + boffset;
|
|
|
|
|
|
|
|
|
|
if (boffset == -1)
|
|
|
|
|
fprintf_filtered (stream, "<invalid address>");
|
|
|
|
|
else
|
|
|
|
|
pascal_object_print_value_fields (baseclass, base_valaddr, address + boffset,
|
|
|
|
|
stream, format, recurse, pretty,
|
|
|
|
|
(struct type **) obstack_base (&dont_print_vb_obstack),
|
|
|
|
|
0);
|
|
|
|
|
fputs_filtered (", ", stream);
|
|
|
|
|
|
|
|
|
|
flush_it:
|
|
|
|
|
;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dont_print_vb == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Free the space used to deal with the printing
|
|
|
|
|
of this type from top level. */
|
|
|
|
|
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_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
|
2001-11-10 20:44:38 +00:00
|
|
|
|
pascal_object_print_static_field (struct type *type, struct value *val,
|
2000-07-30 01:48:28 +00:00
|
|
|
|
struct ui_file *stream, int format,
|
|
|
|
|
int recurse, enum val_prettyprint pretty)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
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, (char *) &VALUE_ADDRESS (val),
|
|
|
|
|
sizeof (CORE_ADDR));
|
|
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
pascal_object_print_value_fields (type, VALUE_CONTENTS (val), VALUE_ADDRESS (val),
|
|
|
|
|
stream, format, recurse, pretty, NULL, 1);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
val_print (type, VALUE_CONTENTS (val), 0, VALUE_ADDRESS (val),
|
|
|
|
|
stream, format, 0, recurse, pretty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
pascal_object_print_class_member (char *valaddr, struct type *domain,
|
|
|
|
|
struct ui_file *stream, char *prefix)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
/* VAL is a byte offset into the structure type DOMAIN.
|
|
|
|
|
Find the name of the field for that offset and
|
|
|
|
|
print it. */
|
|
|
|
|
int extra = 0;
|
|
|
|
|
int bits = 0;
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 16:32:14 +00:00
|
|
|
|
unsigned int i;
|
2000-06-14 12:27:59 +00:00
|
|
|
|
unsigned len = TYPE_NFIELDS (domain);
|
|
|
|
|
/* @@ Make VAL into bit offset */
|
|
|
|
|
LONGEST val = unpack_long (builtin_type_int, valaddr) << 3;
|
|
|
|
|
for (i = TYPE_N_BASECLASSES (domain); i < len; i++)
|
|
|
|
|
{
|
|
|
|
|
int bitpos = TYPE_FIELD_BITPOS (domain, i);
|
|
|
|
|
QUIT;
|
|
|
|
|
if (val == bitpos)
|
|
|
|
|
break;
|
|
|
|
|
if (val < bitpos && i != 0)
|
|
|
|
|
{
|
|
|
|
|
/* Somehow pointing into a field. */
|
|
|
|
|
i -= 1;
|
|
|
|
|
extra = (val - TYPE_FIELD_BITPOS (domain, i));
|
|
|
|
|
if (extra & 0x7)
|
|
|
|
|
bits = 1;
|
|
|
|
|
else
|
|
|
|
|
extra >>= 3;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i < len)
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
2003-08-04 David Carlton <carlton@kealia.com>
* charset.c (cached_iconv_convert): Add __FILE__ and __LINE__ args
to internal_error call.
* source.c (forward_search_command): Add "%s" format argument.
(reverse_search_command): Ditto.
* top.c (quit_confirm): Ditto.
* cli/cli-setshow.c (do_setshow_command): Ditto.
* cp-valprint.c (cp_print_class_method): Replace
{f,}printf_{un,}filtered by {f,}puts_{un,}filtered.
(cp_print_class_member): Ditto.
* event-top.c (command_line_handler): Ditto.
* linux-proc.c (linux_info_proc_cmd): Ditto.
* p-typeprint.c (pascal_type_print_base): Ditto.
* p-valprint.c (pascal_object_print_class_method): Ditto.
(pascal_object_print_class_member): Ditto.
* printcmd.c (print_scalar_formatted,printf_command): Ditto.
* remote.c (remote_cisco_section_offsets): Ditto.
* top.c (command_line_input): Ditto.
* utils.c (vwarning,error_stream,quit): Ditto.
* valprint.c (print_floating,print_binary_chars)
(print_octal_chars,print_decimal_chars,print_hex_chars): Ditto.
2003-08-04 David Carlton <carlton@kealia.com>
* mi-main.c (mi_error_last_message): Add "%s" second argument to
xasprintf call.
2003-08-04 David Carlton <carlton@kealia.com>
* generic/gdbtk.c (gdbtk_source_start_file): Add "%s" first
argument to error call.
(tk_command): Ditto.
(view_command): Ditto.
2003-08-04 17:08:24 +00:00
|
|
|
|
fputs_filtered (prefix, stream);
|
2000-06-14 12:27:59 +00:00
|
|
|
|
name = type_name_no_tag (domain);
|
|
|
|
|
if (name)
|
|
|
|
|
fputs_filtered (name, stream);
|
|
|
|
|
else
|
|
|
|
|
pascal_type_print_base (domain, stream, 0, 0);
|
|
|
|
|
fprintf_filtered (stream, "::");
|
|
|
|
|
fputs_filtered (TYPE_FIELD_NAME (domain, i), stream);
|
|
|
|
|
if (extra)
|
|
|
|
|
fprintf_filtered (stream, " + %d bytes", extra);
|
|
|
|
|
if (bits)
|
|
|
|
|
fprintf_filtered (stream, " (offset in bits)");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
fprintf_filtered (stream, "%ld", (long int) (val >> 3));
|
|
|
|
|
}
|
|
|
|
|
|
2003-06-08 Andrew Cagney <cagney@redhat.com>
* acinclude.m4 (gcc_AC_CHECK_DECL, (gcc_AC_CHECK_DECL): Stolen
from GCC's acinclude.m4.
* configure.in: Check for getopt's delcaration.
* aclocal.m4, config.in, configure: Re-generate.
* main.c (error_init): Delete declaration.
* defs.h (error_init): Declare.
* rs6000-tdep.c (rs6000_fetch_pointer_argument): Make static.
(rs6000_convert_from_func_ptr_addr): Make static.
(_initialize_rs6000_tdep): Add declaration.
* cli/cli-cmds.c (dont_repeat): Delete declaration.
(show_commands, set_verbose, show_history): Delete declaration.
* top.h (set_verbose): Add declaration.
(show_history, set_history, show_commands): Add declaration.
(do_restore_instream_cleanup): Add declaration.
* objc-lang.c (specialcmp): Make static.
(print_object_command): Make static.
(find_objc_msgsend): Make static.
(find_objc_msgcall_submethod_helper): Make static.
(find_objc_msgcall_submethod): Make static.
(_initialize_objc_language): Add declaration.
(find_implementation_from_class): Make static.
(find_implementation): Make static.
* objc-exp.y (yylex): Delete lookup_struct_typedef declaration.
* objc-lang.h (lookup_struct_typedef): Add declaration.
* cli/cli-interp.c (_initialize_cli_interp): Add declaration.
* cli/cli-script.c (clear_hook_in_cleanup): Make static.
(do_restore_user_call_depth): Make static.
(do_restore_instream_cleanup): Delete declaration.
(dont_repeat): Delete declaration.
* cli/cli-decode.c (add_abbrev_cmd): Delete function.
* cli/cli-dump.c (_initialize_cli_dump): Add declaration.
* reggroups.c (_initialize_reggroup): Add declaration.
* cp-support.c (_initialize_cp_support): Add declaration.
* cp-abi.c (_initialize_cp_abi): Add declaration.
* hpacc-abi.c (_initialize_hpacc_abi): Add declaration.
* gnu-v3-abi.c (gnuv3_baseclass_offset): Make static.
(_initialize_gnu_v3_abi): Add declaration.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Make static.
(_initialize_gnu_v2_abi): Add declaration.
* frame-base.c (_initialize_frame_base): Add declaration.
* doublest.c (floatformat_from_length): Make static.
* frame-unwind.c (_initialize_frame_unwind): Add declaration.
* frame.c (create_sentinel_frame): Make static.
(_initialize_frame): Add declaration.
* top.c (do_catch_errors): Make static.
(gdb_rl_operate_and_get_next_completion): Make static.
* typeprint.c: Include "typeprint.h".
* sentinel-frame.c (sentinel_frame_prev_register): Make static.
(sentinel_frame_this_id): Make static.
* p-valprint.c (_initialize_pascal_valprint): Add declaration.
* ui-out.c (make_cleanup_ui_out_begin_end): Delete function.
* dwarf2-frame.c (dwarf2_frame_cache): Make static.
* p-exp.y (push_current_type, pop_current_type): ISO C declaration.
* dwarf2expr.h (dwarf_expr_context): ISO C declaration.
* maint.c (maintenance_print_architecture): Make static.
* signals/signals.c (_initialize_signals): Add declaration.
* std-regs.c (_initialize_frame_reg): Add declaration.
* jv-exp.y (push_variable): ISO C definition.
(push_qualified_expression_name): Ditto.
* memattr.c (_initialize_mem): Add declaration.
* remote.c (remote_check_watch_resources): Make static.
(remote_stopped_by_watchpoint): Make static.
(remote_stopped_data_address): Make static.
* d10v-tdep.c (nr_dmap_regs): Make static.
(a0_regnum): Make static.
(d10v_frame_unwind_cache): Make static.
(d10v_frame_p): Make static.
* osabi.c (show_osabi): Make static.
(_initialize_gdb_osabi): Add extern declaration.
* gdbtypes.c (make_qualified_type): Make static.
(safe_parse_type): Make static.
* macrocmd.c (_initialize_macrocmd): Add extern declaration.
* macrotab.c (macro_bcache_free): Make static.
* interps.c (interp_set_quiet): Make static.
(interpreter_exec_cmd): Make static.
* stack.h (select_frame_command): New file.
* stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete function.
(select_frame_command): Make global.
* infcall.c: Include "infcall.h".
* linespec.c: Include "linespec.h".
* symfile.c (sections_overlap): Make static.
* cp-support.h (cp_initialize_namespace): ISO C declaration.
* charset.c (_initialize_charset): Add missing prototype.
* regcache.c (init_legacy_regcache_descr): Make static.
(do_regcache_xfree): Make static.
(regcache_xfer_part): Make static.
(_initialize_regcache): Add missing prototype.
* breakpoint.c (parse_breakpoint_sals): Make static.
(breakpoint_sals_to_pc): Make static.
* interps.h (clear_interpreter_hooks): ISO C declaration.
* Makefile.in (stack_h): Define.
(stack.o, typeprint.o, mi-main.o): Update dependencies.
(mi-cmd-stack.o, infcall.o, linespec.o): Update dependencies.
Index: mi/ChangeLog
2003-06-08 Andrew Cagney <cagney@redhat.com>
* mi-parse.c (_initialize_mi_parse): Delete function.
* mi-main.c: Include "mi-main.h".
* mi-interp.c (_initialize_mi_interp): Add declaration.
* mi-cmd-stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete extern declaration.
(mi_cmd_stack_select_frame): Replace select_frame_command_wrapper
with select_frame_command.
2003-06-08 18:27:14 +00:00
|
|
|
|
extern initialize_file_ftype _initialize_pascal_valprint; /* -Wmissing-prototypes */
|
2000-06-14 12:27:59 +00:00
|
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
|
_initialize_pascal_valprint (void)
|
2000-06-14 12:27:59 +00:00
|
|
|
|
{
|
|
|
|
|
add_show_from_set
|
|
|
|
|
(add_set_cmd ("pascal_static-members", class_support, var_boolean,
|
|
|
|
|
(char *) &pascal_static_field_print,
|
|
|
|
|
"Set printing of pascal static members.",
|
|
|
|
|
&setprintlist),
|
|
|
|
|
&showprintlist);
|
|
|
|
|
/* Turn on printing of static fields. */
|
|
|
|
|
pascal_static_field_print = 1;
|
|
|
|
|
|
|
|
|
|
}
|