OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix hex floating point lexing 

PR gdb/18318 notes that gdb will sometimes incorrectly handle hex
floating point input.  This turns out to be a bug in the C lexer; the
'p' was not being correctly recognized, and so the exponent was not
always passed to the floating point "from_string" method.

Tested by the buildbot "Fedora-x86_64-m64" builder.

gdb/ChangeLog
2020-06-11  Tom Tromey  <tom@tromey.com>

	PR gdb/18318:
	* c-exp.y (lex_one_token): Handle 'p' like 'e'.

gdb/testsuite/ChangeLog
2020-06-11  Tom Tromey  <tom@tromey.com>

	PR gdb/18318:
	* gdb.base/printcmds.exp (test_float_accepted): Add more hex
	floating point tests.
This commit is contained in:
Tom Tromey 2020-06-11 10:34:31 -06:00
parent 4412332f4b
commit 2b4e6a3f4b
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-06-11 Tom Tromey <tom@tromey.com>
PR gdb/18318:
* c-exp.y (lex_one_token): Handle 'p' like 'e'.
2020-06-09 Jonny Grant <jg@jguk.org>
2020-06-09 Simon Marchi <simon.marchi@polymtl.ca>

11
gdb/c-exp.y
View File

@ -2748,7 +2748,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
case '9':
{
/* It's a number. */
int got_dot = 0, got_e = 0, toktype;
int got_dot = 0, got_e = 0, got_p = 0, toktype;
const char *p = tokstart;
int hex = input_radix > 10;
@ -2768,13 +2768,16 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
/* This test includes !hex because 'e' is a valid hex digit
and thus does not indicate a floating point number when
the radix is hex. */
if (!hex && !got_e && (*p == 'e' || *p == 'E'))
if (!hex && !got_e && !got_p && (*p == 'e' || *p == 'E'))
got_dot = got_e = 1;
else if (!got_e && !got_p && (*p == 'p' || *p == 'P'))
got_dot = got_p = 1;
/* This test does not include !hex, because a '.' always indicates
a decimal floating point number regardless of the radix. */
else if (!got_dot && *p == '.')
got_dot = 1;
else if (got_e && (p[-1] == 'e' || p[-1] == 'E')
else if (((got_e && (p[-1] == 'e' || p[-1] == 'E'))
|| (got_p && (p[-1] == 'p' || p[-1] == 'P')))
&& (*p == '-' || *p == '+'))
/* This is the sign of the exponent, not the end of the
number. */
@ -2787,7 +2790,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
break;
}
toktype = parse_number (par_state, tokstart, p - tokstart,
got_dot|got_e, &yylval);
got_dot | got_e | got_p, &yylval);
if (toktype == ERROR)
{
char *err_copy = (char *) alloca (p - tokstart + 1);

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2020-06-11 Tom Tromey <tom@tromey.com>
PR gdb/18318:
* gdb.base/printcmds.exp (test_float_accepted): Add more hex
floating point tests.
2020-06-11 Keith Seitz <keiths@redhat.com>
PR gdb/21356

18
gdb/testsuite/gdb.base/printcmds.exp
View File

@ -127,15 +127,15 @@ proc test_float_accepted {} {
gdb_test "p 1.5l" " = 1.5"
# Test hexadecimal floating point.
set test "p 0x1.1"
gdb_test_multiple $test $test {
-re " = 1\\.0625\r\n$gdb_prompt $" {
pass $test
}
-re "Invalid number \"0x1\\.1\"\\.\r\n$gdb_prompt $" {
# Older glibc does not support hex float, newer does.
xfail $test
}
foreach {num result} {
0x1.1 1.0625
0x1.8480000000000p+6 97.125
0x1.8480000000000p6 97.125
0x00.1p0 0.0625
0x00.1p1 0.125
0x00.1p-1 0.03125
} {
gdb_test "p $num" " = [string_to_regexp $result]"
}
}