X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ff-typeprint.c;h=7dbe093a7fcafd12353189207f1ded02f20989ff;hb=f65e204425b5b46a5927d9501c42f25d98a866ce;hp=c2decc9ebd8d7bd3c8bb5465f8a4350807f8d805;hpb=a9762ec78a53fbe9209fe1654db42df0cd328d50;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c index c2decc9ebd..7dbe093a7f 100644 --- a/gdb/f-typeprint.c +++ b/gdb/f-typeprint.c @@ -1,7 +1,6 @@ /* Support for printing Fortran types for GDB, the GNU debugger. - Copyright (C) 1986, 1988, 1989, 1991, 1993, 1994, 1995, 1996, 1998, 2000, - 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1986-2017 Free Software Foundation, Inc. Contributed by Motorola. Adapted from the C version by Farooq Butt (fmbutt@engage.sps.mot.com). @@ -31,18 +30,13 @@ #include "gdbcore.h" #include "target.h" #include "f-lang.h" +#include "typeprint.h" -#include "gdb_string.h" -#include - -#if 0 /* Currently unused */ +#if 0 /* Currently unused. */ static void f_type_print_args (struct type *, struct ui_file *); #endif -static void print_equivalent_f77_float_type (int level, struct type *, - struct ui_file *); - -static void f_type_print_varspec_suffix (struct type *, struct ui_file *, +static void f_type_print_varspec_suffix (struct type *, struct ui_file *, int, int, int, int); void f_type_print_varspec_prefix (struct type *, struct ui_file *, @@ -54,34 +48,49 @@ void f_type_print_base (struct type *, struct ui_file *, int, int); /* LEVEL is the depth to indent lines by. */ void -f_print_type (struct type *type, char *varstring, struct ui_file *stream, - int show, int level) +f_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; + + if (type_not_associated (type)) + { + val_print_not_associated (stream); + return; + } + + if (type_not_allocated (type)) + { + val_print_not_allocated (stream); + return; + } f_type_print_base (type, stream, show, level); code = TYPE_CODE (type); if ((varstring != NULL && *varstring != '\0') - || /* Need a space if going to print stars or brackets; but not if we will print just a type name. */ - ((show > 0 || TYPE_NAME (type) == 0) - && - (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC - || code == TYPE_CODE_METHOD - || code == TYPE_CODE_ARRAY - || code == TYPE_CODE_REF))) + || ((show > 0 || TYPE_NAME (type) == 0) + && (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC + || code == TYPE_CODE_METHOD + || code == TYPE_CODE_ARRAY + || code == TYPE_CODE_REF))) fputs_filtered (" ", stream); f_type_print_varspec_prefix (type, stream, show, 0); - fputs_filtered (varstring, stream); + if (varstring != NULL) + { + int demangled_args; + + fputs_filtered (varstring, stream); - /* For demangled function names, we have the arglist as part of the name, - so don't print an additional pair of ()'s */ + /* For demangled function names, we have the arglist as part of the name, + so don't print an additional pair of ()'s. */ - demangled_args = varstring[strlen (varstring) - 1] == ')'; - f_type_print_varspec_suffix (type, stream, show, 0, demangled_args); + demangled_args = (*varstring != '\0' + && varstring[strlen (varstring) - 1] == ')'); + f_type_print_varspec_suffix (type, stream, show, 0, demangled_args, 0); + } } /* Print any asterisks or open-parentheses needed before the @@ -133,7 +142,6 @@ f_type_print_varspec_prefix (struct type *type, struct ui_file *stream, case TYPE_CODE_SET: case TYPE_CODE_RANGE: case TYPE_CODE_STRING: - case TYPE_CODE_BITSTRING: case TYPE_CODE_METHOD: case TYPE_CODE_REF: case TYPE_CODE_COMPLEX: @@ -150,12 +158,13 @@ f_type_print_varspec_prefix (struct type *type, struct ui_file *stream, static void f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, - int show, int passed_a_ptr, int demangled_args) + int show, int passed_a_ptr, int demangled_args, + int arrayprint_recurse_level) { int upper_bound, lower_bound; - int lower_bound_was_default = 0; - static int arrayprint_recurse_level = 0; - int retcode; + + /* No static variables are permitted as an error call may occur during + execution of this function. */ if (type == 0) return; @@ -173,42 +182,35 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, if (arrayprint_recurse_level == 1) fprintf_filtered (stream, "("); - if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY) - f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0); - - retcode = f77_get_dynamic_lowerbound (type, &lower_bound); - - lower_bound_was_default = 0; - - if (retcode == BOUND_FETCH_ERROR) - fprintf_filtered (stream, "???"); - else if (lower_bound == 1) /* The default */ - lower_bound_was_default = 1; + if (type_not_associated (type)) + val_print_not_associated (stream); + else if (type_not_allocated (type)) + val_print_not_allocated (stream); else - fprintf_filtered (stream, "%d", lower_bound); - - if (lower_bound_was_default) - lower_bound_was_default = 0; - else - fprintf_filtered (stream, ":"); - - /* Make sure that, if we have an assumed size array, we - print out a warning and print the upperbound as '*' */ - - if (TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED) - fprintf_filtered (stream, "*"); - else - { - retcode = f77_get_dynamic_upperbound (type, &upper_bound); - - if (retcode == BOUND_FETCH_ERROR) - fprintf_filtered (stream, "???"); - else - fprintf_filtered (stream, "%d", upper_bound); - } - - if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY) - f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 0, 0); + { + if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY) + f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, + 0, 0, arrayprint_recurse_level); + + lower_bound = f77_get_lowerbound (type); + if (lower_bound != 1) /* Not the default. */ + fprintf_filtered (stream, "%d:", lower_bound); + + /* Make sure that, if we have an assumed size array, we + print out a warning and print the upperbound as '*'. */ + + if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type)) + fprintf_filtered (stream, "*"); + else + { + upper_bound = f77_get_upperbound (type); + fprintf_filtered (stream, "%d", upper_bound); + } + + if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_ARRAY) + f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, + 0, 0, arrayprint_recurse_level); + } if (arrayprint_recurse_level == 1) fprintf_filtered (stream, ")"); else @@ -218,13 +220,14 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, case TYPE_CODE_PTR: case TYPE_CODE_REF: - f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0); + f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, 1, 0, + arrayprint_recurse_level); fprintf_filtered (stream, ")"); break; case TYPE_CODE_FUNC: f_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0, - passed_a_ptr, 0); + passed_a_ptr, 0, arrayprint_recurse_level); if (passed_a_ptr) fprintf_filtered (stream, ")"); @@ -244,7 +247,6 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, case TYPE_CODE_SET: case TYPE_CODE_RANGE: case TYPE_CODE_STRING: - case TYPE_CODE_BITSTRING: case TYPE_CODE_METHOD: case TYPE_CODE_COMPLEX: case TYPE_CODE_TYPEDEF: @@ -254,17 +256,6 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream, } } -static void -print_equivalent_f77_float_type (int level, struct type *type, - struct ui_file *stream) -{ - /* Override type name "float" and make it the - appropriate real. XLC stupidly outputs -12 as a type - for real when it really should be outputting -18 */ - - fprintfi_filtered (level, stream, "real*%d", TYPE_LENGTH (type)); -} - /* Print the name of the type (or the ultimate pointer target, function value or array element), or the description of a structure or union. @@ -282,9 +273,7 @@ void f_type_print_base (struct type *type, struct ui_file *stream, int show, int level) { - int retcode; int upper_bound; - int index; QUIT; @@ -297,19 +286,16 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, } /* When SHOW is zero or less, and there is a valid type name, then always - just print the type name directly from the type. */ + just print the type name directly from the type. */ if ((show <= 0) && (TYPE_NAME (type) != NULL)) { - if (TYPE_CODE (type) == TYPE_CODE_FLT) - print_equivalent_f77_float_type (level, type, stream); - else - fputs_filtered (TYPE_NAME (type), stream); + fprintfi_filtered (level, stream, "%s", TYPE_NAME (type)); return; } if (TYPE_CODE (type) != TYPE_CODE_TYPEDEF) - CHECK_TYPEDEF (type); + type = check_typedef (type); switch (TYPE_CODE (type)) { @@ -324,12 +310,12 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, case TYPE_CODE_PTR: fprintf_filtered (stream, "PTR TO -> ( "); - f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level); + f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level); break; case TYPE_CODE_REF: fprintf_filtered (stream, "REF TO -> ( "); - f_type_print_base (TYPE_TARGET_TYPE (type), stream, 0, level); + f_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level); break; case TYPE_CODE_VOID: @@ -341,19 +327,15 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, break; case TYPE_CODE_ERROR: - fprintfi_filtered (level, stream, ""); + fprintfi_filtered (level, stream, "%s", TYPE_ERROR_NAME (type)); break; case TYPE_CODE_RANGE: - /* This should not occur */ + /* This should not occur. */ fprintfi_filtered (level, stream, ""); break; case TYPE_CODE_CHAR: - /* Override name "char" and make it "character" */ - fprintfi_filtered (level, stream, "character"); - break; - case TYPE_CODE_INT: /* There may be some character types that attempt to come through as TYPE_CODE_INT since dbxstclass.h is so @@ -365,43 +347,47 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, goto default_case; break; - case TYPE_CODE_COMPLEX: - fprintfi_filtered (level, stream, "complex*%d", TYPE_LENGTH (type)); - break; - - case TYPE_CODE_FLT: - print_equivalent_f77_float_type (level, type, stream); - break; - case TYPE_CODE_STRING: - /* Strings may have dynamic upperbounds (lengths) like arrays. */ + /* Strings may have dynamic upperbounds (lengths) like arrays. */ - if (TYPE_ARRAY_UPPER_BOUND_TYPE (type) == BOUND_CANNOT_BE_DETERMINED) + if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type)) fprintfi_filtered (level, stream, "character*(*)"); else { - retcode = f77_get_dynamic_upperbound (type, &upper_bound); - - if (retcode == BOUND_FETCH_ERROR) - fprintf_filtered (stream, "character*???"); - else - fprintf_filtered (stream, "character*%d", upper_bound); + upper_bound = f77_get_upperbound (type); + fprintf_filtered (stream, "character*%d", upper_bound); } break; case TYPE_CODE_STRUCT: - fprintfi_filtered (level, stream, "Type "); + case TYPE_CODE_UNION: + if (TYPE_CODE (type) == TYPE_CODE_UNION) + fprintfi_filtered (level, stream, "Type, C_Union :: "); + else + fprintfi_filtered (level, stream, "Type "); fputs_filtered (TYPE_TAG_NAME (type), stream); - fputs_filtered ("\n", stream); - for (index = 0; index < TYPE_NFIELDS (type); index++) + /* According to the definition, + we only print structure elements in case show > 0. */ + if (show > 0) { - f_print_type (TYPE_FIELD_TYPE (type, index), "", stream, show, level + 4); - fputs_filtered (" :: ", stream); - fputs_filtered (TYPE_FIELD_NAME (type, index), stream); fputs_filtered ("\n", stream); - } - fprintfi_filtered (level, stream, "End Type "); - fputs_filtered (TYPE_TAG_NAME (type), stream); + for (index = 0; index < TYPE_NFIELDS (type); index++) + { + f_type_print_base (TYPE_FIELD_TYPE (type, index), stream, + show - 1, level + 4); + fputs_filtered (" :: ", stream); + fputs_filtered (TYPE_FIELD_NAME (type, index), stream); + f_type_print_varspec_suffix (TYPE_FIELD_TYPE (type, index), + stream, show - 1, 0, 0, 0); + fputs_filtered ("\n", stream); + } + fprintfi_filtered (level, stream, "End Type "); + fputs_filtered (TYPE_TAG_NAME (type), stream); + } + break; + + case TYPE_CODE_MODULE: + fprintfi_filtered (level, stream, "module %s", TYPE_TAG_NAME (type)); break; default_case: @@ -409,7 +395,7 @@ f_type_print_base (struct type *type, struct ui_file *stream, int show, /* Handle types not explicitly handled by the other cases, such as fundamental types. For these, just print whatever the type name is, as recorded in the type itself. If there - is no type name, then complain. */ + is no type name, then complain. */ if (TYPE_NAME (type) != NULL) fprintfi_filtered (level, stream, "%s", TYPE_NAME (type)); else