1999-04-14 Andrew Haley <aph@cygnus.com>

        * java/lang/natDouble.java (doubleToLongBits): ensure that all
        NaNs are always converted to the same long value.
        * java/lang/natFloat.java (floatToIntBits): ditto, but for float
        converted to int.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26439 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 13 insertions, 0 deletions

diff --git a/libjava/java/lang/natDouble.cc b/libjava/java/lang/natDouble.cc
index 17990884751..8d8c7883ba4 100644
--- a/libjava/java/lang/natDouble.cc
+++ b/libjava/java/lang/natDouble.cc
@@ -47,6 +47,13 @@ java::lang::Double::doubleToLongBits(jdouble value)
 {
   union u u;
   u.d = value;
+  
+  jlong e = u.l & 0x7ff0000000000000LL;
+  jlong f = u.l & 0x000fffffffffffffLL;
+
+  if (e == 0x7ff0000000000000LL && f != 0L)
+    u.l = 0x7ff8000000000000LL;
+
   return u.l;
 }
 
diff --git a/libjava/java/lang/natFloat.cc b/libjava/java/lang/natFloat.cc
index e3189bebc2d..5712fd4190c 100644
--- a/libjava/java/lang/natFloat.cc
+++ b/libjava/java/lang/natFloat.cc
@@ -24,6 +24,12 @@ java::lang::Float::floatToIntBits(jfloat value)
 {
   union u u;
   u.d = value;
+  jint e = u.l & 0x7f800000;
+  jint f = u.l & 0x007fffff;
+
+  if (e == 0x7f800000 && f != 0)
+    u.l = 0x7fc00000;
+
   return u.l;
 }