X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fm2-typeprint.c;h=653cb7762c1c6d712382e10f520fcc78157a5912;hb=1da77581c0559e62b80b27f06f81dad4c7a7a0be;hp=6516b2c78c84580b512931df08a3e482bd891289;hpb=7b6bb8daaceb9ecf3f42dea57ae82733d6a3b2f6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c index 6516b2c78c..653cb7762c 100644 --- a/gdb/m2-typeprint.c +++ b/gdb/m2-typeprint.c @@ -1,7 +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, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 1986-2013 Free Software Foundation, Inc. This file is part of GDB. @@ -41,23 +39,30 @@ 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); @@ -67,11 +72,11 @@ int m2_is_unbounded_array (struct type *type); void -m2_print_type (struct type *type, const 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; - CHECK_TYPEDEF (type); QUIT; @@ -83,7 +88,6 @@ m2_print_type (struct type *type, const char *varstring, struct ui_file *stream, return; } - code = TYPE_CODE (type); switch (TYPE_CODE (type)) { case TYPE_CODE_SET: @@ -91,26 +95,26 @@ m2_print_type (struct type *type, const 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 +122,7 @@ m2_print_type (struct type *type, const 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 +137,7 @@ m2_print_type (struct type *type, const 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,7 +146,7 @@ m2_print_type (struct type *type, const char *varstring, struct ui_file *stream, break; case TYPE_CODE_RANGE: - m2_range (type, stream, show, level); + m2_range (type, stream, show, level, flags); break; default: @@ -184,10 +188,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); @@ -202,20 +207,20 @@ 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 @@ -233,27 +238,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 @@ -270,7 +275,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); @@ -286,12 +291,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); } } } @@ -328,8 +333,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; @@ -421,7 +426,8 @@ 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 *of_type; int i; @@ -452,7 +458,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, "["); @@ -467,7 +473,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; @@ -509,7 +515,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)) { @@ -517,7 +523,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; } @@ -526,7 +532,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) @@ -554,7 +560,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++) @@ -566,7 +572,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 @@ -587,7 +593,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) { @@ -607,10 +614,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++; }