Hi all,
as discussed on the list, I've removed the method.
cheers,
dalibor topic
2008-02-08 Dalibor Topic <[EMAIL PROTECTED]>
* m4/acinclude.m4 (CLASSPATH_CHECK_JAVAH) [USER_JAVAH]: Check
for gjavah-4.2
and gjavah-4.1.
2008-02-08 Dalibor Topic <[EMAIL PROTECTED]>
* vm/reference/java/lang/VMDouble.java (doubleToLongBits): Removed
unused method.
* native/jni/java-lang/java_lang_VMDouble.c
(Java_java_lang_VMDouble_doubleToLongBits):
Removed unused function.
* include/java_lang_VMDouble.h: Regenerated.
* doc/cp-vmintegration.texinfo (java.lang.VMDouble): Removed
unused method doubleToLongBits.
Index: doc/cp-vmintegration.texinfo
===================================================================
RCS file: /sources/classpath/classpath/doc/cp-vmintegration.texinfo,v
retrieving revision 1.2
diff -u -p -r1.2 cp-vmintegration.texinfo
--- doc/cp-vmintegration.texinfo 19 Feb 2007 14:42:46 -0000 1.2
+++ doc/cp-vmintegration.texinfo 8 Feb 2008 17:39:49 -0000
@@ -526,8 +526,6 @@ compiler, and is specific to the compile
of doubles.
@itemize @bullet
[EMAIL PROTECTED] @code{doubleToLongBits(double)} -- Converts the double to the IEEE 754
-bit layout, collapsing NaNs to @code{0x7ff8000000000000L}.
@item @code{doubleToRawLongBits(double)} -- Same as the above, but preserves
NaNs.
@item @code{longBitsToDouble(long)} -- This is the inverse of the last method,
Index: include/java_lang_VMDouble.h
===================================================================
RCS file: /sources/classpath/classpath/include/java_lang_VMDouble.h,v
retrieving revision 1.3
diff -u -p -r1.3 java_lang_VMDouble.h
--- include/java_lang_VMDouble.h 16 Apr 2005 09:19:54 -0000 1.3
+++ include/java_lang_VMDouble.h 8 Feb 2008 17:39:50 -0000
@@ -1,16 +1,15 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+
#ifndef __java_lang_VMDouble__
#define __java_lang_VMDouble__
-#include <jni.h>
-
#ifdef __cplusplus
extern "C"
{
#endif
-JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToLongBits (JNIEnv *env, jclass, jdouble);
JNIEXPORT jlong JNICALL Java_java_lang_VMDouble_doubleToRawLongBits (JNIEnv *env, jclass, jdouble);
JNIEXPORT jdouble JNICALL Java_java_lang_VMDouble_longBitsToDouble (JNIEnv *env, jclass, jlong);
JNIEXPORT jstring JNICALL Java_java_lang_VMDouble_toString (JNIEnv *env, jclass, jdouble, jboolean);
Index: m4/acinclude.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.27
diff -u -p -r1.27 acinclude.m4
--- m4/acinclude.m4 14 Jan 2008 14:36:34 -0000 1.27
+++ m4/acinclude.m4 8 Feb 2008 17:39:50 -0000
@@ -221,7 +221,7 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAH],
AC_PATH_PROG(USER_JAVAH, "$1")
fi
else
- AC_PATH_PROGS([USER_JAVAH],[gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah])
+ AC_PATH_PROGS([USER_JAVAH],[gjavah gjavah-4.2 gjavah-4.1 gcjh-wrapper-4.1 gcjh-4.1 gcjh javah])
fi
if test "x${USER_JAVAH}" = x; then
Index: native/jni/java-lang/java_lang_VMDouble.c
===================================================================
RCS file: /sources/classpath/classpath/native/jni/java-lang/java_lang_VMDouble.c,v
retrieving revision 1.18
diff -u -p -r1.18 java_lang_VMDouble.c
--- native/jni/java-lang/java_lang_VMDouble.c 11 Jan 2008 22:14:31 -0000 1.18
+++ native/jni/java-lang/java_lang_VMDouble.c 8 Feb 2008 17:39:50 -0000
@@ -112,16 +112,15 @@ Java_java_lang_VMDouble_initIDs (JNIEnv
/*
* Class: java_lang_VMDouble
- * Method: doubleToLongBits
+ * Method: doubleToRawLongBits
* Signature: (D)J
*/
JNIEXPORT jlong JNICALL
-Java_java_lang_VMDouble_doubleToLongBits
+Java_java_lang_VMDouble_doubleToRawLongBits
(JNIEnv * env __attribute__ ((__unused__)),
jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
{
jvalue val;
- jlong e, f;
val.d = doubleValue;
@@ -135,33 +134,6 @@ Java_java_lang_VMDouble_doubleToLongBits
val.j = SWAP_DOUBLE(val.j);
#endif
- e = val.j & 0x7ff0000000000000LL;
- f = val.j & 0x000fffffffffffffLL;
-
- if (e == 0x7ff0000000000000LL && f != 0L)
- val.j = 0x7ff8000000000000LL;
-
- return val.j;
-}
-
-/*
- * Class: java_lang_VMDouble
- * Method: doubleToRawLongBits
- * Signature: (D)J
- */
-JNIEXPORT jlong JNICALL
-Java_java_lang_VMDouble_doubleToRawLongBits
- (JNIEnv * env __attribute__ ((__unused__)),
- jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
-{
- jvalue val;
-
- val.d = doubleValue;
-
-#if defined(__IEEE_BYTES_LITTLE_ENDIAN)
- val.j = SWAP_DOUBLE(val.j);
-#endif
-
return val.j;
}
Index: vm/reference/java/lang/VMDouble.java
===================================================================
RCS file: /sources/classpath/classpath/vm/reference/java/lang/VMDouble.java,v
retrieving revision 1.3
diff -u -p -r1.3 VMDouble.java
--- vm/reference/java/lang/VMDouble.java 2 Jul 2005 20:33:08 -0000 1.3
+++ vm/reference/java/lang/VMDouble.java 8 Feb 2008 17:39:50 -0000
@@ -70,22 +70,6 @@ final class VMDouble
* layout. Bit 63 (the most significant) is the sign bit, bits 62-52
* (masked by 0x7ff0000000000000L) represent the exponent, and bits 51-0
* (masked by 0x000fffffffffffffL) are the mantissa. This function
- * collapses all versions of NaN to 0x7ff8000000000000L. The result of this
- * function can be used as the argument to
- * <code>Double.longBitsToDouble(long)</code> to obtain the original
- * <code>double</code> value.
- *
- * @param value the <code>double</code> to convert
- * @return the bits of the <code>double</code>
- * @see #longBitsToDouble(long)
- */
- public static native long doubleToLongBits(double value);
-
- /**
- * Convert the double to the IEEE 754 floating-point "double format" bit
- * layout. Bit 63 (the most significant) is the sign bit, bits 62-52
- * (masked by 0x7ff0000000000000L) represent the exponent, and bits 51-0
- * (masked by 0x000fffffffffffffL) are the mantissa. This function
* leaves NaN alone, rather than collapsing to a canonical value. The
* result of this function can be used as the argument to
* <code>Double.longBitsToDouble(long)</code> to obtain the original
