mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-09 23:21:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

javaop.h (WORD_TO_INT): Mask lower 32 bits of a jword before sign extending.

Browse Source 
2000-08-22  Andrew Haley  <aph@cygnus.com>

	* javaop.h (WORD_TO_INT): Mask lower 32 bits of a jword before
	sign extending. Fixes gcj/321.
	* jcf-parse.c (get_constant): Mask lower 32 bits of a jint before
	combining to make a jlong. Fixes gcj/321.

(This fixes gcj/321:
 http://sources.redhat.com/ml/java-prs/2000-q3/msg00146.html
 http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00897.html)

From-SVN: r36037
This commit is contained in:
Andrew Haley 2000-08-29 16:12:59 +00:00 committed by Alexandre Petit-Bianco
parent dc478a5dd4
commit 9b1ee05b0e
3 changed files with 15 additions and 5 deletions

7
gcc/java/ChangeLog

@ -7,6 +7,13 @@
* lang.c (lang_decode_option): Use ARRAY_SIZE.
* parse.y (BINOP_LOOKUP): Likewise.
2000-08-22 Andrew Haley <aph@cygnus.com>
* javaop.h (WORD_TO_INT): Mask lower 32 bits of a jword before
sign extending. Fixes gcj/321.
* jcf-parse.c (get_constant): Mask lower 32 bits of a jint before
combining to make a jlong. Fixes gcj/321.
2000-08-21 Nix <nix@esperi.demon.co.uk>
* lang-specs.h: Do not process -o or run the assembler if

9
gcc/java/javaop.h

@ -109,13 +109,16 @@ WORD_TO_FLOAT(jword w)
return wu.f;
}
/* Sign extend w. */
/* Sign extend w. If the host on which this cross-compiler runs uses
a 64-bit type for jword the appropriate sign extension is
performed; if it's a 32-bit type the arithmetic does nothing but is
harmless. */
static inline jint
WORD_TO_INT(jword w)
{
jint n = w;
jint n = w & 0xffffffff; /* Mask lower 32 bits. */
n ^= (jint)1 << 31;
n -= (jint)1 << 31;
n -= (jint)1 << 31; /* Sign extend lower 32 bits to upper. */
return n;
}

4
gcc/java/jcf-parse.c

@ -270,8 +270,8 @@ get_constant (jcf, index)
jint num = JPOOL_INT (jcf, index);
HOST_WIDE_INT lo, hi;
lshift_double (num, 0, 32, 64, &lo, &hi, 0);
num = JPOOL_INT (jcf, index+1);
add_double (lo, hi, (uint32)num, 0, &lo, &hi);
num = JPOOL_INT (jcf, index+1) & 0xffffffff;
add_double (lo, hi, num, 0, &lo, &hi);
value = build_int_2 (lo, hi);
TREE_TYPE (value) = long_type_node;
force_fit_type (value, 0);