public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.ada/literals.exp with aarch64 Date: Sat, 30 Jul 2022 06:02:24 +0000 (GMT) [thread overview] Message-ID: <20220730060224.51B403858407@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=61b9faef51ddd40f9e6de0e41b66c41cd943d868 commit 61b9faef51ddd40f9e6de0e41b66c41cd943d868 Author: Tom de Vries <tdevries@suse.de> Date: Sat Jul 30 08:02:20 2022 +0200 [gdb/testsuite] Fix gdb.ada/literals.exp with aarch64 On aarch64-linux, I run into: ... (gdb) print 16#ffffffffffffffff#^M $7 = 18446744073709551615^M (gdb) FAIL: gdb.ada/literals.exp: print 16#ffffffffffffffff# ... while on x86_64-linux instead, I get: ... (gdb) print 16#ffffffffffffffff#^M $7 = -1^M (gdb) PASS: gdb.ada/literals.exp: print 16#ffffffffffffffff# ... We can easily reproduce this on x86_64-linux using: ... $ gdb -q -batch -ex "set lang ada" -ex "set arch i386" \ -ex "print 16#ffffffffffffffff#" $1 = -1 $ gdb -q -batch -ex "set lang ada" -ex "set arch aarch64" \ -ex "print 16#ffffffffffffffff#" $1 = 18446744073709551615 ... With i386, we have: ... (gdb) p int_bits $3 = 32 (gdb) p long_bits $4 = 32 (gdb) p long_long_bits $5 = 64 ... and so in processInt we hit the fits-in-unsigned-long-long case where we use as type long long: ... /* Note: Interprets ULLONG_MAX as -1. */ yylval.typed_val.type = type_long_long (par_state); ... With aarch64, we have instead: ... (gdb) p int_bits $1 = 32 (gdb) p long_bits $2 = 64 (gdb) p long_long_bits $3 = 64 ... and so in processInt we hit the fits-in-unsigned-long case where we use as type unsigned long: ... yylval.typed_val.type = builtin_type (par_state->gdbarch ())->builtin_unsigned_long; ... It's not clear why for ada we're using long long for the fits-in-unsigned-long-long case. Fix this by using unsigned long long for the fits-in-unsigned-long-long case, meaning the new reference output is 18446744073709551615 instead of -1. Tested on x86_64-linux. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29416 Diff: --- gdb/ada-lex.l | 4 ++-- gdb/testsuite/gdb.ada/literals.exp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index 002eb811e41..ed88d502e9f 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -498,8 +498,8 @@ processInt (struct parser_state *par_state, const char *base0, yylval.typed_val.type = type_long_long (par_state); else if (fits_in_type (1, value, long_long_bits, false)) { - /* Note: Interprets ULLONG_MAX as -1. */ - yylval.typed_val.type = type_long_long (par_state); + yylval.typed_val.type + = builtin_type (par_state->gdbarch ())->builtin_unsigned_long_long; /* See unsigned long case above. */ if (value & LONGEST_SIGN) yylval.typed_val.val = diff --git a/gdb/testsuite/gdb.ada/literals.exp b/gdb/testsuite/gdb.ada/literals.exp index a6ac89b540f..6badc857292 100644 --- a/gdb/testsuite/gdb.ada/literals.exp +++ b/gdb/testsuite/gdb.ada/literals.exp @@ -36,4 +36,4 @@ gdb_test "print 16#f#e1" " = 240" gdb_test "print 16#1#e10" " = 1099511627776" gdb_test "print/x 16#7fffffffffffffff#" " = 0x7fffffffffffffff" -gdb_test "print 16#ffffffffffffffff#" " = -1" +gdb_test "print 16#ffffffffffffffff#" " = 18446744073709551615"
reply other threads:[~2022-07-30 6:02 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220730060224.51B403858407@sourceware.org \ --to=vries@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).