[vmkit-commits] [PATCH] Impl JVM_Clone

[Will Dietz]

Inlined below.

The cloneNotSupportedException will be uncommented and fixed later,
when I'm making a pass to fix behavior like that with mauve and the
like.

~Will

>From a417116231df8de0a080687e7c6116b4cd3ee457 Mon Sep 17 00:00:00 2001
From: Will Dietz <w at wdtz.org>
Date: Wed, 2 Nov 2011 20:36:17 -0500
Subject: [PATCH 03/17] Impl JVM_Clone

---
 lib/J3/ClassLib/OpenJDK/OpenJDK.inc |   73 ++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 1 deletions(-)

diff --git a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
index b724e73..30a670f 100644
--- a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
+++ b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
@@ -159,7 +159,78 @@ JVM_MonitorNotifyAll(JNIEnv *env, jobject obj) {

 JNIEXPORT jobject JNICALL
 JVM_Clone(JNIEnv *env, jobject obj) {
-  NYI();
+  JavaObject* res = NULL;
+  JavaObject* tmp = NULL;
+  JavaObject* src = NULL;
+  llvm_gcroot(res, 0);
+  llvm_gcroot(tmp, 0);
+  llvm_gcroot(src, 0);
+
+  BEGIN_JNI_EXCEPTION
+
+  src = *(JavaObject**)obj;
+
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  UserCommonClass* cl = JavaObject::getClass(src);
+
+  // If this doesn't inherit the Cloneable interface, it's invalid
+  // to try to clone it.
+  if (!JavaObject::instanceOf(src, vm->upcalls->cloneableClass))
+    NYI(); //vm->cloneNotSupportedException();
+
+  if (cl->isArray()) {
+    UserClassArray* array = cl->asArrayClass();
+    int length = JavaArray::getSize(src);
+    res = array->doNew(length, vm);
+    UserCommonClass* base = array->baseClass();
+    if (base->isPrimitive()) {
+      int size = length << base->asPrimitiveClass()->logSize;
+      memcpy((void*)((uintptr_t)res + sizeof(JavaObject) + sizeof(size_t)),
+             (void*)((uintptr_t)src + sizeof(JavaObject) + sizeof(size_t)),
+             size);
+    } else {
+      for (int i = 0; i < length; i++) {
+        tmp = ArrayObject::getElement((ArrayObject*)src, i);
+        ArrayObject::setElement((ArrayObject*)res, tmp, i);
+      }
+    }
+  } else {
+    assert(cl->isClass() && "Not a class!");
+    res = cl->asClass()->doNew(vm);
+    while (cl != NULL) {
+      for (uint32 i = 0; i < cl->asClass()->nbVirtualFields; ++i) {
+        JavaField& field = cl->asClass()->virtualFields[i];
+        if (field.isReference()) {
+          tmp = field.getInstanceObjectField(src);
+          JavaObject** ptr = field.getInstanceObjectFieldPtr(res);
+          mvm::Collector::objectReferenceWriteBarrier((gc*)res,
(gc**)ptr, (gc*)tmp);
+        } else if (field.isLong()) {
+          field.setInstanceLongField(res, field.getInstanceLongField(src));
+        } else if (field.isDouble()) {
+          field.setInstanceDoubleField(res, field.getInstanceDoubleField(src));
+        } else if (field.isInt()) {
+          field.setInstanceInt32Field(res, field.getInstanceInt32Field(src));
+        } else if (field.isFloat()) {
+          field.setInstanceFloatField(res, field.getInstanceFloatField(src));
+        } else if (field.isShort() || field.isChar()) {
+          field.setInstanceInt16Field(res, field.getInstanceInt16Field(src));
+        } else if (field.isByte() || field.isBoolean()) {
+          field.setInstanceInt8Field(res, field.getInstanceInt8Field(src));
+        } else {
+          UNREACHABLE();
+        }
+      }
+      cl = cl->super;
+    }
+  }
+
+  res = (JavaObject*)th->pushJNIRef(res);
+
+  RETURN_FROM_JNI((jobject)res);
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }

 /*
-- 
1.7.5.1