diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2019-01-18 11:24:24 +0000 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2019-03-06 18:11:31 +0000 |
| commit | 4a270568d93263e4970099456b4efb58466134a6 (patch) | |
| tree | 826ed6321c654560d167c5cf693f1c22bc9ea1da /gdb | |
| parent | 067630bdb553bb889104e3b064e4551531ddcedc (diff) | |
| download | gdb-4a270568d93263e4970099456b4efb58466134a6.zip gdb-4a270568d93263e4970099456b4efb58466134a6.tar.gz gdb-4a270568d93263e4970099456b4efb58466134a6.tar.bz2 | |
gdb/fortran: Use TYPE_CODE_CHAR for character types
Switch to using TYPE_CODE_CHAR for character types. This appears to
have little impact on the test results as gFortran uses the
DW_TAG_string_type to represent all character variables (as far as I
can see). The only place this has an impact is when the user casts a
variable to a character type, in which case GDB does now use the CHAR
type, and prints the variable as both a value and a character, for
example, before:
(gdb) p ((character) 97)
$1 = 97
and after:
(gdb) p ((character) 97)
$1 = 97 'a'
gdb/ChangeLog:
* f-lang.c (build_fortran_types): Use TYPE_CODE_CHAR for character
types.
gdb/testsuite/ChangeLog:
* gdb.fortran/type-kinds.exp: Update expected results.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/f-lang.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/type-kinds.exp | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b0d0edb..e1fdda0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-03-06 Andrew Burgess <andrew.burgess@embecosm.com> + * f-lang.c (build_fortran_types): Use TYPE_CODE_CHAR for character + types. + +2019-03-06 Andrew Burgess <andrew.burgess@embecosm.com> + * f-exp.y (convert_to_kind_type): Handle integer (kind=8). * f-lang.c (build_fortran_types): Setup builtin_integer_s8. * f-lang.h (struct builtin_f_type): Add builtin_integer_s8 field. diff --git a/gdb/f-lang.c b/gdb/f-lang.c index f27eb0d..c329d60 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -366,7 +366,7 @@ build_fortran_types (struct gdbarch *gdbarch) = arch_type (gdbarch, TYPE_CODE_VOID, TARGET_CHAR_BIT, "VOID"); builtin_f_type->builtin_character - = arch_integer_type (gdbarch, TARGET_CHAR_BIT, 0, "character"); + = arch_type (gdbarch, TYPE_CODE_CHAR, TARGET_CHAR_BIT, "character"); builtin_f_type->builtin_logical_s1 = arch_boolean_type (gdbarch, TARGET_CHAR_BIT, 1, "logical*1"); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b5599e4..87c491f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2019-03-06 Andrew Burgess <andrew.burgess@embecosm.com> + * gdb.fortran/type-kinds.exp: Update expected results. + +2019-03-06 Andrew Burgess <andrew.burgess@embecosm.com> + * gdb.fortran/type-kinds.exp: Test new integer type kind. 2019-03-06 Andrew Burgess <andrew.burgess@embecosm.com> diff --git a/gdb/testsuite/gdb.fortran/type-kinds.exp b/gdb/testsuite/gdb.fortran/type-kinds.exp index 198ac58..b5d4e7b 100644 --- a/gdb/testsuite/gdb.fortran/type-kinds.exp +++ b/gdb/testsuite/gdb.fortran/type-kinds.exp @@ -38,7 +38,7 @@ proc test_cast_1_to_type_kind {base_type type_kind cast_result size_result} { # Test parsing of `(kind=N)` type modifiers. proc test_basic_parsing_of_type_kinds {} { - test_cast_1_to_type_kind "character" "1" "1" "1" + test_cast_1_to_type_kind "character" "1" "1 '\\\\001'" "1" test_cast_1_to_type_kind "complex" "4" "\\(1,0\\)" "8" test_cast_1_to_type_kind "complex" "8" "\\(1,0\\)" "16" |