[kaffe] CVS kaffe (robilad): resynched java_lang_VMDouble.c with Classpath

[Kaffe CVS]

PatchSet 7452 
Date: 2006/11/28 21:20:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynched java_lang_VMDouble.c with Classpath

2006-11-28  Dalibor Topic  <robilad at kaffe.org>

        * librariec/clib/native/java_lang_VMDouble.c,
        libraries/javalib/external/classpath/native/fdlibm/mprec.h:
        Resynced with changes from GNU Classpath.

        2006-09-14  Christian Thalinger  <twisti at complang.tuwien.ac.at>

        Fixes PR22800
        * native/fdlibm/mprec.h (Storeinc): Define correctly for LE
        architectures (like Arm).
        * native/jni/java-lang/java_lang_VMDouble.c (doubleToLongBits):
        Reverted SWAP_DOUBLE patch.
        (doubleToRawLongBits): Likewise.
        (longBitsToDouble): Likewise.

Members: 
	ChangeLog:1.4952->1.4953 
	libraries/clib/native/java_lang_VMDouble.c:1.5->1.6 
	libraries/javalib/external/classpath/native/fdlibm/mprec.h:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4952 kaffe/ChangeLog:1.4953
--- kaffe/ChangeLog:1.4952	Mon Nov 27 21:47:20 2006
+++ kaffe/ChangeLog	Tue Nov 28 21:20:32 2006
@@ -1,3 +1,19 @@
+2006-11-28  Dalibor Topic  <robilad at kaffe.org>
+
+	* librariec/clib/native/java_lang_VMDouble.c,
+	libraries/javalib/external/classpath/native/fdlibm/mprec.h:
+	Resynced with changes from GNU Classpath.
+
+	2006-09-14  Christian Thalinger  <twisti at complang.tuwien.ac.at>
+
+        Fixes PR22800
+        * native/fdlibm/mprec.h (Storeinc): Define correctly for LE
+        architectures (like Arm).
+        * native/jni/java-lang/java_lang_VMDouble.c (doubleToLongBits):
+        Reverted SWAP_DOUBLE patch.
+        (doubleToRawLongBits): Likewise.
+        (longBitsToDouble): Likewise.
+
 2006-11-27  Dalibor Topic  <robilad at kaffe.org>
 
 	Fixed the build on Mac OS X 10.4.8.
Index: kaffe/libraries/clib/native/java_lang_VMDouble.c
diff -u kaffe/libraries/clib/native/java_lang_VMDouble.c:1.5 kaffe/libraries/clib/native/java_lang_VMDouble.c:1.6
--- kaffe/libraries/clib/native/java_lang_VMDouble.c:1.5	Mon Apr 17 11:11:23 2006
+++ kaffe/libraries/clib/native/java_lang_VMDouble.c	Tue Nov 28 21:20:33 2006
@@ -122,17 +122,8 @@
 {
   jvalue val;
   jlong e, f;
-  val.d = doubleValue;
-
-#if defined(__IEEE_BYTES_LITTLE_ENDIAN)
-  /* On little endian ARM processors when using FPA, word order of
-     doubles is still big endian. So take that into account here. When
-     using VFP, word order of doubles follows byte order. */
 
-#define SWAP_DOUBLE(a)    (((a) << 32) | (((a) >> 32) & 0x00000000ffffffff))
-
-  val.j = SWAP_DOUBLE(val.j);
-#endif
+  val.d = doubleValue;
 
   e = val.j & 0x7ff0000000000000LL;
   f = val.j & 0x000fffffffffffffLL;
@@ -154,11 +145,8 @@
    jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
 {
   jvalue val;
-  val.d = doubleValue;
 
-#if defined(__IEEE_BYTES_LITTLE_ENDIAN)
-  val.j = SWAP_DOUBLE(val.j);
-#endif
+  val.d = doubleValue;
 
   return val.j;
 }
@@ -174,11 +162,8 @@
    jclass cls __attribute__ ((__unused__)), jlong longValue)
 {
   jvalue val;
-  val.j = longValue;
 
-#if defined(__IEEE_BYTES_LITTLE_ENDIAN)
-  val.j = SWAP_DOUBLE(val.j);
-#endif
+  val.j = longValue;
 
   return val.d;
 }
Index: kaffe/libraries/javalib/external/classpath/native/fdlibm/mprec.h
diff -u kaffe/libraries/javalib/external/classpath/native/fdlibm/mprec.h:1.5 kaffe/libraries/javalib/external/classpath/native/fdlibm/mprec.h:1.6
--- kaffe/libraries/javalib/external/classpath/native/fdlibm/mprec.h:1.5	Sun Jul 16 04:06:51 2006
+++ kaffe/libraries/javalib/external/classpath/native/fdlibm/mprec.h	Tue Nov 28 21:20:33 2006
@@ -100,7 +100,7 @@
  * An alternative that might be better on some machines is
  * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
  */
-#if defined(IEEE_8087) + defined(VAX)
+#if defined(__IEEE_BYTES_LITTLE_ENDIAN) + defined(IEEE_8087) + defined(VAX)
 #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
 ((unsigned short *)a)[0] = (unsigned short)c, a++)
 #else