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_arm.cc

diff --git a/src/assembler_arm.cc b/src/assembler_arm.cc
index 93d08b2..6d51867 100644
--- a/src/assembler_arm.cc
+++ b/src/assembler_arm.cc
@@ -1667,6 +1667,24 @@
   }
 }
 
+void ArmAssembler::MemoryBarrier(ManagedRegister mscratch) {
+#if ANDROID_SMP != 0
+#if defined(__ARM_HAVE_DMB)
+  int32_t encoding = 0xf57ff05f;  // dmb
+  Emit(encoding);
+#elif  defined(__ARM_HAVE_LDREX_STREX)
+  CHECK(mscratch.AsArm().AsCoreRegister() == R12);
+  LoadImmediate(R12, 0);
+  int32_t encoding = 0xee07cfba;  // mcr p15, 0, r12, c7, c10, 5
+  Emit(encoding);
+#else
+  CHECK(mscratch.AsArm().AsCoreRegister() == R12);
+  LoadImmediate(R12, 0xffff0fa0);  // kuser_memory_barrier
+  blx(R12);
+#endif
+#endif
+}
+
 void ArmAssembler::CreateSirtEntry(ManagedRegister mout_reg,
                                    FrameOffset sirt_offset,
                                    ManagedRegister min_reg, bool null_allowed) {
@@ -1796,10 +1814,9 @@
   __ Bind(&entry_);
   // Save return value
   __ Store(return_save_location_, return_register_, return_size_);
-  // Pass top of stack as argument
-  __ mov(R0, ShifterOperand(SP));
-  __ LoadFromOffset(kLoadWord, R12, TR,
-                         Thread::SuspendCountEntryPointOffset().Int32Value());
+  // Pass thread as argument
+  __ mov(R0, ShifterOperand(TR));
+  __ LoadFromOffset(kLoadWord, R12, TR, OFFSETOF_MEMBER(Thread, pCheckSuspendFromCode));
   // Note: assume that link register will be spilled/filled on method entry/exit
   __ blx(R12);
   // Reload return value