/* Support for printing C and C++ types for GDB, the GNU debugger.
- Copyright (C) 1986-2013 Free Software Foundation, Inc.
+ Copyright (C) 1986-2022 Free Software Foundation, Inc.
This file is part of GDB.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include "gdb_obstack.h"
+#include "gdbsupport/gdb_obstack.h"
#include "bfd.h" /* Binary File Description. */
#include "symtab.h"
#include "gdbtypes.h"
#include "language.h"
#include "demangle.h"
#include "c-lang.h"
+#include "cli/cli-style.h"
#include "typeprint.h"
#include "cp-abi.h"
-#include "jv-lang.h"
-#include "gdb_string.h"
-#include <errno.h>
#include "cp-support.h"
+/* A list of access specifiers used for printing. */
+
+enum access_specifier
+{
+ s_none,
+ s_public,
+ s_private,
+ s_protected
+};
+
+static void c_type_print_varspec_suffix (struct type *, struct ui_file *, int,
+ int, int,
+ enum language,
+ const struct type_print_options *);
+
static void c_type_print_varspec_prefix (struct type *,
struct ui_file *,
int, int, int,
- const struct type_print_options *);
+ enum language,
+ const struct type_print_options *,
+ struct print_offset_data *);
/* Print "const", "volatile", or address space modifiers. */
static void c_type_print_modifier (struct type *,
struct ui_file *,
- int, int);
+ int, int, enum language);
+
+static void c_type_print_base_1 (struct type *type, struct ui_file *stream,
+ int show, int level, enum language language,
+ const struct type_print_options *flags,
+ struct print_offset_data *podata);
\f
/* A callback function for cp_canonicalize_string_full that uses
- find_typedef_in_hash. */
+ typedef_hash_table::find_typedef. */
static const char *
find_typedef_for_canonicalize (struct type *t, void *data)
{
- return find_typedef_in_hash (data, t);
+ return typedef_hash_table::find_typedef
+ ((const struct type_print_options *) data, t);
}
/* Print NAME on STREAM. If the 'raw' field of FLAGS is not set,
const struct type_print_options *flags,
struct ui_file *stream)
{
- char *s = NULL;
+ gdb::unique_xmalloc_ptr<char> s;
if (!flags->raw)
s = cp_canonicalize_string_full (name,
find_typedef_for_canonicalize,
(void *) flags);
- fputs_filtered (s ? s : name, stream);
- xfree (s);
+ gdb_puts (s != nullptr ? s.get () : name, stream);
}
\f
-/* LEVEL is the depth to indent lines by. */
+/* Helper function for c_print_type. */
-void
-c_print_type (struct type *type,
- const char *varstring,
- struct ui_file *stream,
- int show, int level,
- const struct type_print_options *flags)
+static void
+c_print_type_1 (struct type *type,
+ const char *varstring,
+ struct ui_file *stream,
+ int show, int level,
+ enum language language,
+ const struct type_print_options *flags,
+ struct print_offset_data *podata)
{
enum type_code code;
int demangled_args;
const char *local_name;
if (show > 0)
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
- local_name = find_typedef_in_hash (flags, type);
+ local_name = typedef_hash_table::find_typedef (flags, type);
+ code = type->code ();
if (local_name != NULL)
{
- fputs_filtered (local_name, stream);
+ c_type_print_modifier (type, stream, 0, 1, language);
+ gdb_puts (local_name, stream);
if (varstring != NULL && *varstring != '\0')
- fputs_filtered (" ", stream);
+ gdb_puts (" ", stream);
}
else
{
- c_type_print_base (type, stream, show, level, flags);
- code = TYPE_CODE (type);
+ c_type_print_base_1 (type, stream, show, level, language, flags, podata);
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)
+ || ((show > 0 || type->name () == 0)
&& (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
|| code == TYPE_CODE_METHOD
|| (code == TYPE_CODE_ARRAY
- && !TYPE_VECTOR (type))
+ && !type->is_vector ())
|| code == TYPE_CODE_MEMBERPTR
|| code == TYPE_CODE_METHODPTR
- || code == TYPE_CODE_REF)))
- fputs_filtered (" ", stream);
+ || TYPE_IS_REFERENCE (type))))
+ gdb_puts (" ", stream);
need_post_space = (varstring != NULL && strcmp (varstring, "") != 0);
c_type_print_varspec_prefix (type, stream, show, 0, need_post_space,
- flags);
+ language, flags, podata);
}
if (varstring != NULL)
{
- fputs_filtered (varstring, stream);
+ if (code == TYPE_CODE_FUNC || code == TYPE_CODE_METHOD)
+ fputs_styled (varstring, function_name_style.style (), stream);
+ else
+ fputs_styled (varstring, variable_name_style.style (), stream);
/* For demangled function names, we have the arglist as part of
- the name, so don't print an additional pair of ()'s. */
+ the name, so don't print an additional pair of ()'s. */
if (local_name == NULL)
{
demangled_args = strchr (varstring, '(') != NULL;
c_type_print_varspec_suffix (type, stream, show,
0, demangled_args,
- flags);
+ language, flags);
}
}
}
+/* See c-lang.h. */
+
+void
+c_print_type (struct type *type,
+ const char *varstring,
+ struct ui_file *stream,
+ int show, int level,
+ enum language language,
+ const struct type_print_options *flags)
+{
+ struct print_offset_data podata (flags);
+
+ c_print_type_1 (type, varstring, stream, show, level, language, flags,
+ &podata);
+}
+
/* Print a typedef using C syntax. TYPE is the underlying type.
NEW_SYMBOL is the symbol naming the type. STREAM is the stream on
which to print. */
struct symbol *new_symbol,
struct ui_file *stream)
{
- CHECK_TYPEDEF (type);
- fprintf_filtered (stream, "typedef ");
- type_print (type, "", stream, 0);
- if (TYPE_NAME ((SYMBOL_TYPE (new_symbol))) == 0
- || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
- SYMBOL_LINKAGE_NAME (new_symbol)) != 0
- || TYPE_CODE (SYMBOL_TYPE (new_symbol)) == TYPE_CODE_TYPEDEF)
- fprintf_filtered (stream, " %s", SYMBOL_PRINT_NAME (new_symbol));
- fprintf_filtered (stream, ";\n");
+ type = check_typedef (type);
+ gdb_printf (stream, "typedef ");
+ type_print (type, "", stream, -1);
+ if ((new_symbol->type ())->name () == 0
+ || strcmp ((new_symbol->type ())->name (),
+ new_symbol->linkage_name ()) != 0
+ || new_symbol->type ()->code () == TYPE_CODE_TYPEDEF)
+ gdb_printf (stream, " %s", new_symbol->print_name ());
+ gdb_printf (stream, ";");
}
/* If TYPE is a derived type, then print out derivation information.
for (i = 0; i < TYPE_N_BASECLASSES (type); i++)
{
- wrap_here (" ");
- fputs_filtered (i == 0 ? ": " : ", ", stream);
- fprintf_filtered (stream, "%s%s ",
- BASETYPE_VIA_PUBLIC (type, i)
- ? "public" : (TYPE_FIELD_PROTECTED (type, i)
- ? "protected" : "private"),
- BASETYPE_VIA_VIRTUAL (type, i) ? " virtual" : "");
- name = type_name_no_tag (TYPE_BASECLASS (type, i));
+ stream->wrap_here (8);
+ gdb_puts (i == 0 ? ": " : ", ", stream);
+ gdb_printf (stream, "%s%s ",
+ BASETYPE_VIA_PUBLIC (type, i)
+ ? "public" : (TYPE_FIELD_PROTECTED (type, i)
+ ? "protected" : "private"),
+ BASETYPE_VIA_VIRTUAL (type, i) ? " virtual" : "");
+ name = TYPE_BASECLASS (type, i)->name ();
if (name)
print_name_maybe_canonical (name, flags, stream);
else
- fprintf_filtered (stream, "(null)");
+ gdb_printf (stream, "(null)");
}
if (i > 0)
{
- fputs_filtered (" ", stream);
+ gdb_puts (" ", stream);
}
}
cp_type_print_method_args (struct type *mtype, const char *prefix,
const char *varstring, int staticp,
struct ui_file *stream,
+ enum language language,
const struct type_print_options *flags)
{
- struct field *args = TYPE_FIELDS (mtype);
- int nargs = TYPE_NFIELDS (mtype);
- int varargs = TYPE_VARARGS (mtype);
+ struct field *args = mtype->fields ();
+ int nargs = mtype->num_fields ();
+ int varargs = mtype->has_varargs ();
int i;
- fprintf_symbol_filtered (stream, prefix,
- language_cplus, DMGL_ANSI);
- fprintf_symbol_filtered (stream, varstring,
- language_cplus, DMGL_ANSI);
- fputs_filtered ("(", stream);
+ fprintf_symbol (stream, prefix,
+ language_cplus, DMGL_ANSI);
+ fprintf_symbol (stream, varstring,
+ language_cplus, DMGL_ANSI);
+ gdb_puts ("(", stream);
- /* Skip the class variable. */
+ /* Skip the class variable. We keep this here to accommodate older
+ compilers and debug formats which may not support artificial
+ parameters. */
i = staticp ? 0 : 1;
if (nargs > i)
{
while (i < nargs)
{
- c_print_type (args[i++].type, "", stream, 0, 0, flags);
+ struct field arg = args[i++];
+
+ /* Skip any artificial arguments. */
+ if (FIELD_ARTIFICIAL (arg))
+ continue;
+
+ c_print_type (arg.type (), "", stream, 0, 0, language, flags);
if (i == nargs && varargs)
- fprintf_filtered (stream, ", ...");
+ gdb_printf (stream, ", ...");
else if (i < nargs)
{
- fprintf_filtered (stream, ", ");
- wrap_here (" ");
+ gdb_printf (stream, ", ");
+ stream->wrap_here (8);
}
}
}
else if (varargs)
- fprintf_filtered (stream, "...");
- else if (current_language->la_language == language_cplus)
- fprintf_filtered (stream, "void");
+ gdb_printf (stream, "...");
+ else if (language == language_cplus)
+ gdb_printf (stream, "void");
- fprintf_filtered (stream, ")");
+ gdb_printf (stream, ")");
/* For non-static methods, read qualifiers from the type of
THIS. */
struct type *domain;
gdb_assert (nargs > 0);
- gdb_assert (TYPE_CODE (args[0].type) == TYPE_CODE_PTR);
- domain = TYPE_TARGET_TYPE (args[0].type);
+ gdb_assert (args[0].type ()->code () == TYPE_CODE_PTR);
+ domain = TYPE_TARGET_TYPE (args[0].type ());
if (TYPE_CONST (domain))
- fprintf_filtered (stream, " const");
+ gdb_printf (stream, " const");
if (TYPE_VOLATILE (domain))
- fprintf_filtered (stream, " volatile");
+ gdb_printf (stream, " volatile");
if (TYPE_RESTRICT (domain))
- fprintf_filtered (stream, " restrict");
+ gdb_printf (stream, (language == language_cplus
+ ? " __restrict__"
+ : " restrict"));
+
+ if (TYPE_ATOMIC (domain))
+ gdb_printf (stream, " _Atomic");
}
}
struct ui_file *stream,
int show, int passed_a_ptr,
int need_post_space,
- const struct type_print_options *flags)
+ enum language language,
+ const struct type_print_options *flags,
+ struct print_offset_data *podata)
{
const char *name;
if (type == 0)
return;
- if (TYPE_NAME (type) && show <= 0)
+ if (type->name () && show <= 0)
return;
QUIT;
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_PTR:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
- stream, show, 1, 1, flags);
- fprintf_filtered (stream, "*");
- c_type_print_modifier (type, stream, 1, need_post_space);
+ stream, show, 1, 1, language, flags,
+ podata);
+ gdb_printf (stream, "*");
+ c_type_print_modifier (type, stream, 1, need_post_space, language);
break;
case TYPE_CODE_MEMBERPTR:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
- stream, show, 0, 0, flags);
- name = type_name_no_tag (TYPE_DOMAIN_TYPE (type));
+ stream, show, 0, 0, language, flags, podata);
+ name = TYPE_SELF_TYPE (type)->name ();
if (name)
print_name_maybe_canonical (name, flags, stream);
else
- c_type_print_base (TYPE_DOMAIN_TYPE (type),
- stream, -1, passed_a_ptr, flags);
- fprintf_filtered (stream, "::*");
+ c_type_print_base_1 (TYPE_SELF_TYPE (type),
+ stream, -1, passed_a_ptr, language, flags,
+ podata);
+ gdb_printf (stream, "::*");
break;
case TYPE_CODE_METHODPTR:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
- stream, show, 0, 0, flags);
- fprintf_filtered (stream, "(");
- name = type_name_no_tag (TYPE_DOMAIN_TYPE (type));
+ stream, show, 0, 0, language, flags,
+ podata);
+ gdb_printf (stream, "(");
+ name = TYPE_SELF_TYPE (type)->name ();
if (name)
print_name_maybe_canonical (name, flags, stream);
else
- c_type_print_base (TYPE_DOMAIN_TYPE (type),
- stream, -1, passed_a_ptr, flags);
- fprintf_filtered (stream, "::*");
+ c_type_print_base_1 (TYPE_SELF_TYPE (type),
+ stream, -1, passed_a_ptr, language, flags,
+ podata);
+ gdb_printf (stream, "::*");
break;
case TYPE_CODE_REF:
+ case TYPE_CODE_RVALUE_REF:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
- stream, show, 1, 0, flags);
- fprintf_filtered (stream, "&");
- c_type_print_modifier (type, stream, 1, need_post_space);
+ stream, show, 1, 0, language, flags,
+ podata);
+ gdb_printf (stream, type->code () == TYPE_CODE_REF ? "&" : "&&");
+ c_type_print_modifier (type, stream, 1, need_post_space, language);
break;
case TYPE_CODE_METHOD:
case TYPE_CODE_FUNC:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
- stream, show, 0, 0, flags);
+ stream, show, 0, 0, language, flags,
+ podata);
if (passed_a_ptr)
- fprintf_filtered (stream, "(");
+ gdb_printf (stream, "(");
break;
case TYPE_CODE_ARRAY:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
- stream, show, 0, 0, flags);
+ stream, show, 0, need_post_space,
+ language, flags, podata);
if (passed_a_ptr)
- fprintf_filtered (stream, "(");
+ gdb_printf (stream, "(");
break;
case TYPE_CODE_TYPEDEF:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
- stream, show, passed_a_ptr, 0, flags);
+ stream, show, passed_a_ptr, 0,
+ language, flags, podata);
break;
case TYPE_CODE_UNDEF:
case TYPE_CODE_STRUCT:
case TYPE_CODE_UNION:
case TYPE_CODE_ENUM:
+ case TYPE_CODE_FLAGS:
case TYPE_CODE_INT:
case TYPE_CODE_FLT:
case TYPE_CODE_VOID:
case TYPE_CODE_COMPLEX:
case TYPE_CODE_NAMESPACE:
case TYPE_CODE_DECFLOAT:
+ case TYPE_CODE_FIXED_POINT:
/* These types need no prefix. They are listed here so that
- gcc -Wall will reveal any types that haven't been handled. */
+ gcc -Wall will reveal any types that haven't been handled. */
break;
default:
error (_("type not handled in c_type_print_varspec_prefix()"));
static void
c_type_print_modifier (struct type *type, struct ui_file *stream,
- int need_pre_space, int need_post_space)
+ int need_pre_space, int need_post_space,
+ enum language language)
{
int did_print_modifier = 0;
const char *address_space_id;
/* We don't print `const' qualifiers for references --- since all
operators affect the thing referenced, not the reference itself,
every reference is `const'. */
- if (TYPE_CONST (type)
- && TYPE_CODE (type) != TYPE_CODE_REF)
+ if (TYPE_CONST (type) && !TYPE_IS_REFERENCE (type))
{
if (need_pre_space)
- fprintf_filtered (stream, " ");
- fprintf_filtered (stream, "const");
+ gdb_printf (stream, " ");
+ gdb_printf (stream, "const");
did_print_modifier = 1;
}
if (TYPE_VOLATILE (type))
{
if (did_print_modifier || need_pre_space)
- fprintf_filtered (stream, " ");
- fprintf_filtered (stream, "volatile");
+ gdb_printf (stream, " ");
+ gdb_printf (stream, "volatile");
did_print_modifier = 1;
}
if (TYPE_RESTRICT (type))
{
if (did_print_modifier || need_pre_space)
- fprintf_filtered (stream, " ");
- fprintf_filtered (stream, "restrict");
+ gdb_printf (stream, " ");
+ gdb_printf (stream, (language == language_cplus
+ ? "__restrict__"
+ : "restrict"));
+ did_print_modifier = 1;
+ }
+
+ if (TYPE_ATOMIC (type))
+ {
+ if (did_print_modifier || need_pre_space)
+ gdb_printf (stream, " ");
+ gdb_printf (stream, "_Atomic");
did_print_modifier = 1;
}
- address_space_id = address_space_int_to_name (get_type_arch (type),
- TYPE_INSTANCE_FLAGS (type));
+ address_space_id
+ = address_space_type_instance_flags_to_name (type->arch (),
+ type->instance_flags ());
if (address_space_id)
{
if (did_print_modifier || need_pre_space)
- fprintf_filtered (stream, " ");
- fprintf_filtered (stream, "@%s", address_space_id);
+ gdb_printf (stream, " ");
+ gdb_printf (stream, "@%s", address_space_id);
did_print_modifier = 1;
}
if (did_print_modifier && need_post_space)
- fprintf_filtered (stream, " ");
+ gdb_printf (stream, " ");
}
parameter types get removed their possible const and volatile qualifiers to
match demangled linkage name parameters part of such function type.
LANGUAGE is the language in which TYPE was defined. This is a necessary
- evil since this code is used by the C, C++, and Java backends. */
+ evil since this code is used by the C and C++. */
void
c_type_print_args (struct type *type, struct ui_file *stream,
int linkage_name, enum language language,
const struct type_print_options *flags)
{
- int i, len;
- struct field *args;
+ int i;
int printed_any = 0;
- fprintf_filtered (stream, "(");
- args = TYPE_FIELDS (type);
- len = TYPE_NFIELDS (type);
+ gdb_printf (stream, "(");
- for (i = 0; i < TYPE_NFIELDS (type); i++)
+ for (i = 0; i < type->num_fields (); i++)
{
struct type *param_type;
if (printed_any)
{
- fprintf_filtered (stream, ", ");
- wrap_here (" ");
+ gdb_printf (stream, ", ");
+ stream->wrap_here (4);
}
- param_type = TYPE_FIELD_TYPE (type, i);
+ param_type = type->field (i).type ();
if (language == language_cplus && linkage_name)
{
param_type = make_cv_type (0, 0, param_type, NULL);
}
- if (language == language_java)
- java_print_type (param_type, "", stream, -1, 0, flags);
- else
- c_print_type (param_type, "", stream, -1, 0, flags);
+ c_print_type (param_type, "", stream, -1, 0, language, flags);
printed_any = 1;
}
- if (printed_any && TYPE_VARARGS (type))
+ if (printed_any && type->has_varargs ())
{
/* Print out a trailing ellipsis for varargs functions. Ignore
TYPE_VARARGS if the function has no named arguments; that
represents unprototyped (K&R style) C functions. */
- if (printed_any && TYPE_VARARGS (type))
+ if (printed_any && type->has_varargs ())
{
- fprintf_filtered (stream, ", ");
- wrap_here (" ");
- fprintf_filtered (stream, "...");
+ gdb_printf (stream, ", ");
+ stream->wrap_here (4);
+ gdb_printf (stream, "...");
}
}
else if (!printed_any
- && ((TYPE_PROTOTYPED (type) && language != language_java)
- || language == language_cplus))
- fprintf_filtered (stream, "void");
+ && (type->is_prototyped () || language == language_cplus))
+ gdb_printf (stream, "void");
- fprintf_filtered (stream, ")");
+ gdb_printf (stream, ")");
}
/* Return true iff the j'th overloading of the i'th method of TYPE
some other way, feel free to rewrite this function. */
const char *name = TYPE_FN_FIELDLIST_NAME (type, i);
- if (strncmp (name, "operator", 8) != 0)
+ if (!startswith (name, CP_OPERATOR_STR))
return 0;
name += 8;
/* If this doesn't look like the start of an identifier, then it
isn't a type conversion operator. */
return 0;
- else if (strncmp (name, "new", 3) == 0)
+ else if (startswith (name, "new"))
name += 3;
- else if (strncmp (name, "delete", 6) == 0)
+ else if (startswith (name, "delete"))
name += 6;
else
/* If it doesn't look like new or delete, it's a type conversion
form. Even the author of this function feels that writing little
parsers like this everywhere is stupid. */
-static char *
-remove_qualifiers (char *qid)
+static const char *
+remove_qualifiers (const char *qid)
{
int quoted = 0; /* Zero if we're not in quotes;
'"' if we're in a double-quoted string;
'\'' if we're in a single-quoted string. */
int depth = 0; /* Number of unclosed parens we've seen. */
char *parenstack = (char *) alloca (strlen (qid));
- char *scan;
- char *last = 0; /* The character after the rightmost
+ const char *scan;
+ const char *last = 0; /* The character after the rightmost
`::' token we've seen so far. */
for (scan = qid; *scan; scan++)
needed after the variable name (to describe its type).
Args work like c_type_print_varspec_prefix. */
-void
+static void
c_type_print_varspec_suffix (struct type *type,
struct ui_file *stream,
int show, int passed_a_ptr,
int demangled_args,
+ enum language language,
const struct type_print_options *flags)
{
if (type == 0)
return;
- if (TYPE_NAME (type) && show <= 0)
+ if (type->name () && show <= 0)
return;
QUIT;
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_ARRAY:
{
LONGEST low_bound, high_bound;
- int is_vector = TYPE_VECTOR (type);
+ int is_vector = type->is_vector ();
if (passed_a_ptr)
- fprintf_filtered (stream, ")");
-
- fprintf_filtered (stream, (is_vector ?
- " __attribute__ ((vector_size(" : "["));
- if (get_array_bounds (type, &low_bound, &high_bound))
- fprintf_filtered (stream, "%s",
- plongest (high_bound - low_bound + 1));
- fprintf_filtered (stream, (is_vector ? ")))" : "]"));
+ gdb_printf (stream, ")");
+
+ gdb_printf (stream, (is_vector ?
+ " __attribute__ ((vector_size(" : "["));
+ /* Bounds are not yet resolved, print a bounds placeholder instead. */
+ if (type->bounds ()->high.kind () == PROP_LOCEXPR
+ || type->bounds ()->high.kind () == PROP_LOCLIST)
+ gdb_printf (stream, "variable length");
+ else if (get_array_bounds (type, &low_bound, &high_bound))
+ gdb_printf (stream, "%s",
+ plongest (high_bound - low_bound + 1));
+ gdb_printf (stream, (is_vector ? ")))" : "]"));
c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
- show, 0, 0, flags);
+ show, 0, 0, language, flags);
}
break;
case TYPE_CODE_MEMBERPTR:
c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
- show, 0, 0, flags);
+ show, 0, 0, language, flags);
break;
case TYPE_CODE_METHODPTR:
- fprintf_filtered (stream, ")");
+ gdb_printf (stream, ")");
c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
- show, 0, 0, flags);
+ show, 0, 0, language, flags);
break;
case TYPE_CODE_PTR:
case TYPE_CODE_REF:
+ case TYPE_CODE_RVALUE_REF:
c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
- show, 1, 0, flags);
+ show, 1, 0, language, flags);
break;
case TYPE_CODE_METHOD:
case TYPE_CODE_FUNC:
if (passed_a_ptr)
- fprintf_filtered (stream, ")");
+ gdb_printf (stream, ")");
if (!demangled_args)
- c_type_print_args (type, stream, 0, current_language->la_language,
- flags);
+ c_type_print_args (type, stream, 0, language, flags);
c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
- show, passed_a_ptr, 0, flags);
+ show, passed_a_ptr, 0, language, flags);
break;
case TYPE_CODE_TYPEDEF:
c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
- show, passed_a_ptr, 0, flags);
+ show, passed_a_ptr, 0, language, flags);
break;
case TYPE_CODE_UNDEF:
case TYPE_CODE_STRUCT:
case TYPE_CODE_UNION:
+ case TYPE_CODE_FLAGS:
case TYPE_CODE_ENUM:
case TYPE_CODE_INT:
case TYPE_CODE_FLT:
case TYPE_CODE_COMPLEX:
case TYPE_CODE_NAMESPACE:
case TYPE_CODE_DECFLOAT:
+ case TYPE_CODE_FIXED_POINT:
/* These types do not need a suffix. They are listed so that
- gcc -Wall will report types that may not have been
- considered. */
+ gcc -Wall will report types that may not have been
+ considered. */
break;
default:
error (_("type not handled in c_type_print_varspec_suffix()"));
static void
c_type_print_template_args (const struct type_print_options *flags,
- struct type *type, struct ui_file *stream)
+ struct type *type, struct ui_file *stream,
+ enum language language)
{
int first = 1, i;
{
struct symbol *sym = TYPE_TEMPLATE_ARGUMENT (type, i);
- if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
+ if (sym->aclass () != LOC_TYPEDEF)
continue;
if (first)
{
- wrap_here (" ");
- fprintf_filtered (stream, _("[with %s = "),
- SYMBOL_LINKAGE_NAME (sym));
+ stream->wrap_here (4);
+ gdb_printf (stream, _("[with %s = "), sym->linkage_name ());
first = 0;
}
else
{
- fputs_filtered (", ", stream);
- wrap_here (" ");
- fprintf_filtered (stream, "%s = ", SYMBOL_LINKAGE_NAME (sym));
+ gdb_puts (", ", stream);
+ stream->wrap_here (9);
+ gdb_printf (stream, "%s = ", sym->linkage_name ());
}
- c_print_type (SYMBOL_TYPE (sym), "", stream, -1, 0, flags);
+ c_print_type (sym->type (), "", stream, -1, 0, language, flags);
}
if (!first)
- fputs_filtered (_("] "), stream);
+ gdb_puts (_("] "), 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.
+/* Use 'print_spaces', but take into consideration the
+ type_print_options FLAGS in order to determine how many whitespaces
+ will be printed. */
- 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;}".
+static void
+print_spaces_filtered_with_print_options
+ (int level, struct ui_file *stream, const struct type_print_options *flags)
+{
+ if (!flags->print_offsets)
+ print_spaces (level, stream);
+ else
+ print_spaces (level + print_offset_data::indentation, stream);
+}
- LEVEL is the number of spaces to indent by.
- We increase it for some recursive calls. */
+/* Output an access specifier to STREAM, if needed. LAST_ACCESS is the
+ last access specifier output (typically returned by this function). */
-void
-c_type_print_base (struct type *type, struct ui_file *stream,
- int show, int level, const struct type_print_options *flags)
+static enum access_specifier
+output_access_specifier (struct ui_file *stream,
+ enum access_specifier last_access,
+ int level, bool is_protected, bool is_private,
+ const struct type_print_options *flags)
{
- int i;
- int len, real_len;
- enum
+ if (is_protected)
+ {
+ if (last_access != s_protected)
+ {
+ last_access = s_protected;
+ print_spaces_filtered_with_print_options (level + 2, stream, flags);
+ gdb_printf (stream, "protected:\n");
+ }
+ }
+ else if (is_private)
+ {
+ if (last_access != s_private)
+ {
+ last_access = s_private;
+ print_spaces_filtered_with_print_options (level + 2, stream, flags);
+ gdb_printf (stream, "private:\n");
+ }
+ }
+ else
{
- s_none, s_public, s_private, s_protected
+ if (last_access != s_public)
+ {
+ last_access = s_public;
+ print_spaces_filtered_with_print_options (level + 2, stream, flags);
+ gdb_printf (stream, "public:\n");
+ }
}
- section_type;
- int need_access_label = 0;
- int j, len2;
- QUIT;
+ return last_access;
+}
- if (type == NULL)
+/* Return true if an access label (i.e., "public:", "private:",
+ "protected:") needs to be printed for TYPE. */
+
+static bool
+need_access_label_p (struct type *type)
+{
+ if (type->is_declared_class ())
{
- fputs_filtered (_("<type unknown>"), stream);
- return;
+ QUIT;
+ for (int i = TYPE_N_BASECLASSES (type); i < type->num_fields (); i++)
+ if (!TYPE_FIELD_PRIVATE (type, i))
+ return true;
+ QUIT;
+ for (int j = 0; j < TYPE_NFN_FIELDS (type); j++)
+ for (int i = 0; i < TYPE_FN_FIELDLIST_LENGTH (type, j); i++)
+ if (!TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
+ j), i))
+ return true;
+ QUIT;
+ for (int i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); ++i)
+ if (!TYPE_TYPEDEF_FIELD_PRIVATE (type, i))
+ return true;
+ }
+ else
+ {
+ QUIT;
+ for (int i = TYPE_N_BASECLASSES (type); i < type->num_fields (); i++)
+ if (TYPE_FIELD_PRIVATE (type, i) || TYPE_FIELD_PROTECTED (type, i))
+ return true;
+ QUIT;
+ for (int j = 0; j < TYPE_NFN_FIELDS (type); j++)
+ {
+ QUIT;
+ for (int i = 0; i < TYPE_FN_FIELDLIST_LENGTH (type, j); i++)
+ if (TYPE_FN_FIELD_PROTECTED (TYPE_FN_FIELDLIST1 (type,
+ j), i)
+ || TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
+ j),
+ i))
+ return true;
+ }
+ QUIT;
+ for (int i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); ++i)
+ if (TYPE_TYPEDEF_FIELD_PROTECTED (type, i)
+ || TYPE_TYPEDEF_FIELD_PRIVATE (type, i))
+ return true;
}
- /* 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 we have "typedef struct foo {. . .} bar;" do we want to print
- it as "struct foo" or as "bar"? Pick the latter, because C++
- folk tend to expect things like "class5 *foo" rather than "struct
- class5 *foo". */
+ return false;
+}
- if (show <= 0
- && TYPE_NAME (type) != NULL)
+/* Helper function that temporarily disables FLAGS->PRINT_OFFSETS,
+ calls 'c_print_type_1', and then reenables FLAGS->PRINT_OFFSETS if
+ applicable. */
+
+static void
+c_print_type_no_offsets (struct type *type,
+ const char *varstring,
+ struct ui_file *stream,
+ int show, int level,
+ enum language language,
+ struct type_print_options *flags,
+ struct print_offset_data *podata)
+{
+ unsigned int old_po = flags->print_offsets;
+
+ /* Temporarily disable print_offsets, because it would mess with
+ indentation. */
+ flags->print_offsets = 0;
+ c_print_type_1 (type, varstring, stream, show, level, language, flags,
+ podata);
+ flags->print_offsets = old_po;
+}
+
+/* Helper for 'c_type_print_base' that handles structs and unions.
+ For a description of the arguments, see 'c_type_print_base'. */
+
+static void
+c_type_print_base_struct_union (struct type *type, struct ui_file *stream,
+ int show, int level,
+ enum language language,
+ const struct type_print_options *flags,
+ struct print_offset_data *podata)
+{
+ struct type_print_options local_flags = *flags;
+ local_flags.local_typedefs = NULL;
+
+ std::unique_ptr<typedef_hash_table> hash_holder;
+ if (!flags->raw)
{
- c_type_print_modifier (type, stream, 0, 1);
- print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
- return;
- }
+ if (flags->local_typedefs)
+ local_flags.local_typedefs
+ = new typedef_hash_table (*flags->local_typedefs);
+ else
+ local_flags.local_typedefs = new typedef_hash_table ();
- CHECK_TYPEDEF (type);
+ hash_holder.reset (local_flags.local_typedefs);
+ }
- switch (TYPE_CODE (type))
+ c_type_print_modifier (type, stream, 0, 1, language);
+ if (type->code () == TYPE_CODE_UNION)
+ gdb_printf (stream, "union ");
+ else if (type->is_declared_class ())
+ gdb_printf (stream, "class ");
+ else
+ gdb_printf (stream, "struct ");
+
+ /* Print the tag if it exists. The HP aCC compiler emits a
+ spurious "{unnamed struct}"/"{unnamed union}"/"{unnamed
+ enum}" tag for unnamed struct/union/enum's, which we don't
+ want to print. */
+ if (type->name () != NULL
+ && !startswith (type->name (), "{unnamed"))
{
- case TYPE_CODE_TYPEDEF:
- /* If we get here, the typedef doesn't have a name, and we
- couldn't resolve TYPE_TARGET_TYPE. Not much we can do. */
- gdb_assert (TYPE_NAME (type) == NULL);
- gdb_assert (TYPE_TARGET_TYPE (type) == NULL);
- fprintf_filtered (stream, _("<unnamed typedef>"));
- break;
+ /* When printing the tag name, we are still effectively
+ printing in the outer context, hence the use of FLAGS
+ here. */
+ print_name_maybe_canonical (type->name (), flags, stream);
+ if (show > 0)
+ gdb_puts (" ", stream);
+ }
- case TYPE_CODE_ARRAY:
- case TYPE_CODE_PTR:
- case TYPE_CODE_MEMBERPTR:
- case TYPE_CODE_REF:
- case TYPE_CODE_FUNC:
- case TYPE_CODE_METHOD:
- case TYPE_CODE_METHODPTR:
- c_type_print_base (TYPE_TARGET_TYPE (type),
- stream, show, level, flags);
- break;
+ if (show < 0)
+ {
+ /* If we just printed a tag name, no need to print anything
+ else. */
+ if (type->name () == NULL)
+ gdb_printf (stream, "{...}");
+ }
+ else if (show > 0 || type->name () == NULL)
+ {
+ struct type *basetype;
+ int vptr_fieldno;
- case TYPE_CODE_STRUCT:
- case TYPE_CODE_UNION:
- {
- struct type_print_options local_flags = *flags;
- struct type_print_options semi_local_flags = *flags;
- struct cleanup *local_cleanups = make_cleanup (null_cleanup, NULL);
+ c_type_print_template_args (&local_flags, type, stream, language);
- local_flags.local_typedefs = NULL;
- semi_local_flags.local_typedefs = NULL;
+ /* Add in template parameters when printing derivation info. */
+ if (local_flags.local_typedefs != NULL)
+ local_flags.local_typedefs->add_template_parameters (type);
+ cp_type_print_derivation_info (stream, type, &local_flags);
- if (!flags->raw)
- {
- if (flags->local_typedefs)
- local_flags.local_typedefs
- = copy_typedef_hash (flags->local_typedefs);
- else
- local_flags.local_typedefs = create_typedef_hash ();
+ /* This holds just the global typedefs and the template
+ parameters. */
+ struct type_print_options semi_local_flags = *flags;
+ semi_local_flags.local_typedefs = NULL;
- make_cleanup_free_typedef_hash (local_flags.local_typedefs);
- }
+ std::unique_ptr<typedef_hash_table> semi_holder;
+ if (local_flags.local_typedefs != nullptr)
+ {
+ semi_local_flags.local_typedefs
+ = new typedef_hash_table (*local_flags.local_typedefs);
+ semi_holder.reset (semi_local_flags.local_typedefs);
- c_type_print_modifier (type, stream, 0, 1);
- if (TYPE_CODE (type) == TYPE_CODE_UNION)
- fprintf_filtered (stream, "union ");
- else if (TYPE_DECLARED_CLASS (type))
- fprintf_filtered (stream, "class ");
- else
- fprintf_filtered (stream, "struct ");
-
- /* Print the tag if it exists. The HP aCC compiler emits a
- spurious "{unnamed struct}"/"{unnamed union}"/"{unnamed
- enum}" tag for unnamed struct/union/enum's, which we don't
- want to print. */
- if (TYPE_TAG_NAME (type) != NULL
- && strncmp (TYPE_TAG_NAME (type), "{unnamed", 8))
- {
- /* When printing the tag name, we are still effectively
- printing in the outer context, hence the use of FLAGS
- here. */
- print_name_maybe_canonical (TYPE_TAG_NAME (type), flags, stream);
- if (show > 0)
- fputs_filtered (" ", stream);
- }
+ /* Now add in the local typedefs. */
+ local_flags.local_typedefs->recursively_update (type);
+ }
- 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)
- {
- struct type *basetype;
- int vptr_fieldno;
+ gdb_printf (stream, "{\n");
- c_type_print_template_args (&local_flags, type, stream);
+ if (type->num_fields () == 0 && TYPE_NFN_FIELDS (type) == 0
+ && TYPE_TYPEDEF_FIELD_COUNT (type) == 0)
+ {
+ print_spaces_filtered_with_print_options (level + 4, stream, flags);
+ if (type->is_stub ())
+ gdb_printf (stream, _("%p[<incomplete type>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
+ else
+ gdb_printf (stream, _("%p[<no data fields>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
+ }
- /* Add in template parameters when printing derivation info. */
- add_template_parameters (local_flags.local_typedefs, type);
- cp_type_print_derivation_info (stream, type, &local_flags);
+ /* Start off with no specific section type, so we can print
+ one for the first field we find, and use that section type
+ thereafter until we find another type. */
- /* This holds just the global typedefs and the template
- parameters. */
- semi_local_flags.local_typedefs
- = copy_typedef_hash (local_flags.local_typedefs);
- if (semi_local_flags.local_typedefs)
- make_cleanup_free_typedef_hash (semi_local_flags.local_typedefs);
+ enum access_specifier section_type = s_none;
- /* Now add in the local typedefs. */
- recursively_update_typedef_hash (local_flags.local_typedefs, type);
+ /* For a class, if all members are private, there's no need
+ for a "private:" label; similarly, for a struct or union
+ masquerading as a class, if all members are public, there's
+ no need for a "public:" label. */
+ bool need_access_label = need_access_label_p (type);
- fprintf_filtered (stream, "{\n");
- if (TYPE_NFIELDS (type) == 0 && TYPE_NFN_FIELDS (type) == 0
- && TYPE_TYPEDEF_FIELD_COUNT (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. */
- /* Start off with no specific section type, so we can print
- one for the first field we find, and use that section type
- thereafter until we find another type. */
+ int len = type->num_fields ();
+ vptr_fieldno = get_vptr_fieldno (type, &basetype);
- section_type = s_none;
+ struct print_offset_data local_podata (flags);
- /* For a class, if all members are private, there's no need
- for a "private:" label; similarly, for a struct or union
- masquerading as a class, if all members are public, there's
- no need for a "public:" label. */
+ for (int i = TYPE_N_BASECLASSES (type); i < len; i++)
+ {
+ QUIT;
- if (TYPE_DECLARED_CLASS (type))
- {
- QUIT;
- len = TYPE_NFIELDS (type);
- for (i = TYPE_N_BASECLASSES (type); i < len; i++)
- if (!TYPE_FIELD_PRIVATE (type, i))
- {
- need_access_label = 1;
- break;
- }
- QUIT;
- if (!need_access_label)
- {
- len2 = TYPE_NFN_FIELDS (type);
- for (j = 0; j < len2; j++)
- {
- len = TYPE_FN_FIELDLIST_LENGTH (type, j);
- for (i = 0; i < len; i++)
- if (!TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
- j), i))
- {
- need_access_label = 1;
- break;
- }
- if (need_access_label)
- break;
- }
- }
- }
- else
- {
- QUIT;
- len = TYPE_NFIELDS (type);
- for (i = TYPE_N_BASECLASSES (type); i < len; i++)
- if (TYPE_FIELD_PRIVATE (type, i)
- || TYPE_FIELD_PROTECTED (type, i))
- {
- need_access_label = 1;
- break;
- }
- QUIT;
- if (!need_access_label)
- {
- len2 = TYPE_NFN_FIELDS (type);
- for (j = 0; j < len2; j++)
- {
- QUIT;
- len = TYPE_FN_FIELDLIST_LENGTH (type, j);
- for (i = 0; i < len; i++)
- if (TYPE_FN_FIELD_PROTECTED (TYPE_FN_FIELDLIST1 (type,
- j), i)
- || TYPE_FN_FIELD_PRIVATE (TYPE_FN_FIELDLIST1 (type,
- j),
- i))
- {
- need_access_label = 1;
- break;
- }
- if (need_access_label)
- break;
- }
- }
- }
+ /* If we have a virtual table pointer, omit it. Even if
+ virtual table pointers are not specifically marked in
+ the debug info, they should be artificial. */
+ if ((i == vptr_fieldno && type == basetype)
+ || TYPE_FIELD_ARTIFICIAL (type, i))
+ continue;
- /* If there is a base class for this type,
- do not print the field that it occupies. */
+ if (need_access_label)
+ {
+ section_type = output_access_specifier
+ (stream, section_type, level,
+ TYPE_FIELD_PROTECTED (type, i),
+ TYPE_FIELD_PRIVATE (type, i), flags);
+ }
- len = TYPE_NFIELDS (type);
- vptr_fieldno = get_vptr_fieldno (type, &basetype);
- for (i = TYPE_N_BASECLASSES (type); i < len; i++)
- {
- QUIT;
+ bool is_static = field_is_static (&type->field (i));
- /* If we have a virtual table pointer, omit it. Even if
- virtual table pointers are not specifically marked in
- the debug info, they should be artificial. */
- if ((i == vptr_fieldno && type == basetype)
- || TYPE_FIELD_ARTIFICIAL (type, i))
- continue;
+ if (flags->print_offsets)
+ podata->update (type, i, stream);
- if (need_access_label)
- {
- if (TYPE_FIELD_PROTECTED (type, i))
- {
- if (section_type != s_protected)
- {
- section_type = s_protected;
- fprintfi_filtered (level + 2, stream,
- "protected:\n");
- }
- }
- else if (TYPE_FIELD_PRIVATE (type, i))
- {
- if (section_type != s_private)
- {
- section_type = s_private;
- fprintfi_filtered (level + 2, stream,
- "private:\n");
- }
- }
- else
- {
- if (section_type != s_public)
- {
- section_type = s_public;
- fprintfi_filtered (level + 2, stream,
- "public:\n");
- }
- }
- }
+ print_spaces (level + 4, stream);
+ if (is_static)
+ gdb_printf (stream, "static ");
- print_spaces_filtered (level + 4, stream);
- if (field_is_static (&TYPE_FIELD (type, i)))
- fprintf_filtered (stream, "static ");
- c_print_type (TYPE_FIELD_TYPE (type, i),
- TYPE_FIELD_NAME (type, i),
- stream, show - 1, level + 4,
- &local_flags);
- if (!field_is_static (&TYPE_FIELD (type, i))
- && TYPE_FIELD_PACKED (type, i))
- {
- /* It is a bitfield. This code does not attempt
- to look at the bitpos and reconstruct filler,
- unnamed fields. This would lead to misleading
- results if the compiler does not put out fields
- for such things (I don't know what it does). */
- fprintf_filtered (stream, " : %d",
- TYPE_FIELD_BITSIZE (type, i));
- }
- fprintf_filtered (stream, ";\n");
- }
+ int newshow = show - 1;
- /* If there are both fields and methods, put a blank line
- between them. Make sure to count only method that we
- will display; artificial methods will be hidden. */
- len = TYPE_NFN_FIELDS (type);
- if (!flags->print_methods)
- len = 0;
- real_len = 0;
- for (i = 0; i < len; i++)
+ if (!is_static && flags->print_offsets
+ && (type->field (i).type ()->code () == TYPE_CODE_STRUCT
+ || type->field (i).type ()->code () == TYPE_CODE_UNION))
{
- struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
- int len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
- int j;
+ /* If we're printing offsets and this field's type is
+ either a struct or an union, then we're interested in
+ expanding it. */
+ ++newshow;
+
+ /* Make sure we carry our offset when we expand the
+ struct/union. */
+ local_podata.offset_bitpos
+ = podata->offset_bitpos + type->field (i).loc_bitpos ();
+ /* We're entering a struct/union. Right now,
+ PODATA->END_BITPOS points right *after* the
+ struct/union. However, when printing the first field
+ of this inner struct/union, the end_bitpos we're
+ expecting is exactly at the beginning of the
+ struct/union. Therefore, we subtract the length of
+ the whole struct/union. */
+ local_podata.end_bitpos
+ = podata->end_bitpos
+ - TYPE_LENGTH (type->field (i).type ()) * TARGET_CHAR_BIT;
+ }
+
+ c_print_type_1 (type->field (i).type (),
+ type->field (i).name (),
+ stream, newshow, level + 4,
+ language, &local_flags, &local_podata);
- for (j = 0; j < len2; j++)
- if (!TYPE_FN_FIELD_ARTIFICIAL (f, j))
- real_len++;
+ if (!is_static && TYPE_FIELD_PACKED (type, i))
+ {
+ /* It is a bitfield. This code does not attempt
+ to look at the bitpos and reconstruct filler,
+ unnamed fields. This would lead to misleading
+ results if the compiler does not put out fields
+ for such things (I don't know what it does). */
+ gdb_printf (stream, " : %d",
+ TYPE_FIELD_BITSIZE (type, i));
}
- if (real_len > 0 && section_type != s_none)
- fprintf_filtered (stream, "\n");
+ gdb_printf (stream, ";\n");
+ }
- /* C++: print out the methods. */
- for (i = 0; i < len; i++)
+ /* If there are both fields and methods, put a blank line
+ between them. Make sure to count only method that we
+ will display; artificial methods will be hidden. */
+ len = TYPE_NFN_FIELDS (type);
+ if (!flags->print_methods)
+ len = 0;
+ int real_len = 0;
+ for (int i = 0; i < len; i++)
+ {
+ struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
+ int len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
+ int j;
+
+ for (j = 0; j < len2; j++)
+ if (!TYPE_FN_FIELD_ARTIFICIAL (f, j))
+ real_len++;
+ }
+ if (real_len > 0 && section_type != s_none)
+ gdb_printf (stream, "\n");
+
+ /* C++: print out the methods. */
+ for (int i = 0; i < len; i++)
+ {
+ struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
+ int j, len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
+ const char *method_name = TYPE_FN_FIELDLIST_NAME (type, i);
+ const char *name = type->name ();
+ int is_constructor = name && strcmp (method_name,
+ name) == 0;
+
+ for (j = 0; j < len2; j++)
{
- struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
- int j, len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
- const char *method_name = TYPE_FN_FIELDLIST_NAME (type, i);
- const char *name = type_name_no_tag (type);
- int is_constructor = name && strcmp (method_name,
- name) == 0;
-
- for (j = 0; j < len2; j++)
+ const char *mangled_name;
+ gdb::unique_xmalloc_ptr<char> mangled_name_holder;
+ const char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
+ int is_full_physname_constructor =
+ TYPE_FN_FIELD_CONSTRUCTOR (f, j)
+ || is_constructor_name (physname)
+ || is_destructor_name (physname)
+ || method_name[0] == '~';
+
+ /* Do not print out artificial methods. */
+ if (TYPE_FN_FIELD_ARTIFICIAL (f, j))
+ continue;
+
+ QUIT;
+ section_type = output_access_specifier
+ (stream, section_type, level,
+ TYPE_FN_FIELD_PROTECTED (f, j),
+ TYPE_FN_FIELD_PRIVATE (f, j), flags);
+
+ print_spaces_filtered_with_print_options (level + 4, stream,
+ flags);
+ if (TYPE_FN_FIELD_VIRTUAL_P (f, j))
+ gdb_printf (stream, "virtual ");
+ else if (TYPE_FN_FIELD_STATIC_P (f, j))
+ gdb_printf (stream, "static ");
+ if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) == 0)
{
- const char *mangled_name;
- char *demangled_name;
- struct cleanup *inner_cleanup;
- const char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
- int is_full_physname_constructor =
- TYPE_FN_FIELD_CONSTRUCTOR (f, j)
- || is_constructor_name (physname)
- || is_destructor_name (physname)
- || method_name[0] == '~';
-
- /* Do not print out artificial methods. */
- if (TYPE_FN_FIELD_ARTIFICIAL (f, j))
- continue;
-
- inner_cleanup = make_cleanup (null_cleanup, NULL);
-
- QUIT;
- if (TYPE_FN_FIELD_PROTECTED (f, j))
- {
- if (section_type != s_protected)
- {
- section_type = s_protected;
- fprintfi_filtered (level + 2, stream,
- "protected:\n");
- }
- }
- else if (TYPE_FN_FIELD_PRIVATE (f, j))
+ /* Keep GDB from crashing here. */
+ gdb_printf (stream,
+ _("%p[<undefined type>%p] %s;\n"),
+ metadata_style.style ().ptr (), nullptr,
+ TYPE_FN_FIELD_PHYSNAME (f, j));
+ break;
+ }
+ else if (!is_constructor /* Constructors don't
+ have declared
+ types. */
+ && !is_full_physname_constructor /* " " */
+ && !is_type_conversion_operator (type, i, j))
+ {
+ c_print_type_no_offsets
+ (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
+ "", stream, -1, 0, language, &local_flags, podata);
+
+ gdb_puts (" ", stream);
+ }
+ if (TYPE_FN_FIELD_STUB (f, j))
+ {
+ /* Build something we can demangle. */
+ mangled_name_holder.reset (gdb_mangle_name (type, i, j));
+ mangled_name = mangled_name_holder.get ();
+ }
+ else
+ mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
+
+ gdb::unique_xmalloc_ptr<char> demangled_name
+ = gdb_demangle (mangled_name,
+ DMGL_ANSI | DMGL_PARAMS);
+ if (demangled_name == NULL)
+ {
+ /* In some cases (for instance with the HP
+ demangling), if a function has more than 10
+ arguments, the demangling will fail.
+ Let's try to reconstruct the function
+ signature from the symbol information. */
+ if (!TYPE_FN_FIELD_STUB (f, j))
{
- if (section_type != s_private)
- {
- section_type = s_private;
- fprintfi_filtered (level + 2, stream,
- "private:\n");
- }
+ int staticp = TYPE_FN_FIELD_STATIC_P (f, j);
+ struct type *mtype = TYPE_FN_FIELD_TYPE (f, j);
+
+ cp_type_print_method_args (mtype,
+ "",
+ method_name,
+ staticp,
+ stream, language,
+ &local_flags);
}
else
+ fprintf_styled (stream, metadata_style.style (),
+ _("<badly mangled name '%s'>"),
+ mangled_name);
+ }
+ else
+ {
+ const char *p;
+ const char *demangled_no_class
+ = remove_qualifiers (demangled_name.get ());
+
+ /* Get rid of the `static' appended by the
+ demangler. */
+ p = strstr (demangled_no_class, " static");
+ if (p != NULL)
{
- if (section_type != s_public)
- {
- section_type = s_public;
- fprintfi_filtered (level + 2, stream,
- "public:\n");
- }
+ int length = p - demangled_no_class;
+ std::string demangled_no_static (demangled_no_class,
+ length);
+ gdb_puts (demangled_no_static.c_str (), stream);
}
+ else
+ gdb_puts (demangled_no_class, stream);
+ }
- print_spaces_filtered (level + 4, stream);
- if (TYPE_FN_FIELD_VIRTUAL_P (f, j))
- fprintf_filtered (stream, "virtual ");
- else if (TYPE_FN_FIELD_STATIC_P (f, j))
- fprintf_filtered (stream, "static ");
- 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 /* Constructors don't
- have declared
- types. */
- && !is_full_physname_constructor /* " " */
- && !is_type_conversion_operator (type, i, j))
- {
- c_print_type (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
- "", stream, -1, 0,
- &local_flags);
- fputs_filtered (" ", stream);
- }
- if (TYPE_FN_FIELD_STUB (f, j))
- {
- char *tem;
+ gdb_printf (stream, ";\n");
+ }
+ }
- /* Build something we can demangle. */
- tem = gdb_mangle_name (type, i, j);
- make_cleanup (xfree, tem);
- mangled_name = tem;
- }
- else
- mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
+ /* Print out nested types. */
+ if (TYPE_NESTED_TYPES_COUNT (type) != 0
+ && semi_local_flags.print_nested_type_limit != 0)
+ {
+ if (semi_local_flags.print_nested_type_limit > 0)
+ --semi_local_flags.print_nested_type_limit;
- demangled_name =
- cplus_demangle (mangled_name,
- DMGL_ANSI | DMGL_PARAMS);
- if (demangled_name == NULL)
- {
- /* In some cases (for instance with the HP
- demangling), if a function has more than 10
- arguments, the demangling will fail.
- Let's try to reconstruct the function
- signature from the symbol information. */
- if (!TYPE_FN_FIELD_STUB (f, j))
- {
- int staticp = TYPE_FN_FIELD_STATIC_P (f, j);
- struct type *mtype = TYPE_FN_FIELD_TYPE (f, j);
-
- cp_type_print_method_args (mtype,
- "",
- method_name,
- staticp,
- stream, &local_flags);
- }
- else
- fprintf_filtered (stream,
- _("<badly mangled name '%s'>"),
- mangled_name);
- }
- else
- {
- char *p;
- char *demangled_no_class
- = remove_qualifiers (demangled_name);
-
- /* Get rid of the `static' appended by the
- demangler. */
- p = strstr (demangled_no_class, " static");
- if (p != NULL)
- {
- int length = p - demangled_no_class;
- char *demangled_no_static;
-
- demangled_no_static
- = (char *) xmalloc (length + 1);
- strncpy (demangled_no_static,
- demangled_no_class, length);
- *(demangled_no_static + length) = '\0';
- fputs_filtered (demangled_no_static, stream);
- xfree (demangled_no_static);
- }
- else
- fputs_filtered (demangled_no_class, stream);
- xfree (demangled_name);
- }
+ if (type->num_fields () != 0 || TYPE_NFN_FIELDS (type) != 0)
+ gdb_printf (stream, "\n");
+
+ for (int i = 0; i < TYPE_NESTED_TYPES_COUNT (type); ++i)
+ {
+ print_spaces_filtered_with_print_options (level + 4, stream,
+ flags);
+ c_print_type_no_offsets (TYPE_NESTED_TYPES_FIELD_TYPE (type, i),
+ "", stream, show, level + 4,
+ language, &semi_local_flags, podata);
+ gdb_printf (stream, ";\n");
+ }
+ }
- do_cleanups (inner_cleanup);
+ /* Print typedefs defined in this class. */
- fprintf_filtered (stream, ";\n");
+ if (TYPE_TYPEDEF_FIELD_COUNT (type) != 0 && flags->print_typedefs)
+ {
+ if (type->num_fields () != 0 || TYPE_NFN_FIELDS (type) != 0
+ || TYPE_NESTED_TYPES_COUNT (type) != 0)
+ gdb_printf (stream, "\n");
+
+ for (int i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
+ {
+ struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
+
+ /* Dereference the typedef declaration itself. */
+ gdb_assert (target->code () == TYPE_CODE_TYPEDEF);
+ target = TYPE_TARGET_TYPE (target);
+
+ if (need_access_label)
+ {
+ section_type = output_access_specifier
+ (stream, section_type, level,
+ TYPE_TYPEDEF_FIELD_PROTECTED (type, i),
+ TYPE_TYPEDEF_FIELD_PRIVATE (type, i), flags);
}
+ print_spaces_filtered_with_print_options (level + 4, stream,
+ flags);
+ gdb_printf (stream, "typedef ");
+
+ /* We want to print typedefs with substitutions
+ from the template parameters or globally-known
+ typedefs but not local typedefs. */
+ c_print_type_no_offsets (target,
+ TYPE_TYPEDEF_FIELD_NAME (type, i),
+ stream, show - 1, level + 4,
+ language, &semi_local_flags, podata);
+ gdb_printf (stream, ";\n");
}
+ }
+
+ if (flags->print_offsets)
+ {
+ if (show > 0)
+ podata->finish (type, level, stream);
- /* Print typedefs defined in this class. */
+ print_spaces (print_offset_data::indentation, stream);
+ if (level == 0)
+ print_spaces (2, stream);
+ }
+
+ gdb_printf (stream, "%*s}", level, "");
+ }
+}
+
+/* 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 {...}".
- if (TYPE_TYPEDEF_FIELD_COUNT (type) != 0 && flags->print_typedefs)
+ 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
+c_type_print_base_1 (struct type *type, struct ui_file *stream,
+ int show, int level,
+ enum language language,
+ const struct type_print_options *flags,
+ struct print_offset_data *podata)
+{
+ int i;
+ int len;
+
+ QUIT;
+
+ if (type == NULL)
+ {
+ fputs_styled (_("<type unknown>"), metadata_style.style (), 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 () != NULL)
+ {
+ c_type_print_modifier (type, stream, 0, 1, language);
+
+ /* If we have "typedef struct foo {. . .} bar;" do we want to
+ print it as "struct foo" or as "bar"? Pick the latter for
+ C++, because C++ folk tend to expect things like "class5
+ *foo" rather than "struct class5 *foo". We rather
+ arbitrarily choose to make language_minimal work in a C-like
+ way. */
+ if (language == language_c || language == language_minimal)
+ {
+ if (type->code () == TYPE_CODE_UNION)
+ gdb_printf (stream, "union ");
+ else if (type->code () == TYPE_CODE_STRUCT)
{
- if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0)
- fprintf_filtered (stream, "\n");
+ if (type->is_declared_class ())
+ gdb_printf (stream, "class ");
+ else
+ gdb_printf (stream, "struct ");
+ }
+ else if (type->code () == TYPE_CODE_ENUM)
+ gdb_printf (stream, "enum ");
+ }
- for (i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
- {
- struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
- struct typedef_hash_table *table2;
-
- /* Dereference the typedef declaration itself. */
- gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);
- target = TYPE_TARGET_TYPE (target);
-
- print_spaces_filtered (level + 4, stream);
- fprintf_filtered (stream, "typedef ");
-
- /* We want to print typedefs with substitutions
- from the template parameters or globally-known
- typedefs but not local typedefs. */
- c_print_type (target,
- TYPE_TYPEDEF_FIELD_NAME (type, i),
- stream, show - 1, level + 4,
- &semi_local_flags);
- fprintf_filtered (stream, ";\n");
- }
- }
+ print_name_maybe_canonical (type->name (), flags, stream);
+ return;
+ }
- fprintfi_filtered (level, stream, "}");
- }
+ type = check_typedef (type);
- do_cleanups (local_cleanups);
- }
+ switch (type->code ())
+ {
+ case TYPE_CODE_TYPEDEF:
+ /* If we get here, the typedef doesn't have a name, and we
+ couldn't resolve TYPE_TARGET_TYPE. Not much we can do. */
+ gdb_assert (type->name () == NULL);
+ gdb_assert (TYPE_TARGET_TYPE (type) == NULL);
+ fprintf_styled (stream, metadata_style.style (),
+ _("<unnamed typedef>"));
+ break;
+
+ case TYPE_CODE_FUNC:
+ case TYPE_CODE_METHOD:
+ if (TYPE_TARGET_TYPE (type) == NULL)
+ type_print_unknown_return_type (stream);
+ else
+ c_type_print_base_1 (TYPE_TARGET_TYPE (type),
+ stream, show, level, language, flags, podata);
+ break;
+ case TYPE_CODE_ARRAY:
+ case TYPE_CODE_PTR:
+ case TYPE_CODE_MEMBERPTR:
+ case TYPE_CODE_REF:
+ case TYPE_CODE_RVALUE_REF:
+ case TYPE_CODE_METHODPTR:
+ c_type_print_base_1 (TYPE_TARGET_TYPE (type),
+ stream, show, level, language, flags, podata);
+ break;
+
+ case TYPE_CODE_STRUCT:
+ case TYPE_CODE_UNION:
+ c_type_print_base_struct_union (type, stream, show, level,
+ language, flags, podata);
break;
case TYPE_CODE_ENUM:
- c_type_print_modifier (type, stream, 0, 1);
- fprintf_filtered (stream, "enum ");
+ c_type_print_modifier (type, stream, 0, 1, language);
+ gdb_printf (stream, "enum ");
+ if (type->is_declared_class ())
+ gdb_printf (stream, "class ");
/* Print the tag name if it exists.
- The aCC compiler emits a spurious
- "{unnamed struct}"/"{unnamed union}"/"{unnamed enum}"
- tag for unnamed struct/union/enum's, which we don't
- want to print. */
- if (TYPE_TAG_NAME (type) != NULL
- && strncmp (TYPE_TAG_NAME (type), "{unnamed", 8))
+ The aCC compiler emits a spurious
+ "{unnamed struct}"/"{unnamed union}"/"{unnamed enum}"
+ tag for unnamed struct/union/enum's, which we don't
+ want to print. */
+ if (type->name () != NULL
+ && !startswith (type->name (), "{unnamed"))
{
- print_name_maybe_canonical (TYPE_TAG_NAME (type), flags, stream);
+ print_name_maybe_canonical (type->name (), flags, stream);
if (show > 0)
- fputs_filtered (" ", stream);
+ gdb_puts (" ", stream);
}
- wrap_here (" ");
+ stream->wrap_here (4);
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, "{...}");
+ if (type->name () == NULL)
+ gdb_printf (stream, "{...}");
}
- else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
+ else if (show > 0 || type->name () == NULL)
{
LONGEST lastval = 0;
- fprintf_filtered (stream, "{");
- len = TYPE_NFIELDS (type);
+ /* We can't handle this case perfectly, as DWARF does not
+ tell us whether or not the underlying type was specified
+ in the source (and other debug formats don't provide this
+ at all). We choose to print the underlying type, if it
+ has a name, when in C++ on the theory that it's better to
+ print too much than too little; but conversely not to
+ print something egregiously outside the current
+ language's syntax. */
+ if (language == language_cplus && TYPE_TARGET_TYPE (type) != NULL)
+ {
+ struct type *underlying = check_typedef (TYPE_TARGET_TYPE (type));
+
+ if (underlying->name () != NULL)
+ gdb_printf (stream, ": %s ", underlying->name ());
+ }
+
+ gdb_printf (stream, "{");
+ len = type->num_fields ();
for (i = 0; i < len; i++)
{
QUIT;
if (i)
- fprintf_filtered (stream, ", ");
- wrap_here (" ");
- fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
- if (lastval != TYPE_FIELD_ENUMVAL (type, i))
+ gdb_printf (stream, ", ");
+ stream->wrap_here (4);
+ fputs_styled (type->field (i).name (),
+ variable_name_style.style (), stream);
+ if (lastval != type->field (i).loc_enumval ())
{
- fprintf_filtered (stream, " = %s",
- plongest (TYPE_FIELD_ENUMVAL (type, i)));
- lastval = TYPE_FIELD_ENUMVAL (type, i);
+ gdb_printf (stream, " = %s",
+ plongest (type->field (i).loc_enumval ()));
+ lastval = type->field (i).loc_enumval ();
}
lastval++;
}
- fprintf_filtered (stream, "}");
+ gdb_printf (stream, "}");
}
break;
+ case TYPE_CODE_FLAGS:
+ {
+ struct type_print_options local_flags = *flags;
+
+ local_flags.local_typedefs = NULL;
+
+ c_type_print_modifier (type, stream, 0, 1, language);
+ gdb_printf (stream, "flag ");
+ print_name_maybe_canonical (type->name (), flags, stream);
+ if (show > 0)
+ {
+ gdb_puts (" ", stream);
+ gdb_printf (stream, "{\n");
+ if (type->num_fields () == 0)
+ {
+ if (type->is_stub ())
+ gdb_printf (stream,
+ _("%*s%p[<incomplete type>%p]\n"),
+ level + 4, "",
+ metadata_style.style ().ptr (), nullptr);
+ else
+ gdb_printf (stream,
+ _("%*s%p[<no data fields>%p]\n"),
+ level + 4, "",
+ metadata_style.style ().ptr (), nullptr);
+ }
+ len = type->num_fields ();
+ for (i = 0; i < len; i++)
+ {
+ QUIT;
+ print_spaces (level + 4, stream);
+ /* We pass "show" here and not "show - 1" to get enum types
+ printed. There's no other way to see them. */
+ c_print_type_1 (type->field (i).type (),
+ type->field (i).name (),
+ stream, show, level + 4,
+ language, &local_flags, podata);
+ gdb_printf (stream, " @%s",
+ plongest (type->field (i).loc_bitpos ()));
+ if (TYPE_FIELD_BITSIZE (type, i) > 1)
+ {
+ gdb_printf (stream, "-%s",
+ plongest (type->field (i).loc_bitpos ()
+ + TYPE_FIELD_BITSIZE (type, i)
+ - 1));
+ }
+ gdb_printf (stream, ";\n");
+ }
+ gdb_printf (stream, "%*s}", level, "");
+ }
+ }
+ break;
+
case TYPE_CODE_VOID:
- fprintf_filtered (stream, "void");
+ gdb_printf (stream, "void");
break;
case TYPE_CODE_UNDEF:
- fprintf_filtered (stream, _("struct <unknown>"));
+ gdb_printf (stream, _("struct <unknown>"));
break;
case TYPE_CODE_ERROR:
- fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type));
+ gdb_printf (stream, "%s", TYPE_ERROR_NAME (type));
break;
case TYPE_CODE_RANGE:
/* This should not occur. */
- fprintf_filtered (stream, _("<range type>"));
+ fprintf_styled (stream, metadata_style.style (), _("<range type>"));
+ break;
+
+ case TYPE_CODE_FIXED_POINT:
+ print_type_fixed_point (type, stream);
break;
case TYPE_CODE_NAMESPACE:
- fputs_filtered ("namespace ", stream);
- fputs_filtered (TYPE_TAG_NAME (type), stream);
+ gdb_puts ("namespace ", stream);
+ gdb_puts (type->name (), stream);
break;
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)
+ 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 () != NULL)
{
- c_type_print_modifier (type, stream, 0, 1);
- print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ c_type_print_modifier (type, stream, 0, 1, language);
+ print_name_maybe_canonical (type->name (), flags, stream);
}
else
{
/* At least for dump_symtab, it is important that this not
be an error (). */
- fprintf_filtered (stream, _("<invalid type code %d>"),
- TYPE_CODE (type));
+ fprintf_styled (stream, metadata_style.style (),
+ _("<invalid type code %d>"), type->code ());
}
break;
}
}
+
+/* See c_type_print_base_1. */
+
+void
+c_type_print_base (struct type *type, struct ui_file *stream,
+ int show, int level,
+ const struct type_print_options *flags)
+{
+ struct print_offset_data podata (flags);
+
+ c_type_print_base_1 (type, stream, show, level,
+ current_language->la_language, flags, &podata);
+}
projects / binutils-gdb.git / blobdiff