remove native calls

BobHanson · BobHanson · commit 2d339d78f320 · 2019-11-13T21:32:38.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/io/ObjectInputStream.java b/sources/net.sf.j2s.java.core/src/java/io/ObjectInputStream.java
@@ -40,6 +40,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import javajs.util.BC;
+
 import static java.io.ObjectStreamClass.processQueue;
 import sun.reflect.misc.ReflectUtil;
 
@@ -2031,17 +2034,21 @@ private void handleReset() throws StreamCorruptedException {
      * Converts specified span of bytes into float values.
      */
     // REMIND: remove once hotspot inlines Float.intBitsToFloat
-    private static native void bytesToFloats(byte[] src, int srcpos,
+    private static void bytesToFloats(byte[] src, int srcpos,
                                              float[] dst, int dstpos,
-                                             int nfloats);
+                                             int nfloats) {
+    	BC.bytesToFloats(src, srcpos, dst, dstpos, nfloats);
+    }
 
     /**
      * Converts specified span of bytes into double values.
      */
     // REMIND: remove once hotspot inlines Double.longBitsToDouble
-    private static native void bytesToDoubles(byte[] src, int srcpos,
+    private static void bytesToDoubles(byte[] src, int srcpos,
                                               double[] dst, int dstpos,
-                                              int ndoubles);
+                                              int ndoubles) {
+    	BC.bytesToDouble(src, srcpos, dst, dstpos, ndoubles);    	
+    }
 
     /**
      * Returns the first non-null class loader (not counting class loaders of
diff --git a/sources/net.sf.j2s.java.core/src/java/io/ObjectStreamClass.java b/sources/net.sf.j2s.java.core/src/java/io/ObjectStreamClass.java
@@ -189,13 +189,13 @@ InvalidClassException newInvalidClassException() {
     /** superclass descriptor appearing in stream */
     private ObjectStreamClass superDesc;
 
-    /**
-     * Initializes native code.
-     */
-    private static native void initNative();
-    static {
-        initNative();
-    }
+//    /**
+//     * Initializes native code.
+//     */
+//    private static native void initNative();
+//    static {
+//        initNative();
+//    }
 
     /**
      * Find the descriptor for a class that can be serialized.  Creates an
@@ -1815,11 +1815,12 @@ private static long computeDefaultSUID(Class<?> cl) {
 //        }
     }
 
-    /**
-     * Returns true if the given class defines a static initializer method,
-     * false otherwise.
-     */
-    private native static boolean hasStaticInitializer(Class<?> cl);
+//    /**
+//     * Ha! We can do this in java2script 3.2.4.10! C$.$static$ === 0
+//     * Returns true if the given class defines a static initializer method,
+//     * false otherwise.
+//     */
+//    private native static boolean hasStaticInitializer(Class<?> cl);
 
     /**
      * Class for computing and caching field/constructor/method signatures
