Commit 313344b4 by Andreas Jaeger

mprec.c (mult, [...]): Add parenthesis to avoid warnings.

	* java/lang/mprec.c (mult, lshift, b2d, d2b): Add parenthesis to
	avoid warnings.

From-SVN: r100057
parent cc7e6e8f
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> 2005-05-21 Ranjit Mathew <rmathew@hotmail.com>
* testsuite/libjava.jacks/jacks.xfail: Remove 3.10.2-round-6. * testsuite/libjava.jacks/jacks.xfail: Remove 3.10.2-round-6.
...@@ -7544,4 +7549,3 @@ ...@@ -7544,4 +7549,3 @@
2005-01-01 Bryce McKinlay <mckinlay@redhat.com> 2005-01-01 Bryce McKinlay <mckinlay@redhat.com>
* include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h. * include/boehm-gc.h: Include gc_ext_config.h, not gc_config.h.
...@@ -385,7 +385,7 @@ _DEFUN (mult, (ptr, a, b), struct _Jv_reent * ptr _AND _Jv_Bigint * a _AND _Jv_B ...@@ -385,7 +385,7 @@ _DEFUN (mult, (ptr, a, b), struct _Jv_reent * ptr _AND _Jv_Bigint * a _AND _Jv_B
#else #else
for (; xb < xbe; xc0++) for (; xb < xbe; xc0++)
{ {
if (y = *xb++) if ((y = *xb++))
{ {
x = xa; x = xa;
xc = xc0; xc = xc0;
...@@ -488,11 +488,11 @@ _DEFUN (lshift, (ptr, b, k), struct _Jv_reent * ptr _AND _Jv_Bigint * b _AND int ...@@ -488,11 +488,11 @@ _DEFUN (lshift, (ptr, b, k), struct _Jv_reent * ptr _AND _Jv_Bigint * b _AND int
z = 0; z = 0;
do do
{ {
*x1++ = *x << k & 0xffff | z; *x1++ = (*x << k & 0xffff) | z;
z = *x++ >> k1; z = *x++ >> k1;
} }
while (x < xe); while (x < xe);
if (*x1 = z) if ((*x1 = z))
++n1; ++n1;
} }
#endif #endif
...@@ -718,18 +718,18 @@ _DEFUN (b2d, (a, e), ...@@ -718,18 +718,18 @@ _DEFUN (b2d, (a, e),
if (k < Ebits + 16) if (k < Ebits + 16)
{ {
z = xa > xa0 ? *--xa : 0; 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; w = xa > xa0 ? *--xa : 0;
y = 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; goto ret_d;
} }
z = xa > xa0 ? *--xa : 0; z = xa > xa0 ? *--xa : 0;
w = xa > xa0 ? *--xa : 0; w = xa > xa0 ? *--xa : 0;
k -= Ebits + 16; 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; y = xa > xa0 ? *--xa : 0;
d1 = w << k + 16 | y << k; d1 = w << (k + 16) | y << k;
#endif #endif
ret_d: ret_d:
#ifdef VAX #ifdef VAX
...@@ -812,22 +812,22 @@ _DEFUN (d2b, ...@@ -812,22 +812,22 @@ _DEFUN (d2b,
#endif #endif
} }
#else #else
if (y = d1) if ((y = d1))
{ {
if (k = lo0bits (&y)) if ((k = lo0bits (&y)))
if (k >= 16) if (k >= 16)
{ {
x[0] = y | z << 32 - k & 0xffff; x[0] = y | (z << (32 - k) & 0xffff);
x[1] = z >> k - 16 & 0xffff; x[1] = z >> (k - 16) & 0xffff;
x[2] = z >> k; x[2] = z >> k;
i = 2; i = 2;
} }
else else
{ {
x[0] = y & 0xffff; 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[2] = z >> k & 0xffff;
x[3] = z >> k + 16; x[3] = z >> (k + 16);
i = 3; i = 3;
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment