Hi Will,<div><br></div><div>It looks like a big chunk of this code could be shared between the 2 class libraries. Could you just make a method in JavaObject? Thanks!</div><div><br></div><div>Nicolas</div><div><br><div class="gmail_quote">
On Thu, Nov 3, 2011 at 3:24 PM, Will Dietz <span dir="ltr"><<a href="mailto:wdietz2@illinois.edu">wdietz2@illinois.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Inlined below.<br>
<br>
The cloneNotSupportedException will be uncommented and fixed later,<br>
when I'm making a pass to fix behavior like that with mauve and the<br>
like.<br>
<br>
~Will<br>
<br>
>From a417116231df8de0a080687e7c6116b4cd3ee457 Mon Sep 17 00:00:00 2001<br>
From: Will Dietz <<a href="mailto:w@wdtz.org">w@wdtz.org</a>><br>
Date: Wed, 2 Nov 2011 20:36:17 -0500<br>
Subject: [PATCH 03/17] Impl JVM_Clone<br>
<br>
---<br>
 lib/J3/ClassLib/OpenJDK/OpenJDK.inc |   73 ++++++++++++++++++++++++++++++++++-<br>
 1 files changed, 72 insertions(+), 1 deletions(-)<br>
<br>
diff --git a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc<br>
b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc<br>
index b724e73..30a670f 100644<br>
--- a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc<br>
+++ b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc<br>
@@ -159,7 +159,78 @@ JVM_MonitorNotifyAll(JNIEnv *env, jobject obj) {<br>
<br>
 JNIEXPORT jobject JNICALL<br>
 JVM_Clone(JNIEnv *env, jobject obj) {<br>
-  NYI();<br>
+  JavaObject* res = NULL;<br>
+  JavaObject* tmp = NULL;<br>
+  JavaObject* src = NULL;<br>
+  llvm_gcroot(res, 0);<br>
+  llvm_gcroot(tmp, 0);<br>
+  llvm_gcroot(src, 0);<br>
+<br>
+  BEGIN_JNI_EXCEPTION<br>
+<br>
+  src = *(JavaObject**)obj;<br>
+<br>
+  Jnjvm* vm = JavaThread::get()->getJVM();<br>
+  UserCommonClass* cl = JavaObject::getClass(src);<br>
+<br>
+  // If this doesn't inherit the Cloneable interface, it's invalid<br>
+  // to try to clone it.<br>
+  if (!JavaObject::instanceOf(src, vm->upcalls->cloneableClass))<br>
+    NYI(); //vm->cloneNotSupportedException();<br>
+<br>
+  if (cl->isArray()) {<br>
+    UserClassArray* array = cl->asArrayClass();<br>
+    int length = JavaArray::getSize(src);<br>
+    res = array->doNew(length, vm);<br>
+    UserCommonClass* base = array->baseClass();<br>
+    if (base->isPrimitive()) {<br>
+      int size = length << base->asPrimitiveClass()->logSize;<br>
+      memcpy((void*)((uintptr_t)res + sizeof(JavaObject) + sizeof(size_t)),<br>
+             (void*)((uintptr_t)src + sizeof(JavaObject) + sizeof(size_t)),<br>
+             size);<br>
+    } else {<br>
+      for (int i = 0; i < length; i++) {<br>
+        tmp = ArrayObject::getElement((ArrayObject*)src, i);<br>
+        ArrayObject::setElement((ArrayObject*)res, tmp, i);<br>
+      }<br>
+    }<br>
+  } else {<br>
+    assert(cl->isClass() && "Not a class!");<br>
+    res = cl->asClass()->doNew(vm);<br>
+    while (cl != NULL) {<br>
+      for (uint32 i = 0; i < cl->asClass()->nbVirtualFields; ++i) {<br>
+        JavaField& field = cl->asClass()->virtualFields[i];<br>
+        if (field.isReference()) {<br>
+          tmp = field.getInstanceObjectField(src);<br>
+          JavaObject** ptr = field.getInstanceObjectFieldPtr(res);<br>
+          mvm::Collector::objectReferenceWriteBarrier((gc*)res,<br>
(gc**)ptr, (gc*)tmp);<br>
+        } else if (field.isLong()) {<br>
+          field.setInstanceLongField(res, field.getInstanceLongField(src));<br>
+        } else if (field.isDouble()) {<br>
+          field.setInstanceDoubleField(res, field.getInstanceDoubleField(src));<br>
+        } else if (field.isInt()) {<br>
+          field.setInstanceInt32Field(res, field.getInstanceInt32Field(src));<br>
+        } else if (field.isFloat()) {<br>
+          field.setInstanceFloatField(res, field.getInstanceFloatField(src));<br>
+        } else if (field.isShort() || field.isChar()) {<br>
+          field.setInstanceInt16Field(res, field.getInstanceInt16Field(src));<br>
+        } else if (field.isByte() || field.isBoolean()) {<br>
+          field.setInstanceInt8Field(res, field.getInstanceInt8Field(src));<br>
+        } else {<br>
+          UNREACHABLE();<br>
+        }<br>
+      }<br>
+      cl = cl->super;<br>
+    }<br>
+  }<br>
+<br>
+  res = (JavaObject*)th->pushJNIRef(res);<br>
+<br>
+  RETURN_FROM_JNI((jobject)res);<br>
+<br>
+  END_JNI_EXCEPTION<br>
+<br>
+  return 0;<br>
 }<br>
<br>
 /*<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.5.1<br>
_______________________________________________<br>
vmkit-commits mailing list<br>
<a href="mailto:vmkit-commits@cs.uiuc.edu">vmkit-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits</a><br>
</font></span></blockquote></div><br></div>