/* Support for printing C values for GDB, the GNU debugger.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2022 Free Software Foundation, Inc.
This file is part of GDB.
true_type = check_typedef (type);
/* TYPE_CODE_CHAR is always textual. */
- if (TYPE_CODE (true_type) == TYPE_CODE_CHAR)
+ if (true_type->code () == TYPE_CODE_CHAR)
return 1;
/* Any other character-like types must be integral. */
- if (TYPE_CODE (true_type) != TYPE_CODE_INT)
+ if (true_type->code () != TYPE_CODE_INT)
return 0;
/* We peel typedefs one by one, looking for a match. */
while (iter_type)
{
/* Check the name of the type. */
- if (TYPE_NAME (iter_type) && textual_name (TYPE_NAME (iter_type)))
+ if (iter_type->name () && textual_name (iter_type->name ()))
return 1;
- if (TYPE_CODE (iter_type) != TYPE_CODE_TYPEDEF)
+ if (iter_type->code () != TYPE_CODE_TYPEDEF)
break;
/* Peel a single typedef. If the typedef doesn't have a target
{
/* Print this as a string if we can manage it. For now, no wide
character support. */
- if (TYPE_CODE (true_type) == TYPE_CODE_INT
+ if (true_type->code () == TYPE_CODE_INT
&& TYPE_LENGTH (true_type) == 1)
return 1;
}
/* If a one-byte TYPE_CODE_INT is missing the not-a-character
flag, then we treat it as text; otherwise, we assume it's
being used as data. */
- if (TYPE_CODE (true_type) == TYPE_CODE_INT
+ if (true_type->code () == TYPE_CODE_INT
&& TYPE_LENGTH (true_type) == 1
&& !TYPE_NOTTEXT (true_type))
return 1;
const struct value_print_options *options)
{
int want_space = 0;
- struct gdbarch *gdbarch = get_type_arch (type);
+ struct gdbarch *gdbarch = type->arch ();
- if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
+ if (elttype->code () == TYPE_CODE_FUNC)
{
/* Try to print what function it points to. */
print_function_pointer_address (options, gdbarch, address, stream);
demangle);
else if (options->addressprint)
{
- fputs_filtered (paddress (gdbarch, address), stream);
+ gdb_puts (paddress (gdbarch, address), stream);
want_space = 1;
}
&& address != 0)
{
if (want_space)
- fputs_filtered (" ", stream);
+ gdb_puts (" ", stream);
val_print_string (unresolved_elttype, NULL, address, -1, stream, options);
}
else if (cp_is_vtbl_member (type))
/* If 'symbol_print' is set, we did the work above. */
if (!options->symbol_print
&& (msymbol.minsym != NULL)
- && (vt_address == BMSYMBOL_VALUE_ADDRESS (msymbol)))
+ && (vt_address == msymbol.value_address ()))
{
if (want_space)
- fputs_filtered (" ", stream);
- fputs_filtered (" <", stream);
- fputs_filtered (msymbol.minsym->print_name (), stream);
- fputs_filtered (">", stream);
+ gdb_puts (" ", stream);
+ gdb_puts (" <", stream);
+ gdb_puts (msymbol.minsym->print_name (), stream);
+ gdb_puts (">", stream);
want_space = 1;
}
struct type *wtype;
if (want_space)
- fputs_filtered (" ", stream);
+ gdb_puts (" ", stream);
if (msymbol.minsym != NULL)
{
if (wsym)
{
- wtype = SYMBOL_TYPE (wsym);
+ wtype = wsym->type ();
}
else
{
current_language);
if (options->prettyformat)
{
- fprintf_filtered (stream, "\n");
- print_spaces_filtered (2 + 2 * recurse, stream);
+ gdb_printf (stream, "\n");
+ print_spaces (2 + 2 * recurse, stream);
}
}
}
{
struct type *type = check_typedef (value_type (val));
CORE_ADDR address = value_address (val);
- const gdb_byte *valaddr = value_contents_for_printing (val);
+ const gdb_byte *valaddr = value_contents_for_printing (val).data ();
struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
struct type *elttype = check_typedef (unresolved_elttype);
++temp_len)
;
- /* Force LA_PRINT_STRING to print ellipses if
+ /* Force printstr to print ellipses if
we've printed the maximum characters and
the next character is not \000. */
if (temp_len == options->print_max && temp_len < len)
len = temp_len;
}
- LA_PRINT_STRING (stream, unresolved_elttype, valaddr, len,
- NULL, force_ellipses, options);
+ current_language->printstr (stream, unresolved_elttype, valaddr, len,
+ NULL, force_ellipses, options);
}
else
{
unsigned int i = 0;
- fprintf_filtered (stream, "{");
+ gdb_printf (stream, "{");
/* If this is a virtual function table, print the 0th
entry specially, and the rest of the members
normally. */
if (cp_is_vtbl_ptr_type (elttype))
{
i = 1;
- fprintf_filtered (stream, _("%d vtable entries"),
- len - 1);
+ gdb_printf (stream, _("%d vtable entries"),
+ len - 1);
}
value_print_array_elements (val, stream, recurse, options, i);
- fprintf_filtered (stream, "}");
+ gdb_printf (stream, "}");
}
}
else
}
struct type *type = check_typedef (value_type (val));
- struct gdbarch *arch = get_type_arch (type);
- const gdb_byte *valaddr = value_contents_for_printing (val);
+ const gdb_byte *valaddr = value_contents_for_printing (val).data ();
if (options->vtblprint && cp_is_vtbl_ptr_type (type))
{
TYPE_CODE_STRUCT.) */
CORE_ADDR addr = extract_typed_address (valaddr, type);
- print_function_pointer_address (options, arch, addr, stream);
+ print_function_pointer_address (options, type->arch (), addr, stream);
}
else
{
{
struct type *type = check_typedef (value_type (val));
- if (TYPE_CODE (type) == TYPE_CODE_UNION && recurse && !options->unionprint)
- fprintf_filtered (stream, "{...}");
+ if (type->code () == TYPE_CODE_UNION && recurse && !options->unionprint)
+ gdb_printf (stream, "{...}");
else if (options->vtblprint && cp_is_vtbl_ptr_type (type))
{
/* Print the unmangled name if desired. */
/* Print vtable entry - we only get here if NOT using
-fvtable_thunks. (Otherwise, look under
TYPE_CODE_PTR.) */
- struct gdbarch *gdbarch = get_type_arch (type);
- int offset = TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8;
- struct type *field_type = TYPE_FIELD_TYPE (type, VTBL_FNADDR_OFFSET);
- const gdb_byte *valaddr = value_contents_for_printing (val);
+ int offset = type->field (VTBL_FNADDR_OFFSET).loc_bitpos () / 8;
+ struct type *field_type = type->field (VTBL_FNADDR_OFFSET).type ();
+ const gdb_byte *valaddr = value_contents_for_printing (val).data ();
CORE_ADDR addr = extract_typed_address (valaddr + offset, field_type);
- print_function_pointer_address (options, gdbarch, addr, stream);
+ print_function_pointer_address (options, type->arch (), addr, stream);
}
else
cp_print_value_fields (val, stream, recurse, options, NULL, 0);
intended to be used as an integer or a character, print
the character equivalent as well. */
struct type *type = value_type (val);
- const gdb_byte *valaddr = value_contents_for_printing (val);
+ const gdb_byte *valaddr = value_contents_for_printing (val).data ();
if (c_textual_element_type (type, options->format))
{
- fputs_filtered (" ", stream);
- LA_PRINT_CHAR (unpack_long (type, valaddr), type, stream);
+ gdb_puts (" ", stream);
+ current_language->printchar (unpack_long (type, valaddr), type,
+ stream);
}
}
}
-/* c_value_print helper for TYPE_CODE_MEMBERPTR. */
-
-static void
-c_value_print_memberptr (struct value *val, struct ui_file *stream,
- int recurse,
- const struct value_print_options *options)
-{
- if (!options->format)
- {
- struct type *type = check_typedef (value_type (val));
- const gdb_byte *valaddr = value_contents_for_printing (val);
- cp_print_class_member (valaddr, type, stream, "&");
- }
- else
- generic_value_print (val, stream, recurse, options, &c_decorations);
-}
-
/* See c-lang.h. */
void
const struct value_print_options *options)
{
struct type *type = value_type (val);
- const gdb_byte *valaddr = value_contents_for_printing (val);
type = check_typedef (type);
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_ARRAY:
c_value_print_array (val, stream, recurse, options);
break;
- case TYPE_CODE_METHODPTR:
- cplus_print_method_ptr (valaddr, type, stream);
- break;
-
case TYPE_CODE_PTR:
c_value_print_ptr (val, stream, recurse, options);
break;
c_value_print_struct (val, stream, recurse, options);
break;
+ case TYPE_CODE_CHAR:
case TYPE_CODE_INT:
c_value_print_int (val, stream, options);
break;
+ case TYPE_CODE_METHODPTR:
case TYPE_CODE_MEMBERPTR:
- c_value_print_memberptr (val, stream, recurse, options);
- break;
-
case TYPE_CODE_REF:
case TYPE_CODE_RVALUE_REF:
case TYPE_CODE_ENUM:
case TYPE_CODE_ERROR:
case TYPE_CODE_UNDEF:
case TYPE_CODE_COMPLEX:
- case TYPE_CODE_CHAR:
default:
generic_value_print (val, stream, recurse, options, &c_decorations);
break;
type = check_typedef (value_type (val));
- if (TYPE_CODE (type) == TYPE_CODE_PTR || TYPE_IS_REFERENCE (type))
+ if (type->is_pointer_or_reference ())
{
struct type *original_type = value_type (val);
/* Hack: remove (char *) for char strings. Their
- type is indicated by the quoted string anyway.
- (Don't use c_textual_element_type here; quoted strings
- are always exactly (char *), (wchar_t *), or the like. */
- if (TYPE_CODE (original_type) == TYPE_CODE_PTR
- && TYPE_NAME (original_type) == NULL
- && TYPE_NAME (TYPE_TARGET_TYPE (original_type)) != NULL
- && (strcmp (TYPE_NAME (TYPE_TARGET_TYPE (original_type)),
+ type is indicated by the quoted string anyway.
+ (Don't use c_textual_element_type here; quoted strings
+ are always exactly (char *), (wchar_t *), or the like. */
+ if (original_type->code () == TYPE_CODE_PTR
+ && original_type->name () == NULL
+ && TYPE_TARGET_TYPE (original_type)->name () != NULL
+ && (strcmp (TYPE_TARGET_TYPE (original_type)->name (),
"char") == 0
- || textual_name (TYPE_NAME (TYPE_TARGET_TYPE (original_type)))))
+ || textual_name (TYPE_TARGET_TYPE (original_type)->name ())))
{
/* Print nothing. */
}
else if (options->objectprint
- && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRUCT))
+ && (TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_STRUCT))
{
int is_ref = TYPE_IS_REFERENCE (type);
enum type_code refcode = TYPE_CODE_UNDEF;
if (is_ref)
{
val = value_addr (val);
- refcode = TYPE_CODE (type);
+ refcode = type->code ();
}
/* Pointer to class, check real type of object. */
- fprintf_filtered (stream, "(");
+ gdb_printf (stream, "(");
if (value_entirely_available (val))
{
type = value_type (val);
type_print (type, "", stream, -1);
- fprintf_filtered (stream, ") ");
+ gdb_printf (stream, ") ");
}
else
{
/* normal case */
- fprintf_filtered (stream, "(");
+ gdb_printf (stream, "(");
type_print (value_type (val), "", stream, -1);
- fprintf_filtered (stream, ") ");
+ gdb_printf (stream, ") ");
}
}
if (!value_initialized (val))
- fprintf_filtered (stream, " [uninitialized] ");
+ gdb_printf (stream, " [uninitialized] ");
- if (options->objectprint && (TYPE_CODE (type) == TYPE_CODE_STRUCT))
+ if (options->objectprint && (type->code () == TYPE_CODE_STRUCT))
{
/* Attempt to determine real type of object. */
real_type = value_rtti_type (val, &full, &top, &using_enc);
&& (TYPE_LENGTH (real_type)
< TYPE_LENGTH (value_enclosing_type (val)))))
val = value_cast (real_type, val);
- fprintf_filtered (stream, "(%s%s) ",
- TYPE_NAME (real_type),
- full ? "" : _(" [incomplete object]"));
+ gdb_printf (stream, "(%s%s) ",
+ real_type->name (),
+ full ? "" : _(" [incomplete object]"));
}
else if (type != check_typedef (value_enclosing_type (val)))
{
/* No RTTI information, so let's do our best. */
- fprintf_filtered (stream, "(%s ?) ",
- TYPE_NAME (value_enclosing_type (val)));
+ gdb_printf (stream, "(%s ?) ",
+ value_enclosing_type (val)->name ());
val = value_cast (value_enclosing_type (val), val);
}
}
projects / binutils-gdb.git / blobdiff