diff options
author | Joel Brobecker <brobecker@gnat.com> | 2011-02-17 06:42:57 +0000 |
---|---|---|
committer | Joel Brobecker <brobecker@gnat.com> | 2011-02-17 06:42:57 +0000 |
commit | e67ad678a1e75d69343e4270305c3bf390922362 (patch) | |
tree | de842fb23809a9fb5cd399a571e1bc71dd972a9b /gdb/testsuite/gdb.ada | |
parent | 93084bcabb5f23c509734a202f5a45201b723657 (diff) | |
download | gdb-e67ad678a1e75d69343e4270305c3bf390922362.zip gdb-e67ad678a1e75d69343e4270305c3bf390922362.tar.gz gdb-e67ad678a1e75d69343e4270305c3bf390922362.tar.bz2 |
[Ada] Fix unconstrained packed array size
When ada-lang transforms an array descriptor type (an XUP structure)
into an array type, the size of the array type is computed by using
the element size, and multiplying it by the number of elements in
that array. This does not work, however, for packed arrays, where
the *packed* size in bits needs to be used.
This usually does not cause any problem, because we end up reading
more memory than needed. However, we have observed on LynxOS
a memory error while trying to read the entire array, because
the larger-than-needed read tried to read past the end of the stack
into inaccessible memory.
This patch fixes the problem by correctly computing the array size
in bytes in the case of packed arrays.
gdb/ChangeLog:
* ada-lang.c (ada_type_of_array): Fix the size of the array
in the case of an unconstrained packed array.
gdb/testsuite/ChangeLog:
* gdb.ada/packed_array: Expand testcase to test printing of
unconstrained packed array.
Diffstat (limited to 'gdb/testsuite/gdb.ada')
-rw-r--r-- | gdb/testsuite/gdb.ada/packed_array.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/packed_array/pa.adb | 10 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/packed_array/pck.adb | 22 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/packed_array/pck.ads | 19 |
4 files changed, 57 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.ada/packed_array.exp b/gdb/testsuite/gdb.ada/packed_array.exp index 1789aab..d7885bb 100644 --- a/gdb/testsuite/gdb.ada/packed_array.exp +++ b/gdb/testsuite/gdb.ada/packed_array.exp @@ -50,3 +50,9 @@ gdb_test "ptype &var" \ gdb_test "print &var" \ "= \\(access array \\(\\.\\.\\.\\) of boolean\\) \\(4 => true, false, true, false, true\\)" \ "print &var" + +# Print the value of U_Var, an unconstrainted packed array. + +gdb_test "print u_var" \ + "= \\(true, false, false, true, true, false\\)" + diff --git a/gdb/testsuite/gdb.ada/packed_array/pa.adb b/gdb/testsuite/gdb.ada/packed_array/pa.adb index fbe681d..ca60c2d 100644 --- a/gdb/testsuite/gdb.ada/packed_array/pa.adb +++ b/gdb/testsuite/gdb.ada/packed_array/pa.adb @@ -14,6 +14,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. +with Pck; use Pck; + procedure PA is type Packed_Array is array (4 .. 8) of Boolean; @@ -21,9 +23,17 @@ procedure PA is Var : Packed_Array; + -- Unconstrained packed array (bounds are dynamic). + type Unconstrained_Packed_Array is array (Integer range <>) of Boolean; + + U_Var : Unconstrained_Packed_Array (1 .. Ident (6)); + begin Var := (True, False, True, False, True); + U_Var := (True, False, False, True, True, False); + Var (8) := False; -- STOP + U_Var (U_Var'Last) := True; end PA; diff --git a/gdb/testsuite/gdb.ada/packed_array/pck.adb b/gdb/testsuite/gdb.ada/packed_array/pck.adb new file mode 100644 index 0000000..b396524 --- /dev/null +++ b/gdb/testsuite/gdb.ada/packed_array/pck.adb @@ -0,0 +1,22 @@ +-- Copyright (C) 2011 +-- 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/>. + +package body Pck is + function Ident (I : Integer) return Integer is + begin + return I; + end Ident; +end Pck; diff --git a/gdb/testsuite/gdb.ada/packed_array/pck.ads b/gdb/testsuite/gdb.ada/packed_array/pck.ads new file mode 100644 index 0000000..87db78c --- /dev/null +++ b/gdb/testsuite/gdb.ada/packed_array/pck.ads @@ -0,0 +1,19 @@ +-- Copyright (C) 2011 +-- 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/>. + +package Pck is + function Ident (I : Integer) return Integer; +end Pck; |