natSystem.cc (arraycopy): Don't always use jbyteArray; instead switch on actual eleme...

	* java/lang/natSystem.cc (arraycopy): Don't always use jbyteArray;
	instead switch on actual element type.

From-SVN: r26405

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c72d9d4f2f0119d792374617f4b19228c44037d3..1cd361cafe48c239037f14fe633b1e6d1333c8d3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 1999-04-13  Tom Tromey  <tromey@cygnus.com>
 
+       * java/lang/natSystem.cc (arraycopy): Don't always use jbyteArray;
+       instead switch on actual element type.
+
        * Makefile.in: Rebuilt.
        * Makefile.am (AM_MAKEFLAGS): Added JC1FLAGS.
 

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 6ceb642107495209f94126045c1e7970bb87ced1..10acfceafa3f56af52dea19e5e84d6b035466be9 100644 (file)
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -116,15 +116,57 @@ java::lang::System::arraycopy (jobject src, jint src_offset,
   const bool prim = src_comp->isPrimitive();
   if (prim || dst_comp->isAssignableFrom(src_comp) || src == dst)
     {
-      const size_t size = prim ? src_comp->size() 
-       : sizeof elements((jobjectArray)src)[0];
-
-      // We need a particular type to get the pointer to the data.  So
-      // we choose bytes.
-      char *src_elts = (((char *) elements ((jbyteArray) src))
-                       + src_offset * size);
-      char *dst_elts = (((char *) elements ((jbyteArray) dst))
-                       + dst_offset * size);
+      const size_t size = (prim ? src_comp->size()
+                          : sizeof elements((jobjectArray)src)[0]);
+
+      // In an ideal world we would do this via a virtual function in
+      // __JArray.  However, we can't have virtual functions in
+      // __JArray due to the need to copy an array's virtual table in
+      // _Jv_FindArrayClass.
+      // We can't just pick a single subtype of __JArray to use due to
+      // alignment concerns.
+      char *src_elts = NULL;
+      if (! prim)
+       src_elts = (char *) elements ((jobjectArray) src);
+      else if (src_comp == JvPrimClass (byte))
+       src_elts = (char *) elements ((jbyteArray) src);
+      else if (src_comp == JvPrimClass (short))
+       src_elts = (char *) elements ((jshortArray) src);
+      else if (src_comp == JvPrimClass (int))
+       src_elts = (char *) elements ((jintArray) src);
+      else if (src_comp == JvPrimClass (long))
+       src_elts = (char *) elements ((jlongArray) src);
+      else if (src_comp == JvPrimClass (boolean))
+       src_elts = (char *) elements ((jbooleanArray) src);
+      else if (src_comp == JvPrimClass (char))
+       src_elts = (char *) elements ((jcharArray) src);
+      else if (src_comp == JvPrimClass (float))
+       src_elts = (char *) elements ((jfloatArray) src);
+      else if (src_comp == JvPrimClass (double))
+       src_elts = (char *) elements ((jdoubleArray) src);
+      src_elts += size * src_offset;
+
+      char *dst_elts = NULL;
+      if (! prim)
+       dst_elts = (char *) elements ((jobjectArray) dst);
+      else if (dst_comp == JvPrimClass (byte))
+       dst_elts = (char *) elements ((jbyteArray) dst);
+      else if (dst_comp == JvPrimClass (short))
+       dst_elts = (char *) elements ((jshortArray) dst);
+      else if (dst_comp == JvPrimClass (int))
+       dst_elts = (char *) elements ((jintArray) dst);
+      else if (dst_comp == JvPrimClass (long))
+       dst_elts = (char *) elements ((jlongArray) dst);
+      else if (dst_comp == JvPrimClass (boolean))
+       dst_elts = (char *) elements ((jbooleanArray) dst);
+      else if (dst_comp == JvPrimClass (char))
+       dst_elts = (char *) elements ((jcharArray) dst);
+      else if (dst_comp == JvPrimClass (float))
+       dst_elts = (char *) elements ((jfloatArray) dst);
+      else if (dst_comp == JvPrimClass (double))
+       dst_elts = (char *) elements ((jdoubleArray) dst);
+      dst_elts += size * dst_offset;
+
       // We don't bother trying memcpy.  It can't be worth the cost of
       // the check.
       memmove ((void *) dst_elts, (void *) src_elts, count * size);