From a05cf17ab92357449ed62fa0d1bac7389ee2de09 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 25 Nov 2019 13:04:52 -0700 Subject: [PATCH] Propagate endianity to subrange types A subrange type should inherit its endianity from its base type. gdb/ChangeLog 2019-12-04 Tom Tromey * gdbtypes.c (create_range_type): Inherit endianity from base type. gdb/testsuite/ChangeLog 2019-12-04 Tom Tromey * gdb.ada/scalar_storage/storage.adb: New file. * gdb.ada/scalar_storage/pck.adb: New file. * gdb.ada/scalar_storage/pck.ads: New file. * gdb.ada/scalar_storage.exp: New file. Change-Id: I2998ab919dc28aeff097763c4242f9bfb90823a3 --- gdb/ChangeLog | 5 ++ gdb/gdbtypes.c | 3 ++ gdb/testsuite/ChangeLog | 7 +++ gdb/testsuite/gdb.ada/scalar_storage.exp | 36 ++++++++++++++ gdb/testsuite/gdb.ada/scalar_storage/pck.adb | 21 +++++++++ gdb/testsuite/gdb.ada/scalar_storage/pck.ads | 19 ++++++++ .../gdb.ada/scalar_storage/storage.adb | 47 +++++++++++++++++++ 7 files changed, 138 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/scalar_storage.exp create mode 100644 gdb/testsuite/gdb.ada/scalar_storage/pck.adb create mode 100644 gdb/testsuite/gdb.ada/scalar_storage/pck.ads create mode 100644 gdb/testsuite/gdb.ada/scalar_storage/storage.adb diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e09a5887d14..f06f73903a6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-12-04 Tom Tromey + + * gdbtypes.c (create_range_type): Inherit endianity + from base type. + 2019-12-04 Tom Tromey * ada-lang.c (decode_constrained_packed_array) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 737ebfecc55..775e8c18f91 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -949,6 +949,9 @@ create_range_type (struct type *result_type, struct type *index_type, if (high_bound->kind == PROP_CONST && high_bound->data.const_val < 0) TYPE_UNSIGNED (result_type) = 0; + TYPE_ENDIANITY_NOT_DEFAULT (result_type) + = TYPE_ENDIANITY_NOT_DEFAULT (index_type); + return result_type; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1c8aa8633e4..3ba369245c0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2019-12-04 Tom Tromey + + * gdb.ada/scalar_storage/storage.adb: New file. + * gdb.ada/scalar_storage/pck.adb: New file. + * gdb.ada/scalar_storage/pck.ads: New file. + * gdb.ada/scalar_storage.exp: New file. + 2019-12-04 Tom Tromey * gdb.base/endianity.c (struct otherendian) : New field. diff --git a/gdb/testsuite/gdb.ada/scalar_storage.exp b/gdb/testsuite/gdb.ada/scalar_storage.exp new file mode 100644 index 00000000000..92ad4edf99e --- /dev/null +++ b/gdb/testsuite/gdb.ada/scalar_storage.exp @@ -0,0 +1,36 @@ +# Copyright 2019 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 . + +# Test that range types with scalar storage order are handled +# properly. + +load_lib "ada.exp" + +standard_ada_testfile storage + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "START" ${testdir}/storage.adb] +if ![runto "storage.adb:$bp_location" ] then { + perror "Couldn't run ${testfile}" + return +} + +gdb_test "print V_LE" "= \\(value => 126\\)" +gdb_test "print V_BE" "= \\(value => 126\\)" diff --git a/gdb/testsuite/gdb.ada/scalar_storage/pck.adb b/gdb/testsuite/gdb.ada/scalar_storage/pck.adb new file mode 100644 index 00000000000..6535991a193 --- /dev/null +++ b/gdb/testsuite/gdb.ada/scalar_storage/pck.adb @@ -0,0 +1,21 @@ +-- Copyright 2019 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/scalar_storage/pck.ads b/gdb/testsuite/gdb.ada/scalar_storage/pck.ads new file mode 100644 index 00000000000..b8d00101753 --- /dev/null +++ b/gdb/testsuite/gdb.ada/scalar_storage/pck.ads @@ -0,0 +1,19 @@ +-- Copyright 2019 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 + procedure Do_Nothing (A : System.Address); +end Pck; diff --git a/gdb/testsuite/gdb.ada/scalar_storage/storage.adb b/gdb/testsuite/gdb.ada/scalar_storage/storage.adb new file mode 100644 index 00000000000..abc1a83860e --- /dev/null +++ b/gdb/testsuite/gdb.ada/scalar_storage/storage.adb @@ -0,0 +1,47 @@ +-- Copyright 2019 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; +with System.Storage_Elements; use System.Storage_Elements; + +procedure Storage is + subtype Some_Range is Natural range 0..127; + + type Rec is record + Value : Some_Range; + end record; + + for Rec use record + Value at 0 range 0..127; + end record; + + type Rec_LE is new Rec; + for Rec_LE'Bit_Order use System.Low_Order_First; + for Rec_LE'Scalar_Storage_Order use System.Low_Order_First; + + type Rec_BE is new Rec; + for Rec_BE'Bit_Order use System.High_Order_First; + for Rec_BE'Scalar_Storage_Order use System.High_Order_First; + + V_LE : Rec_LE; + V_BE : Rec_BE; + +begin + V_LE.Value := 126; + V_BE.Value := 126; + + Do_Nothing (V_LE'Address); -- START + Do_Nothing (V_BE'Address); +end Storage; -- 2.30.2