/* Support for printing C values for GDB, the GNU debugger.
- Copyright (C) 1986-2015 Free Software Foundation, Inc.
+ Copyright (C) 1986-2017 Free Software Foundation, Inc.
This file is part of GDB.
" * I",
"true",
"false",
- "void"
+ "void",
+ "{",
+ "}"
};
/* Print a pointer based on the type of its target.
if (vt_address && options->vtblprint)
{
struct value *vt_val;
- struct symbol *wsym = (struct symbol *) NULL;
+ struct symbol *wsym = NULL;
struct type *wtype;
- struct block *block = (struct block *) NULL;
+ struct block *block = NULL;
struct field_of_this_result is_this_fld;
if (want_space)
if (msymbol.minsym != NULL)
wsym = lookup_symbol (MSYMBOL_LINKAGE_NAME(msymbol.minsym), block,
- VAR_DOMAIN, &is_this_fld);
+ VAR_DOMAIN, &is_this_fld).symbol;
if (wsym)
{
c_val_print_array (struct type *type, const gdb_byte *valaddr,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
- const struct value *original_value,
+ struct value *original_value,
const struct value_print_options *options)
{
struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
struct type *elttype = check_typedef (unresolved_elttype);
+ struct gdbarch *arch = get_type_arch (type);
+ int unit_size = gdbarch_addressable_memory_unit_size (arch);
if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0)
{
for (temp_len = 0;
(temp_len < len
&& temp_len < options->print_max
- && extract_unsigned_integer (valaddr + embedded_offset
+ && extract_unsigned_integer (valaddr
+ + embedded_offset * unit_size
+ temp_len * eltlen,
eltlen, byte_order) != 0);
++temp_len)
if (temp_len == options->print_max && temp_len < len)
{
ULONGEST val
- = extract_unsigned_integer (valaddr + embedded_offset
+ = extract_unsigned_integer (valaddr
+ + embedded_offset * unit_size
+ temp_len * eltlen,
eltlen, byte_order);
if (val != 0)
}
LA_PRINT_STRING (stream, unresolved_elttype,
- valaddr + embedded_offset, len,
+ valaddr + embedded_offset * unit_size, len,
NULL, force_ellipses, options);
i = len;
}
{
i = 0;
}
- val_print_array_elements (type, valaddr, embedded_offset,
+ val_print_array_elements (type, embedded_offset,
address, stream,
recurse, original_value, options, i);
fprintf_filtered (stream, "}");
static void
c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
int embedded_offset, struct ui_file *stream, int recurse,
- const struct value *original_value,
+ struct value *original_value,
const struct value_print_options *options)
{
+ struct gdbarch *arch = get_type_arch (type);
+ int unit_size = gdbarch_addressable_memory_unit_size (arch);
+
if (options->format && options->format != 's')
{
- val_print_scalar_formatted (type, valaddr, embedded_offset,
+ val_print_scalar_formatted (type, embedded_offset,
original_value, options, 0, stream);
}
else if (options->vtblprint && cp_is_vtbl_ptr_type (type))
{
struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
struct type *elttype = check_typedef (unresolved_elttype);
- CORE_ADDR addr = unpack_pointer (type, valaddr + embedded_offset);
+ CORE_ADDR addr = unpack_pointer (type,
+ valaddr + embedded_offset * unit_size);
print_unpacked_pointer (type, elttype, unresolved_elttype, valaddr,
embedded_offset, addr, stream, recurse, options);
c_val_print_struct (struct type *type, const gdb_byte *valaddr,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
- const struct value *original_value,
+ struct value *original_value,
const struct value_print_options *options)
{
if (options->vtblprint && cp_is_vtbl_ptr_type (type))
c_val_print_union (struct type *type, const gdb_byte *valaddr,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
- const struct value *original_value,
+ struct value *original_value,
const struct value_print_options *options)
{
if (recurse && !options->unionprint)
static void
c_val_print_int (struct type *type, struct type *unresolved_type,
const gdb_byte *valaddr, int embedded_offset,
- struct ui_file *stream, const struct value *original_value,
+ struct ui_file *stream, struct value *original_value,
const struct value_print_options *options)
{
+ struct gdbarch *arch = get_type_arch (type);
+ int unit_size = gdbarch_addressable_memory_unit_size (arch);
+
if (options->format || options->output_format)
{
struct value_print_options opts = *options;
opts.format = (options->format ? options->format
: options->output_format);
- val_print_scalar_formatted (type, valaddr, embedded_offset,
+ val_print_scalar_formatted (type, embedded_offset,
original_value, &opts, 0, stream);
}
else
{
- val_print_type_code_int (type, valaddr + embedded_offset,
+ val_print_type_code_int (type, valaddr + embedded_offset * unit_size,
stream);
/* C and C++ has no single byte int type, char is used
instead. Since we don't know whether the value is really
if (c_textual_element_type (unresolved_type, options->format))
{
fputs_filtered (" ", stream);
- LA_PRINT_CHAR (unpack_long (type, valaddr + embedded_offset),
+ LA_PRINT_CHAR (unpack_long (type,
+ valaddr + embedded_offset * unit_size),
unresolved_type, stream);
}
}
}
+/* c_val_print helper for TYPE_CODE_MEMBERPTR. */
+
+static void
+c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
+ int embedded_offset, CORE_ADDR address,
+ struct ui_file *stream, int recurse,
+ struct value *original_value,
+ const struct value_print_options *options)
+{
+ if (!options->format)
+ {
+ cp_print_class_member (valaddr + embedded_offset, type, stream, "&");
+ }
+ else
+ {
+ generic_val_print (type, embedded_offset, address, stream,
+ recurse, original_value, options, &c_decorations);
+ }
+}
+
/* See val_print for a description of the various parameters of this
function; they are identical. */
void
-c_val_print (struct type *type, const gdb_byte *valaddr,
+c_val_print (struct type *type,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int recurse,
- const struct value *original_value,
+ struct value *original_value,
const struct value_print_options *options)
{
struct type *unresolved_type = type;
+ const gdb_byte *valaddr = value_contents_for_printing (original_value);
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
switch (TYPE_CODE (type))
{
case TYPE_CODE_ARRAY:
break;
case TYPE_CODE_MEMBERPTR:
- if (!options->format)
- {
- cp_print_class_member (valaddr + embedded_offset, type, stream, "&");
- break;
- }
- /* FALLTHROUGH */
+ c_val_print_memberptr (type, valaddr, embedded_offset, address, stream,
+ recurse, original_value, options);
+ break;
case TYPE_CODE_REF:
+ case TYPE_CODE_RVALUE_REF:
case TYPE_CODE_ENUM:
case TYPE_CODE_FLAGS:
case TYPE_CODE_FUNC:
case TYPE_CODE_COMPLEX:
case TYPE_CODE_CHAR:
default:
- generic_val_print (type, valaddr, embedded_offset, address,
+ generic_val_print (type, embedded_offset, address,
stream, recurse, original_value, options,
&c_decorations);
break;
const struct value_print_options *options)
{
struct type *type, *real_type, *val_type;
- int full, top, using_enc;
+ int full, using_enc;
+ LONGEST top;
struct value_print_options opts = *options;
opts.deref_ref = 1;
val_type = value_type (val);
type = check_typedef (val_type);
- if (TYPE_CODE (type) == TYPE_CODE_PTR
- || TYPE_CODE (type) == TYPE_CODE_REF)
+ if (TYPE_CODE (type) == TYPE_CODE_PTR || TYPE_IS_REFERENCE (type))
{
/* Hack: remove (char *) for char strings. Their
type is indicated by the quoted string anyway.
else if (options->objectprint
&& (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRUCT))
{
- int is_ref = TYPE_CODE (type) == TYPE_CODE_REF;
+ int is_ref = TYPE_IS_REFERENCE (type);
+ enum type_code refcode = TYPE_CODE_UNDEF;
if (is_ref)
- val = value_addr (val);
+ {
+ val = value_addr (val);
+ refcode = TYPE_CODE (type);
+ }
/* Pointer to class, check real type of object. */
fprintf_filtered (stream, "(");
if (value_entirely_available (val))
- {
+ {
real_type = value_rtti_indirect_type (val, &full, &top,
&using_enc);
if (real_type)
val = value_from_pointer (real_type,
value_as_address (val) - top);
- if (is_ref)
- {
- val = value_ref (value_ind (val));
- type = value_type (val);
- }
-
/* Note: When we look up RTTI entries, we don't get
any information on const or volatile
attributes. */
}
}
- type_print (type, "", stream, -1);
+
+ if (is_ref)
+ {
+ val = value_ref (value_ind (val), refcode);
+ type = value_type (val);
+ }
+
+ type_print (type, "", stream, -1);
fprintf_filtered (stream, ") ");
val_type = type;
}
/* Print out object: enclosing type is same as real_type if
full. */
val_print (value_enclosing_type (val),
- value_contents_for_printing (val), 0,
+ 0,
value_address (val), stream, 0,
val, &opts, current_language);
return;
fprintf_filtered (stream, "(%s ?) ",
TYPE_NAME (value_enclosing_type (val)));
val_print (value_enclosing_type (val),
- value_contents_for_printing (val), 0,
+ 0,
value_address (val), stream, 0,
val, &opts, current_language);
return;
/* Otherwise, we end up at the return outside this "if". */
}
- val_print (val_type, value_contents_for_printing (val),
+ val_print (val_type,
value_embedded_offset (val),
value_address (val),
stream, 0,