public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb/gdb-12-branch] Fix bug in Ada number lexing
@ 2022-04-12 19:02 Tom Tromey
  0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-04-12 19:02 UTC (permalink / raw)
  To: gdb-cvs

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0349d33f1dfda8b831ad32c8dfe949e343dfcf0c

commit 0349d33f1dfda8b831ad32c8dfe949e343dfcf0c
Author: Tom Tromey <tromey@adacore.com>
Date:   Fri Apr 8 10:11:58 2022 -0600

    Fix bug in Ada number lexing
    
    On irc, Pedro pointed out that Ada couldn't properly handle
    0xffffffffffffffff.  This used to work, but is a regression due to
    some patches I wrote in the Ada lexer.  This patch fixes the bug.

Diff:
---
 gdb/ada-lex.l                      | 4 ++--
 gdb/testsuite/gdb.ada/literals.exp | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 27470a75653..3900a839a8e 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -434,11 +434,11 @@ processInt (struct parser_state *par_state, const char *base0,
       return FLOAT;
     }
 
-  gdb_mpz maxval (ULONGEST_MAX / base);
+  gdb_mpz maxval (ULONGEST_MAX);
   if (mpz_cmp (result.val, maxval.val) > 0)
     error (_("Integer literal out of range"));
 
-  LONGEST value = result.as_integer<LONGEST> ();
+  ULONGEST value = result.as_integer<ULONGEST> ();
   if ((value >> (gdbarch_int_bit (par_state->gdbarch ())-1)) == 0)
     yylval.typed_val.type = type_int (par_state);
   else if ((value >> (gdbarch_long_bit (par_state->gdbarch ())-1)) == 0)
diff --git a/gdb/testsuite/gdb.ada/literals.exp b/gdb/testsuite/gdb.ada/literals.exp
index 92a9a1954fc..a6ac89b540f 100644
--- a/gdb/testsuite/gdb.ada/literals.exp
+++ b/gdb/testsuite/gdb.ada/literals.exp
@@ -34,3 +34,6 @@ gdb_test "print 2e1000" "Integer literal out of range"
 gdb_test "print 16#ffff#" " = 65535"
 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"


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-04-12 19:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-12 19:02 [binutils-gdb/gdb-12-branch] Fix bug in Ada number lexing Tom Tromey

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).