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

[Will Dietz]

Author: wdietz2
Date: Sat Nov  5 16:10:52 2011
New Revision: 143832

URL: http://llvm.org/viewvc/llvm-project?rev=143832&view=rev
Log:
Impl JVM_DefineClass and variants.  No support for source or verification yet.

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=143832&r1=143831&r2=143832&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/J3/ClassLib/OpenJDK/OpenJDK.inc Sat Nov  5 16:10:52 2011
@@ -951,7 +951,30 @@
 JNIEXPORT jclass JNICALL
 JVM_DefineClass(JNIEnv *env, const char *name, jobject _loader, const jbyte *buf,
                 jsize len, jobject pd) {
-  NYI();
+  JavaObject * loader = 0;
+  llvm_gcroot(loader, 0);
+  BEGIN_JNI_EXCEPTION
+
+  loader = _loader ? *(JavaObject**)_loader : 0;
+
+  jclass res;
+
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  JnjvmClassLoader* JCL = NULL;
+  JCL = JnjvmClassLoader::getJnjvmLoaderFromJavaObject(loader, vm);
+
+  ClassBytes * bytes = new (JCL->allocator, len) ClassBytes(len);
+  memcpy(bytes->elements,buf,len);
+  const UTF8* utfName = JCL->asciizConstructUTF8(name);
+  UserClass *cl = JCL->constructClass(utfName, bytes);
+
+  if (cl) res = (jclass)cl->getClassDelegateePtr(vm);
+
+  RETURN_FROM_JNI(res);
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }
 
 /* Define a class with a source (added in JDK1.5) */
@@ -959,7 +982,8 @@
 JVM_DefineClassWithSource(JNIEnv *env, const char *name, jobject loader,
                           const jbyte *buf, jsize len, jobject pd,
                           const char *source) {
-  NYI();
+  // Discard source for now
+  return JVM_DefineClass(env, name, loader, buf, len, pd);
 }
 
 /* Define a class with a source with conditional verification (added HSX 14)
@@ -971,7 +995,8 @@
 JVM_DefineClassWithSourceCond(JNIEnv *env, const char *name, jobject loader,
                               const jbyte *buf, jsize len, jobject pd,
                               const char *source, jboolean verify) {
-  NYI();
+  // Discard source and verification
+  return JVM_DefineClass(env, name, loader, buf, len, pd);
 }
 
 /*