[vmkit-commits] [PATCH] Impl JVM_DefineClass and variants. No support for source or verification yet.

[Will Dietz]

Inlined below.

~Will

>From 1d583aa7435e95f243c2e27008c31f52d322938b Mon Sep 17 00:00:00 2001
From: Will Dietz <w at wdtz.org>
Date: Thu, 3 Nov 2011 09:10:11 -0500
Subject: [PATCH 17/17] Impl JVM_DefineClass and variants.  No support for
 source or verification yet.

---
 lib/J3/ClassLib/OpenJDK/OpenJDK.inc |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
index 954234d..c08908b 100644
--- a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
+++ b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
@@ -1114,7 +1114,30 @@ JVM_FindLoadedClass(JNIEnv *env, jobject
_loader, jstring name) {
 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) */
@@ -1122,7 +1145,8 @@ JNIEXPORT jclass JNICALL
 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)
@@ -1134,7 +1158,8 @@ JNIEXPORT jclass JNICALL
 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);
 }

 /*
-- 
1.7.5.1