mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-09 04:21:49 +08:00
0d5de0100f
* Makefile.in (gnu-v3-abi.o): Delete special rule. (eval.o, gnu-v3-abi.o, ia64-tdep.o): Update. * ada-valprint.c (ada_print_scalar): Update for new type codes. * c-typeprint.c (c_print_type): Update for new type codes. (c_type_print_varspec_prefix, c_type_print_varspec_suffix) (c_type_print_base): Likewise. (c_type_print_args): Rewrite. * c-valprint.c (c_val_print): Update for new type codes. Remove support for references to members. Treat methods like functions. * cp-abi.c (cplus_print_method_ptr, cplus_method_ptr_size) (cplus_make_method_ptr, cplus_method_ptr_to_value): New. * cp-abi.h (cplus_print_method_ptr, cplus_method_ptr_size) (cplus_make_method_ptr, cplus_method_ptr_to_value): New prototypes. (struct cp_abi_ops): Add corresponding members. * cp-valprint.c (cp_print_class_method): Delete. (cp_find_class_member): New function. (cp_print_class_member): Use it. Simplify support for bogus member pointers. * dwarf2read.c (quirk_gcc_member_function_pointer): Use lookup_methodptr_type. (read_tag_ptr_to_member_type): Likewise, and lookup_memberptr_type. * eval.c (evaluate_subexp_standard): Implement EVAL_SKIP for OP_SCOPE. Update call to value_aggregate_elt. Rewrite member pointer support. (evaluate_subexp_for_address): Handle OP_SCOPE explicitly. Handle references returned by user defined operators. * f-typeprint.c (f_print_type, f_type_print_varspec_prefix) (f_type_print_varspec_suffix): Remove support for member pointers. * gdbtypes.c (lookup_memberptr_type): Renamed from lookup_member_type and adjusted. (smash_to_memberptr_type): Likewise, from smash_to_member_type. (lookup_methodptr_type): New. (rank_one_type): Adjust for TYPE_CODE_MEMBERPTR. (recursive_dump_type): Update for new types. * gdbtypes.h (enum type_code): Replace TYPE_CODE_MEMBER with TYPE_CODE_MEMBERPTR and TYPE_CODE_METHODPTR. (lookup_memberptr_type, lookup_methodptr_type) (smash_to_memberptr_type): New prototypes. (smash_to_method_type): Formatting fix. (lookup_member_type, smash_to_member_type): Delete prototypes. * gnu-v3-abi.c (gnuv3_get_vtable, gnuv3_get_virtual_fn): New. Do not rely on debug information for the vptr or the method's enclosing type. Handle function descriptors for IA64. (gnuv3_virtual_fn_field): Rewrite using the new functions. (gnuv3_find_method_in, gnuv3_print_method_ptr) (gnuv3_method_ptr_size, gnuv3_make_method_ptr) (gnuv3_method_ptr_to_value): New. (init_gnuv3_ops): Set new members of gnu_v3_abi_ops. * hpread.c (hpread_type_lookup): Update for new types. * infcall.c (value_arg_coerce): Likewise. * m2-typeprint.c (m2_print_type): Remove explicit support for member pointers. * m2-valprint.c (m2_val_print): Likewise. * p-typeprint.c (pascal_type_print_varspec_prefix) (pascal_type_print_varspec_suffix, pascal_type_print_base): Likewise. * p-valprint.c (pascal_val_print): Likewise. (pascal_object_print_class_method, pascal_object_print_class_member): Delete. * p-lang.h (pascal_object_print_class_method) (pascal_object_print_class_member): Delete prototypes. * stabsread.c (read_type): Update for new types. * typeprint.c (print_type_scalar): Likewise. * valops.c (value_struct_elt_for_reference, value_namespace_elt) (value_maybe_namespace_elt, value_aggregate_elt): Add want_address argument. Construct a pointer to member if the address of a function or data member is requested. (value_cast_pointers): Don't modify the input value. (value_cast): Adjust pointer to member handling for new types. Allow null pointer to member constants. Don't modify the input value. (value_ind): Remove pointer to member check. Handle function descriptors for function pointers. (value_struct_elt, value_find_oload_method_list, check_field): Remove pointer to member checks. * value.c (unpack_long): Allow pointers to data members. (value_from_longest): Allow member pointers. * value.h (value_aggregate_elt): Add want_address. * varobj.c (c_variable_editable): Remove check for members. * gdbarch.sh: Add vtable_function_descriptors and vbit_in_delta. * ia64-tdep.c (ia64_convert_from_func_ptr_addr): Handle descriptors in virtual tables. (ia64_gdbarch_init): Call set_gdbarch_vtable_function_descriptors. * c-lang.h (cp_print_class_method): Delete prototype. * arm-tdep.c (arm_gdbarch_init): Call set_gdbarch_vbit_in_delta. * mips-tdep.c (mips_gdbarch_init): Likewise. * gdbarch.c, gdbarch.h: Regenerated. * gdb.cp/classes.exp (test_pointers_to_class_members): Update expected output. Test the types of members and member pointers. * gdb.cp/inherit.exp (test_print_mi_member_types): Remove KFAILs for gdb/2092. * gdb.cp/member-ptr.exp: Search for a comment instead of a statement. Enable for GCC. Update expected output for some tests and add new tests. Remove obsolete GCC KFAILs. Allow GCC's class layout. * gdb.cp/member-ptr.cc (Padding, Padding::vspacer, Base, Base::get_x) (Base::vget_base, Left, Left::vget, Right, Right::vget, Diamond) (Diamond::vget_base): New. (main): Add new tests. * gdb.cp/printmethod.exp: Update expected output for member functions. * gdb.cp/virtfunc.exp (test_virtual_calls): Add a KFAIL for print pEe->D::vg().
325 lines
8.9 KiB
C
325 lines
8.9 KiB
C
/* Language independent support for printing types for GDB, the GNU debugger.
|
||
|
||
Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998,
|
||
1999, 2000, 2001, 2003, 2006 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., 51 Franklin Street, Fifth Floor,
|
||
Boston, MA 02110-1301, USA. */
|
||
|
||
#include "defs.h"
|
||
#include "gdb_obstack.h"
|
||
#include "bfd.h" /* Binary File Description */
|
||
#include "symtab.h"
|
||
#include "gdbtypes.h"
|
||
#include "expression.h"
|
||
#include "value.h"
|
||
#include "gdbcore.h"
|
||
#include "command.h"
|
||
#include "gdbcmd.h"
|
||
#include "target.h"
|
||
#include "language.h"
|
||
#include "cp-abi.h"
|
||
#include "typeprint.h"
|
||
#include "gdb_string.h"
|
||
#include <errno.h>
|
||
|
||
/* For real-type printing in whatis_exp() */
|
||
extern int objectprint; /* Controls looking up an object's derived type
|
||
using what we find in its vtables. */
|
||
|
||
extern void _initialize_typeprint (void);
|
||
|
||
static void ptype_command (char *, int);
|
||
|
||
static void whatis_command (char *, int);
|
||
|
||
static void whatis_exp (char *, int);
|
||
|
||
/* Print a description of a type in the format of a
|
||
typedef for the current language.
|
||
NEW is the new name for a type TYPE. */
|
||
|
||
void
|
||
typedef_print (struct type *type, struct symbol *new, struct ui_file *stream)
|
||
{
|
||
CHECK_TYPEDEF (type);
|
||
switch (current_language->la_language)
|
||
{
|
||
#ifdef _LANG_c
|
||
case language_c:
|
||
case language_cplus:
|
||
fprintf_filtered (stream, "typedef ");
|
||
type_print (type, "", stream, 0);
|
||
if (TYPE_NAME ((SYMBOL_TYPE (new))) == 0
|
||
|| strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), DEPRECATED_SYMBOL_NAME (new)) != 0)
|
||
fprintf_filtered (stream, " %s", SYMBOL_PRINT_NAME (new));
|
||
break;
|
||
#endif
|
||
#ifdef _LANG_m2
|
||
case language_m2:
|
||
fprintf_filtered (stream, "TYPE ");
|
||
if (!TYPE_NAME (SYMBOL_TYPE (new))
|
||
|| strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), DEPRECATED_SYMBOL_NAME (new)) != 0)
|
||
fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new));
|
||
else
|
||
fprintf_filtered (stream, "<builtin> = ");
|
||
type_print (type, "", stream, 0);
|
||
break;
|
||
#endif
|
||
#ifdef _LANG_pascal
|
||
case language_pascal:
|
||
fprintf_filtered (stream, "type ");
|
||
fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new));
|
||
type_print (type, "", stream, 0);
|
||
break;
|
||
#endif
|
||
default:
|
||
error (_("Language not supported."));
|
||
}
|
||
fprintf_filtered (stream, ";\n");
|
||
}
|
||
|
||
/* Print a description of a type TYPE in the form of a declaration of a
|
||
variable named VARSTRING. (VARSTRING is demangled if necessary.)
|
||
Output goes to STREAM (via stdio).
|
||
If SHOW is positive, we show the contents of the outermost level
|
||
of structure even if there is a type name that could be used instead.
|
||
If SHOW is negative, we never show the details of elements' types. */
|
||
|
||
void
|
||
type_print (struct type *type, char *varstring, struct ui_file *stream,
|
||
int show)
|
||
{
|
||
LA_PRINT_TYPE (type, varstring, stream, show, 0);
|
||
}
|
||
|
||
/* Print type of EXP, or last thing in value history if EXP == NULL.
|
||
show is passed to type_print. */
|
||
|
||
static void
|
||
whatis_exp (char *exp, int show)
|
||
{
|
||
struct expression *expr;
|
||
struct value *val;
|
||
struct cleanup *old_chain = NULL;
|
||
struct type *real_type = NULL;
|
||
struct type *type;
|
||
int full = 0;
|
||
int top = -1;
|
||
int using_enc = 0;
|
||
|
||
if (exp)
|
||
{
|
||
expr = parse_expression (exp);
|
||
old_chain = make_cleanup (free_current_contents, &expr);
|
||
val = evaluate_type (expr);
|
||
}
|
||
else
|
||
val = access_value_history (0);
|
||
|
||
type = value_type (val);
|
||
|
||
if (objectprint)
|
||
{
|
||
if (((TYPE_CODE (type) == TYPE_CODE_PTR) ||
|
||
(TYPE_CODE (type) == TYPE_CODE_REF))
|
||
&&
|
||
(TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
|
||
{
|
||
real_type = value_rtti_target_type (val, &full, &top, &using_enc);
|
||
if (real_type)
|
||
{
|
||
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
||
real_type = lookup_pointer_type (real_type);
|
||
else
|
||
real_type = lookup_reference_type (real_type);
|
||
}
|
||
}
|
||
else if (TYPE_CODE (type) == TYPE_CODE_CLASS)
|
||
real_type = value_rtti_type (val, &full, &top, &using_enc);
|
||
}
|
||
|
||
printf_filtered ("type = ");
|
||
|
||
if (real_type)
|
||
{
|
||
printf_filtered ("/* real type = ");
|
||
type_print (real_type, "", gdb_stdout, -1);
|
||
if (! full)
|
||
printf_filtered (" (incomplete object)");
|
||
printf_filtered (" */\n");
|
||
}
|
||
|
||
type_print (type, "", gdb_stdout, show);
|
||
printf_filtered ("\n");
|
||
|
||
if (exp)
|
||
do_cleanups (old_chain);
|
||
}
|
||
|
||
static void
|
||
whatis_command (char *exp, int from_tty)
|
||
{
|
||
/* Most of the time users do not want to see all the fields
|
||
in a structure. If they do they can use the "ptype" command.
|
||
Hence the "-1" below. */
|
||
whatis_exp (exp, -1);
|
||
}
|
||
|
||
/* TYPENAME is either the name of a type, or an expression. */
|
||
|
||
static void
|
||
ptype_command (char *typename, int from_tty)
|
||
{
|
||
whatis_exp (typename, 1);
|
||
}
|
||
|
||
/* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.
|
||
Used to print data from type structures in a specified type. For example,
|
||
array bounds may be characters or booleans in some languages, and this
|
||
allows the ranges to be printed in their "natural" form rather than as
|
||
decimal integer values.
|
||
|
||
FIXME: This is here simply because only the type printing routines
|
||
currently use it, and it wasn't clear if it really belonged somewhere
|
||
else (like printcmd.c). There are a lot of other gdb routines that do
|
||
something similar, but they are generally concerned with printing values
|
||
that come from the inferior in target byte order and target size. */
|
||
|
||
void
|
||
print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
|
||
{
|
||
unsigned int i;
|
||
unsigned len;
|
||
|
||
CHECK_TYPEDEF (type);
|
||
|
||
switch (TYPE_CODE (type))
|
||
{
|
||
|
||
case TYPE_CODE_ENUM:
|
||
len = TYPE_NFIELDS (type);
|
||
for (i = 0; i < len; i++)
|
||
{
|
||
if (TYPE_FIELD_BITPOS (type, i) == val)
|
||
{
|
||
break;
|
||
}
|
||
}
|
||
if (i < len)
|
||
{
|
||
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
|
||
}
|
||
else
|
||
{
|
||
print_longest (stream, 'd', 0, val);
|
||
}
|
||
break;
|
||
|
||
case TYPE_CODE_INT:
|
||
print_longest (stream, TYPE_UNSIGNED (type) ? 'u' : 'd', 0, val);
|
||
break;
|
||
|
||
case TYPE_CODE_CHAR:
|
||
LA_PRINT_CHAR ((unsigned char) val, stream);
|
||
break;
|
||
|
||
case TYPE_CODE_BOOL:
|
||
fprintf_filtered (stream, val ? "TRUE" : "FALSE");
|
||
break;
|
||
|
||
case TYPE_CODE_RANGE:
|
||
print_type_scalar (TYPE_TARGET_TYPE (type), val, stream);
|
||
return;
|
||
|
||
case TYPE_CODE_UNDEF:
|
||
case TYPE_CODE_PTR:
|
||
case TYPE_CODE_ARRAY:
|
||
case TYPE_CODE_STRUCT:
|
||
case TYPE_CODE_UNION:
|
||
case TYPE_CODE_FUNC:
|
||
case TYPE_CODE_FLT:
|
||
case TYPE_CODE_VOID:
|
||
case TYPE_CODE_SET:
|
||
case TYPE_CODE_STRING:
|
||
case TYPE_CODE_ERROR:
|
||
case TYPE_CODE_MEMBERPTR:
|
||
case TYPE_CODE_METHODPTR:
|
||
case TYPE_CODE_METHOD:
|
||
case TYPE_CODE_REF:
|
||
case TYPE_CODE_NAMESPACE:
|
||
error (_("internal error: unhandled type in print_type_scalar"));
|
||
break;
|
||
|
||
default:
|
||
error (_("Invalid type code in symbol table."));
|
||
}
|
||
gdb_flush (stream);
|
||
}
|
||
|
||
/* Dump details of a type specified either directly or indirectly.
|
||
Uses the same sort of type lookup mechanism as ptype_command()
|
||
and whatis_command(). */
|
||
|
||
void
|
||
maintenance_print_type (char *typename, int from_tty)
|
||
{
|
||
struct value *val;
|
||
struct type *type;
|
||
struct cleanup *old_chain;
|
||
struct expression *expr;
|
||
|
||
if (typename != NULL)
|
||
{
|
||
expr = parse_expression (typename);
|
||
old_chain = make_cleanup (free_current_contents, &expr);
|
||
if (expr->elts[0].opcode == OP_TYPE)
|
||
{
|
||
/* The user expression names a type directly, just use that type. */
|
||
type = expr->elts[1].type;
|
||
}
|
||
else
|
||
{
|
||
/* The user expression may name a type indirectly by naming an
|
||
object of that type. Find that indirectly named type. */
|
||
val = evaluate_type (expr);
|
||
type = value_type (val);
|
||
}
|
||
if (type != NULL)
|
||
{
|
||
recursive_dump_type (type, 0);
|
||
}
|
||
do_cleanups (old_chain);
|
||
}
|
||
}
|
||
|
||
|
||
void
|
||
_initialize_typeprint (void)
|
||
{
|
||
|
||
add_com ("ptype", class_vars, ptype_command, _("\
|
||
Print definition of type TYPE.\n\
|
||
Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\
|
||
or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\
|
||
The selected stack frame's lexical context is used to look up the name."));
|
||
|
||
add_com ("whatis", class_vars, whatis_command,
|
||
_("Print data type of expression EXP."));
|
||
|
||
}
|