/* Support for printing C and C++ types for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
- 1999, 2000, 2001, 2002, 2003
- Free Software Foundation, Inc.
+ Copyright (C) 1986-2020 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ 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,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "gdb_obstack.h"
-#include "bfd.h" /* Binary File Description */
+#include "bfd.h" /* Binary File Description. */
#include "symtab.h"
#include "gdbtypes.h"
#include "expression.h"
#include "language.h"
#include "demangle.h"
#include "c-lang.h"
+#include "cli/cli-style.h"
#include "typeprint.h"
#include "cp-abi.h"
+#include "cp-support.h"
-#include "gdb_string.h"
-#include <errno.h>
+/* A list of access specifiers used for printing. */
-/* Flag indicating target was compiled by HP compiler */
-extern int hp_som_som_object_present;
+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,
+ 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);
-static void cp_type_print_method_args (struct type *mtype, char *prefix,
- char *varstring, int staticp,
- struct ui_file *stream);
+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
-static void c_type_print_args (struct type *, struct ui_file *);
+/* A callback function for cp_canonicalize_string_full that uses
+ typedef_hash_table::find_typedef. */
-static void cp_type_print_derivation_info (struct ui_file *, struct type *);
+static const char *
+find_typedef_for_canonicalize (struct type *t, void *data)
+{
+ return typedef_hash_table::find_typedef
+ ((const struct type_print_options *) data, t);
+}
-static void c_type_print_varspec_prefix (struct type *, struct ui_file *, int,
- int, int);
+/* Print NAME on STREAM. If the 'raw' field of FLAGS is not set,
+ canonicalize NAME using the local typedefs first. */
-/* Print "const", "volatile", or address space modifiers. */
-static void c_type_print_modifier (struct type *, struct ui_file *,
- int, int);
-\f
+static void
+print_name_maybe_canonical (const char *name,
+ const struct type_print_options *flags,
+ struct ui_file *stream)
+{
+ std::string s;
+ if (!flags->raw)
+ s = cp_canonicalize_string_full (name,
+ find_typedef_for_canonicalize,
+ (void *) flags);
+ fputs_filtered (!s.empty () ? s.c_str () : name, stream);
+}
-/* LEVEL is the depth to indent lines by. */
+\f
-void
-c_print_type (struct type *type, char *varstring, struct ui_file *stream,
- int show, int level)
+/* Helper function for c_print_type. */
+
+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;
int need_post_space;
+ const char *local_name;
if (show > 0)
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
- c_type_print_base (type, stream, show, level);
+ local_name = typedef_hash_table::find_typedef (flags, type);
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_MEMBER
- || code == TYPE_CODE_REF)))
- fputs_filtered (" ", stream);
- need_post_space = (varstring != NULL && strcmp (varstring, "") != 0);
- c_type_print_varspec_prefix (type, stream, show, 0, need_post_space);
+ if (local_name != NULL)
+ {
+ fputs_filtered (local_name, stream);
+ if (varstring != NULL && *varstring != '\0')
+ fputs_filtered (" ", stream);
+ }
+ else
+ {
+ 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)
+ && (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
+ || code == TYPE_CODE_METHOD
+ || (code == TYPE_CODE_ARRAY
+ && !TYPE_VECTOR (type))
+ || code == TYPE_CODE_MEMBERPTR
+ || code == TYPE_CODE_METHODPTR
+ || TYPE_IS_REFERENCE (type))))
+ fputs_filtered (" ", stream);
+ need_post_space = (varstring != NULL && strcmp (varstring, "") != 0);
+ c_type_print_varspec_prefix (type, stream, show, 0, need_post_space,
+ language, flags, podata);
+ }
if (varstring != NULL)
{
- 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 */
+ if (code == TYPE_CODE_FUNC || code == TYPE_CODE_METHOD)
+ fputs_styled (varstring, function_name_style.style (), stream);
+ else
+ fputs_filtered (varstring, stream);
- demangled_args = strchr (varstring, '(') != NULL;
- c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
+ /* For demangled function names, we have the arglist as part of
+ 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,
+ language, flags);
+ }
}
}
+/* LEVEL is the depth to indent lines by. */
+
+void
+c_print_type (struct type *type,
+ const char *varstring,
+ struct ui_file *stream,
+ int show, int level,
+ const struct type_print_options *flags)
+{
+ struct print_offset_data podata;
+
+ c_print_type_1 (type, varstring, stream, show, level,
+ current_language->la_language, flags, &podata);
+}
+
+
+/* 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;
+
+ 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. */
+
+void
+c_print_typedef (struct type *type,
+ struct symbol *new_symbol,
+ struct ui_file *stream)
+{
+ type = check_typedef (type);
+ fprintf_filtered (stream, "typedef ");
+ type_print (type, "", stream, -1);
+ if (TYPE_NAME ((SYMBOL_TYPE (new_symbol))) == 0
+ || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
+ new_symbol->linkage_name ()) != 0
+ || TYPE_CODE (SYMBOL_TYPE (new_symbol)) == TYPE_CODE_TYPEDEF)
+ fprintf_filtered (stream, " %s", new_symbol->print_name ());
+ fprintf_filtered (stream, ";");
+}
+
/* If TYPE is a derived type, then print out derivation information.
- Print only the actual base classes of this type, not the base classes
- of the base classes. I.E. for the derivation hierarchy:
+ Print only the actual base classes of this type, not the base
+ classes of the base classes. I.e. for the derivation hierarchy:
class A { int a; };
class B : public A {int b; };
int c;
}
- Not as the following (like gdb used to), which is not legal C++ syntax for
- derived types and may be confused with the multiple inheritance form:
+ Not as the following (like gdb used to), which is not legal C++
+ syntax for derived types and may be confused with the multiple
+ inheritance form:
class C : public B : public A {
int c;
}
- In general, gdb should try to print the types as closely as possible to
- the form that they appear in the source code.
- Note that in case of protected derivation gcc will not say 'protected'
- but 'private'. The HP's aCC compiler emits specific information for
- derivation via protected inheritance, so gdb can print it out */
+ In general, gdb should try to print the types as closely as
+ possible to the form that they appear in the source code. */
static void
-cp_type_print_derivation_info (struct ui_file *stream, struct type *type)
+cp_type_print_derivation_info (struct ui_file *stream,
+ struct type *type,
+ const struct type_print_options *flags)
{
- char *name;
+ const char *name;
int i;
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_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));
- fprintf_filtered (stream, "%s", name ? name : "(null)");
+ name = TYPE_NAME (TYPE_BASECLASS (type, i));
+ if (name)
+ print_name_maybe_canonical (name, flags, stream);
+ else
+ fprintf_filtered (stream, "(null)");
}
if (i > 0)
{
/* Print the C++ method arguments ARGS to the file STREAM. */
static void
-cp_type_print_method_args (struct type *mtype, char *prefix, char *varstring,
- int staticp, struct ui_file *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);
int i;
- fprintf_symbol_filtered (stream, prefix, language_cplus, DMGL_ANSI);
- fprintf_symbol_filtered (stream, varstring, language_cplus, DMGL_ANSI);
+ fprintf_symbol_filtered (stream, prefix,
+ language_cplus, DMGL_ANSI);
+ fprintf_symbol_filtered (stream, varstring,
+ language_cplus, DMGL_ANSI);
fputs_filtered ("(", 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)
{
- type_print (args[i++].type, "", stream, 0);
+ struct field arg = args[i++];
+
+ /* Skip any artificial arguments. */
+ if (FIELD_ARTIFICIAL (arg))
+ continue;
+
+ c_print_type (arg.type, "", stream, 0, 0, flags);
if (i == nargs && varargs)
fprintf_filtered (stream, ", ...");
else if (i < nargs)
- fprintf_filtered (stream, ", ");
+ {
+ fprintf_filtered (stream, ", ");
+ wrap_here (" ");
+ }
}
}
else if (varargs)
fprintf_filtered (stream, "...");
- else if (current_language->la_language == language_cplus)
+ else if (language == language_cplus)
fprintf_filtered (stream, "void");
fprintf_filtered (stream, ")");
+
+ /* For non-static methods, read qualifiers from the type of
+ THIS. */
+ if (!staticp)
+ {
+ struct type *domain;
+
+ gdb_assert (nargs > 0);
+ gdb_assert (TYPE_CODE (args[0].type) == TYPE_CODE_PTR);
+ domain = TYPE_TARGET_TYPE (args[0].type);
+
+ if (TYPE_CONST (domain))
+ fprintf_filtered (stream, " const");
+
+ if (TYPE_VOLATILE (domain))
+ fprintf_filtered (stream, " volatile");
+
+ if (TYPE_RESTRICT (domain))
+ fprintf_filtered (stream, " restrict");
+
+ if (TYPE_ATOMIC (domain))
+ fprintf_filtered (stream, " _Atomic");
+ }
}
between a trailing qualifier and a field, variable, or function
name. */
-void
-c_type_print_varspec_prefix (struct type *type, struct ui_file *stream,
- int show, int passed_a_ptr, int need_post_space)
+static void
+c_type_print_varspec_prefix (struct type *type,
+ struct ui_file *stream,
+ int show, int passed_a_ptr,
+ int need_post_space,
+ enum language language,
+ const struct type_print_options *flags,
+ struct print_offset_data *podata)
{
- char *name;
+ const char *name;
+
if (type == 0)
return;
switch (TYPE_CODE (type))
{
case TYPE_CODE_PTR:
- c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, show, 1, 1);
+ c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
+ stream, show, 1, 1, language, flags,
+ podata);
fprintf_filtered (stream, "*");
c_type_print_modifier (type, stream, 1, need_post_space);
break;
- case TYPE_CODE_MEMBER:
- if (passed_a_ptr)
- fprintf_filtered (stream, "(");
- c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, show, 0, 0);
- fprintf_filtered (stream, " ");
- name = type_name_no_tag (TYPE_DOMAIN_TYPE (type));
+ case TYPE_CODE_MEMBERPTR:
+ c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
+ stream, show, 0, 0, language, flags, podata);
+ name = TYPE_NAME (TYPE_SELF_TYPE (type));
if (name)
- fputs_filtered (name, stream);
+ print_name_maybe_canonical (name, flags, stream);
else
- c_type_print_base (TYPE_DOMAIN_TYPE (type), stream, 0, passed_a_ptr);
- fprintf_filtered (stream, "::");
+ c_type_print_base_1 (TYPE_SELF_TYPE (type),
+ stream, -1, passed_a_ptr, language, flags,
+ podata);
+ fprintf_filtered (stream, "::*");
break;
- case TYPE_CODE_METHOD:
- if (passed_a_ptr)
- fprintf_filtered (stream, "(");
- c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, show, 0, 0);
- if (passed_a_ptr)
- {
- fprintf_filtered (stream, " ");
- c_type_print_base (TYPE_DOMAIN_TYPE (type), stream, 0, passed_a_ptr);
- fprintf_filtered (stream, "::");
- }
+ case TYPE_CODE_METHODPTR:
+ c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
+ stream, show, 0, 0, language, flags,
+ podata);
+ fprintf_filtered (stream, "(");
+ name = TYPE_NAME (TYPE_SELF_TYPE (type));
+ if (name)
+ print_name_maybe_canonical (name, flags, stream);
+ else
+ c_type_print_base_1 (TYPE_SELF_TYPE (type),
+ stream, -1, passed_a_ptr, language, flags,
+ podata);
+ fprintf_filtered (stream, "::*");
break;
case TYPE_CODE_REF:
- c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, show, 1, 0);
- fprintf_filtered (stream, "&");
+ case TYPE_CODE_RVALUE_REF:
+ c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
+ stream, show, 1, 0, language, flags,
+ podata);
+ fprintf_filtered (stream, TYPE_CODE(type) == TYPE_CODE_REF ? "&" : "&&");
c_type_print_modifier (type, stream, 1, need_post_space);
break;
+ case TYPE_CODE_METHOD:
case TYPE_CODE_FUNC:
- c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, show, 0, 0);
+ c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
+ stream, show, 0, 0, language, flags,
+ podata);
if (passed_a_ptr)
fprintf_filtered (stream, "(");
break;
case TYPE_CODE_ARRAY:
- c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, show, 0, 0);
+ c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
+ stream, show, 0, 0, language, flags,
+ podata);
if (passed_a_ptr)
fprintf_filtered (stream, "(");
break;
case TYPE_CODE_TYPEDEF:
- c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type), stream, show, 0, 0);
+ c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
+ 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_SET:
case TYPE_CODE_RANGE:
case TYPE_CODE_STRING:
- case TYPE_CODE_BITSTRING:
case TYPE_CODE_COMPLEX:
- case TYPE_CODE_TEMPLATE:
case TYPE_CODE_NAMESPACE:
+ case TYPE_CODE_DECFLOAT:
/* These types need no prefix. They are listed here so that
gcc -Wall will reveal any types that haven't been handled. */
break;
default:
- error ("type not handled in c_type_print_varspec_prefix()");
+ error (_("type not handled in c_type_print_varspec_prefix()"));
break;
}
}
-/* Print out "const" and "volatile" attributes.
+/* Print out "const" and "volatile" attributes,
+ and address space id if present.
TYPE is a pointer to the type being printed out.
STREAM is the output destination.
- NEED_SPACE = 1 indicates an initial white space is needed */
+ NEED_PRE_SPACE = 1 indicates an initial white space is needed.
+ NEED_POST_SPACE = 1 indicates a final white space is needed. */
static void
c_type_print_modifier (struct type *type, struct ui_file *stream,
/* 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, " ");
did_print_modifier = 1;
}
- address_space_id = address_space_int_to_name (TYPE_INSTANCE_FLAGS (type));
+ if (TYPE_RESTRICT (type))
+ {
+ if (did_print_modifier || need_pre_space)
+ fprintf_filtered (stream, " ");
+ fprintf_filtered (stream, "restrict");
+ did_print_modifier = 1;
+ }
+
+ if (TYPE_ATOMIC (type))
+ {
+ if (did_print_modifier || need_pre_space)
+ fprintf_filtered (stream, " ");
+ fprintf_filtered (stream, "_Atomic");
+ did_print_modifier = 1;
+ }
+
+ address_space_id = address_space_int_to_name (get_type_arch (type),
+ TYPE_INSTANCE_FLAGS (type));
if (address_space_id)
{
if (did_print_modifier || need_pre_space)
}
+/* Print out the arguments of TYPE, which should have TYPE_CODE_METHOD
+ or TYPE_CODE_FUNC, to STREAM. Artificial arguments, such as "this"
+ in non-static methods, are displayed if LINKAGE_NAME is zero. If
+ LINKAGE_NAME is non-zero and LANGUAGE is language_cplus the topmost
+ 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 and C++. */
-
-static void
-c_type_print_args (struct type *type, struct ui_file *stream)
+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;
- struct field *args;
+ int printed_any = 0;
fprintf_filtered (stream, "(");
- args = TYPE_FIELDS (type);
- if (args != NULL)
+
+ for (i = 0; i < TYPE_NFIELDS (type); i++)
{
- int i;
+ struct type *param_type;
- /* FIXME drow/2002-05-31: Always skips the first argument,
- should we be checking for static members? */
+ if (TYPE_FIELD_ARTIFICIAL (type, i) && linkage_name)
+ continue;
- for (i = 1; i < TYPE_NFIELDS (type); i++)
+ if (printed_any)
{
- c_print_type (args[i].type, "", stream, -1, 0);
- if (i != TYPE_NFIELDS (type))
- {
- fprintf_filtered (stream, ",");
- wrap_here (" ");
- }
+ fprintf_filtered (stream, ", ");
+ wrap_here (" ");
+ }
+
+ param_type = TYPE_FIELD_TYPE (type, i);
+
+ if (language == language_cplus && linkage_name)
+ {
+ /* C++ standard, 13.1 Overloadable declarations, point 3, item:
+ - Parameter declarations that differ only in the presence or
+ absence of const and/or volatile are equivalent.
+
+ And the const/volatile qualifiers are not present in the mangled
+ names as produced by GCC. */
+
+ param_type = make_cv_type (0, 0, param_type, NULL);
}
- if (TYPE_VARARGS (type))
- fprintf_filtered (stream, "...");
- else if (i == 1
- && (current_language->la_language == language_cplus))
- fprintf_filtered (stream, "void");
+
+ c_print_type (param_type, "", stream, -1, 0, language, flags);
+ printed_any = 1;
}
- else if (current_language->la_language == language_cplus)
+
+ if (printed_any && TYPE_VARARGS (type))
{
- fprintf_filtered (stream, "void");
+ /* 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))
+ {
+ fprintf_filtered (stream, ", ");
+ wrap_here (" ");
+ fprintf_filtered (stream, "...");
+ }
}
+ else if (!printed_any
+ && (TYPE_PROTOTYPED (type) || language == language_cplus))
+ fprintf_filtered (stream, "void");
fprintf_filtered (stream, ")");
}
-
/* Return true iff the j'th overloading of the i'th method of TYPE
is a type conversion operator, like `operator int () { ... }'.
When listing a class's methods, we don't print the return type of
such operators. */
+
static int
is_type_conversion_operator (struct type *type, int i, int j)
{
by their name is pretty terrible. But I don't think our present
data structure gives us any other way to tell. If you know of
some other way, feel free to rewrite this function. */
- char *name = TYPE_FN_FIELDLIST_NAME (type, i);
+ 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
return 1;
/* That was indeed the end of the name, so it was `operator new' or
- `operator delete', neither of which are type conversion operators. */
+ `operator delete', neither of which are type conversion
+ operators. */
return 0;
}
-
/* Given a C++ qualified identifier QID, strip off the qualifiers,
yielding the unqualified name. The return value is a pointer into
the original string.
It's a pity we don't have this information in some more structured
form. Even the author of this function feels that writing little
parsers like this everywhere is stupid. */
+
static char *
remove_qualifiers (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 */
+ 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
- `::' token we've seen so far. */
+ char *last = 0; /* The character after the rightmost
+ `::' token we've seen so far. */
for (scan = qid; *scan; scan++)
{
/* If we're inside parenthesis (i.e., an argument list) or
angle brackets (i.e., a list of template arguments), then
we don't record the position of this :: token, since it's
- not relevant to the top-level structure we're trying
- to operate on. */
+ not relevant to the top-level structure we're trying to
+ operate on. */
if (depth == 0)
{
last = scan + 2;
depth--;
else
{
- /* We're going to do a little error recovery here. If we
- don't find a match for *scan on the paren stack, but
- there is something lower on the stack that does match, we
- pop the stack to that point. */
+ /* We're going to do a little error recovery here. If
+ we don't find a match for *scan on the paren stack,
+ but there is something lower on the stack that does
+ match, we pop the stack to that point. */
int i;
for (i = depth - 1; i >= 0; i--)
return qid;
}
-
/* 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. */
-void
-c_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
- int show, int passed_a_ptr, int demangled_args)
+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;
switch (TYPE_CODE (type))
{
case TYPE_CODE_ARRAY:
- if (passed_a_ptr)
- fprintf_filtered (stream, ")");
+ {
+ LONGEST low_bound, high_bound;
+ int is_vector = TYPE_VECTOR (type);
- fprintf_filtered (stream, "[");
- if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
- && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
- fprintf_filtered (stream, "%d",
- (TYPE_LENGTH (type)
- / TYPE_LENGTH (TYPE_TARGET_TYPE (type))));
- fprintf_filtered (stream, "]");
+ if (passed_a_ptr)
+ fprintf_filtered (stream, ")");
- c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, show,
- 0, 0);
+ fprintf_filtered (stream, (is_vector ?
+ " __attribute__ ((vector_size(" : "["));
+ /* Bounds are not yet resolved, print a bounds placeholder instead. */
+ if (TYPE_HIGH_BOUND_KIND (TYPE_INDEX_TYPE (type)) == PROP_LOCEXPR
+ || TYPE_HIGH_BOUND_KIND (TYPE_INDEX_TYPE (type)) == PROP_LOCLIST)
+ fprintf_filtered (stream, "variable length");
+ else if (get_array_bounds (type, &low_bound, &high_bound))
+ fprintf_filtered (stream, "%s",
+ plongest (high_bound - low_bound + 1));
+ fprintf_filtered (stream, (is_vector ? ")))" : "]"));
+
+ c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
+ show, 0, 0, language, flags);
+ }
break;
- case TYPE_CODE_MEMBER:
- if (passed_a_ptr)
- fprintf_filtered (stream, ")");
- c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, show,
- 0, 0);
+ case TYPE_CODE_MEMBERPTR:
+ c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
+ show, 0, 0, language, flags);
break;
- case TYPE_CODE_METHOD:
- if (passed_a_ptr)
- fprintf_filtered (stream, ")");
- c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, show,
- 0, 0);
- if (passed_a_ptr)
- {
- c_type_print_args (type, stream);
- }
+ case TYPE_CODE_METHODPTR:
+ fprintf_filtered (stream, ")");
+ c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
+ show, 0, 0, language, flags);
break;
case TYPE_CODE_PTR:
case TYPE_CODE_REF:
- c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, show,
- 1, 0);
+ case TYPE_CODE_RVALUE_REF:
+ c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
+ show, 1, 0, language, flags);
break;
+ case TYPE_CODE_METHOD:
case TYPE_CODE_FUNC:
if (passed_a_ptr)
fprintf_filtered (stream, ")");
if (!demangled_args)
- {
- int i, len = TYPE_NFIELDS (type);
- fprintf_filtered (stream, "(");
- if (len == 0
- && (TYPE_PROTOTYPED (type)
- || current_language->la_language == language_cplus))
- {
- fprintf_filtered (stream, "void");
- }
- else
- for (i = 0; i < len; i++)
- {
- if (i > 0)
- {
- fputs_filtered (", ", stream);
- wrap_here (" ");
- }
- c_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0);
- }
- fprintf_filtered (stream, ")");
- }
- c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, show,
- passed_a_ptr, 0);
+ c_type_print_args (type, stream, 0, language, flags);
+ c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
+ 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);
+ c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
+ 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_SET:
case TYPE_CODE_RANGE:
case TYPE_CODE_STRING:
- case TYPE_CODE_BITSTRING:
case TYPE_CODE_COMPLEX:
- case TYPE_CODE_TEMPLATE:
case TYPE_CODE_NAMESPACE:
+ case TYPE_CODE_DECFLOAT:
/* 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()");
+ error (_("type not handled in c_type_print_varspec_suffix()"));
break;
}
}
-/* 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;}".
+/* A helper for c_type_print_base that displays template
+ parameters and their bindings, if needed.
- LEVEL is the number of spaces to indent by.
- We increase it for some recursive calls. */
+ TABLE is the local bindings table to use. If NULL, no printing is
+ done. Note that, at this point, TABLE won't have any useful
+ information in it -- but it is also used as a flag to
+ print_name_maybe_canonical to activate searching the global typedef
+ table.
-void
-c_type_print_base (struct type *type, struct ui_file *stream, int show,
- int level)
+ TYPE is the type whose template arguments are being displayed.
+
+ STREAM is the stream on which to print. */
+
+static void
+c_type_print_template_args (const struct type_print_options *flags,
+ struct type *type, struct ui_file *stream)
{
- int i;
- int len, real_len;
- int lastval;
- char *mangled_name;
- char *demangled_name;
- char *demangled_no_static;
- enum
- {
- s_none, s_public, s_private, s_protected
- }
- section_type;
- int need_access_label = 0;
- int j, len2;
+ int first = 1, i;
- QUIT;
+ if (flags->raw)
+ return;
- wrap_here (" ");
- if (type == NULL)
+ for (i = 0; i < TYPE_N_TEMPLATE_ARGUMENTS (type); ++i)
{
- fputs_filtered ("<type unknown>", stream);
- return;
+ struct symbol *sym = TYPE_TEMPLATE_ARGUMENT (type, i);
+
+ if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
+ continue;
+
+ if (first)
+ {
+ wrap_here (" ");
+ fprintf_filtered (stream, _("[with %s = "), sym->linkage_name ());
+ first = 0;
+ }
+ else
+ {
+ fputs_filtered (", ", stream);
+ wrap_here (" ");
+ fprintf_filtered (stream, "%s = ", sym->linkage_name ());
+ }
+
+ c_print_type (SYMBOL_TYPE (sym), "", stream, -1, 0, flags);
}
- /* 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". */
+ if (!first)
+ fputs_filtered (_("] "), stream);
+}
+
+/* Use 'print_spaces_filtered', but take into consideration the
+ type_print_options FLAGS in order to determine how many whitespaces
+ will be printed. */
- if (show <= 0
- && TYPE_NAME (type) != NULL)
+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_filtered (level, stream);
+ else
+ print_spaces_filtered (level + print_offset_data::indentation, stream);
+}
+
+/* Output an access specifier to STREAM, if needed. LAST_ACCESS is the
+ last access specifier output (typically returned by this function). */
+
+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)
+{
+ if (is_protected)
{
- c_type_print_modifier (type, stream, 0, 1);
- fputs_filtered (TYPE_NAME (type), stream);
- return;
+ if (last_access != s_protected)
+ {
+ last_access = s_protected;
+ print_spaces_filtered_with_print_options (level + 2, stream, flags);
+ fprintf_filtered (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);
+ fprintf_filtered (stream, "private:\n");
+ }
+ }
+ else
+ {
+ if (last_access != s_public)
+ {
+ last_access = s_public;
+ print_spaces_filtered_with_print_options (level + 2, stream, flags);
+ fprintf_filtered (stream, "public:\n");
+ }
}
- CHECK_TYPEDEF (type);
+ return last_access;
+}
- switch (TYPE_CODE (type))
- {
- case TYPE_CODE_TYPEDEF:
- case TYPE_CODE_ARRAY:
- case TYPE_CODE_PTR:
- case TYPE_CODE_MEMBER:
- case TYPE_CODE_REF:
- case TYPE_CODE_FUNC:
- case TYPE_CODE_METHOD:
- c_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
- break;
+/* Return true if an access label (i.e., "public:", "private:",
+ "protected:") needs to be printed for TYPE. */
- case TYPE_CODE_STRUCT:
- c_type_print_modifier (type, stream, 0, 1);
- /* Note TYPE_CODE_STRUCT and TYPE_CODE_CLASS have the same value,
- * so we use another means for distinguishing them.
- */
- if (HAVE_CPLUS_STRUCT (type))
+static bool
+need_access_label_p (struct type *type)
+{
+ if (TYPE_DECLARED_CLASS (type))
+ {
+ QUIT;
+ for (int i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); 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_NFIELDS (type); 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++)
{
- switch (TYPE_DECLARED_TYPE (type))
- {
- case DECLARED_TYPE_CLASS:
- fprintf_filtered (stream, "class ");
- break;
- case DECLARED_TYPE_UNION:
- fprintf_filtered (stream, "union ");
- break;
- case DECLARED_TYPE_STRUCT:
- fprintf_filtered (stream, "struct ");
- break;
- default:
- /* If there is a CPLUS_STRUCT, assume class if not
- * otherwise specified in the declared_type field.
- */
- fprintf_filtered (stream, "class ");
- break;
- } /* switch */
+ 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;
+ }
+
+ return false;
+}
+
+/* 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)
+ {
+ if (flags->local_typedefs)
+ local_flags.local_typedefs
+ = new typedef_hash_table (*flags->local_typedefs);
else
- {
- /* If not CPLUS_STRUCT, then assume it's a C struct */
- fprintf_filtered (stream, "struct ");
- }
- goto struct_union;
+ local_flags.local_typedefs = new typedef_hash_table ();
- case TYPE_CODE_UNION:
- c_type_print_modifier (type, stream, 0, 1);
- fprintf_filtered (stream, "union ");
-
- struct_union:
-
- /* 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))
+ hash_holder.reset (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_NAME (type) != NULL
+ && !startswith (TYPE_NAME (type), "{unnamed"))
+ {
+ /* 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 (type), flags, stream);
+ if (show > 0)
+ fputs_filtered (" ", stream);
+ }
+
+ if (show < 0)
+ {
+ /* If we just printed a tag name, no need to print anything
+ else. */
+ if (TYPE_NAME (type) == NULL)
+ fprintf_filtered (stream, "{...}");
+ }
+ else if (show > 0 || TYPE_NAME (type) == NULL)
+ {
+ struct type *basetype;
+ int vptr_fieldno;
+
+ c_type_print_template_args (&local_flags, type, stream);
+
+ /* 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);
+
+ /* This holds just the global typedefs and the template
+ parameters. */
+ struct type_print_options semi_local_flags = *flags;
+ semi_local_flags.local_typedefs = NULL;
+
+ std::unique_ptr<typedef_hash_table> semi_holder;
+ if (local_flags.local_typedefs != nullptr)
{
- fputs_filtered (TYPE_TAG_NAME (type), stream);
- if (show > 0)
- fputs_filtered (" ", stream);
+ semi_local_flags.local_typedefs
+ = new typedef_hash_table (*local_flags.local_typedefs);
+ semi_holder.reset (semi_local_flags.local_typedefs);
+
+ /* Now add in the local typedefs. */
+ local_flags.local_typedefs->recursively_update (type);
}
- wrap_here (" ");
- if (show < 0)
+
+ fprintf_filtered (stream, "{\n");
+
+ if (TYPE_NFIELDS (type) == 0 && TYPE_NFN_FIELDS (type) == 0
+ && TYPE_TYPEDEF_FIELD_COUNT (type) == 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_STUB (type))
+ fprintfi_filtered (level + 4, stream,
+ _("%p[<incomplete type>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
+ else
+ fprintfi_filtered (level + 4, stream,
+ _("%p[<no data fields>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
}
- else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
+
+ /* 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. */
+
+ enum access_specifier section_type = s_none;
+
+ /* 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);
+
+ /* If there is a base class for this type,
+ do not print the field that it occupies. */
+
+ int len = TYPE_NFIELDS (type);
+ vptr_fieldno = get_vptr_fieldno (type, &basetype);
+
+ struct print_offset_data local_podata;
+
+ for (int i = TYPE_N_BASECLASSES (type); i < len; i++)
{
- cp_type_print_derivation_info (stream, type);
+ QUIT;
- fprintf_filtered (stream, "{\n");
- if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
+ /* 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 (need_access_label)
{
- if (TYPE_STUB (type))
- fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
- else
- fprintfi_filtered (level + 4, stream, "<no data fields>\n");
+ section_type = output_access_specifier
+ (stream, section_type, level,
+ TYPE_FIELD_PROTECTED (type, i),
+ TYPE_FIELD_PRIVATE (type, i), 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. */
+ bool is_static = field_is_static (&TYPE_FIELD (type, i));
+
+ if (flags->print_offsets)
+ podata->update (type, i, stream);
- section_type = s_none;
+ print_spaces_filtered (level + 4, stream);
+ if (is_static)
+ fprintf_filtered (stream, "static ");
- /* 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. */
+ int newshow = show - 1;
- if ((TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_CLASS) ||
- (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_TEMPLATE))
+ if (!is_static && flags->print_offsets
+ && (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_STRUCT
+ || TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_UNION))
{
- 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;
- }
- }
+ /* 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_BITPOS (type, i);
+ /* 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_TYPE (type, i)) * TARGET_CHAR_BIT;
}
- else if ((TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_STRUCT) ||
- (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_UNION))
+
+ c_print_type_1 (TYPE_FIELD_TYPE (type, i),
+ TYPE_FIELD_NAME (type, i),
+ stream, newshow, level + 4,
+ language, &local_flags, &local_podata);
+
+ if (!is_static && TYPE_FIELD_PACKED (type, i))
{
- 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_PRIVATE (TYPE_FN_FIELDLIST1 (type, j), i) ||
- TYPE_FN_FIELD_PROTECTED (TYPE_FN_FIELDLIST1 (type, j), i))
- {
- need_access_label = 1;
- break;
- }
- if (need_access_label)
- break;
- }
- }
+ /* 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");
+ }
- /* If there is a base class for this type,
- do not print the field that it occupies. */
+ /* 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;
- len = TYPE_NFIELDS (type);
- for (i = TYPE_N_BASECLASSES (type); i < len; i++)
+ for (j = 0; j < len2; j++)
+ if (!TYPE_FN_FIELD_ARTIFICIAL (f, j))
+ real_len++;
+ }
+ if (real_len > 0 && section_type != s_none)
+ fprintf_filtered (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 (type);
+ int is_constructor = name && strcmp (method_name,
+ name) == 0;
+
+ for (j = 0; j < len2; j++)
{
- QUIT;
- /* Don't print out virtual function table. */
- /* HP ANSI C++ case */
- if (TYPE_HAS_VTABLE (type) && (STREQN (TYPE_FIELD_NAME (type, i), "__vfp", 5)))
- continue;
- /* Other compilers */
- if (STREQN (TYPE_FIELD_NAME (type, i), "_vptr", 5)
- && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
+ const char *mangled_name;
+ gdb::unique_xmalloc_ptr<char> mangled_name_holder;
+ char *demangled_name;
+ 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;
- /* If this is a C++ class we can print the various C++ section
- labels. */
+ 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))
+ 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,
+ _("%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);
+
+ fputs_filtered (" ", 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);
- if (HAVE_CPLUS_STRUCT (type) && need_access_label)
+ demangled_name =
+ gdb_demangle (mangled_name,
+ DMGL_ANSI | DMGL_PARAMS);
+ if (demangled_name == NULL)
{
- 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))
+ /* 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
+ {
+ 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)
{
- if (section_type != s_public)
- {
- section_type = s_public;
- fprintfi_filtered (level + 2, stream, "public:\n");
- }
+ 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);
}
- print_spaces_filtered (level + 4, stream);
- if (TYPE_FIELD_STATIC (type, i))
- {
- fprintf_filtered (stream, "static ");
- }
- c_print_type (TYPE_FIELD_TYPE (type, i),
- TYPE_FIELD_NAME (type, i),
- stream, show - 1, level + 4);
- if (!TYPE_FIELD_STATIC (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");
}
+ }
- /* 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);
- real_len = 0;
- for (i = 0; i < len; i++)
+ /* 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;
+
+ if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0)
+ fprintf_filtered (stream, "\n");
+
+ for (int i = 0; i < TYPE_NESTED_TYPES_COUNT (type); ++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++;
+ 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);
+ fprintf_filtered (stream, ";\n");
}
- if (real_len > 0 && section_type != s_none)
+ }
+
+ /* Print typedefs defined in this class. */
+
+ if (TYPE_TYPEDEF_FIELD_COUNT (type) != 0 && flags->print_typedefs)
+ {
+ if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0
+ || TYPE_NESTED_TYPES_COUNT (type) != 0)
fprintf_filtered (stream, "\n");
- /* C++: print out the methods */
- for (i = 0; i < len; i++)
+ for (int i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
{
- struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
- int j, len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
- char *method_name = TYPE_FN_FIELDLIST_NAME (type, i);
- char *name = type_name_no_tag (type);
- int is_constructor = name && STREQ (method_name, name);
- for (j = 0; j < len2; j++)
+ struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
+
+ /* Dereference the typedef declaration itself. */
+ gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);
+ target = TYPE_TARGET_TYPE (target);
+
+ if (need_access_label)
{
- char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
- int is_full_physname_constructor =
- 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;
- 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))
- {
- 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");
- }
- }
+ 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);
+ 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_no_offsets (target,
+ TYPE_TYPEDEF_FIELD_NAME (type, i),
+ stream, show - 1, level + 4,
+ language, &semi_local_flags, podata);
+ fprintf_filtered (stream, ";\n");
+ }
+ }
- 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))
- {
- 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 = TYPE_FN_FIELD_PHYSNAME (f, j);
+ if (flags->print_offsets)
+ {
+ if (show > 0)
+ podata->finish (type, level, stream);
- 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);
- }
- 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;
- 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);
- }
+ print_spaces_filtered (print_offset_data::indentation, stream);
+ if (level == 0)
+ print_spaces_filtered (2, stream);
+ }
- if (TYPE_FN_FIELD_STUB (f, j))
- xfree (mangled_name);
+ fprintfi_filtered (level, stream, "}");
+ }
+}
- fprintf_filtered (stream, ";\n");
- }
- }
+/* 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 {...}".
- fprintfi_filtered (level, stream, "}");
+ 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. */
- if (TYPE_LOCALTYPE_PTR (type) && show >= 0)
- fprintfi_filtered (level, stream, " (Local at %s:%d)\n",
- TYPE_LOCALTYPE_FILE (type),
- TYPE_LOCALTYPE_LINE (type));
+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 (type) != NULL)
+ {
+ c_type_print_modifier (type, stream, 0, 1);
+
+ /* 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) == TYPE_CODE_UNION)
+ fprintf_filtered (stream, "union ");
+ else if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ {
+ if (TYPE_DECLARED_CLASS (type))
+ fprintf_filtered (stream, "class ");
+ else
+ fprintf_filtered (stream, "struct ");
+ }
+ else if (TYPE_CODE (type) == TYPE_CODE_ENUM)
+ fprintf_filtered (stream, "enum ");
}
- if (TYPE_CODE (type) == TYPE_CODE_TEMPLATE)
- goto go_back;
+
+ print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ return;
+ }
+
+ type = check_typedef (type);
+
+ switch (TYPE_CODE (type))
+ {
+ 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_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);
- /* HP C supports sized enums */
- if (hp_som_som_object_present)
- switch (TYPE_LENGTH (type))
- {
- case 1:
- fputs_filtered ("char ", stream);
- break;
- case 2:
- fputs_filtered ("short ", stream);
- break;
- default:
- break;
- }
fprintf_filtered (stream, "enum ");
+ if (TYPE_DECLARED_CLASS (type))
+ fprintf_filtered (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))
+ want to print. */
+ if (TYPE_NAME (type) != NULL
+ && !startswith (TYPE_NAME (type), "{unnamed"))
{
- fputs_filtered (TYPE_TAG_NAME (type), stream);
+ print_name_maybe_canonical (TYPE_NAME (type), flags, 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)
+ /* If we just printed a tag name, no need to print anything
+ else. */
+ if (TYPE_NAME (type) == NULL)
fprintf_filtered (stream, "{...}");
}
- else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
+ else if (show > 0 || TYPE_NAME (type) == NULL)
{
+ LONGEST lastval = 0;
+
+ /* 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 (TYPE_NAME (underlying) != NULL)
+ fprintf_filtered (stream, ": %s ", TYPE_NAME (underlying));
+ }
+
fprintf_filtered (stream, "{");
len = TYPE_NFIELDS (type);
- lastval = 0;
for (i = 0; i < len; i++)
{
QUIT;
fprintf_filtered (stream, ", ");
wrap_here (" ");
fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
- if (lastval != TYPE_FIELD_BITPOS (type, i))
+ if (lastval != TYPE_FIELD_ENUMVAL (type, i))
{
- fprintf_filtered (stream, " = %d", TYPE_FIELD_BITPOS (type, i));
- lastval = TYPE_FIELD_BITPOS (type, i);
+ fprintf_filtered (stream, " = %s",
+ plongest (TYPE_FIELD_ENUMVAL (type, i)));
+ lastval = TYPE_FIELD_ENUMVAL (type, i);
}
lastval++;
}
}
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);
+ fprintf_filtered (stream, "flag ");
+ print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ if (show > 0)
+ {
+ fputs_filtered (" ", stream);
+ fprintf_filtered (stream, "{\n");
+ if (TYPE_NFIELDS (type) == 0)
+ {
+ if (TYPE_STUB (type))
+ fprintfi_filtered (level + 4, stream,
+ _("%p[<incomplete type>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
+ else
+ fprintfi_filtered (level + 4, stream,
+ _("%p[<no data fields>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
+ }
+ len = TYPE_NFIELDS (type);
+ for (i = 0; i < len; i++)
+ {
+ QUIT;
+ print_spaces_filtered (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_TYPE (type, i),
+ TYPE_FIELD_NAME (type, i),
+ stream, show, level + 4,
+ language, &local_flags, podata);
+ fprintf_filtered (stream, " @%s",
+ plongest (TYPE_FIELD_BITPOS (type, i)));
+ if (TYPE_FIELD_BITSIZE (type, i) > 1)
+ {
+ fprintf_filtered (stream, "-%s",
+ plongest (TYPE_FIELD_BITPOS (type, i)
+ + TYPE_FIELD_BITSIZE (type, i)
+ - 1));
+ }
+ fprintf_filtered (stream, ";\n");
+ }
+ fprintfi_filtered (level, stream, "}");
+ }
+ }
+ break;
+
case TYPE_CODE_VOID:
fprintf_filtered (stream, "void");
break;
case TYPE_CODE_UNDEF:
- fprintf_filtered (stream, "struct <unknown>");
+ fprintf_filtered (stream, _("struct <unknown>"));
break;
case TYPE_CODE_ERROR:
- fprintf_filtered (stream, "<unknown type>");
+ fprintf_filtered (stream, "%s", TYPE_ERROR_NAME (type));
break;
case TYPE_CODE_RANGE:
- /* This should not occur */
- fprintf_filtered (stream, "<range type>");
- break;
-
- case TYPE_CODE_TEMPLATE:
- /* Called on "ptype t" where "t" is a template.
- Prints the template header (with args), e.g.:
- template <class T1, class T2> class "
- and then merges with the struct/union/class code to
- print the rest of the definition. */
- c_type_print_modifier (type, stream, 0, 1);
- fprintf_filtered (stream, "template <");
- for (i = 0; i < TYPE_NTEMPLATE_ARGS (type); i++)
- {
- struct template_arg templ_arg;
- templ_arg = TYPE_TEMPLATE_ARG (type, i);
- fprintf_filtered (stream, "class %s", templ_arg.name);
- if (i < TYPE_NTEMPLATE_ARGS (type) - 1)
- fprintf_filtered (stream, ", ");
- }
- fprintf_filtered (stream, "> class ");
- /* Yuck, factor this out to a subroutine so we can call
- it and return to the point marked with the "goback:" label... - RT */
- goto struct_union;
- go_back:
- if (TYPE_NINSTANTIATIONS (type) > 0)
- {
- fprintf_filtered (stream, "\ntemplate instantiations:\n");
- for (i = 0; i < TYPE_NINSTANTIATIONS (type); i++)
- {
- fprintf_filtered (stream, " ");
- c_type_print_base (TYPE_INSTANTIATION (type, i), stream, 0, level);
- if (i < TYPE_NINSTANTIATIONS (type) - 1)
- fprintf_filtered (stream, "\n");
- }
- }
+ /* This should not occur. */
+ fprintf_styled (stream, metadata_style.style (), _("<range type>"));
break;
case TYPE_CODE_NAMESPACE:
fputs_filtered ("namespace ", stream);
- fputs_filtered (TYPE_TAG_NAME (type), stream);
+ fputs_filtered (TYPE_NAME (type), 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. */
+ /* 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)
{
c_type_print_modifier (type, stream, 0, 1);
- fputs_filtered (TYPE_NAME (type), stream);
+ print_name_maybe_canonical (TYPE_NAME (type), 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));
+ /* At least for dump_symtab, it is important that this not
+ be an error (). */
+ fprintf_styled (stream, metadata_style.style (),
+ _("<invalid type code %d>"), TYPE_CODE (type));
}
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;
+
+ c_type_print_base_1 (type, stream, show, level,
+ current_language->la_language, flags, &podata);
+}
projects / deliverable / binutils-gdb.git / blobdiff