commit 45a76cb99104a222d6a9bd768a084893dcb7cf30
author Ian Rogers <irogers@google.com> Thu Jul 21 22:00:15 2011 -0700
committer Ian Rogers <irogers@google.com> Fri Jul 22 15:16:43 2011 -0700
tree 995557ba95942309ffe9c4a13819a10da8c4b4bb
parent 69759eaa6fd4386f1e6d8748052ad221087b3476

Exception and suspend count polling on JNI bridge return.

Change-Id: I0e5597fcbdcdb88100b18d63323e7ba8d27f13fe

src/jni_compiler.cc

diff --git a/src/jni_compiler.cc b/src/jni_compiler.cc
index 5385a8b..a6f5faf 100644
--- a/src/jni_compiler.cc
+++ b/src/jni_compiler.cc
@@ -89,6 +89,7 @@
   // 5. Transition from being in managed to native code
   // TODO: write out anchor, ensure the transition to native follow a store
   //       fence.
+  jni_asm->StoreStackPointerToThread(Thread::TopOfManagedStackOffset());
   jni_asm->StoreImmediateToThread(Thread::StateOffset(), Thread::kNative,
                                   mr_conv.InterproceduralScratchRegister());
 
@@ -230,9 +231,18 @@
 
   // 12. Transition from being in native to managed code, possibly entering a
   //     safepoint
+  CHECK(!jni_conv.InterproceduralScratchRegister()
+                 .Equals(jni_conv.ReturnRegister()));  // don't clobber result
+  // Location to preserve result on slow path, ensuring its within the frame
+  FrameOffset return_save_location = jni_conv.ReturnValueSaveLocation();
+  CHECK_LT(return_save_location.Uint32Value(), frame_size);
+  jni_asm->SuspendPoll(jni_conv.InterproceduralScratchRegister(),
+                       jni_conv.ReturnRegister(), return_save_location,
+                       jni_conv.SizeOfReturnValue());
+  jni_asm->ExceptionPoll(jni_conv.InterproceduralScratchRegister());
   jni_asm->StoreImmediateToThread(Thread::StateOffset(), Thread::kRunnable,
-                                  mr_conv.InterproceduralScratchRegister());
-  // TODO: check for safepoint transition
+                                  jni_conv.InterproceduralScratchRegister());
+
 
   // 15. Place result in correct register possibly dehandlerizing
   if (jni_conv.IsReturnAReference()) {
@@ -250,6 +260,7 @@
   jni_asm->RemoveFrame(frame_size);
 
   // 18. Finalize code generation
+  jni_asm->EmitSlowPaths();
   size_t cs = jni_asm->CodeSize();
   MemoryRegion code(AllocateCode(cs), cs);
   jni_asm->FinalizeInstructions(code);