* 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
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;
}
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);