[vmkit-commits] [vmkit] r76471 - /vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Jul 20 16:13:35 2009
New Revision: 76471

URL: http://llvm.org/viewvc/llvm-project?rev=76471&view=rev
Log:
Apparently, MacosX requires to return the address for it to work. Not really
sure why yet...


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Mon Jul 20 16:13:35 2009
@@ -391,9 +391,9 @@
 }
 
 // Never throws.
-extern "C" void jnjvmGetSJLJBuffer(uint32* localReferencesNumber,
-                                   uint32** oldLocalReferencesNumber,
-                                   void* newBuffer, void** oldBuffer) {
+extern "C" void** jnjvmGetSJLJBuffer(uint32* localReferencesNumber,
+                                     uint32** oldLocalReferencesNumber,
+                                     void* newBuffer, void** oldBuffer) {
   JavaThread* th = JavaThread::get();
  
   *oldBuffer = th->currentSjljBuffer;
@@ -407,8 +407,9 @@
   // Start JNI because the next instruction after setjmp is a call to a
   // JNI function.
   th->startJNI(2);
+  void** val = (void**)th->addresses.back();
 
-  return;
+  return val;
 }
 
 // Never throws.