f168693bc9
I think that the CHECK_TYPEDEF macro is not necessary, and even a bit annoying. It makes unclear the fact that the "type" variables gets overwritten. It has actually bitten me a few times. I think the following, explicit form, is better. type = check_typedef (type); This patches changes all instances of CHECK_TYPEDEF for an equivalent call to check_typedef. The bulk of the change was done with this sed: sed -i 's/CHECK_TYPEDEF (\([^)]*\));/\1 = check_typedef (\1);/' <file>.c The ChangeLog was generated using David Malcom's generate_changelog.py. I manually fixed those places where it gets the wrong function name, hopefully all of them. The patch was built-tested, and I ran a few smoke tests. gdb/ChangeLog: * gdbtypes.h (CHECK_TYPEDEF): Remove. * aarch64-tdep.c (aarch64_return_in_memory): Replace CHECK_TYPEDEF with check_typedef. * ada-lang.c (decode_constrained_packed_array_type): Likewise. (ada_array_length): Likewise. (find_parallel_type_by_descriptive_type): Likewise. (ada_check_typedef): Likewise. * arm-tdep.c (arm_return_in_memory): Likewise. * ax-gdb.c (gen_trace_static_fields): Likewise. (gen_struct_ref_recursive): Likewise. * c-exp.y (exp : SIZEOF '(' type ')' %prec UNARY): Likewise. (variable: block COLONCOLON name): Likewise. (qualified_name: TYPENAME COLONCOLON name): Likewise. * c-lang.c (classify_type): Likewise. * c-typeprint.c (c_print_type): Likewise. (c_print_typedef): Likewise. (c_type_print_base): Likewise. * c-valprint.c (c_val_print): Likewise. * compile/compile-c-types.c (convert_type): Likewise. * compile/compile-object-load.c (get_out_value_type): Likewise. * completer.c (add_struct_fields): Likewise. (expression_completer): Likewise. * cp-namespace.c (cp_find_type_baseclass_by_name): Likewise. (cp_lookup_nested_symbol_1): Likewise. (cp_lookup_nested_symbol): Likewise. * cp-valprint.c (cp_print_value_fields): Likewise. (cp_print_static_field): Likewise. * d-valprint.c (d_val_print): Likewise. * eval.c (evaluate_subexp_standard): Likewise. (evaluate_subexp_for_sizeof): Likewise. * f-exp.y (exp : SIZEOF '(' type ')' %prec UNARY): Likewise. * f-typeprint.c (f_type_print_base): Likewise. * f-valprint.c (f_val_print): Likewise. * gdbtypes.c (get_discrete_bounds): Likewise. (create_array_type_with_stride): Likewise. (type_name_no_tag_or_error): Likewise. (lookup_struct_elt_type): Likewise. (get_unsigned_type_max): Likewise. (internal_type_vptr_fieldno): Likewise. (set_type_vptr_fieldno): Likewise. (internal_type_vptr_basetype): Likewise. (set_type_vptr_basetype): Likewise. (get_vptr_fieldno): Likewise. (is_integral_type): Likewise. (is_scalar_type): Likewise. (is_scalar_type_recursive): Likewise. (distance_to_ancestor): Likewise. (is_unique_ancestor_worker): Likewise. (check_types_equal): Likewise. * gnu-v2-abi.c (gnuv2_value_rtti_type): Likewise. * gnu-v3-abi.c (gnuv3_dynamic_class): Likewise. (gnuv3_get_vtable): Likewise. (gnuv3_pass_by_reference): Likewise. * go-exp.y (exp : SIZEOF_KEYWORD '(' type ')' %prec UNARY): Likewise. * go-lang.c (gccgo_string_p): Likewise. (go_classify_struct_type): Likewise. * go-typeprint.c (go_print_type): Likewise. * go-valprint.c (go_val_print): Likewise. * guile/scm-math.c (vlscm_binop): Likewise. * guile/scm-value.c (gdbscm_value_dynamic_type): Likewise. (gdbscm_value_to_bytevector): Likewise. (gdbscm_value_to_bool): Likewise. (gdbscm_value_to_integer): Likewise. (gdbscm_value_to_real): Likewise. * infcall.c (call_function_by_hand_dummy): Likewise. * infcmd.c (get_return_value): Likewise. * jv-lang.c (is_object_type): Likewise. * jv-typeprint.c (java_type_print_base): Likewise. * jv-valprint.c (java_print_value_fields): Likewise. (java_val_print): Likewise. * linespec.c (find_methods): Likewise. (collect_one_symbol): Likewise. * m2-typeprint.c (m2_print_type): Likewise. (m2_print_typedef): Likewise. (m2_get_discrete_bounds): Likewise. * m2-valprint.c (m2_print_long_set): Likewise. (m2_print_unbounded_array): Likewise. (m2_print_array_contents): Likewise. (m2_val_print): Likewise. * opencl-lang.c (opencl_print_type): Likewise. * p-exp.y (exp : SIZEOF '(' type ')' %prec UNARY): Likewise. * p-typeprint.c (pascal_print_type): Likewise. (pascal_print_typedef): Likewise. (pascal_type_print_base): Likewise. * p-valprint.c (pascal_val_print): Likewise. (pascal_object_print_value_fields): Likewise. (pascal_object_print_static_field): Likewise. * python/py-type.c (typy_fields_items): Likewise. (typy_get_composite): Likewise. * python/py-value.c (valpy_get_dynamic_type): Likewise. (valpy_binop): Likewise. (valpy_long): Likewise. (valpy_float): Likewise. * stack.c (return_command): Likewise. * symtab.c (check_field): Likewise. (lookup_symbol_aux): Likewise. * tic6x-tdep.c (tic6x_return_value): Likewise. * typeprint.c (print_type_scalar): Likewise. * valarith.c (value_vector_widen): Likewise. * valops.c (value_cast): Likewise. (value_assign): Likewise. (do_search_struct_field): Likewise. (search_struct_method): Likewise. (find_method_list): Likewise. * valprint.c (val_print_scalar_type_p): Likewise. (valprint_check_validity): Likewise. (generic_val_print): Likewise. * value.c (unpack_double): Likewise. (value_primitive_field): Likewise. (unpack_bits_as_long): Likewise.
354 lines
9.5 KiB
C
354 lines
9.5 KiB
C
/* Support for printing Java types for GDB, the GNU debugger.
|
|
Copyright (C) 1997-2015 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 3 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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
#include "defs.h"
|
|
#include "symtab.h"
|
|
#include "gdbtypes.h"
|
|
#include "value.h"
|
|
#include "demangle.h"
|
|
#include "gdb-demangle.h"
|
|
#include "jv-lang.h"
|
|
#include "typeprint.h"
|
|
#include "c-lang.h"
|
|
#include "cp-abi.h"
|
|
#include "cp-support.h"
|
|
|
|
/* Local functions */
|
|
|
|
static void java_type_print_base (struct type * type,
|
|
struct ui_file *stream, int show,
|
|
int level,
|
|
const struct type_print_options *flags);
|
|
|
|
static void
|
|
java_type_print_derivation_info (struct ui_file *stream, struct type *type)
|
|
{
|
|
const char *name;
|
|
int i;
|
|
int n_bases;
|
|
int prev;
|
|
|
|
n_bases = TYPE_N_BASECLASSES (type);
|
|
|
|
for (i = 0, prev = 0; i < n_bases; i++)
|
|
{
|
|
int kind;
|
|
|
|
kind = BASETYPE_VIA_VIRTUAL (type, i) ? 'I' : 'E';
|
|
|
|
fputs_filtered (kind == prev ? ", "
|
|
: kind == 'I' ? " implements "
|
|
: " extends ",
|
|
stream);
|
|
prev = kind;
|
|
name = type_name_no_tag (TYPE_BASECLASS (type, i));
|
|
|
|
fprintf_filtered (stream, "%s", name ? name : "(null)");
|
|
}
|
|
|
|
if (i > 0)
|
|
fputs_filtered (" ", stream);
|
|
}
|
|
|
|
/* 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 positive means print details about the type (e.g. enum values),
|
|
and print structure elements passing SHOW - 1 for show.
|
|
SHOW negative means just print the type name or struct tag if there is one.
|
|
If there is no name, print something sensible but concise like
|
|
"struct {...}".
|
|
SHOW zero means just print the type name or struct tag if there is one.
|
|
If there is no name, print something sensible but not as concise like
|
|
"struct {int x; int y;}".
|
|
|
|
LEVEL is the number of spaces to indent by.
|
|
We increase it for some recursive calls. */
|
|
|
|
static void
|
|
java_type_print_base (struct type *type, struct ui_file *stream, int show,
|
|
int level, const struct type_print_options *flags)
|
|
{
|
|
int i;
|
|
int len;
|
|
char *mangled_name;
|
|
char *demangled_name;
|
|
|
|
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)
|
|
{
|
|
fputs_filtered (TYPE_NAME (type), stream);
|
|
return;
|
|
}
|
|
|
|
type = check_typedef (type);
|
|
|
|
switch (TYPE_CODE (type))
|
|
{
|
|
case TYPE_CODE_PTR:
|
|
java_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level,
|
|
flags);
|
|
break;
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
|
|
{ /* array type */
|
|
char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
|
|
|
|
fputs_filtered (name, stream);
|
|
xfree (name);
|
|
break;
|
|
}
|
|
|
|
if (show >= 0)
|
|
fprintf_filtered (stream, "class ");
|
|
|
|
if (TYPE_TAG_NAME (type) != NULL)
|
|
{
|
|
fputs_filtered (TYPE_TAG_NAME (type), stream);
|
|
if (show > 0)
|
|
fputs_filtered (" ", stream);
|
|
}
|
|
|
|
wrap_here (" ");
|
|
|
|
if (show < 0)
|
|
{
|
|
/* If we just printed a tag name, no need to print anything else. */
|
|
if (TYPE_TAG_NAME (type) == NULL)
|
|
fprintf_filtered (stream, "{...}");
|
|
}
|
|
else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
|
|
{
|
|
java_type_print_derivation_info (stream, type);
|
|
|
|
fprintf_filtered (stream, "{\n");
|
|
if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
|
|
{
|
|
if (TYPE_STUB (type))
|
|
fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
|
|
else
|
|
fprintfi_filtered (level + 4, stream, "<no data fields>\n");
|
|
}
|
|
|
|
/* If there is a base class for this type,
|
|
do not print the field that it occupies. */
|
|
|
|
len = TYPE_NFIELDS (type);
|
|
for (i = TYPE_N_BASECLASSES (type); i < len; i++)
|
|
{
|
|
QUIT;
|
|
/* Don't print out virtual function table. */
|
|
if (startswith (TYPE_FIELD_NAME (type, i), "_vptr")
|
|
&& is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
|
|
continue;
|
|
|
|
/* Don't print the dummy field "class". */
|
|
if (startswith (TYPE_FIELD_NAME (type, i), "class"))
|
|
continue;
|
|
|
|
print_spaces_filtered (level + 4, stream);
|
|
|
|
if (HAVE_CPLUS_STRUCT (type))
|
|
{
|
|
if (TYPE_FIELD_PROTECTED (type, i))
|
|
fprintf_filtered (stream, "protected ");
|
|
else if (TYPE_FIELD_PRIVATE (type, i))
|
|
fprintf_filtered (stream, "private ");
|
|
else
|
|
fprintf_filtered (stream, "public ");
|
|
}
|
|
|
|
if (field_is_static (&TYPE_FIELD (type, i)))
|
|
fprintf_filtered (stream, "static ");
|
|
|
|
java_print_type (TYPE_FIELD_TYPE (type, i),
|
|
TYPE_FIELD_NAME (type, i),
|
|
stream, show - 1, level + 4, flags);
|
|
|
|
fprintf_filtered (stream, ";\n");
|
|
}
|
|
|
|
/* If there are both fields and methods, put a space between. */
|
|
len = TYPE_NFN_FIELDS (type);
|
|
if (len)
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
/* Print out the methods. */
|
|
|
|
for (i = 0; i < len; i++)
|
|
{
|
|
struct fn_field *f;
|
|
int j;
|
|
const char *method_name;
|
|
const char *name;
|
|
int is_constructor;
|
|
int n_overloads;
|
|
|
|
f = TYPE_FN_FIELDLIST1 (type, i);
|
|
n_overloads = TYPE_FN_FIELDLIST_LENGTH (type, i);
|
|
method_name = TYPE_FN_FIELDLIST_NAME (type, i);
|
|
name = type_name_no_tag (type);
|
|
is_constructor = name && strcmp (method_name, name) == 0;
|
|
|
|
for (j = 0; j < n_overloads; j++)
|
|
{
|
|
const char *real_physname;
|
|
char *physname, *p;
|
|
int is_full_physname_constructor;
|
|
|
|
real_physname = TYPE_FN_FIELD_PHYSNAME (f, j);
|
|
|
|
/* The physname will contain the return type
|
|
after the final closing parenthesis. Strip it off. */
|
|
p = strrchr (real_physname, ')');
|
|
gdb_assert (p != NULL);
|
|
++p; /* Keep the trailing ')'. */
|
|
physname = alloca (p - real_physname + 1);
|
|
memcpy (physname, real_physname, p - real_physname);
|
|
physname[p - real_physname] = '\0';
|
|
|
|
is_full_physname_constructor
|
|
= (TYPE_FN_FIELD_CONSTRUCTOR (f, j)
|
|
|| is_constructor_name (physname)
|
|
|| is_destructor_name (physname));
|
|
|
|
QUIT;
|
|
|
|
print_spaces_filtered (level + 4, stream);
|
|
|
|
if (TYPE_FN_FIELD_PROTECTED (f, j))
|
|
fprintf_filtered (stream, "protected ");
|
|
else if (TYPE_FN_FIELD_PRIVATE (f, j))
|
|
fprintf_filtered (stream, "private ");
|
|
else if (TYPE_FN_FIELD_PUBLIC (f, j))
|
|
fprintf_filtered (stream, "public ");
|
|
|
|
if (TYPE_FN_FIELD_ABSTRACT (f, j))
|
|
fprintf_filtered (stream, "abstract ");
|
|
if (TYPE_FN_FIELD_STATIC (f, j))
|
|
fprintf_filtered (stream, "static ");
|
|
if (TYPE_FN_FIELD_FINAL (f, j))
|
|
fprintf_filtered (stream, "final ");
|
|
if (TYPE_FN_FIELD_SYNCHRONIZED (f, j))
|
|
fprintf_filtered (stream, "synchronized ");
|
|
if (TYPE_FN_FIELD_NATIVE (f, j))
|
|
fprintf_filtered (stream, "native ");
|
|
|
|
if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) == 0)
|
|
{
|
|
/* Keep GDB from crashing here. */
|
|
fprintf_filtered (stream, "<undefined type> %s;\n",
|
|
TYPE_FN_FIELD_PHYSNAME (f, j));
|
|
break;
|
|
}
|
|
else if (!is_constructor && !is_full_physname_constructor)
|
|
{
|
|
type_print (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
|
|
"", stream, -1);
|
|
fputs_filtered (" ", stream);
|
|
}
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, j))
|
|
/* Build something we can demangle. */
|
|
mangled_name = gdb_mangle_name (type, i, j);
|
|
else
|
|
mangled_name = physname;
|
|
|
|
demangled_name =
|
|
gdb_demangle (mangled_name,
|
|
DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
|
|
|
|
if (demangled_name == NULL)
|
|
demangled_name = xstrdup (mangled_name);
|
|
|
|
{
|
|
char *demangled_no_class;
|
|
char *ptr;
|
|
|
|
ptr = demangled_no_class = demangled_name;
|
|
|
|
while (1)
|
|
{
|
|
char c;
|
|
|
|
c = *ptr++;
|
|
|
|
if (c == 0 || c == '(')
|
|
break;
|
|
if (c == '.')
|
|
demangled_no_class = ptr;
|
|
}
|
|
|
|
fputs_filtered (demangled_no_class, stream);
|
|
xfree (demangled_name);
|
|
}
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, j))
|
|
xfree (mangled_name);
|
|
|
|
fprintf_filtered (stream, ";\n");
|
|
}
|
|
}
|
|
|
|
fprintfi_filtered (level, stream, "}");
|
|
}
|
|
break;
|
|
|
|
default:
|
|
c_type_print_base (type, stream, show, level, flags);
|
|
}
|
|
}
|
|
|
|
/* LEVEL is the depth to indent lines by. */
|
|
|
|
void
|
|
java_print_type (struct type *type, const char *varstring,
|
|
struct ui_file *stream, int show, int level,
|
|
const struct type_print_options *flags)
|
|
{
|
|
int demangled_args;
|
|
|
|
java_type_print_base (type, stream, show, level, flags);
|
|
|
|
if (varstring != NULL && *varstring != '\0')
|
|
{
|
|
fputs_filtered (" ", stream);
|
|
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 != NULL && strchr (varstring, '(') != NULL;
|
|
c_type_print_varspec_suffix (type, stream, show, 0, demangled_args, flags);
|
|
}
|