[vmkit-commits] [vmkit] r82045 - /vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Sep 16 08:14:08 2009
New Revision: 82045

URL: http://llvm.org/viewvc/llvm-project?rev=82045&view=rev
Log:
When entering JNI, give the correct level of frames for the laspSP
of the thread that was running cooperative code.



Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp?rev=82045&r1=82044&r2=82045&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp Wed Sep 16 08:14:08 2009
@@ -83,6 +83,7 @@
 void JavaThread::startJNI(int level) {
   // Caller of this function.
   void** cur = (void**)FRAME_PTR();
+  unsigned level2 = level;
   
   while (level--)
     cur = (void**)cur[0];
@@ -93,7 +94,7 @@
   addresses.push_back(cur);
 
   // Start uncooperative mode.
-  enterUncooperativeCode();
+  enterUncooperativeCode(level2);
 }
 
 void JavaThread::startJava() {