From e409c542cc3cedebf78c7827e976d36955d477bb Mon Sep 17 00:00:00 2001 From: Alok Kumar Sharma Date: Mon, 3 Feb 2020 20:24:34 -0500 Subject: [PATCH] Fixed gdb to print arrays with very high indexes In the function f77_print_array_1, the variable 'i' which holds the index is of datatype 'int', while bounds are of datatype LONGEST. Due to size of int being smaller than LONGEST, the variable 'i' stores incorrect values for high indexes (higher than max limit of int). Due to this issue in sources, two abnormal behaviors are seen while printing arrays with high indexes (please check array-bounds-high.f90) For high indexes with negative sign, gdb prints empty array even if the array has elements. (gdb) p arr $1 = () For high indexes with positive sign, gdb crashes. We have now changed the datatype of 'i' to LONGEST which is same as datatype of bounds. gdb/ChangeLog: * f-valprint.c (f77_print_array_1): Changed datatype of index variable to LONGEST from int to enable it to contain bound values correctly. gdb/testsuite/ChangeLog: * gdb.fortran/array-bounds-high.exp: New file. * gdb.fortran/array-bounds-high.f90: New file. Change-Id: Ie2dce9380a249e634e2684b9c90f225e104369b7 --- gdb/ChangeLog | 6 +++ gdb/f-valprint.c | 2 +- gdb/testsuite/ChangeLog | 5 +++ .../gdb.fortran/array-bounds-high.exp | 39 +++++++++++++++++++ .../gdb.fortran/array-bounds-high.f90 | 23 +++++++++++ 5 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.fortran/array-bounds-high.exp create mode 100644 gdb/testsuite/gdb.fortran/array-bounds-high.f90 diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5ac2596cca9..f9ef0e15089 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-02-03 Alok Kumar Sharma + + * f-valprint.c (f77_print_array_1): Changed datatype of index + variable to LONGEST from int to enable it to contain bound + values correctly. + 2020-02-03 Maciej W. Rozycki * riscv-linux-nat.c [!NFPREG] (NFPREG): New macro. diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c index 168957f6fb8..71247a7143d 100644 --- a/gdb/f-valprint.c +++ b/gdb/f-valprint.c @@ -115,7 +115,7 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type, struct type *range_type = TYPE_INDEX_TYPE (check_typedef (type)); CORE_ADDR addr = address + embedded_offset; LONGEST lowerbound, upperbound; - int i; + LONGEST i; get_discrete_bounds (range_type, &lowerbound, &upperbound); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 49997564e11..45eb88716cc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-02-03 Alok Kumar Sharma + + * gdb.fortran/array-bounds-high.exp: New file. + * gdb.fortran/array-bounds-high.f90: New file. + 2020-02-03 Lukas Durfina (tiny change) * gdb.base/fileio.c: Remove #include of . diff --git a/gdb/testsuite/gdb.fortran/array-bounds-high.exp b/gdb/testsuite/gdb.fortran/array-bounds-high.exp new file mode 100644 index 00000000000..81e2f87b89f --- /dev/null +++ b/gdb/testsuite/gdb.fortran/array-bounds-high.exp @@ -0,0 +1,39 @@ +# Copyright 2020 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 3 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, see . + +# This file is part of the gdb testsuite. It contains test to ensure that +# array bounds accept LONGEST. + +if { [skip_fortran_tests] } { return -1 } + +set testfile "array-bounds-high" +standard_testfile .f90 + +if {[prepare_for_testing $testfile.exp $testfile $srcfile {f90 debug}]} { + return -1 +} + +if {![runto MAIN__]} { + perror "Could not run to breakpoint `MAIN__'." + continue +} + +gdb_test "until 21" {21.*print.*} + +# Lets check whether too high (with - sign) indexed array are printed correctly +gdb_test "print arr1" {.*\(11, 11\).*} + +# Lets check whether too high (with + sign) indexed array are printed correctly +gdb_test "print arr2" {.*\(22, 22\).*} diff --git a/gdb/testsuite/gdb.fortran/array-bounds-high.f90 b/gdb/testsuite/gdb.fortran/array-bounds-high.f90 new file mode 100644 index 00000000000..b72cd1bb2bc --- /dev/null +++ b/gdb/testsuite/gdb.fortran/array-bounds-high.f90 @@ -0,0 +1,23 @@ +! Copyright 2020 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 3 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, see . + +program main + integer(4) :: arr1(-4294967297_8:-4294967296_8) + integer(4) :: arr2(4294967296_8:4294967297_8) + arr1 = 11 + arr2 = 22 + print *, 'arr1 = ', arr1 + print *, 'arr2 = ', arr2 +end -- 2.30.2