summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c
diff options
context:
space:
mode:
authorbuzbee <buzbee@google.com>2010-11-01 15:53:27 -0700
committerbuzbee <buzbee@google.com>2010-11-01 15:53:27 -0700
commit2ce33c938286c7694238b417be65a9918f421b3d (patch)
treebe34c46ad9d193db22a4c4517a418d18912b49c6 /vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c
parentd4b3b2f5293e40c91e767acce61dc1286929ffcb (diff)
downloadandroid_dalvik-2ce33c938286c7694238b417be65a9918f421b3d.tar.gz
android_dalvik-2ce33c938286c7694238b417be65a9918f421b3d.tar.bz2
android_dalvik-2ce33c938286c7694238b417be65a9918f421b3d.zip
JIT - support for return-void-barrier [Issue 2992352]
Slight reworking of the memory barrier instruction generation to generalize it, and then add "dmb st" for the new return-void-barrier instruction. Change-Id: Iad95aa5b0ba9b616a17dcbe4c6ca2e3906bb49dc
Diffstat (limited to 'vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c')
-rw-r--r--vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c
index f1727c6f1..3aa429449 100644
--- a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c
+++ b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.c
@@ -88,10 +88,10 @@ int dvmCompilerTargetOptHint(int key)
return res;
}
-void dvmCompilerGenMemBarrier(CompilationUnit *cUnit)
+void dvmCompilerGenMemBarrier(CompilationUnit *cUnit, int barrierKind)
{
#if ANDROID_SMP != 0
- ArmLIR *dmb = newLIR1(cUnit, kThumb2Dmb, kSY); // Full system DMB
+ ArmLIR *dmb = newLIR1(cUnit, kThumb2Dmb, barrierKind);
dmb->defMask = ENCODE_ALL;
#endif
}