From patchwork Wed Dec 4 16:41:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36513 Received: (qmail 26710 invoked by alias); 4 Dec 2019 16:41:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 26622 invoked by uid 89); 4 Dec 2019 16:41:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 04 Dec 2019 16:41:18 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 87DB4202E5; Wed, 4 Dec 2019 11:41:14 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 16A0F203C1; Wed, 4 Dec 2019 11:41:10 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id DDD4D28174; Wed, 4 Dec 2019 11:41:09 -0500 (EST) X-Gerrit-PatchSet: 3 Date: Wed, 4 Dec 2019 11:41:09 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , gdb-patches@sourceware.org Cc: Simon Marchi Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] Add scalar_storage_order support for floating point X-Gerrit-Change-Id: Ic02eb711d80ce678ef0ecf8c506a626e441b8440 X-Gerrit-Change-Number: 727 X-Gerrit-ChangeURL: X-Gerrit-Commit: 103a685e7fd27bb1347a2459c07e648aac7a6f54 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, simon.marchi@polymtl.ca, tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191204164109.DDD4D28174@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/727 ...................................................................... Add scalar_storage_order support for floating point Testing the scalar_storage_order patch pointed out that it does not handle floating point properly. This patch fixes this problem. gdb/ChangeLog 2019-12-04 Tom Tromey * dwarf2read.c (dwarf2_init_float_type) (dwarf2_init_complex_target_type): Add byte_order parameter. (read_base_type): Compute byte order earlier. * gdbtypes.c (init_float_type): Add byte_order parameter. * gdbtypes.h (init_float_type): Add byte_order parameter. gdb/testsuite/ChangeLog 2019-12-04 Tom Tromey * gdb.base/endianity.c (struct otherendian) : New field. (main): Initialize it. * gdb.base/endianity.exp: Update. Change-Id: Ic02eb711d80ce678ef0ecf8c506a626e441b8440 --- M gdb/ChangeLog M gdb/dwarf2read.c M gdb/gdbtypes.c M gdb/gdbtypes.h M gdb/testsuite/ChangeLog M gdb/testsuite/gdb.base/endianity.c M gdb/testsuite/gdb.base/endianity.exp 7 files changed, 67 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8837a23..ffae608 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2019-12-04 Tom Tromey + * dwarf2read.c (dwarf2_init_float_type) + (dwarf2_init_complex_target_type): Add byte_order parameter. + (read_base_type): Compute byte order earlier. + * gdbtypes.c (init_float_type): Add byte_order parameter. + * gdbtypes.h (init_float_type): Add byte_order parameter. + +2019-12-04 Tom Tromey + * unittests/tui-selftests.c: Conditionally include tui-winsource.h. 2019-12-04 Tom Tromey diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index f99061d..40d93c9 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -17624,7 +17624,7 @@ static struct type * dwarf2_init_float_type (struct objfile *objfile, int bits, const char *name, - const char *name_hint) + const char *name_hint, enum bfd_endian byte_order) { struct gdbarch *gdbarch = get_objfile_arch (objfile); const struct floatformat **format; @@ -17632,7 +17632,7 @@ format = gdbarch_floatformat_for_type (gdbarch, name_hint, bits); if (format) - type = init_float_type (objfile, bits, name, format); + type = init_float_type (objfile, bits, name, format, byte_order); else type = init_type (objfile, TYPE_CODE_ERROR, bits, name); @@ -17671,7 +17671,8 @@ static struct type * dwarf2_init_complex_target_type (struct dwarf2_cu *cu, struct objfile *objfile, - int bits, const char *name_hint) + int bits, const char *name_hint, + enum bfd_endian byte_order) { gdbarch *gdbarch = get_objfile_arch (objfile); struct type *tt = nullptr; @@ -17720,7 +17721,7 @@ tt = nullptr; const char *name = (tt == nullptr) ? nullptr : TYPE_NAME (tt); - return dwarf2_init_float_type (objfile, bits, name, name_hint); + return dwarf2_init_float_type (objfile, bits, name, name_hint, byte_order); } /* Find a representation of a given base type and install @@ -17733,7 +17734,6 @@ struct type *type; struct attribute *attr; int encoding = 0, bits = 0; - int endianity = 0; const char *name; gdbarch *arch; @@ -17746,11 +17746,29 @@ name = dwarf2_name (die, cu); if (!name) complaint (_("DW_AT_name missing from DW_TAG_base_type")); - attr = dwarf2_attr (die, DW_AT_endianity, cu); - if (attr) - endianity = DW_UNSND (attr); arch = get_objfile_arch (objfile); + enum bfd_endian byte_order = gdbarch_byte_order (arch); + + attr = dwarf2_attr (die, DW_AT_endianity, cu); + if (attr) + { + int endianity = DW_UNSND (attr); + + switch (endianity) + { + case DW_END_big: + byte_order = BFD_ENDIAN_BIG; + break; + case DW_END_little: + byte_order = BFD_ENDIAN_LITTLE; + break; + default: + complaint (_("DW_AT_endianity has unrecognized value %d"), endianity); + break; + } + } + switch (encoding) { case DW_ATE_address: @@ -17762,14 +17780,15 @@ type = init_boolean_type (objfile, bits, 1, name); break; case DW_ATE_complex_float: - type = dwarf2_init_complex_target_type (cu, objfile, bits / 2, name); + type = dwarf2_init_complex_target_type (cu, objfile, bits / 2, name, + byte_order); type = init_complex_type (objfile, name, type); break; case DW_ATE_decimal_float: type = init_decfloat_type (objfile, bits, name); break; case DW_ATE_float: - type = dwarf2_init_float_type (objfile, bits, name, name); + type = dwarf2_init_float_type (objfile, bits, name, name, byte_order); break; case DW_ATE_signed: type = dwarf2_init_integer_type (cu, objfile, bits, 0, name); @@ -17827,17 +17846,7 @@ maybe_set_alignment (cu, die, type); - switch (endianity) - { - case DW_END_big: - if (gdbarch_byte_order (arch) == BFD_ENDIAN_LITTLE) - TYPE_ENDIANITY_NOT_DEFAULT (type) = 1; - break; - case DW_END_little: - if (gdbarch_byte_order (arch) == BFD_ENDIAN_BIG) - TYPE_ENDIANITY_NOT_DEFAULT (type) = 1; - break; - } + TYPE_ENDIANITY_NOT_DEFAULT (type) = gdbarch_byte_order (arch) != byte_order; return set_die_type (die, type, cu); } diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index f10f65d..0609634 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -2976,15 +2976,22 @@ /* Allocate a TYPE_CODE_FLT type structure associated with OBJFILE. BIT is the type size in bits; if BIT equals -1, the size is determined by the floatformat. NAME is the type name. Set the - TYPE_FLOATFORMAT from FLOATFORMATS. */ + TYPE_FLOATFORMAT from FLOATFORMATS. BYTE_ORDER is the byte order + to use. If it is BFD_ENDIAN_UNKNOWN (the default), then the byte + order of the objfile's architecture is used. */ struct type * init_float_type (struct objfile *objfile, int bit, const char *name, - const struct floatformat **floatformats) + const struct floatformat **floatformats, + enum bfd_endian byte_order) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - const struct floatformat *fmt = floatformats[gdbarch_byte_order (gdbarch)]; + if (byte_order == BFD_ENDIAN_UNKNOWN) + { + struct gdbarch *gdbarch = get_objfile_arch (objfile); + byte_order = gdbarch_byte_order (gdbarch); + } + const struct floatformat *fmt = floatformats[byte_order]; struct type *t; bit = verify_floatformat (bit, fmt); diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 963314d..f6879e8 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1821,7 +1821,8 @@ extern struct type *init_boolean_type (struct objfile *, int, int, const char *); extern struct type *init_float_type (struct objfile *, int, const char *, - const struct floatformat **); + const struct floatformat **, + enum bfd_endian = BFD_ENDIAN_UNKNOWN); extern struct type *init_decfloat_type (struct objfile *, int, const char *); extern struct type *init_complex_type (struct objfile *, const char *, struct type *); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 112049f..1c8aa86 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-12-04 Tom Tromey + + * gdb.base/endianity.c (struct otherendian) : New field. + (main): Initialize it. + * gdb.base/endianity.exp: Update. + 2019-12-04 Andrew Burgess * gdb.mi/mi-sym-info.exp: Add tests for -max-results parameter. diff --git a/gdb/testsuite/gdb.base/endianity.c b/gdb/testsuite/gdb.base/endianity.c index 5ab090d..42ee9ae 100644 --- a/gdb/testsuite/gdb.base/endianity.c +++ b/gdb/testsuite/gdb.base/endianity.c @@ -21,6 +21,9 @@ { int v; short w; + float f; + __complex__ float cplx; + double d; } #if defined __GNUC__ && (__GNUC__ >= 6) #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ @@ -39,7 +42,7 @@ int main (void) { - struct otherendian o = {3,2}; + struct otherendian o = {3, 2, 23.5, 1.25 + 7.25i, 75}; do_nothing (&o); /* START */ } diff --git a/gdb/testsuite/gdb.base/endianity.exp b/gdb/testsuite/gdb.base/endianity.exp index 80df012..4277c1f 100644 --- a/gdb/testsuite/gdb.base/endianity.exp +++ b/gdb/testsuite/gdb.base/endianity.exp @@ -25,10 +25,13 @@ return -1 } -gdb_test "print o" "= {v = 3, w = 2}" "print o before assignment" +gdb_test "print o" "= {v = 3, w = 2, f = 23.5, cplx = 1.25 \\+ 7.25 \\* I, d = 75}" \ + "print o before assignment" gdb_test "print o.v = 4" "= 4" gdb_test "print o.w = 3" "= 3" +gdb_test "print o.f = 1.5" "= 1.5" +gdb_test "print o.d = -23.125" "= -23.125" # scalar_storage_order requires gcc >= 6 if { ([test_compiler_info {gcc-[0-5]-*}] || ![test_compiler_info gcc*]) } { @@ -37,4 +40,5 @@ gdb_test "x/x &o.v" "0x04000000" gdb_test "x/xh &o.w" "0x0300" -gdb_test "print o" "= {v = 4, w = 3}" "print o after assignment" +gdb_test "print o" "= {v = 4, w = 3, f = 1.5, cplx = 1.25 \\+ 7.25 \\* I, d = -23.125}" \ + "print o after assignment"