[vmkit-commits] [vmkit] r145571 - in /vmkit/trunk/lib/j3/ClassLib: ClassContext.inc OpenJDK/OpenJDK.inc

[Will Dietz]

Author: wdietz2
Date: Wed Nov 30 22:48:27 2011
New Revision: 145571

URL: http://llvm.org/viewvc/llvm-project?rev=145571&view=rev
Log:
Fix GetClassContext for OpenJDK, need to skip JNI frame.

Important change that gets a lot of more complicated codes (particularly those
    using custom classloaders and j.u.ResourceBundle) working!

Modified:
    vmkit/trunk/lib/j3/ClassLib/ClassContext.inc
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/ClassContext.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/ClassContext.inc?rev=145571&r1=145570&r2=145571&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/ClassContext.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/ClassContext.inc Wed Nov 30 22:48:27 2011
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-ArrayObject* GetClassContext() {
+ArrayObject* GetClassContext(uint32 level = 0) {
   ArrayObject* result = NULL;
   JavaObject* delegatee = NULL;
   llvm_gcroot(result, 0);
@@ -22,14 +22,15 @@
 
   uint32 finalSize = th->getJavaFrameContext((void**)buffer);
 
+  assert(level < finalSize);
   result = (ArrayObject*)
-    vm->upcalls->classArrayClass->doNew(finalSize, vm);
+    vm->upcalls->classArrayClass->doNew(finalSize - level, vm);
 
-  for (uint32 i = 0; i != finalSize; ++i) {
+  for (uint32 i = level; i != finalSize; ++i) {
     JavaMethod* meth = ((JavaMethod**)buffer)[i];
     assert(meth && "Wrong stack trace");
     delegatee = meth->classDef->getClassDelegatee(vm);;
-    ArrayObject::setElement(result, delegatee, i);
+    ArrayObject::setElement(result, delegatee, i - level);
   }
 
   return result;

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=145571&r1=145570&r2=145571&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Wed Nov 30 22:48:27 2011
@@ -836,7 +836,7 @@
   llvm_gcroot(res, 0);
   BEGIN_JNI_EXCEPTION
 
-  res = GetClassContext();
+  res = GetClassContext(1);
 
   RETURN_FROM_JNI((jobjectArray)th->pushJNIRef(res));
   END_JNI_EXCEPTION