From 93d455621810ca1fcb759fcb6cc4c237ba02a584 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 25 Nov 1999 00:36:51 +0000 Subject: prims.cc (_Jv_NewObjectArray): Use _Jv_GetArrayElementFromElementType. * prims.cc (_Jv_NewObjectArray): Use _Jv_GetArrayElementFromElementType. (_Jv_NewPrimArray): Likewise. * java/lang/natObject.cc (clone): Use _Jv_GetArrayElementFromElementType instead of sizeof. * java/lang/natSystem.cc (arraycopy): Use _Jv_GetArrayElementFromElementType. * include/jvm.h (_Jv_GetArrayElementFromElementType): New function. From-SVN: r30655 --- libjava/include/jvm.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'libjava/include') diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index d917a4f7..33925d3 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -114,6 +114,36 @@ _Jv_HashCode (jobject obj) return (jint) obj; } +// Return a raw pointer to the elements of an array given the array +// and its element type. You might think we could just pick a single +// array type and use elements() on it, but we can't because we must +// account for alignment of the element type. +inline char * +_Jv_GetArrayElementFromElementType (jobject array, + jclass element_type) +{ + char *elts; + if (element_type == JvPrimClass (byte)) + elts = (char *) elements ((jbyteArray) array); + else if (element_type == JvPrimClass (short)) + elts = (char *) elements ((jshortArray) array); + else if (element_type == JvPrimClass (int)) + elts = (char *) elements ((jintArray) array); + else if (element_type == JvPrimClass (long)) + elts = (char *) elements ((jlongArray) array); + else if (element_type == JvPrimClass (boolean)) + elts = (char *) elements ((jbooleanArray) array); + else if (element_type == JvPrimClass (char)) + elts = (char *) elements ((jcharArray) array); + else if (element_type == JvPrimClass (float)) + elts = (char *) elements ((jfloatArray) array); + else if (element_type == JvPrimClass (double)) + elts = (char *) elements ((jdoubleArray) array); + else + elts = (char *) elements ((jobjectArray) array); + return elts; +} + extern "C" void _Jv_ThrowBadArrayIndex (jint bad_index); extern "C" jobject _Jv_NewArray (jint type, jint size); extern "C" jobject _Jv_NewMultiArray (jclass klass, jint dims, ...); -- cgit v1.1