diff options
| author | Bill Buzbee <buzbee@android.com> | 2014-09-10 22:10:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-10 22:10:13 +0000 |
| commit | 73f7d79c1755f85b2be590aa9d9b18e054f76a1a (patch) | |
| tree | 803f8a14c0c94c393122b38c1a2ab8a7c0809a2f /compiler | |
| parent | 2adccb618c0de207fde96e5e90ce99c79eb8eb85 (diff) | |
| parent | b5477f0f8080cef4cb8a9dcea4367344ea7cdab4 (diff) | |
| download | art-73f7d79c1755f85b2be590aa9d9b18e054f76a1a.zip art-73f7d79c1755f85b2be590aa9d9b18e054f76a1a.tar.gz art-73f7d79c1755f85b2be590aa9d9b18e054f76a1a.tar.bz2 | |
Merge "Fix kThumb2Vldrd definition to set correct flag."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/arm/assemble_arm.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick/arm/assemble_arm.cc b/compiler/dex/quick/arm/assemble_arm.cc index 06d9dd5..dcec861 100644 --- a/compiler/dex/quick/arm/assemble_arm.cc +++ b/compiler/dex/quick/arm/assemble_arm.cc @@ -427,7 +427,7 @@ const ArmEncodingMap ArmMir2Lir::EncodingMap[kArmLast] = { REG_DEF_LR | NEEDS_FIXUP, "vldr", "!0s, [!1C, #!2E]", 4, kFixupVLoad), ENCODING_MAP(kThumb2Vldrd, 0xed900b00, kFmtDfp, 22, 12, kFmtBitBlt, 19, 16, kFmtBitBlt, 7, 0, - kFmtUnused, -1, -1, IS_TERTIARY_OP | REG_DEF0_USE1 | IS_LOAD_OFF | + kFmtUnused, -1, -1, IS_TERTIARY_OP | REG_DEF0_USE1 | IS_LOAD_OFF4 | REG_DEF_LR | NEEDS_FIXUP, "vldr", "!0S, [!1C, #!2E]", 4, kFixupVLoad), ENCODING_MAP(kThumb2Vmuls, 0xee200a00, kFmtSfp, 22, 12, kFmtSfp, 7, 16, kFmtSfp, 5, 0, |