projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb/jit: return bool in jit_breakpoint_re_set_internal and jit_read_descriptor
[deliverable/binutils-gdb.git]
/
gdb
/
m2-typeprint.c
diff --git
a/gdb/m2-typeprint.c
b/gdb/m2-typeprint.c
index a4a7689c33eeda556b06301de908da75645a6fec..fe041b48c53d99e0222c3a65b1c0c910d8be6fc4 100644
(file)
--- a/
gdb/m2-typeprint.c
+++ b/
gdb/m2-typeprint.c
@@
-86,7
+86,7
@@
m2_print_type (struct type *type, const char *varstring,
return;
}
return;
}
- switch (
TYPE_CODE (type
))
+ switch (
type->code (
))
{
case TYPE_CODE_SET:
m2_short_set(type, stream, show, level);
{
case TYPE_CODE_SET:
m2_short_set(type, stream, show, level);
@@
-163,8
+163,8
@@
m2_print_typedef (struct type *type, struct symbol *new_symbol,
{
type = check_typedef (type);
fprintf_filtered (stream, "TYPE ");
{
type = check_typedef (type);
fprintf_filtered (stream, "TYPE ");
- if (!
TYPE_NAME (SYMBOL_TYPE (new_symbol)
)
- || strcmp (
TYPE_NAME ((SYMBOL_TYPE (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
new_symbol->linkage_name ()) != 0)
fprintf_filtered (stream, "%s = ", new_symbol->print_name ());
else
@@
-178,8
+178,8
@@
m2_print_typedef (struct type *type, struct symbol *new_symbol,
void
m2_type_name (struct type *type, struct ui_file *stream)
{
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 - displays a Modula-2 subrange type. */
@@
-211,9
+211,9
@@
static void
m2_typedef (struct type *type, struct ui_file *stream, int show,
int level, const struct type_print_options *flags)
{
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);
fputs_filtered (" = ", stream);
}
m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
@@
-228,11
+228,11
@@
static void m2_array (struct type *type, struct ui_file *stream,
if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
&& !TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))
{
if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
&& !TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))
{
- 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, "..");
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)
}
else
fputs_filtered (pulongest ((TYPE_LENGTH (type)
@@
-282,9
+282,9
@@
m2_procedure (struct type *type, struct ui_file *stream,
fprintf_filtered (stream, "PROCEDURE ");
m2_type_name (type, stream);
if (TYPE_TARGET_TYPE (type) == NULL
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++)
fprintf_filtered (stream, " (");
for (i = 0; i < len; i++)
@@
-294,7
+294,7
@@
m2_procedure (struct type *type, struct ui_file *stream,
fputs_filtered (", ", stream);
wrap_here (" ");
}
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)
}
fprintf_filtered (stream, ") : ");
if (TYPE_TARGET_TYPE (type) != NULL)
@@
-311,7
+311,7
@@
m2_print_bounds (struct type *type,
{
struct type *target = TYPE_TARGET_TYPE (type);
{
struct type *target = TYPE_TARGET_TYPE (type);
- if (
TYPE_NFIELDS(type
) == 0)
+ if (
type->num_fields (
) == 0)
return;
if (print_high)
return;
if (print_high)
@@
-324,11
+324,11
@@
static void
m2_short_set (struct type *type, struct ui_file *stream, int show, int level)
{
fprintf_filtered(stream, "SET [");
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, "..");
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, "]");
}
show - 1, level, 1);
fprintf_filtered(stream, "]");
}
@@
-341,22
+341,22
@@
m2_is_long_set (struct type *type)
int len, i;
struct type *range;
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. */
{
/* 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++)
{
for (i = TYPE_N_BASECLASSES (type); i < len; i++)
{
- if (
TYPE_FIELD_TYPE (type, i
) == NULL)
+ if (
type->field (i).type (
) == NULL)
return 0;
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;
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))
return 0;
if ((i > TYPE_N_BASECLASSES (type))
&& previous_high + 1 != TYPE_LOW_BOUND (range))
return 0;
@@
-376,7
+376,7
@@
static int
m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
{
type = check_typedef (type);
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))
{
case TYPE_CODE_CHAR:
if (TYPE_LENGTH (type) < sizeof (LONGEST))
@@
-407,17
+407,17
@@
m2_is_long_set_of_type (struct type *type, struct type **of_type)
LONGEST l1, l2;
LONGEST h1, h2;
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;
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);
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_LOW_BOUND (
type->field (i).type ()->index_type (
));
+ h1 = TYPE_HIGH_BOUND (
type->field (len - 1).type ()->index_type (
));
*of_type = target;
if (m2_get_discrete_bounds (target, &l2, &h2) >= 0)
return (l1 == l2 && h1 == h2);
*of_type = target;
if (m2_get_discrete_bounds (target, &l2, &h2) >= 0)
return (l1 == l2 && h1 == h2);
@@
-434,15
+434,15
@@
m2_long_set (struct type *type, struct ui_file *stream, int show, int level,
{
struct type *of_type;
int i;
{
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))
{
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);
if (show == 0)
return 1;
fputs_filtered (" = ", stream);
@@
-457,12
+457,12
@@
m2_long_set (struct type *type, struct ui_file *stream, int show, int level,
else
{
fprintf_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, "..");
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, "]");
}
stream, show - 1, level, 1);
fprintf_filtered(stream, "]");
}
@@
-482,7
+482,7
@@
m2_long_set (struct type *type, struct ui_file *stream, int show, int level,
int
m2_is_unbounded_array (struct type *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
{
/*
* check if we have a structure with exactly two fields named
@@
-490,13
+490,13
@@
m2_is_unbounded_array (struct type *type)
* type of _m2_contents is a pointer. The TYPE_TARGET_TYPE
* of the pointer determines the unbounded ARRAY OF type.
*/
* 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;
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;
}
return 0;
return 1;
}
@@
-517,7
+517,7
@@
m2_unbounded_array (struct type *type, struct ui_file *stream, int show,
if (show > 0)
{
fputs_filtered ("ARRAY OF ", stream);
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;
"", stream, 0, level, flags);
}
return 1;
@@
-530,11
+530,11
@@
m2_record_fields (struct type *type, struct ui_file *stream, int show,
int level, const struct type_print_options *flags)
{
/* Print the tag if it exists. */
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, " = ");
}
if (show > 0)
fprintf_filtered (stream, " = ");
}
@@
-542,19
+542,19
@@
m2_record_fields (struct type *type, struct ui_file *stream, int show,
wrap_here (" ");
if (show < 0)
{
wrap_here (" ");
if (show < 0)
{
- if (
TYPE_CODE (type
) == TYPE_CODE_STRUCT)
+ if (
type->code (
) == TYPE_CODE_STRUCT)
fprintf_filtered (stream, "RECORD ... END ");
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;
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");
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"));
/* i18n: Do not translate "CASE" and "OF". */
fprintf_filtered (stream, _("CASE <variant> OF\n"));
@@
-566,7
+566,7
@@
m2_record_fields (struct type *type, struct ui_file *stream, int show,
fputs_styled (TYPE_FIELD_NAME (type, i),
variable_name_style.style (), stream);
fputs_filtered (" : ", 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))
"",
stream, 0, level + 4, flags);
if (TYPE_FIELD_PACKED (type, i))
@@
-595,13
+595,13
@@
m2_enum (struct type *type, struct ui_file *stream, int show, int level)
if (show < 0)
{
/* If we just printed a tag name, no need to print anything else. */
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, "(...)");
}
fprintf_filtered (stream, "(...)");
}
- else if (show > 0 ||
TYPE_NAME (type
) == NULL)
+ else if (show > 0 ||
type->name (
) == NULL)
{
fprintf_filtered (stream, "(");
{
fprintf_filtered (stream, "(");
- len =
TYPE_NFIELDS (type
);
+ len =
type->num_fields (
);
lastval = 0;
for (i = 0; i < len; i++)
{
lastval = 0;
for (i = 0; i < len; i++)
{
This page took
0.029678 seconds
and
4
git commands to generate.