/* Support for printing Modula 2 types for GDB, the GNU debugger.
- Copyright (C) 1986, 1988-1989, 1991-1992, 1995, 2000-2012 Free
- Software Foundation, Inc.
+ Copyright (C) 1986-2018 Free Software Foundation, Inc.
This file is part of GDB.
#include "typeprint.h"
#include "cp-abi.h"
-#include "gdb_string.h"
-#include <errno.h>
-
static void m2_print_bounds (struct type *type,
struct ui_file *stream, int show, int level,
int print_high);
-static void m2_typedef (struct type *, struct ui_file *, int, int);
-static void m2_array (struct type *, struct ui_file *, int, int);
-static void m2_pointer (struct type *, struct ui_file *, int, int);
-static void m2_ref (struct type *, struct ui_file *, int, int);
-static void m2_procedure (struct type *, struct ui_file *, int, int);
+static void m2_typedef (struct type *, struct ui_file *, int, int,
+ const struct type_print_options *);
+static void m2_array (struct type *, struct ui_file *, int, int,
+ const struct type_print_options *);
+static void m2_pointer (struct type *, struct ui_file *, int, int,
+ const struct type_print_options *);
+static void m2_ref (struct type *, struct ui_file *, int, int,
+ const struct type_print_options *);
+static void m2_procedure (struct type *, struct ui_file *, int, int,
+ const struct type_print_options *);
static void m2_union (struct type *, struct ui_file *);
static void m2_enum (struct type *, struct ui_file *, int, int);
-static void m2_range (struct type *, struct ui_file *, int, int);
+static void m2_range (struct type *, struct ui_file *, int, int,
+ const struct type_print_options *);
static void m2_type_name (struct type *type, struct ui_file *stream);
static void m2_short_set (struct type *type, struct ui_file *stream,
int show, int level);
static int m2_long_set (struct type *type, struct ui_file *stream,
- int show, int level);
+ int show, int level, const struct type_print_options *flags);
static int m2_unbounded_array (struct type *type, struct ui_file *stream,
- int show, int level);
+ int show, int level,
+ const struct type_print_options *flags);
static void m2_record_fields (struct type *type, struct ui_file *stream,
- int show, int level);
+ int show, int level, const struct type_print_options *flags);
static void m2_unknown (const char *s, struct type *type,
struct ui_file *stream, int show, int level);
void
m2_print_type (struct type *type, const char *varstring,
struct ui_file *stream,
- int show, int level)
+ int show, int level,
+ const struct type_print_options *flags)
{
- enum type_code code;
-
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
QUIT;
return;
}
- code = TYPE_CODE (type);
switch (TYPE_CODE (type))
{
case TYPE_CODE_SET:
break;
case TYPE_CODE_STRUCT:
- if (m2_long_set (type, stream, show, level)
- || m2_unbounded_array (type, stream, show, level))
+ if (m2_long_set (type, stream, show, level, flags)
+ || m2_unbounded_array (type, stream, show, level, flags))
break;
- m2_record_fields (type, stream, show, level);
+ m2_record_fields (type, stream, show, level, flags);
break;
case TYPE_CODE_TYPEDEF:
- m2_typedef (type, stream, show, level);
+ m2_typedef (type, stream, show, level, flags);
break;
case TYPE_CODE_ARRAY:
- m2_array (type, stream, show, level);
+ m2_array (type, stream, show, level, flags);
break;
case TYPE_CODE_PTR:
- m2_pointer (type, stream, show, level);
+ m2_pointer (type, stream, show, level, flags);
break;
case TYPE_CODE_REF:
- m2_ref (type, stream, show, level);
+ m2_ref (type, stream, show, level, flags);
break;
case TYPE_CODE_METHOD:
break;
case TYPE_CODE_FUNC:
- m2_procedure (type, stream, show, level);
+ m2_procedure (type, stream, show, level, flags);
break;
case TYPE_CODE_UNION:
break;
case TYPE_CODE_RANGE:
- m2_range (type, stream, show, level);
+ m2_range (type, stream, show, level, flags);
break;
default:
m2_print_typedef (struct type *type, struct symbol *new_symbol,
struct ui_file *stream)
{
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
fprintf_filtered (stream, "TYPE ");
if (!TYPE_NAME (SYMBOL_TYPE (new_symbol))
|| strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
void
m2_range (struct type *type, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
if (TYPE_HIGH_BOUND (type) == TYPE_LOW_BOUND (type))
- m2_print_type (TYPE_DOMAIN_TYPE (type), "", stream, show, level);
+ {
+ /* FIXME: TYPE_TARGET_TYPE used to be TYPE_DOMAIN_TYPE but that was
+ wrong. Not sure if TYPE_TARGET_TYPE is correct though. */
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level,
+ flags);
+ }
else
{
struct type *target = TYPE_TARGET_TYPE (type);
static void
m2_typedef (struct type *type, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
if (TYPE_NAME (type) != NULL)
{
fputs_filtered (TYPE_NAME (type), stream);
fputs_filtered (" = ", stream);
}
- m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
}
/* m2_array - prints out a Modula-2 ARRAY ... OF type. */
static void m2_array (struct type *type, struct ui_file *stream,
- int show, int level)
+ int show, int level, const struct type_print_options *flags)
{
fprintf_filtered (stream, "ARRAY [");
if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
/ TYPE_LENGTH (TYPE_TARGET_TYPE (type))));
}
fprintf_filtered (stream, "] OF ");
- m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
}
static void
m2_pointer (struct type *type, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
if (TYPE_CONST (type))
fprintf_filtered (stream, "[...] : ");
else
fprintf_filtered (stream, "POINTER TO ");
- m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
}
static void
m2_ref (struct type *type, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
fprintf_filtered (stream, "VAR");
- m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
}
static void
static void
m2_procedure (struct type *type, struct ui_file *stream,
- int show, int level)
+ int show, int level, const struct type_print_options *flags)
{
fprintf_filtered (stream, "PROCEDURE ");
m2_type_name (type, stream);
- if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
+ if (TYPE_TARGET_TYPE (type) == NULL
+ || TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
{
int i, len = TYPE_NFIELDS (type);
fputs_filtered (", ", stream);
wrap_here (" ");
}
- m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0);
+ m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);
}
+ fprintf_filtered (stream, ") : ");
if (TYPE_TARGET_TYPE (type) != NULL)
- {
- fprintf_filtered (stream, " : ");
- m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0);
- }
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
+ else
+ type_print_unknown_return_type (stream);
}
}
static int
m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
{
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
switch (TYPE_CODE (type))
{
case TYPE_CODE_CHAR:
}
static int
-m2_long_set (struct type *type, struct ui_file *stream, int show, int level)
+m2_long_set (struct type *type, struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags)
{
struct type *of_type;
int i;
fprintf_filtered(stream, "SET OF ");
i = TYPE_N_BASECLASSES (type);
if (m2_is_long_set_of_type (type, &of_type))
- m2_print_type (of_type, "", stream, show - 1, level);
+ m2_print_type (of_type, "", stream, show - 1, level, flags);
else
{
fprintf_filtered(stream, "[");
static int
m2_unbounded_array (struct type *type, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
if (m2_is_unbounded_array (type))
{
{
fputs_filtered ("ARRAY OF ", stream);
m2_print_type (TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 0)),
- "", stream, 0, level);
+ "", stream, 0, level, flags);
}
return 1;
}
void
m2_record_fields (struct type *type, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
/* Print the tag if it exists. */
if (TYPE_TAG_NAME (type) != NULL)
{
- if (strncmp (TYPE_TAG_NAME (type), "$$", 2) != 0)
+ if (!startswith (TYPE_TAG_NAME (type), "$$"))
{
fputs_filtered (TYPE_TAG_NAME (type), stream);
if (show > 0)
fputs_filtered (" : ", stream);
m2_print_type (TYPE_FIELD_TYPE (type, i),
"",
- stream, 0, level + 4);
+ stream, 0, level + 4, flags);
if (TYPE_FIELD_PACKED (type, i))
{
/* It is a bitfield. This code does not attempt
void
m2_enum (struct type *type, struct ui_file *stream, int show, int level)
{
- int lastval, i, len;
+ LONGEST lastval;
+ int i, len;
if (show < 0)
{
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++;
}