From 551792a5ade93126dfbcb56d7263a21f5bbb7fc7 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 20 Feb 2002 22:41:52 +0000 Subject: [PATCH] 2002-02-20 Daniel Jacobowitz Fix PR gdb/265. * jv-exp.y (parse_number): Handle 64-bit integers. --- gdb/ChangeLog | 5 +++++ gdb/jv-exp.y | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 168cfb1a86..22d2785ee8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-02-20 Daniel Jacobowitz + + Fix PR gdb/265. + * jv-exp.y (parse_number): Handle 64-bit integers. + 2002-02-20 Daniel Jacobowitz * gdbserver/configure.in: Remove AM_PROC_CC_STDC. Change diff --git a/gdb/jv-exp.y b/gdb/jv-exp.y index 2a9b17e250..403794e931 100644 --- a/gdb/jv-exp.y +++ b/gdb/jv-exp.y @@ -764,13 +764,13 @@ parse_number (p, len, parsed_float, putithere) } c = p[len-1]; + /* A paranoid calculation of (1<<64)-1. */ limit = (ULONGEST)0xffffffff; + limit = ((limit << 16) << 16) | limit; if (c == 'l' || c == 'L') { type = java_long_type; len--; - /* A paranoid calculation of (1<<64)-1. */ - limit = ((limit << 16) << 16) | limit; } else { @@ -797,9 +797,13 @@ parse_number (p, len, parsed_float, putithere) n += c; } - putithere->typed_val_int.val = n; - putithere->typed_val_int.type = type; - return INTEGER_LITERAL; + if (type == java_int_type && n > (ULONGEST)0xffffffff) + type = java_long_type; + + putithere->typed_val_int.val = n; + putithere->typed_val_int.type = type; + + return INTEGER_LITERAL; } struct token