diff options
| author | 2014-10-22 16:07:05 +0100 | |
|---|---|---|
| committer | 2014-10-29 13:01:48 +0000 | |
| commit | 19a19cffd197a28ae4c9c3e59eff6352fd392241 (patch) | |
| tree | 265b971afd0e33afc8986317aea2f5a6fe817aec /compiler/utils/arm/assembler_thumb2.cc | |
| parent | 7c049c1f34220b0dc1a7f68f3b30f388bae7bdb9 (diff) | |
Add support for static fields in optimizing compiler.
Change-Id: Id2f010589e2bd6faf42c05bb33abf6816ebe9fa9
Diffstat (limited to 'compiler/utils/arm/assembler_thumb2.cc')
| -rw-r--r-- | compiler/utils/arm/assembler_thumb2.cc | 9 |
1 files changed, 7 insertions, 2 deletions
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 } |