commit e5de95b3f9609e02fefd7cda7b21f30c9412eb4c
author Ian Rogers <irogers@google.com> Sun Sep 18 20:31:38 2011 -0700
committer Ian Rogers <irogers@google.com> Sun Sep 18 23:16:14 2011 -0700
tree 0a8ef975ac588b444a99957e66e502df84895589
parent c0fe6c7dcc3d5269d2c7dcffafe8b0741f6b8bca

Fix JNI thread state transitions.

Thread state transitions need correct fencing. This change introduces
the fences and makes the behaviour match that of Thread::SetState.

Change-Id: Ia0ff68e2493ae153cf24d251e610b02b3f39d93e

src/assembler_x86.cc

diff --git a/src/assembler_x86.cc b/src/assembler_x86.cc
index e126d88..2aae7de 100644
--- a/src/assembler_x86.cc
+++ b/src/assembler_x86.cc
@@ -1585,6 +1585,14 @@
   }
 }
 
+void X86Assembler::MemoryBarrier(ManagedRegister) {
+#if ANDROID_SMP != 0
+  EmitUint8(0x0F);  // mfence
+  EmitUint8(0xAE);
+  EmitOperand(0, Operand(EAX));  // EAX is unused
+#endif
+}
+
 void X86Assembler::CreateSirtEntry(ManagedRegister mout_reg,
                                    FrameOffset sirt_offset,
                                    ManagedRegister min_reg, bool null_allowed) {
@@ -1699,9 +1707,9 @@
   __ Bind(&entry_);
   // Save return value
   __ Store(return_save_location_, return_register_, return_size_);
-  // Pass top of stack as argument
-  __ pushl(ESP);
-  __ fs()->call(Address::Absolute(Thread::SuspendCountEntryPointOffset()));
+  // Pass Thread::Current as argument
+  __ fs()->pushl(Address::Absolute(Thread::SelfOffset()));
+  __ fs()->call(Address::Absolute(OFFSETOF_MEMBER(Thread, pCheckSuspendFromCode)));
   // Release argument
   __ addl(ESP, Immediate(kPointerSize));
   // Reload return value