commit 68d4d6728cb15ef2662965c10fa426a1c272c33f
author Elliott Hughes <enh@google.com> Fri Mar 16 14:13:57 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 16 14:13:57 2012 -0700
tree 282a8a995cf2c42ec326768c1270ef0e14c90df0
parent 7ccf4f9aa37faf42a1febca43abcefa57d1bbb2a
parent 76e3694db07d068d1a5e0ae7088b6f7bff6e9d43

Merge "Clean up the trivial uses of __attribute__((unused))." into ics-mr1-plus-art

src/assembler_arm.cc

diff --git a/src/assembler_arm.cc b/src/assembler_arm.cc
index ae9f092..65f8e57 100644
--- a/src/assembler_arm.cc
+++ b/src/assembler_arm.cc
@@ -1738,17 +1738,16 @@
 
 
 void ArmAssembler::MemoryBarrier(ManagedRegister mscratch) {
+  CHECK(mscratch.AsArm().AsCoreRegister() == R12);
 #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