RE: [PATCH] Fixed gdb to print arrays with very high indexes

Sharma, Alok Kumar
2020-02-02T16:06:33Z

[-- Attachment #1: Type: text/plain, Size: 885 bytes --]

Thanks for your valuable feedback. Please find the updated patch as an attachment.

Regards,
Alok

-----Original Message-----
From: Tom Tromey <tom@tromey.com>
Sent: Friday, January 31, 2020 3:43 PM
To: Sharma, Alok Kumar <AlokKumar.Sharma@amd.com>
Cc: gdb-patches@sourceware.org; George, Jini Susan <JiniSusan.George@amd.com>; Achra, Nitika <Nitika.Achra@amd.com>
Subject: Re: [PATCH] Fixed gdb to print arrays with very high indexes

[CAUTION: External Email]

>>>>> ">" == Sharma, Alok Kumar <AlokKumar.Sharma@amd.com> writes:

[...]
>> Resolution:
>> We have now changed the datatype of 'i' to LONGEST which is same as
>> datatype of bounds.

Thank you for the patch and the explanation.

>> +# Copyright 2012-2020 Free Software Foundation, Inc.

The two new files should probably only mention 2020.
The patch is ok with that nit fixed.

Tom

[-- Attachment #2: 0001-Fixed-gdb-to-print-arrays-with-very-high-indexes.patch --]
[-- Type: application/octet-stream, Size: 4869 bytes --]

From c3fed8c97bef7a92a1fe9c988027679a94e2941b Mon Sep 17 00:00:00 2001
From: alosharm <AlokKumar.Sharma@amd.com>
Date: Tue, 28 Jan 2020 21:52:01 +0530
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/f-valprint.c | 2 +-
.../gdb.fortran/array-bounds-high.exp | 39 +++++++++++++++++++
.../gdb.fortran/array-bounds-high.f90 | 23 +++++++++++
3 files changed, 63 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/f-valprint.c b/gdb/f-valprint.c
index 168957f6fb..71247a7143 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/gdb.fortran/array-bounds-high.exp b/gdb/testsuite/gdb.fortran/array-bounds-high.exp
new file mode 100644
index 0000000000..81e2f87b89
--- /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 <http://www.gnu.org/licenses/>.
+
+# 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 0000000000..b72cd1bb2b
--- /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 <http://www.gnu.org/licenses/>.
+
+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.17.1