[vmkit-commits] [PATCH] Implement JVM_GetClassLoader

[Will Dietz]

Inlined below.

~Will

>From a8d486f49ea7a366a8d50b2db74a14fac66cbc25 Mon Sep 17 00:00:00 2001
From: Will Dietz <w at wdtz.org>
Date: Mon, 31 Oct 2011 16:27:07 -0500
Subject: [PATCH 3/8] Implement JVM_GetClassLoader

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

diff --git a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
index 0360894..e0000f2 100644
--- a/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
+++ b/lib/J3/ClassLib/OpenJDK/OpenJDK.inc
@@ -821,7 +821,20 @@ JVM_GetClassInterfaces(JNIEnv *env, jclass cls) {

 JNIEXPORT jobject JNICALL
 JVM_GetClassLoader(JNIEnv *env, jclass cls) {
-  NYI();
+  JavaObject * Cl = *(JavaObject**)cls;
+  JavaObject * res = 0;
+  llvm_gcroot(Cl, 0);
+  llvm_gcroot(res, 0);
+  BEGIN_JNI_EXCEPTION
+
+  Jnjvm* vm = JavaThread::get()->getJVM();
+  UserCommonClass* cl = UserCommonClass::resolvedImplClass(vm, Cl, false);
+  res = cl->classLoader->getJavaClassLoader();
+  RETURN_FROM_JNI((jobject)th->pushJNIRef(res));
+
+  END_JNI_EXCEPTION
+
+  return 0;
 }

 JNIEXPORT jboolean JNICALL
-- 
1.7.5.1