From 99b1c762c990c8488c70ad537412f1209b5610bd Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 29 Feb 2012 19:34:40 +0000 Subject: [PATCH] [Ada] print packed arrays indexed by enumerated type Consider the following declarations (a packed array indexed by an enumerated type): type Color is (Black, Red, Green, Blue, White); type Full_Table is array (Color) of Boolean; pragma Pack (Full_Table); Full : Full_Table := (False, True, False, True, False); GDB is unable to print the index values correctly. It prints the enumeration's underlying value instead of the enumeration name: (gdb) p full $1 = (0 => false, true, false, true, false) (gdb) p full'first $2 = 0 And yet, it is capable of printing the correct type description: (gdb) ptype full type = array (black .. white) of boolean To get to the real index type, one has to follow the parallel XA type. We already do this for normal arrays. We can do it for this packed array as well. gdb/ChangeLog: * ada-lang.c (constrained_packed_array_type): If there is a parallel XA type, use it to determine the array index type. gdb/testsuite/ChangeLog: * gdb.ada/arrayidx.exp: Adjust expected output for p_one_two_three. * gdb.ada/enum_idx_packed: New testcase. --- gdb/ChangeLog | 5 +++ gdb/ada-lang.c | 14 +++++-- gdb/testsuite/ChangeLog | 5 +++ gdb/testsuite/gdb.ada/arrayidx.exp | 4 +- gdb/testsuite/gdb.ada/enum_idx_packed.exp | 38 +++++++++++++++++++ gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb | 24 ++++++++++++ gdb/testsuite/gdb.ada/enum_idx_packed/pck.adb | 21 ++++++++++ gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads | 23 +++++++++++ 8 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 gdb/testsuite/gdb.ada/enum_idx_packed.exp create mode 100644 gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb create mode 100644 gdb/testsuite/gdb.ada/enum_idx_packed/pck.adb create mode 100644 gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d09ed947df1..c00ab1d66dc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-02-29 Joel Brobecker + + * ada-lang.c (constrained_packed_array_type): If there is a + parallel XA type, use it to determine the array index type. + 2012-02-29 Joel Brobecker * ada-valprint.c (ada_val_print_1): If our value is a reference diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 7243ab837e6..b1dbe32a27b 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2006,22 +2006,30 @@ constrained_packed_array_type (struct type *type, long *elt_bits) { struct type *new_elt_type; struct type *new_type; + struct type *index_type_desc; + struct type *index_type; LONGEST low_bound, high_bound; type = ada_check_typedef (type); if (TYPE_CODE (type) != TYPE_CODE_ARRAY) return type; + index_type_desc = ada_find_parallel_type (type, "___XA"); + if (index_type_desc) + index_type = to_fixed_range_type (TYPE_FIELD_TYPE (index_type_desc, 0), + NULL); + else + index_type = TYPE_INDEX_TYPE (type); + new_type = alloc_type_copy (type); new_elt_type = constrained_packed_array_type (ada_check_typedef (TYPE_TARGET_TYPE (type)), elt_bits); - create_array_type (new_type, new_elt_type, TYPE_INDEX_TYPE (type)); + create_array_type (new_type, new_elt_type, index_type); TYPE_FIELD_BITSIZE (new_type, 0) = *elt_bits; TYPE_NAME (new_type) = ada_type_name (type); - if (get_discrete_bounds (TYPE_INDEX_TYPE (type), - &low_bound, &high_bound) < 0) + if (get_discrete_bounds (index_type, &low_bound, &high_bound) < 0) low_bound = high_bound = 0; if (high_bound < low_bound) *elt_bits = TYPE_LENGTH (new_type) = 0; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index af77953a3d8..2ff685aa972 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-02-29 Joel Brobecker + + * gdb.ada/arrayidx.exp: Adjust expected output for p_one_two_three. + * gdb.ada/enum_idx_packed: New testcase. + 2012-02-29 Joel Brobecker * gdb.ada/aliased_array: New testcase. diff --git a/gdb/testsuite/gdb.ada/arrayidx.exp b/gdb/testsuite/gdb.ada/arrayidx.exp index f8c087d6971..dd61a6039c3 100644 --- a/gdb/testsuite/gdb.ada/arrayidx.exp +++ b/gdb/testsuite/gdb.ada/arrayidx.exp @@ -53,7 +53,7 @@ gdb_test "print u_one_two_three" \ "print u_one_two_three, indexes off" gdb_test "print p_one_two_three" \ - "= \\(0 => false, true, true\\)" \ + "= \\(false, true, true\\)" \ "print p_one_two_three, indexes off" gdb_test "print few_reps" \ @@ -89,7 +89,7 @@ gdb_test "print u_one_two_three" \ "print u_one_two_three" gdb_test "print p_one_two_three" \ - "= \\(0 => false, 1 => true, 2 => true\\)" \ + "= \\(one => false, two => true, three => true\\)" \ "print p_one_two_three" gdb_test "print few_reps" \ diff --git a/gdb/testsuite/gdb.ada/enum_idx_packed.exp b/gdb/testsuite/gdb.ada/enum_idx_packed.exp new file mode 100644 index 00000000000..61284bb21a2 --- /dev/null +++ b/gdb/testsuite/gdb.ada/enum_idx_packed.exp @@ -0,0 +1,38 @@ +# Copyright 2012 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 . + +load_lib "ada.exp" + +if { [skip_ada_tests] } { return -1 } + +set testdir "enum_idx_packed" +set testfile "${testdir}/foo" +set srcfile ${srcdir}/${subdir}/${testfile}.adb +set binfile ${objdir}/${subdir}/${testfile} + +file mkdir ${objdir}/${subdir}/${testdir} +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] +runto "foo.adb:$bp_location" + +gdb_test "print full" " = \\(false, true, false, true, false\\)" + +gdb_test "print full'first" " = black" + diff --git a/gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb b/gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb new file mode 100644 index 00000000000..a8a0b916dda --- /dev/null +++ b/gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb @@ -0,0 +1,24 @@ +-- Copyright 2012 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 . + +with Pck; use Pck; + +procedure Foo is + Full : Full_Table := (False, True, False, True, False); +begin + Do_Nothing (Full'Address); -- STOP +end Foo; + + diff --git a/gdb/testsuite/gdb.ada/enum_idx_packed/pck.adb b/gdb/testsuite/gdb.ada/enum_idx_packed/pck.adb new file mode 100644 index 00000000000..1f7d45cf5e2 --- /dev/null +++ b/gdb/testsuite/gdb.ada/enum_idx_packed/pck.adb @@ -0,0 +1,21 @@ +-- Copyright 2012 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 . + +package body Pck is + procedure Do_Nothing (A : System.Address) is + begin + null; + end Do_Nothing; +end Pck; diff --git a/gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads b/gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads new file mode 100644 index 00000000000..cba9eda95eb --- /dev/null +++ b/gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads @@ -0,0 +1,23 @@ +-- Copyright 2012 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 . + +with System; +package Pck is + type Color is (Black, Red, Green, Blue, White); + type Full_Table is array (Color) of Boolean; + pragma Pack (Full_Table); + + procedure Do_Nothing (A : System.Address); +end Pck;