/* Support for printing Modula 2 types for GDB, the GNU debugger.
- Copyright (C) 1986-2019 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
This file is part of GDB.
return;
}
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_SET:
m2_short_set(type, stream, show, level);
which to print. */
void
-m2_print_typedef (struct type *type, struct symbol *new_symbol,
- struct ui_file *stream)
+m2_language::print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream) const
{
type = check_typedef (type);
fprintf_filtered (stream, "TYPE ");
- if (!TYPE_NAME (SYMBOL_TYPE (new_symbol))
- || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
- SYMBOL_LINKAGE_NAME (new_symbol)) != 0)
- fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol));
+ if (!SYMBOL_TYPE (new_symbol)->name ()
+ || strcmp ((SYMBOL_TYPE (new_symbol))->name (),
+ new_symbol->linkage_name ()) != 0)
+ fprintf_filtered (stream, "%s = ", new_symbol->print_name ());
else
fprintf_filtered (stream, "<builtin> = ");
type_print (type, "", stream, 0);
- fprintf_filtered (stream, ";\n");
+ fprintf_filtered (stream, ";");
}
/* m2_type_name - if a, type, has a name then print it. */
void
m2_type_name (struct type *type, struct ui_file *stream)
{
- if (TYPE_NAME (type) != NULL)
- fputs_filtered (TYPE_NAME (type), stream);
+ if (type->name () != NULL)
+ fputs_filtered (type->name (), stream);
}
/* m2_range - displays a Modula-2 subrange type. */
m2_range (struct type *type, struct ui_file *stream, int show,
int level, const struct type_print_options *flags)
{
- if (TYPE_HIGH_BOUND (type) == TYPE_LOW_BOUND (type))
+ if (type->bounds ()->high.const_val () == type->bounds ()->low.const_val ())
{
/* FIXME: TYPE_TARGET_TYPE used to be TYPE_DOMAIN_TYPE but that was
wrong. Not sure if TYPE_TARGET_TYPE is correct though. */
struct type *target = TYPE_TARGET_TYPE (type);
fprintf_filtered (stream, "[");
- print_type_scalar (target, TYPE_LOW_BOUND (type), stream);
+ print_type_scalar (target, type->bounds ()->low.const_val (), stream);
fprintf_filtered (stream, "..");
- print_type_scalar (target, TYPE_HIGH_BOUND (type), stream);
+ print_type_scalar (target, type->bounds ()->high.const_val (), stream);
fprintf_filtered (stream, "]");
}
}
m2_typedef (struct type *type, struct ui_file *stream, int show,
int level, const struct type_print_options *flags)
{
- if (TYPE_NAME (type) != NULL)
+ if (type->name () != NULL)
{
- fputs_filtered (TYPE_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
fputs_filtered (" = ", stream);
}
m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
{
fprintf_filtered (stream, "ARRAY [");
if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
- && !TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))
+ && type->bounds ()->high.kind () != PROP_UNDEFINED)
{
- if (TYPE_INDEX_TYPE (type) != 0)
+ if (type->index_type () != 0)
{
- m2_print_bounds (TYPE_INDEX_TYPE (type), stream, show, -1, 0);
+ m2_print_bounds (type->index_type (), stream, show, -1, 0);
fprintf_filtered (stream, "..");
- m2_print_bounds (TYPE_INDEX_TYPE (type), stream, show, -1, 1);
+ m2_print_bounds (type->index_type (), stream, show, -1, 1);
}
else
fputs_filtered (pulongest ((TYPE_LENGTH (type)
fprintf_filtered (stream, "PROCEDURE ");
m2_type_name (type, stream);
if (TYPE_TARGET_TYPE (type) == NULL
- || TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
+ || TYPE_TARGET_TYPE (type)->code () != TYPE_CODE_VOID)
{
- int i, len = TYPE_NFIELDS (type);
+ int i, len = type->num_fields ();
fprintf_filtered (stream, " (");
for (i = 0; i < len; i++)
fputs_filtered (", ", stream);
wrap_here (" ");
}
- m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);
+ m2_print_type (type->field (i).type (), "", stream, -1, 0, flags);
}
fprintf_filtered (stream, ") : ");
if (TYPE_TARGET_TYPE (type) != NULL)
{
struct type *target = TYPE_TARGET_TYPE (type);
- if (TYPE_NFIELDS(type) == 0)
+ if (type->num_fields () == 0)
return;
if (print_high)
- print_type_scalar (target, TYPE_HIGH_BOUND (type), stream);
+ print_type_scalar (target, type->bounds ()->high.const_val (), stream);
else
- print_type_scalar (target, TYPE_LOW_BOUND (type), stream);
+ print_type_scalar (target, type->bounds ()->low.const_val (), stream);
}
static void
m2_short_set (struct type *type, struct ui_file *stream, int show, int level)
{
fprintf_filtered(stream, "SET [");
- m2_print_bounds (TYPE_INDEX_TYPE (type), stream,
+ m2_print_bounds (type->index_type (), stream,
show - 1, level, 0);
fprintf_filtered(stream, "..");
- m2_print_bounds (TYPE_INDEX_TYPE (type), stream,
+ m2_print_bounds (type->index_type (), stream,
show - 1, level, 1);
fprintf_filtered(stream, "]");
}
int len, i;
struct type *range;
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
{
/* check if all fields of the RECORD are consecutive sets. */
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
for (i = TYPE_N_BASECLASSES (type); i < len; i++)
{
- if (TYPE_FIELD_TYPE (type, i) == NULL)
+ if (type->field (i).type () == NULL)
return 0;
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) != TYPE_CODE_SET)
+ if (type->field (i).type ()->code () != TYPE_CODE_SET)
return 0;
if (TYPE_FIELD_NAME (type, i) != NULL
&& (strcmp (TYPE_FIELD_NAME (type, i), "") != 0))
return 0;
- range = TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i));
+ range = type->field (i).type ()->index_type ();
if ((i > TYPE_N_BASECLASSES (type))
- && previous_high + 1 != TYPE_LOW_BOUND (range))
+ && previous_high + 1 != range->bounds ()->low.const_val ())
return 0;
- previous_high = TYPE_HIGH_BOUND (range);
+ previous_high = range->bounds ()->high.const_val ();
}
return len>0;
}
}
/* m2_get_discrete_bounds - a wrapper for get_discrete_bounds which
- understands that CHARs might be signed.
- This should be integrated into gdbtypes.c
- inside get_discrete_bounds. */
+ understands that CHARs might be signed.
+ This should be integrated into gdbtypes.c
+ inside get_discrete_bounds. */
-static int
+static bool
m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
{
type = check_typedef (type);
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_CHAR:
if (TYPE_LENGTH (type) < sizeof (LONGEST))
{
- if (!TYPE_UNSIGNED (type))
+ if (!type->is_unsigned ())
{
*lowp = -(1 << (TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1));
*highp = -*lowp - 1;
}
/* m2_is_long_set_of_type - returns TRUE if the long set was declared as
- SET OF <oftype> of_type is assigned to the
- subtype. */
+ SET OF <oftype> of_type is assigned to the
+ subtype. */
int
m2_is_long_set_of_type (struct type *type, struct type **of_type)
LONGEST l1, l2;
LONGEST h1, h2;
- 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;
- range = TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i));
+ range = type->field (i).type ()->index_type ();
target = TYPE_TARGET_TYPE (range);
- l1 = TYPE_LOW_BOUND (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i)));
- h1 = TYPE_HIGH_BOUND (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, len-1)));
+ l1 = type->field (i).type ()->bounds ()->low.const_val ();
+ h1 = type->field (len - 1).type ()->bounds ()->high.const_val ();
*of_type = target;
- if (m2_get_discrete_bounds (target, &l2, &h2) >= 0)
+ if (m2_get_discrete_bounds (target, &l2, &h2))
return (l1 == l2 && h1 == h2);
error (_("long_set failed to find discrete bounds for its subtype"));
return 0;
{
struct type *of_type;
int i;
- int len = TYPE_NFIELDS (type);
+ int len = type->num_fields ();
LONGEST low;
LONGEST high;
if (m2_is_long_set (type))
{
- if (TYPE_NAME (type) != NULL)
+ if (type->name () != NULL)
{
- fputs_filtered (TYPE_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
if (show == 0)
return 1;
fputs_filtered (" = ", stream);
else
{
fprintf_filtered(stream, "[");
- m2_print_bounds (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i)),
+ m2_print_bounds (type->field (i).type ()->index_type (),
stream, show - 1, level, 0);
fprintf_filtered(stream, "..");
- m2_print_bounds (TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, len-1)),
+ m2_print_bounds (type->field (len - 1).type ()->index_type (),
stream, show - 1, level, 1);
fprintf_filtered(stream, "]");
}
}
/* m2_is_unbounded_array - returns TRUE if, type, should be regarded
- as a Modula-2 unbounded ARRAY type. */
+ as a Modula-2 unbounded ARRAY type. */
int
m2_is_unbounded_array (struct type *type)
{
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
{
/*
* check if we have a structure with exactly two fields named
* type of _m2_contents is a pointer. The TYPE_TARGET_TYPE
* of the pointer determines the unbounded ARRAY OF type.
*/
- if (TYPE_NFIELDS (type) != 2)
+ if (type->num_fields () != 2)
return 0;
if (strcmp (TYPE_FIELD_NAME (type, 0), "_m2_contents") != 0)
return 0;
if (strcmp (TYPE_FIELD_NAME (type, 1), "_m2_high") != 0)
return 0;
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) != TYPE_CODE_PTR)
+ if (type->field (0).type ()->code () != TYPE_CODE_PTR)
return 0;
return 1;
}
}
/* m2_unbounded_array - if the struct type matches a Modula-2 unbounded
- parameter type then display the type as an
- ARRAY OF type. Returns TRUE if an unbounded
- array type was detected. */
+ parameter type then display the type as an
+ ARRAY OF type. Returns TRUE if an unbounded
+ array type was detected. */
static int
m2_unbounded_array (struct type *type, struct ui_file *stream, int show,
if (show > 0)
{
fputs_filtered ("ARRAY OF ", stream);
- m2_print_type (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0)),
+ m2_print_type (TYPE_TARGET_TYPE (type->field (0).type ()),
"", stream, 0, level, flags);
}
return 1;
int level, const struct type_print_options *flags)
{
/* Print the tag if it exists. */
- if (TYPE_NAME (type) != NULL)
+ if (type->name () != NULL)
{
- if (!startswith (TYPE_NAME (type), "$$"))
+ if (!startswith (type->name (), "$$"))
{
- fputs_filtered (TYPE_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
if (show > 0)
fprintf_filtered (stream, " = ");
}
wrap_here (" ");
if (show < 0)
{
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
fprintf_filtered (stream, "RECORD ... END ");
- else if (TYPE_CODE (type) == TYPE_CODE_UNION)
+ else if (type->code () == TYPE_CODE_UNION)
fprintf_filtered (stream, "CASE ... END ");
}
else if (show > 0)
{
int i;
- int len = TYPE_NFIELDS (type);
+ int len = type->num_fields ();
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
fprintf_filtered (stream, "RECORD\n");
- else if (TYPE_CODE (type) == TYPE_CODE_UNION)
+ else if (type->code () == TYPE_CODE_UNION)
/* i18n: Do not translate "CASE" and "OF". */
fprintf_filtered (stream, _("CASE <variant> OF\n"));
QUIT;
print_spaces_filtered (level + 4, stream);
- fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
+ fputs_styled (TYPE_FIELD_NAME (type, i),
+ variable_name_style.style (), stream);
fputs_filtered (" : ", stream);
- m2_print_type (TYPE_FIELD_TYPE (type, i),
+ m2_print_type (type->field (i).type (),
"",
stream, 0, level + 4, flags);
if (TYPE_FIELD_PACKED (type, i))
fprintf_filtered (stream, ";\n");
}
- fprintfi_filtered (level, stream, "END ");
+ fprintf_filtered (stream, "%*sEND ", level, "");
}
}
if (show < 0)
{
/* If we just printed a tag name, no need to print anything else. */
- if (TYPE_NAME (type) == NULL)
+ if (type->name () == NULL)
fprintf_filtered (stream, "(...)");
}
- else if (show > 0 || TYPE_NAME (type) == NULL)
+ else if (show > 0 || type->name () == NULL)
{
fprintf_filtered (stream, "(");
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
lastval = 0;
for (i = 0; i < len; i++)
{
if (i > 0)
fprintf_filtered (stream, ", ");
wrap_here (" ");
- fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
+ fputs_styled (TYPE_FIELD_NAME (type, i),
+ variable_name_style.style (), stream);
if (lastval != TYPE_FIELD_ENUMVAL (type, i))
{
fprintf_filtered (stream, " = %s",
projects / deliverable / binutils-gdb.git / blobdiff