diff options
| author | buzbee <buzbee@google.com> | 2010-11-01 15:53:27 -0700 |
|---|---|---|
| committer | buzbee <buzbee@google.com> | 2010-11-01 15:53:27 -0700 |
| commit | 2ce33c938286c7694238b417be65a9918f421b3d (patch) | |
| tree | be34c46ad9d193db22a4c4517a418d18912b49c6 /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | d4b3b2f5293e40c91e767acce61dc1286929ffcb (diff) | |
| download | android_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/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index d90050b6e..f0745aed2 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -317,7 +317,7 @@ static void genIGet(CompilationUnit *cUnit, MIR *mir, OpSize size, size, rlObj.sRegLow); HEAP_ACCESS_SHADOW(false); if (isVolatile) { - dvmCompilerGenMemBarrier(cUnit); + dvmCompilerGenMemBarrier(cUnit, kSY); } storeValue(cUnit, rlDest, rlResult); @@ -339,7 +339,7 @@ static void genIPut(CompilationUnit *cUnit, MIR *mir, OpSize size, NULL);/* null object? */ if (isVolatile) { - dvmCompilerGenMemBarrier(cUnit); + dvmCompilerGenMemBarrier(cUnit, kSY); } HEAP_ACCESS_SHADOW(true); storeBaseDisp(cUnit, rlObj.lowReg, fieldOffset, rlSrc.lowReg, size); @@ -1329,8 +1329,10 @@ static bool handleFmt10x(CompilationUnit *cUnit, MIR *mir) return true; } switch (dalvikOpCode) { - case OP_RETURN_VOID: case OP_RETURN_VOID_BARRIER: + dvmCompilerGenMemBarrier(cUnit, kST); + // Intentional fallthrough + case OP_RETURN_VOID: genReturnCommon(cUnit,mir); break; case OP_UNUSED_73: @@ -1486,7 +1488,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir) loadConstant(cUnit, tReg, (int) fieldPtr + valOffset); if (isVolatile) { - dvmCompilerGenMemBarrier(cUnit); + dvmCompilerGenMemBarrier(cUnit, kSY); } HEAP_ACCESS_SHADOW(true); loadWordDisp(cUnit, tReg, 0, rlResult.lowReg); @@ -1561,7 +1563,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir) dvmCompilerFreeTemp(cUnit, tReg); HEAP_ACCESS_SHADOW(false); if (isVolatile) { - dvmCompilerGenMemBarrier(cUnit); + dvmCompilerGenMemBarrier(cUnit, kSY); } if (isSputObject) { /* NOTE: marking card based sfield->clazz */ |