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().
421 lines
12 KiB
C
421 lines
12 KiB
C
/* Support for printing Fortran types for GDB, the GNU debugger.
|
||
|
||
Copyright (C) 1986, 1988, 1989, 1991, 1993, 1994, 1995, 1996, 1998,
|
||
2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
|
||
|
||
Contributed by Motorola. Adapted from the C version by Farooq Butt
|
||
(fmbutt@engage.sps.mot.com).
|
||
|
||
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"
|
||
#include "symtab.h"
|
||
#include "gdbtypes.h"
|
||
#include "expression.h"
|
||
#include "value.h"
|
||
#include "gdbcore.h"
|
||
#include "target.h"
|
||
#include "f-lang.h"
|
||
|
||
#include "gdb_string.h"
|
||
#include <errno.h>
|
||
|
||
#if 0 /* Currently unused */
|
||
static void f_type_print_args (struct type *, struct ui_file *);
|
||
#endif
|
||
|
||
static void print_equivalent_f77_float_type (int level, struct type *,
|
||
struct ui_file *);
|
||
|
||
static void f_type_print_varspec_suffix (struct type *, struct ui_file *,
|
||
int, int, int);
|
||
|
||
void f_type_print_varspec_prefix (struct type *, struct ui_file *,
|
||
int, int);
|
||
|
||
void f_type_print_base (struct type *, struct ui_file *, int, int);
|
||
|
||
|
||
/* LEVEL is the depth to indent lines by. */
|
||
|
||
void
|
||
f_print_type (struct type *type, char *varstring, struct ui_file *stream,
|
||
int show, int level)
|
||
{
|
||
enum type_code code;
|
||
int demangled_args;
|
||
|
||
f_type_print_base (type, stream, show, level);
|
||
code = TYPE_CODE (type);
|
||
if ((varstring != NULL && *varstring != '\0')
|
||
||
|
||
/* Need a space if going to print stars or brackets;
|
||
but not if we will print just a type name. */
|
||
((show > 0 || TYPE_NAME (type) == 0)
|
||
&&
|
||
(code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
|
||
|| code == TYPE_CODE_METHOD
|
||
|| code == TYPE_CODE_ARRAY
|
||
|| code == TYPE_CODE_REF)))
|
||
fputs_filtered (" ", stream);
|
||
f_type_print_varspec_prefix (type, stream, show, 0);
|
||
|
||
fputs_filtered (varstring, stream);
|
||
|
||
/* For demangled function names, we have the arglist as part of the name,
|
||
so don't print an additional pair of ()'s */
|
||
|
||
demangled_args = varstring[strlen (varstring) - 1] == ')';
|
||
f_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
|
||
}
|
||
|
||
/* Print any asterisks or open-parentheses needed before the
|
||
variable name (to describe its type).
|
||
|
||
On outermost call, pass 0 for PASSED_A_PTR.
|
||
On outermost call, SHOW > 0 means should ignore
|
||
any typename for TYPE and show its details.
|
||
SHOW is always zero on recursive calls. */
|
||
|
||
void
|
||
f_type_print_varspec_prefix (struct type *type, struct ui_file *stream,
|
||
int show, int passed_a_ptr)
|
||
{
|
||
if (type == 0)
|
||
return;
|
||
|
||
if (TYPE_NAME (type) && show <= 0)
|
||
return;
|
||
|
||
QUIT;
|
||
|
||
switch (TYPE_CODE (type))
|
||
{
|
||
case TYPE_CODE_PTR:
|
||
f_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, 0, 1);
|
||
break;
|
||
|
||
case TYPE_CODE_FUNC:
|
||
f_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, 0, 0);
|
||
if (passed_a_ptr)
|
||
fprintf_filtered (stream, "(");
|
||
break;
|
||
|
||
case TYPE_CODE_ARRAY:
|
||
f_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, 0, 0);
|
||
break;
|
||
|
||
case TYPE_CODE_UNDEF:
|
||
case TYPE_CODE_STRUCT:
|
||
case TYPE_CODE_UNION:
|
||
case TYPE_CODE_ENUM:
|
||
case TYPE_CODE_INT:
|
||
case TYPE_CODE_FLT:
|
||
case TYPE_CODE_VOID:
|
||
case TYPE_CODE_ERROR:
|
||
case TYPE_CODE_CHAR:
|
||
case TYPE_CODE_BOOL:
|
||
case TYPE_CODE_SET:
|
||
case TYPE_CODE_RANGE:
|
||
case TYPE_CODE_STRING:
|
||
case TYPE_CODE_BITSTRING:
|
||
case TYPE_CODE_METHOD:
|
||
case TYPE_CODE_REF:
|
||
case TYPE_CODE_COMPLEX:
|
||
case TYPE_CODE_TYPEDEF:
|
||
/* These types need no prefix. They are listed here so that
|
||
gcc -Wall will reveal any types that haven't been handled. */
|
||
break;
|
||
}
|
||
}
|
||
|
||
/* Print any array sizes, function arguments or close parentheses
|
||
needed after the variable name (to describe its type).
|
||
Args work like c_type_print_varspec_prefix. */
|
||
|
||
static void
|
||
f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
|
||
int show, int passed_a_ptr, int demangled_args)
|
||
{
|
||
int upper_bound, lower_bound;
|
||
int lower_bound_was_default = 0;
|
||
static int arrayprint_recurse_level = 0;
|
||
int retcode;
|
||
|
||
if (type == 0)
|
||
return;
|
||
|
||
if (TYPE_NAME (type) && show <= 0)
|
||
return;
|
||
|
||
QUIT;
|
||
|
||
switch (TYPE_CODE (type))
|
||
{
|
||
case TYPE_CODE_ARRAY:
|
||
arrayprint_recurse_level++;
|
||
|
||
if (arrayprint_recurse_level == 1)
|
||
fprintf_filtered (stream, "(");
|
||
|
||
if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY)
|
||
f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0);
|
||
|
||
retcode = f77_get_dynamic_lowerbound (type, &lower_bound);
|
||
|
||
lower_bound_was_default = 0;
|
||
|
||
if (retcode == BOUND_FETCH_ERROR)
|
||
fprintf_filtered (stream, "???");
|
||
else if (lower_bound == 1) /* The default */
|
||
lower_bound_was_default = 1;
|
||
else
|
||
fprintf_filtered (stream, "%d", lower_bound);
|
||
|
||
if (lower_bound_was_default)
|
||
lower_bound_was_default = 0;
|
||
else
|
||
fprintf_filtered (stream, ":");
|
||
|
||
/* Make sure that, if we have an assumed size array, we
|
||
print out a warning and print the upperbound as '*' */
|
||
|
||
if (TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED)
|
||
fprintf_filtered (stream, "*");
|
||
else
|
||
{
|
||
retcode = f77_get_dynamic_upperbound (type, &upper_bound);
|
||
|
||
if (retcode == BOUND_FETCH_ERROR)
|
||
fprintf_filtered (stream, "???");
|
||
else
|
||
fprintf_filtered (stream, "%d", upper_bound);
|
||
}
|
||
|
||
if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY)
|
||
f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0);
|
||
if (arrayprint_recurse_level == 1)
|
||
fprintf_filtered (stream, ")");
|
||
else
|
||
fprintf_filtered (stream, ",");
|
||
arrayprint_recurse_level--;
|
||
break;
|
||
|
||
case TYPE_CODE_PTR:
|
||
case TYPE_CODE_REF:
|
||
f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0);
|
||
fprintf_filtered (stream, ")");
|
||
break;
|
||
|
||
case TYPE_CODE_FUNC:
|
||
f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
|
||
passed_a_ptr, 0);
|
||
if (passed_a_ptr)
|
||
fprintf_filtered (stream, ")");
|
||
|
||
fprintf_filtered (stream, "()");
|
||
break;
|
||
|
||
case TYPE_CODE_UNDEF:
|
||
case TYPE_CODE_STRUCT:
|
||
case TYPE_CODE_UNION:
|
||
case TYPE_CODE_ENUM:
|
||
case TYPE_CODE_INT:
|
||
case TYPE_CODE_FLT:
|
||
case TYPE_CODE_VOID:
|
||
case TYPE_CODE_ERROR:
|
||
case TYPE_CODE_CHAR:
|
||
case TYPE_CODE_BOOL:
|
||
case TYPE_CODE_SET:
|
||
case TYPE_CODE_RANGE:
|
||
case TYPE_CODE_STRING:
|
||
case TYPE_CODE_BITSTRING:
|
||
case TYPE_CODE_METHOD:
|
||
case TYPE_CODE_COMPLEX:
|
||
case TYPE_CODE_TYPEDEF:
|
||
/* These types do not need a suffix. They are listed so that
|
||
gcc -Wall will report types that may not have been considered. */
|
||
break;
|
||
}
|
||
}
|
||
|
||
static void
|
||
print_equivalent_f77_float_type (int level, struct type *type,
|
||
struct ui_file *stream)
|
||
{
|
||
/* Override type name "float" and make it the
|
||
appropriate real. XLC stupidly outputs -12 as a type
|
||
for real when it really should be outputting -18 */
|
||
|
||
fprintfi_filtered (level, stream, "real*%d", TYPE_LENGTH (type));
|
||
}
|
||
|
||
/* Print the name of the type (or the ultimate pointer target,
|
||
function value or array element), or the description of a
|
||
structure or union.
|
||
|
||
SHOW nonzero means don't print this type as just its name;
|
||
show its real definition even if it has a name.
|
||
SHOW zero means print just typename or struct tag if there is one
|
||
SHOW negative means abbreviate structure elements.
|
||
SHOW is decremented for printing of structure elements.
|
||
|
||
LEVEL is the depth to indent by.
|
||
We increase it for some recursive calls. */
|
||
|
||
void
|
||
f_type_print_base (struct type *type, struct ui_file *stream, int show,
|
||
int level)
|
||
{
|
||
int retcode;
|
||
int upper_bound;
|
||
|
||
int index;
|
||
|
||
QUIT;
|
||
|
||
wrap_here (" ");
|
||
if (type == NULL)
|
||
{
|
||
fputs_filtered ("<type unknown>", stream);
|
||
return;
|
||
}
|
||
|
||
/* When SHOW is zero or less, and there is a valid type name, then always
|
||
just print the type name directly from the type. */
|
||
|
||
if ((show <= 0) && (TYPE_NAME (type) != NULL))
|
||
{
|
||
if (TYPE_CODE (type) == TYPE_CODE_FLT)
|
||
print_equivalent_f77_float_type (level, type, stream);
|
||
else
|
||
fputs_filtered (TYPE_NAME (type), stream);
|
||
return;
|
||
}
|
||
|
||
if (TYPE_CODE (type) != TYPE_CODE_TYPEDEF)
|
||
CHECK_TYPEDEF (type);
|
||
|
||
switch (TYPE_CODE (type))
|
||
{
|
||
case TYPE_CODE_TYPEDEF:
|
||
f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
|
||
break;
|
||
|
||
case TYPE_CODE_ARRAY:
|
||
case TYPE_CODE_FUNC:
|
||
f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
|
||
break;
|
||
|
||
case TYPE_CODE_PTR:
|
||
fprintf_filtered (stream, "PTR TO -> ( ");
|
||
f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
|
||
break;
|
||
|
||
case TYPE_CODE_REF:
|
||
fprintf_filtered (stream, "REF TO -> ( ");
|
||
f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level);
|
||
break;
|
||
|
||
case TYPE_CODE_VOID:
|
||
fprintfi_filtered (level, stream, "VOID");
|
||
break;
|
||
|
||
case TYPE_CODE_UNDEF:
|
||
fprintfi_filtered (level, stream, "struct <unknown>");
|
||
break;
|
||
|
||
case TYPE_CODE_ERROR:
|
||
fprintfi_filtered (level, stream, "<unknown type>");
|
||
break;
|
||
|
||
case TYPE_CODE_RANGE:
|
||
/* This should not occur */
|
||
fprintfi_filtered (level, stream, "<range type>");
|
||
break;
|
||
|
||
case TYPE_CODE_CHAR:
|
||
/* Override name "char" and make it "character" */
|
||
fprintfi_filtered (level, stream, "character");
|
||
break;
|
||
|
||
case TYPE_CODE_INT:
|
||
/* There may be some character types that attempt to come
|
||
through as TYPE_CODE_INT since dbxstclass.h is so
|
||
C-oriented, we must change these to "character" from "char". */
|
||
|
||
if (strcmp (TYPE_NAME (type), "char") == 0)
|
||
fprintfi_filtered (level, stream, "character");
|
||
else
|
||
goto default_case;
|
||
break;
|
||
|
||
case TYPE_CODE_COMPLEX:
|
||
fprintfi_filtered (level, stream, "complex*%d", TYPE_LENGTH (type));
|
||
break;
|
||
|
||
case TYPE_CODE_FLT:
|
||
print_equivalent_f77_float_type (level, type, stream);
|
||
break;
|
||
|
||
case TYPE_CODE_STRING:
|
||
/* Strings may have dynamic upperbounds (lengths) like arrays. */
|
||
|
||
if (TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED)
|
||
fprintfi_filtered (level, stream, "character*(*)");
|
||
else
|
||
{
|
||
retcode = f77_get_dynamic_upperbound (type, &upper_bound);
|
||
|
||
if (retcode == BOUND_FETCH_ERROR)
|
||
fprintf_filtered (stream, "character*???");
|
||
else
|
||
fprintf_filtered (stream, "character*%d", upper_bound);
|
||
}
|
||
break;
|
||
|
||
case TYPE_CODE_STRUCT:
|
||
fprintfi_filtered (level, stream, "Type ");
|
||
fputs_filtered (TYPE_TAG_NAME (type), stream);
|
||
fputs_filtered ("\n", stream);
|
||
for (index = 0; index < TYPE_NFIELDS (type); index++)
|
||
{
|
||
f_print_type (TYPE_FIELD_TYPE (type, index), "", stream, show, level + 4);
|
||
fputs_filtered (" :: ", stream);
|
||
fputs_filtered (TYPE_FIELD_NAME (type, index), stream);
|
||
fputs_filtered ("\n", stream);
|
||
}
|
||
fprintfi_filtered (level, stream, "End Type ");
|
||
fputs_filtered (TYPE_TAG_NAME (type), stream);
|
||
break;
|
||
|
||
default_case:
|
||
default:
|
||
/* Handle types not explicitly handled by the other cases,
|
||
such as fundamental types. For these, just print whatever
|
||
the type name is, as recorded in the type itself. If there
|
||
is no type name, then complain. */
|
||
if (TYPE_NAME (type) != NULL)
|
||
fprintfi_filtered (level, stream, "%s", TYPE_NAME (type));
|
||
else
|
||
error (_("Invalid type code (%d) in symbol table."), TYPE_CODE (type));
|
||
break;
|
||
}
|
||
}
|