diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-17 10:21:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-17 10:21:26 -0700 |
| commit | 2688b7f660b7e85d395ce5fd0d406da8c67b3785 (patch) | |
| tree | 475af270ed60cf89abd73bb584e57656763e59d6 /vm/compiler/codegen/arm/Assemble.cpp | |
| parent | dc632159549bdf99a58ca149a3828f237c7f461a (diff) | |
| parent | bbd903dec7c25859849fa447aaeef365f20440d4 (diff) | |
| download | android_dalvik-2688b7f660b7e85d395ce5fd0d406da8c67b3785.tar.gz android_dalvik-2688b7f660b7e85d395ce5fd0d406da8c67b3785.tar.bz2 android_dalvik-2688b7f660b7e85d395ce5fd0d406da8c67b3785.zip | |
am bbd903de: am 28702c58: am ae2fb913: Merge "JIT: Use rsb and shift in easy multiply."
* commit 'bbd903dec7c25859849fa447aaeef365f20440d4':
JIT: Use rsb and shift in easy multiply.
Diffstat (limited to 'vm/compiler/codegen/arm/Assemble.cpp')
| -rw-r--r-- | vm/compiler/codegen/arm/Assemble.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vm/compiler/codegen/arm/Assemble.cpp b/vm/compiler/codegen/arm/Assemble.cpp index ac4e64c11..10572eb5f 100644 --- a/vm/compiler/codegen/arm/Assemble.cpp +++ b/vm/compiler/codegen/arm/Assemble.cpp @@ -881,6 +881,11 @@ ArmEncodingMap EncodingMap[kArmLast] = { kFmtUnused, -1, -1, IS_BINARY_OP | REG_DEF0 | REG_USE_PC | IS_LOAD, "ldr", "r!0d, [r15pc, -#!1d]", 2), + ENCODING_MAP(kThumb2RsbRRR, 0xebd00000, /* setflags encoding */ + kFmtBitBlt, 11, 8, kFmtBitBlt, 19, 16, kFmtBitBlt, 3, 0, + kFmtShift, -1, -1, + IS_QUAD_OP | REG_DEF0_USE12 | SETS_CCODES, + "rsb", "r!0d, r!1d, r!2d!3H", 2), ENCODING_MAP(kThumbUndefined, 0xde00, kFmtUnused, -1, -1, kFmtUnused, -1, -1, kFmtUnused, -1, -1, kFmtUnused, -1, -1, NO_OPERAND, |