[vmkit-commits] [vmkit] r144205 - /vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc

[Will Dietz]

Author: wdietz2
Date: Wed Nov  9 13:44:36 2011
New Revision: 144205

URL: http://llvm.org/viewvc/llvm-project?rev=144205&view=rev
Log:
Impl JVM methods: GetArrayLength, SetArrayElement, GetArrayElement

Modified:
    vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc?rev=144205&r1=144204&r2=144205&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc Wed Nov  9 13:44:36 2011
@@ -803,12 +803,34 @@
  */
 JNIEXPORT jint JNICALL
 JVM_GetArrayLength(JNIEnv *env, jobject arr) {
-  NYI();
+  ArrayObject* array = 0;
+  llvm_gcroot(array, 0);
+
+  BEGIN_JNI_EXCEPTION
+  array = *(ArrayObject**)arr;
+  RETURN_FROM_JNI(ArrayObject::getSize(array));
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }
 
 JNIEXPORT jobject JNICALL
 JVM_GetArrayElement(JNIEnv *env, jobject arr, jint index) {
-  NYI();
+  ArrayObject* array = 0;
+  JavaObject* element = 0;
+  llvm_gcroot(array, 0);
+  llvm_gcroot(element, 0);
+
+  BEGIN_JNI_EXCEPTION
+  array = *(ArrayObject**)arr;
+  element = ArrayObject::getElement(array, index);
+
+  RETURN_FROM_JNI((jobject)th->pushJNIRef(element));
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }
 
 JNIEXPORT jvalue JNICALL
@@ -818,7 +840,19 @@
 
 JNIEXPORT void JNICALL
 JVM_SetArrayElement(JNIEnv *env, jobject arr, jint index, jobject val) {
-  NYI();
+  ArrayObject* array = 0;
+  JavaObject* element = 0;
+  llvm_gcroot(array, 0);
+  llvm_gcroot(element, 0);
+
+  BEGIN_JNI_EXCEPTION
+  array = *(ArrayObject**)arr;
+  element = *(JavaObject**)val;
+
+  ArrayObject::setElement(array, element, index);
+
+  RETURN_VOID_FROM_JNI
+  END_JNI_EXCEPTION
 }
 
 JNIEXPORT void JNICALL