X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fm2-typeprint.c;h=72c107b52bbe7a415a697f004540a7cd119e2674;hb=069bb7eced120d5a81fc41f339390719a0063ce3;hp=244146fe63a4875744fe59c0b13be9089a79b743;hpb=844781a1bed001865515739fc576c268af2127d6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c index 244146fe63..72c107b52b 100644 --- a/gdb/m2-typeprint.c +++ b/gdb/m2-typeprint.c @@ -1,6 +1,5 @@ /* Support for printing Modula 2 types for GDB, the GNU debugger. - Copyright (C) 1986, 1988, 1989, 1991, 1992, 1995, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1986-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -33,30 +32,34 @@ #include "typeprint.h" #include "cp-abi.h" -#include "gdb_string.h" -#include - 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); @@ -66,12 +69,11 @@ int m2_is_unbounded_array (struct type *type); void -m2_print_type (struct type *type, char *varstring, struct ui_file *stream, - int show, int level) +m2_print_type (struct type *type, const char *varstring, + struct ui_file *stream, + int show, int level, + const struct type_print_options *flags) { - enum type_code code; - int demangled_args; - CHECK_TYPEDEF (type); QUIT; @@ -83,7 +85,6 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream, return; } - code = TYPE_CODE (type); switch (TYPE_CODE (type)) { case TYPE_CODE_SET: @@ -91,26 +92,26 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream, 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: @@ -118,7 +119,7 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream, break; case TYPE_CODE_FUNC: - m2_procedure (type, stream, show, level); + m2_procedure (type, stream, show, level, flags); break; case TYPE_CODE_UNION: @@ -133,7 +134,7 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream, break; case TYPE_CODE_UNDEF: - /* i18n: Do not translate the "struct" part! */ + /* i18n: Do not translate the "struct" part! */ m2_unknown (_("undef"), type, stream, show, level); break; @@ -142,10 +143,7 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream, break; case TYPE_CODE_RANGE: - m2_range (type, stream, show, level); - break; - - case TYPE_CODE_TEMPLATE: + m2_range (type, stream, show, level, flags); break; default: @@ -154,6 +152,26 @@ m2_print_type (struct type *type, char *varstring, struct ui_file *stream, } } +/* Print a typedef using M2 syntax. TYPE is the underlying type. + NEW_SYMBOL is the symbol naming the type. STREAM is the stream on + which to print. */ + +void +m2_print_typedef (struct type *type, struct symbol *new_symbol, + struct ui_file *stream) +{ + 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)); + else + fprintf_filtered (stream, " = "); + type_print (type, "", stream, 0); + fprintf_filtered (stream, ";\n"); +} + /* m2_type_name - if a, type, has a name then print it. */ void @@ -167,10 +185,11 @@ m2_type_name (struct type *type, struct ui_file *stream) 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); + m2_print_type (TYPE_DOMAIN_TYPE (type), "", stream, show, level, + flags); else { struct type *target = TYPE_TARGET_TYPE (type); @@ -185,24 +204,24 @@ m2_range (struct type *type, struct ui_file *stream, int show, 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_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED) + && !TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type)) { if (TYPE_INDEX_TYPE (type) != 0) { @@ -216,27 +235,27 @@ static void m2_array (struct type *type, struct ui_file *stream, / 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 @@ -253,7 +272,7 @@ static void m2_union (struct type *type, struct ui_file *stream) 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); @@ -269,12 +288,12 @@ m2_procedure (struct type *type, struct ui_file *stream, 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); } 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); } } } @@ -286,9 +305,6 @@ m2_print_bounds (struct type *type, { struct type *target = TYPE_TARGET_TYPE (type); - if (target == NULL) - target = builtin_type_int; - if (TYPE_NFIELDS(type) == 0) return; @@ -314,8 +330,8 @@ m2_short_set (struct type *type, struct ui_file *stream, int show, int level) int m2_is_long_set (struct type *type) { - LONGEST previous_high = 0; /* unnecessary initialization - keeps gcc -Wall happy */ + LONGEST previous_high = 0; /* Unnecessary initialization + keeps gcc -Wall happy. */ int len, i; struct type *range; @@ -350,7 +366,7 @@ m2_is_long_set (struct type *type) This should be integrated into gdbtypes.c inside get_discrete_bounds. */ -int +static int m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp) { CHECK_TYPEDEF (type); @@ -393,8 +409,6 @@ m2_is_long_set_of_type (struct type *type, struct type **of_type) return 0; range = TYPE_INDEX_TYPE (TYPE_FIELD_TYPE (type, i)); target = TYPE_TARGET_TYPE (range); - if (target == NULL) - target = builtin_type_int; 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))); @@ -409,10 +423,9 @@ m2_is_long_set_of_type (struct type *type, struct type **of_type) } 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 *index_type; - struct type *range_type; struct type *of_type; int i; int len = TYPE_NFIELDS (type); @@ -442,7 +455,7 @@ m2_long_set (struct type *type, struct ui_file *stream, int show, int level) 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, "["); @@ -457,7 +470,7 @@ m2_long_set (struct type *type, struct ui_file *stream, int show, int level) } } else - /* i18n: Do not translate the "SET OF" part! */ + /* i18n: Do not translate the "SET OF" part! */ fprintf_filtered(stream, _("SET OF ")); return 1; @@ -499,7 +512,7 @@ m2_is_unbounded_array (struct type *type) 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)) { @@ -507,7 +520,7 @@ m2_unbounded_array (struct type *type, struct ui_file *stream, int show, { 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; } @@ -516,7 +529,7 @@ m2_unbounded_array (struct type *type, struct ui_file *stream, int show, 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) @@ -531,9 +544,9 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show, wrap_here (" "); if (show < 0) { - if (TYPE_CODE (type) == DECLARED_TYPE_STRUCT) + if (TYPE_CODE (type) == TYPE_CODE_STRUCT) fprintf_filtered (stream, "RECORD ... END "); - else if (TYPE_DECLARED_TYPE (type) == DECLARED_TYPE_UNION) + else if (TYPE_CODE (type) == TYPE_CODE_UNION) fprintf_filtered (stream, "CASE ... END "); } else if (show > 0) @@ -544,7 +557,7 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show, if (TYPE_CODE (type) == TYPE_CODE_STRUCT) fprintf_filtered (stream, "RECORD\n"); else if (TYPE_CODE (type) == TYPE_CODE_UNION) - /* i18n: Do not translate "CASE" and "OF" */ + /* i18n: Do not translate "CASE" and "OF". */ fprintf_filtered (stream, _("CASE OF\n")); for (i = TYPE_N_BASECLASSES (type); i < len; i++) @@ -556,7 +569,7 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show, 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 @@ -577,7 +590,8 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show, 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) { @@ -597,10 +611,11 @@ m2_enum (struct type *type, struct ui_file *stream, int show, int level) 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++; }