diff options
| author | buzbee <buzbee@google.com> | 2010-09-03 09:35:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 09:35:22 -0700 |
| commit | 8acfac02a34f12f4690ad419fb85496aec8f97c7 (patch) | |
| tree | ccfe599f974127c01dabffaa8bde137cd35e8676 /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | 9df8f7c6300420cdd4e9ebda8fd86c49348b674e (diff) | |
| parent | 8ef4d4f3d050b0130dbf723285990b045f04d5f3 (diff) | |
am 8ef4d4f3: am 58a661c4: am ddc7d29b: Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Merge commit '8ef4d4f3d050b0130dbf723285990b045f04d5f3' into dalvik-dev
* commit '8ef4d4f3d050b0130dbf723285990b045f04d5f3':
Correct Volatile SGET/SPUT format tag, add missing cases for JIT
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index 54d3b8e7f..d0ef80847 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -1514,6 +1514,8 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir) break; } case OP_SPUT_OBJECT: + case OP_SPUT_OBJECT_VOLATILE: + case OP_SPUT_VOLATILE: case OP_SPUT_BOOLEAN: case OP_SPUT_CHAR: case OP_SPUT_BYTE: |