summaryrefslogtreecommitdiff
path: root/compiler/utils/arm/assembler_arm32.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2014-10-29 13:02:55 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-10-29 13:02:56 +0000
commitcc4337139de2786bb9038789fb8e3f93697c191c (patch)
tree265b971afd0e33afc8986317aea2f5a6fe817aec /compiler/utils/arm/assembler_arm32.cc
parent7c049c1f34220b0dc1a7f68f3b30f388bae7bdb9 (diff)
parent19a19cffd197a28ae4c9c3e59eff6352fd392241 (diff)
Merge "Add support for static fields in optimizing compiler."
Diffstat (limited to 'compiler/utils/arm/assembler_arm32.cc')
-rw-r--r--compiler/utils/arm/assembler_arm32.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/utils/arm/assembler_arm32.cc b/compiler/utils/arm/assembler_arm32.cc
index 3d46617079..d262b6acd6 100644
--- a/compiler/utils/arm/assembler_arm32.cc
+++ b/compiler/utils/arm/assembler_arm32.cc
@@ -1471,9 +1471,14 @@ void Arm32Assembler::StoreDToOffset(DRegister reg,
void Arm32Assembler::MemoryBarrier(ManagedRegister mscratch) {
CHECK_EQ(mscratch.AsArm().AsCoreRegister(), R12);
+ dmb(SY);
+}
+
+
+void Arm32Assembler::dmb(DmbOptions flavor) {
#if ANDROID_SMP != 0
int32_t encoding = 0xf57ff05f; // dmb
- Emit(encoding);
+ Emit(encoding | flavor);
#endif
}