diff options
| -rw-r--r-- | libjava/ChangeLog | 20 | ||||
| -rw-r--r-- | libjava/java/lang/mprec.c | 26 |
2 files changed, 25 insertions, 21 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 490142d29e8..236dd4f6e75 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-05-22 Andreas Jaeger <aj@suse.de> + + * java/lang/mprec.c (mult, lshift, b2d, d2b): Add parenthesis to + avoid warnings. + 2005-05-21 Ranjit Mathew <rmathew@hotmail.com> * testsuite/libjava.jacks/jacks.xfail: Remove 3.10.2-round-6. @@ -9,7 +14,7 @@ 2005-05-19 Bryce McKinlay <mckinlay@redhat.com> * java/lang/natClassLoader.cc (_Jv_NewClass): Use - _Jv_RegisterInitiatingLoader to register array classes, not + _Jv_RegisterInitiatingLoader to register array classes, not _Jv_RegisterClass. (_Jv_RegisterInitiatingLoader): Give up if called very early during bootstrapping. Add a FIXME to handle this case better. @@ -55,9 +60,9 @@ Use AC_CHECK_SIZEOF instead of AC_COMPILE_CHECK_SIZEOF. * aclocal.m4, configure, config.h.in, include/config.h.in, Makefile.in, include/Makefile.in, testsuite/Makefile.in, - external/Makefile.in, external/sax/Makefile.in, + external/Makefile.in, external/sax/Makefile.in, external/w3c_dom/Makefile.in, gcj/Makefile.in: Regenerate. - + 2005-05-17 David Daney <ddaney@avtrex.com> PR libgcj/18220 @@ -169,7 +174,7 @@ (gcj::verbose_class_flag): Move definition here. (_Jv_Linker::wait_for_state): Don't call verify_class if gcj::verifyClasses is not set. - * gij.cc (main): Set gcj::verifyClasses when '-noverify' is given. + * gij.cc (main): Set gcj::verifyClasses when '-noverify' is given. 2005-05-12 Aaron Luchko <aluchko@redhat.com> @@ -411,7 +416,7 @@ 2005-04-29 Andrew Haley <aph@redhat.com> * java/lang/Class.h (_Jv_ResolvePoolEntry): Declare as friend. - + 2005-04-29 Dalibor Topic <robilad@kaffe.org> * java/nio/channels/FileChannelImpl.java @@ -2486,7 +2491,7 @@ (getLinearDay): Should be private. 2005-03-23 Tom Tromey <tromey@redhat.com> - + * include/jvm.h (GCJ_40_BC_ABI_VERSION): New define. (_Jv_CheckABIVersion): Use it. @@ -6258,7 +6263,7 @@ (setRowSelectionInterval): Likewise. (removeColumnSelectionInterval): Likewise. (removeRowSelectionInterval): Likewise. - (isColumnSelected): Likewise. + (isColumnSelected): Likewise. (isRowSelected): Likewise. (isCellSelected): Likewise. (selectAll): Likewise. @@ -7544,4 +7549,3 @@ 2005-01-01 Bryce McKinlay <mckinlay@redhat.com> * include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h. - diff --git a/libjava/java/lang/mprec.c b/libjava/java/lang/mprec.c index b7ec99f35de..00679ed3918 100644 --- a/libjava/java/lang/mprec.c +++ b/libjava/java/lang/mprec.c @@ -385,7 +385,7 @@ _DEFUN (mult, (ptr, a, b), struct _Jv_reent * ptr _AND _Jv_Bigint * a _AND _Jv_B #else for (; xb < xbe; xc0++) { - if (y = *xb++) + if ((y = *xb++)) { x = xa; xc = xc0; @@ -488,11 +488,11 @@ _DEFUN (lshift, (ptr, b, k), struct _Jv_reent * ptr _AND _Jv_Bigint * b _AND int z = 0; do { - *x1++ = *x << k & 0xffff | z; + *x1++ = (*x << k & 0xffff) | z; z = *x++ >> k1; } while (x < xe); - if (*x1 = z) + if ((*x1 = z)) ++n1; } #endif @@ -718,18 +718,18 @@ _DEFUN (b2d, (a, e), if (k < Ebits + 16) { z = xa > xa0 ? *--xa : 0; - d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k; + d0 = Exp_1 | y << (k - Ebits) | z >> (Ebits + 16 - k); w = xa > xa0 ? *--xa : 0; y = xa > xa0 ? *--xa : 0; - d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k; + d1 = z << (k + 16 - Ebits) | w << (k - Ebits) | y >> (16 + Ebits - k); goto ret_d; } z = xa > xa0 ? *--xa : 0; w = xa > xa0 ? *--xa : 0; k -= Ebits + 16; - d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k; + d0 = Exp_1 | y << (k + 16) | z << k | w >> (16 - k); y = xa > xa0 ? *--xa : 0; - d1 = w << k + 16 | y << k; + d1 = w << (k + 16) | y << k; #endif ret_d: #ifdef VAX @@ -812,22 +812,22 @@ _DEFUN (d2b, #endif } #else - if (y = d1) + if ((y = d1)) { - if (k = lo0bits (&y)) + if ((k = lo0bits (&y))) if (k >= 16) { - x[0] = y | z << 32 - k & 0xffff; - x[1] = z >> k - 16 & 0xffff; + x[0] = y | (z << (32 - k) & 0xffff); + x[1] = z >> (k - 16) & 0xffff; x[2] = z >> k; i = 2; } else { x[0] = y & 0xffff; - x[1] = y >> 16 | z << 16 - k & 0xffff; + x[1] = (y >> 16 | z << (16 - k)) & 0xffff; x[2] = z >> k & 0xffff; - x[3] = z >> k + 16; + x[3] = z >> (k + 16); i = 3; } else |