/* Support for printing Modula 2 values for GDB, the GNU debugger.
- Copyright (C) 1986, 1988-1989, 1991-1992, 1996, 1998, 2000, 2005-2012
- Free Software Foundation, Inc.
+ Copyright (C) 1986-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "c-lang.h"
#include "m2-lang.h"
#include "target.h"
+#include "cli/cli-style.h"
static int print_unpacked_pointer (struct type *type,
CORE_ADDR address, CORE_ADDR addr,
const struct value_print_options *options,
struct ui_file *stream);
static void
-m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
- int embedded_offset, CORE_ADDR address,
+m2_print_array_contents (struct value *val,
struct ui_file *stream, int recurse,
- const struct value *val,
const struct value_print_options *options,
int len);
{
int len, i;
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
{
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
i = TYPE_N_BASECLASSES (type);
if (len == 0)
return 0;
struct type *target;
int bitval;
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
fprintf_filtered (stream, "{");
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
if (get_long_set_bounds (type, &low_bound, &high_bound))
{
field = TYPE_N_BASECLASSES (type);
}
else
{
- fprintf_filtered (stream, " %s }", _("<unknown bounds of set>"));
+ fprintf_styled (stream, metadata_style.style (),
+ " %s }", _("<unknown bounds of set>"));
return;
}
}
static void
-m2_print_unbounded_array (struct type *type, const gdb_byte *valaddr,
- int embedded_offset, CORE_ADDR address,
+m2_print_unbounded_array (struct value *value,
struct ui_file *stream, int recurse,
const struct value_print_options *options)
{
- struct type *content_type;
CORE_ADDR addr;
LONGEST len;
struct value *val;
- CHECK_TYPEDEF (type);
- content_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0));
+ struct type *type = check_typedef (value_type (value));
+ const gdb_byte *valaddr = value_contents_for_printing (value);
addr = unpack_pointer (TYPE_FIELD_TYPE (type, 0),
(TYPE_FIELD_BITPOS (type, 0) / 8) +
- valaddr + embedded_offset);
+ valaddr);
val = value_at_lazy (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0)),
addr);
- len = unpack_field_as_long (type, valaddr + embedded_offset, 1);
+ len = unpack_field_as_long (type, valaddr, 1);
fprintf_filtered (stream, "{");
- m2_print_array_contents (value_type (val),
- value_contents_for_printing (val),
- value_embedded_offset (val), addr, stream,
- recurse, val, options, len);
+ m2_print_array_contents (val, stream, recurse, options, len);
fprintf_filtered (stream, ", HIGH = %d}", (int) len);
}
struct type *elttype = check_typedef (TYPE_TARGET_TYPE (type));
int want_space = 0;
- 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, addr, stream);
pointed to, unless pointer is null. */
if (TYPE_LENGTH (elttype) == 1
- && TYPE_CODE (elttype) == TYPE_CODE_INT
+ && elttype->code () == TYPE_CODE_INT
&& (options->format == 0 || options->format == 's')
&& addr != 0)
{
fputs_filtered (paddress (gdbarch, addr), stream);
fprintf_filtered (stream, "] : ");
- if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF)
+ if (elttype->code () != TYPE_CODE_UNDEF)
{
struct value *deref_val =
value_at (TYPE_TARGET_TYPE (type), unpack_pointer (type, valaddr));
separated values. */
static void
-m2_print_array_contents (struct type *type, const gdb_byte *valaddr,
- int embedded_offset, CORE_ADDR address,
+m2_print_array_contents (struct value *val,
struct ui_file *stream, int recurse,
- const struct value *val,
const struct value_print_options *options,
int len)
{
- CHECK_TYPEDEF (type);
+ struct type *type = check_typedef (value_type (val));
if (TYPE_LENGTH (type) > 0)
{
- if (options->prettyprint_arrays)
- print_spaces_filtered (2 + 2 * recurse, stream);
/* For an array of chars, print with string syntax. */
if (TYPE_LENGTH (type) == 1 &&
- ((TYPE_CODE (type) == TYPE_CODE_INT)
+ ((type->code () == TYPE_CODE_INT)
|| ((current_language->la_language == language_m2)
- && (TYPE_CODE (type) == TYPE_CODE_CHAR)))
+ && (type->code () == TYPE_CODE_CHAR)))
&& (options->format == 0 || options->format == 's'))
- val_print_string (type, NULL, address, len+1, stream, options);
+ val_print_string (type, NULL, value_address (val), len+1, stream,
+ options);
else
{
fprintf_filtered (stream, "{");
- val_print_array_elements (type, valaddr, embedded_offset,
- address, stream, recurse, val,
- options, 0);
+ value_print_array_elements (val, stream, recurse, options, 0);
fprintf_filtered (stream, "}");
}
}
" * I",
"TRUE",
"FALSE",
- "void"
+ "void",
+ "{",
+ "}"
};
-/* See val_print for a description of the various parameters of this
- function; they are identical. */
+/* See m2-lang.h. */
void
-m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
- CORE_ADDR address, struct ui_file *stream, int recurse,
- const struct value *original_value,
- const struct value_print_options *options)
+m2_value_print_inner (struct value *val, struct ui_file *stream, int recurse,
+ const struct value_print_options *options)
{
- struct gdbarch *gdbarch = get_type_arch (type);
- unsigned int i = 0; /* Number of characters printed. */
unsigned len;
struct type *elttype;
CORE_ADDR addr;
+ const gdb_byte *valaddr = value_contents_for_printing (val);
+ const CORE_ADDR address = value_address (val);
- CHECK_TYPEDEF (type);
- switch (TYPE_CODE (type))
+ struct type *type = check_typedef (value_type (val));
+ switch (type->code ())
{
case TYPE_CODE_ARRAY:
if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0)
{
elttype = check_typedef (TYPE_TARGET_TYPE (type));
len = TYPE_LENGTH (type) / TYPE_LENGTH (elttype);
- if (options->prettyprint_arrays)
- print_spaces_filtered (2 + 2 * recurse, stream);
/* For an array of chars, print with string syntax. */
if (TYPE_LENGTH (elttype) == 1 &&
- ((TYPE_CODE (elttype) == TYPE_CODE_INT)
+ ((elttype->code () == TYPE_CODE_INT)
|| ((current_language->la_language == language_m2)
- && (TYPE_CODE (elttype) == TYPE_CODE_CHAR)))
+ && (elttype->code () == TYPE_CODE_CHAR)))
&& (options->format == 0 || options->format == 's'))
{
/* If requested, look for the first null char and only print
/* Look for a NULL char. */
for (temp_len = 0;
- (valaddr + embedded_offset)[temp_len]
- && temp_len < len && temp_len < options->print_max;
+ (valaddr[temp_len]
+ && temp_len < len && temp_len < options->print_max);
temp_len++);
len = temp_len;
}
LA_PRINT_STRING (stream, TYPE_TARGET_TYPE (type),
- valaddr + embedded_offset, len, NULL,
- 0, options);
- i = len;
+ valaddr, len, NULL, 0, options);
}
else
{
fprintf_filtered (stream, "{");
- val_print_array_elements (type, valaddr, embedded_offset,
- address, stream,
- recurse, original_value,
- options, 0);
+ value_print_array_elements (val, stream, recurse,
+ options, 0);
fprintf_filtered (stream, "}");
}
break;
case TYPE_CODE_PTR:
if (TYPE_CONST (type))
- print_variable_at_address (type, valaddr + embedded_offset,
- stream, recurse, options);
+ print_variable_at_address (type, valaddr, stream, recurse, options);
else if (options->format && options->format != 's')
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, options, 0, stream);
+ value_print_scalar_formatted (val, options, 0, stream);
else
{
- addr = unpack_pointer (type, valaddr + embedded_offset);
+ addr = unpack_pointer (type, valaddr);
print_unpacked_pointer (type, addr, address, options, stream);
}
break;
/* Fall through. */
case TYPE_CODE_STRUCT:
if (m2_is_long_set (type))
- m2_print_long_set (type, valaddr, embedded_offset, address,
- stream);
+ m2_print_long_set (type, valaddr, 0, address, stream);
else if (m2_is_unbounded_array (type))
- m2_print_unbounded_array (type, valaddr, embedded_offset,
- address, stream, recurse, options);
+ m2_print_unbounded_array (val, stream, recurse, options);
else
- cp_print_value_fields (type, type, valaddr, embedded_offset,
- address, stream, recurse, original_value,
- options, NULL, 0);
+ cp_print_value_fields (val, stream, recurse, options, NULL, 0);
break;
case TYPE_CODE_SET:
elttype = TYPE_INDEX_TYPE (type);
- CHECK_TYPEDEF (elttype);
+ elttype = check_typedef (elttype);
if (TYPE_STUB (elttype))
{
- fprintf_filtered (stream, _("<incomplete type>"));
- gdb_flush (stream);
+ fprintf_styled (stream, metadata_style.style (),
+ _("<incomplete type>"));
break;
}
else
maybe_bad_bstring:
if (i < 0)
{
- fputs_filtered (_("<error value>"), stream);
+ fputs_styled (_("<error value>"), metadata_style.style (),
+ stream);
goto done;
}
for (i = low_bound; i <= high_bound; i++)
{
- int element = value_bit_index (type, valaddr + embedded_offset,
- i);
+ int element = value_bit_index (type, valaddr, i);
if (element < 0)
{
need_comma = 1;
if (i + 1 <= high_bound
- && value_bit_index (type, valaddr + embedded_offset,
- ++i))
+ && value_bit_index (type, valaddr, ++i))
{
int j = i;
fputs_filtered ("..", stream);
while (i + 1 <= high_bound
- && value_bit_index (type,
- valaddr + embedded_offset,
- ++i))
+ && value_bit_index (type, valaddr, ++i))
j = i;
print_type_scalar (range, j, stream);
}
case TYPE_CODE_RANGE:
if (TYPE_LENGTH (type) == TYPE_LENGTH (TYPE_TARGET_TYPE (type)))
{
- m2_val_print (TYPE_TARGET_TYPE (type), valaddr, embedded_offset,
- address, stream, recurse, original_value, options);
+ struct value *v = value_cast (TYPE_TARGET_TYPE (type), val);
+ m2_value_print_inner (v, stream, recurse, options);
break;
}
- /* FIXME: create_range_type does not set the unsigned bit in a
+ /* FIXME: create_static_range_type does not set the unsigned bit in a
range type (I think it probably should copy it from the target
type), so we won't print values which are too large to
fit in a signed integer correctly. */
case TYPE_CODE_BOOL:
case TYPE_CODE_CHAR:
default:
- generic_val_print (type, valaddr, embedded_offset, address,
- stream, recurse, original_value, options,
- &m2_decorations);
+ generic_value_print (val, stream, recurse, options, &m2_decorations);
break;
}
- gdb_flush (stream);
}
projects / deliverable / binutils-gdb.git / blobdiff