From ce4b068214ec304f48cc191f9e912549922d9472 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Tue, 20 Apr 2010 17:22:19 +0000 Subject: [PATCH] gdb/ChangeLog: 2010-04-20 Jan Kratochvil * f-exp.y: Add new production to recognize the `logical*8' type. (LOGICAL_S8_KEYWORD): New token. * f-lang.c (enum f_primitive_types) : New field. (f_language_arch_info): Handling `logical*8' type. (build_fortran_types): Building `logical*8' type. * f-lang.h (struct builtin_f_type) : New field. gdb/testsuite/ChangeLog: 2010-04-20 Jan Kratochvil Sergio Durigan Junior * gdb.fortran/logical.exp: New testcase. * gdb.fortran/logical.f90: New file. --- gdb/ChangeLog | 10 +++++++ gdb/f-exp.y | 4 +++ gdb/f-lang.c | 7 +++++ gdb/f-lang.h | 1 + gdb/testsuite/ChangeLog | 6 +++++ gdb/testsuite/gdb.fortran/logical.exp | 38 +++++++++++++++++++++++++++ gdb/testsuite/gdb.fortran/logical.f90 | 31 ++++++++++++++++++++++ 7 files changed, 97 insertions(+) create mode 100644 gdb/testsuite/gdb.fortran/logical.exp create mode 100644 gdb/testsuite/gdb.fortran/logical.f90 diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f78590295f..168866332f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2010-04-20 Jan Kratochvil + + * f-exp.y: Add new production to recognize the `logical*8' type. + (LOGICAL_S8_KEYWORD): New token. + * f-lang.c (enum f_primitive_types) + : New field. + (f_language_arch_info): Handling `logical*8' type. + (build_fortran_types): Building `logical*8' type. + * f-lang.h (struct builtin_f_type) : New field. + 2010-04-19 Doug Evans * ser-base.c (generic_readchar): Watch for EOF in read of error_fd. diff --git a/gdb/f-exp.y b/gdb/f-exp.y index e320f2cc5f..abc590e199 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -196,6 +196,7 @@ static int parse_number (char *, int, int, YYSTYPE *); /* Special type cases, put in to allow the parser to distinguish different legal basetypes. */ %token INT_KEYWORD INT_S2_KEYWORD LOGICAL_S1_KEYWORD LOGICAL_S2_KEYWORD +%token LOGICAL_S8_KEYWORD %token LOGICAL_KEYWORD REAL_KEYWORD REAL_S8_KEYWORD REAL_S16_KEYWORD %token COMPLEX_S8_KEYWORD COMPLEX_S16_KEYWORD COMPLEX_S32_KEYWORD %token BOOL_AND BOOL_OR BOOL_NOT @@ -606,6 +607,8 @@ typebase /* Implements (approximately): (type-qualifier)* type-specifier */ { $$ = parse_f_type->builtin_integer_s2; } | CHARACTER { $$ = parse_f_type->builtin_character; } + | LOGICAL_S8_KEYWORD + { $$ = parse_f_type->builtin_logical_s8; } | LOGICAL_KEYWORD { $$ = parse_f_type->builtin_logical; } | LOGICAL_S2_KEYWORD @@ -858,6 +861,7 @@ static const struct token f77_keywords[] = { "integer_2", INT_S2_KEYWORD, BINOP_END }, { "logical_1", LOGICAL_S1_KEYWORD, BINOP_END }, { "logical_2", LOGICAL_S2_KEYWORD, BINOP_END }, + { "logical_8", LOGICAL_S8_KEYWORD, BINOP_END }, { "complex_8", COMPLEX_S8_KEYWORD, BINOP_END }, { "integer", INT_KEYWORD, BINOP_END }, { "logical", LOGICAL_KEYWORD, BINOP_END }, diff --git a/gdb/f-lang.c b/gdb/f-lang.c index b914b49152..0bee8f50e8 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -259,6 +259,7 @@ enum f_primitive_types { f_primitive_type_logical, f_primitive_type_logical_s1, f_primitive_type_logical_s2, + f_primitive_type_logical_s8, f_primitive_type_integer, f_primitive_type_integer_s2, f_primitive_type_real, @@ -289,6 +290,8 @@ f_language_arch_info (struct gdbarch *gdbarch, = builtin->builtin_logical_s1; lai->primitive_type_vector [f_primitive_type_logical_s2] = builtin->builtin_logical_s2; + lai->primitive_type_vector [f_primitive_type_logical_s8] + = builtin->builtin_logical_s8; lai->primitive_type_vector [f_primitive_type_real] = builtin->builtin_real; lai->primitive_type_vector [f_primitive_type_real_s8] @@ -372,6 +375,10 @@ build_fortran_types (struct gdbarch *gdbarch) = arch_boolean_type (gdbarch, gdbarch_short_bit (gdbarch), 1, "logical*2"); + builtin_f_type->builtin_logical_s8 + = arch_boolean_type (gdbarch, gdbarch_long_long_bit (gdbarch), 1, + "logical*8"); + builtin_f_type->builtin_integer = arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch), 0, "integer"); diff --git a/gdb/f-lang.h b/gdb/f-lang.h index b98c556ddc..094d6fa66d 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -113,6 +113,7 @@ struct builtin_f_type struct type *builtin_logical; struct type *builtin_logical_s1; struct type *builtin_logical_s2; + struct type *builtin_logical_s8; struct type *builtin_real; struct type *builtin_real_s8; struct type *builtin_real_s16; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b8597d5f95..a9400af334 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-04-20 Jan Kratochvil + Sergio Durigan Junior + + * gdb.fortran/logical.exp: New testcase. + * gdb.fortran/logical.f90: New file. + 2010-04-19 Doug Evans * gdb.base/help.exp (help source): Update expected output. diff --git a/gdb/testsuite/gdb.fortran/logical.exp b/gdb/testsuite/gdb.fortran/logical.exp new file mode 100644 index 0000000000..e9034f7c23 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/logical.exp @@ -0,0 +1,38 @@ +# Copyright 2010 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# This file was written by Jan Kratochvil . + +set test "logical" +set srcfile ${test}.f90 + +if { [prepare_for_testing "${test}.exp" "${test}" "${srcfile}" {debug f77 quiet}] } { + untested "Could not compile ${srcfile}." + return -1 +} + +if { ![runto MAIN__] } { + perror "Could not run to breakpoint `MAIN__'." + continue +} + +gdb_breakpoint [gdb_get_line_number "stop-here"] +gdb_continue_to_breakpoint "stop-here" ".*stop-here.*" +gdb_test "p l" " = \\.TRUE\\." +gdb_test "p l1" " = \\.TRUE\\." +gdb_test "p l2" " = \\.TRUE\\." +gdb_test "p l4" " = \\.TRUE\\." +gdb_test "p l8" " = \\.TRUE\\." diff --git a/gdb/testsuite/gdb.fortran/logical.f90 b/gdb/testsuite/gdb.fortran/logical.f90 new file mode 100644 index 0000000000..2fa93f9062 --- /dev/null +++ b/gdb/testsuite/gdb.fortran/logical.f90 @@ -0,0 +1,31 @@ +! Copyright 2010 Free Software Foundation, Inc. +! +! This program is free software; you can redistribute it and/or modify +! it under the terms of the GNU General Public License as published by +! the Free Software Foundation; either version 2 of the License, or +! (at your option) any later version. +! +! This program is distributed in the hope that it will be useful, +! but WITHOUT ANY WARRANTY; without even the implied warranty of +! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! GNU General Public License for more details. +! +! You should have received a copy of the GNU General Public License +! along with this program; if not, write to the Free Software +! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +! +! This file was written by Jan Kratochvil . + +program test + logical :: l + logical (kind=1) :: l1 + logical (kind=2) :: l2 + logical (kind=4) :: l4 + logical (kind=8) :: l8 + l = .TRUE. + l1 = .TRUE. + l2 = .TRUE. + l4 = .TRUE. + l8 = .TRUE. + l = .FALSE. ! stop-here +end -- 2.34.1