PatchSet 6570
Date: 2005/05/22 15:51:49
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with gnu classpath: cleanuo
2005-05-21 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-05-21 Andreas Jaeger <[EMAIL PROTECTED]>
* java/lang/mprec.c (mult, lshift, b2d, d2b): Add parenthesis to
avoid warnings.
Members:
ChangeLog:1.4097->1.4098
libraries/clib/fdlibm/mprec.c:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4097 kaffe/ChangeLog:1.4098
--- kaffe/ChangeLog:1.4097 Sun May 22 15:49:42 2005
+++ kaffe/ChangeLog Sun May 22 15:51:49 2005
@@ -1,5 +1,14 @@
2005-05-21 Dalibor Topic <[EMAIL PROTECTED]>
+ Resynced with GNU Classpath.
+
+ 2005-05-21 Andreas Jaeger <[EMAIL PROTECTED]>
+
+ * java/lang/mprec.c (mult, lshift, b2d, d2b): Add parenthesis to
+ avoid warnings.
+
+2005-05-21 Dalibor Topic <[EMAIL PROTECTED]>
+
* kaffe/jvmpi/jvmpi_kaffe.c
kaffe/kaffevm/exception.c
kaffe/kaffevm/stackTrace.c:
Index: kaffe/libraries/clib/fdlibm/mprec.c
diff -u kaffe/libraries/clib/fdlibm/mprec.c:1.1
kaffe/libraries/clib/fdlibm/mprec.c:1.2
--- kaffe/libraries/clib/fdlibm/mprec.c:1.1 Fri Apr 22 17:03:49 2005
+++ kaffe/libraries/clib/fdlibm/mprec.c Sun May 22 15:51:52 2005
@@ -385,7 +385,7 @@
#else
for (; xb < xbe; xc0++)
{
- if (y = *xb++)
+ if ((y = *xb++))
{
x = xa;
xc = xc0;
@@ -488,11 +488,11 @@
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 @@
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 @@
#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
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
