From 19a19cffd197a28ae4c9c3e59eff6352fd392241 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 22 Oct 2014 16:07:05 +0100 Subject: Add support for static fields in optimizing compiler. Change-Id: Id2f010589e2bd6faf42c05bb33abf6816ebe9fa9 --- compiler/utils/arm/assembler_thumb2.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'compiler/utils/arm/assembler_thumb2.cc') diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc index 37478c4ac1..633f55b929 100644 --- a/compiler/utils/arm/assembler_thumb2.cc +++ b/compiler/utils/arm/assembler_thumb2.cc @@ -2521,9 +2521,14 @@ void Thumb2Assembler::StoreDToOffset(DRegister reg, void Thumb2Assembler::MemoryBarrier(ManagedRegister mscratch) { CHECK_EQ(mscratch.AsArm().AsCoreRegister(), R12); + dmb(SY); +} + + +void Thumb2Assembler::dmb(DmbOptions flavor) { #if ANDROID_SMP != 0 - int32_t encoding = 0xf3bf8f5f; // dmb in T1 encoding. - Emit32(encoding); + int32_t encoding = 0xf3bf8f50; // dmb in T1 encoding. + Emit32(encoding | flavor); #endif } -- cgit v1.2.3-59-g8ed1b