summaryrefslogtreecommitdiff
path: root/compiler/utils/arm/assembler_thumb2.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2015-11-23 11:26:03 +0000
committer android-build-merger <android-build-merger@google.com> 2015-11-23 11:26:03 +0000
commitbda98bfb15a5ecfec4128d8cc59eeda02ccce638 (patch)
treebea248023c5823bbb28a1864655e3afce9226400 /compiler/utils/arm/assembler_thumb2.cc
parent47c471fd0174c0c8ca840b5271adf78191096bf6 (diff)
parentf2550c7330c5bc012a6aafdcc0188472ed332dc1 (diff)
Merge "Optimizing/ARM: Improve long shifts by 1." am: f180af0fc0
am: f2550c7330 * commit 'f2550c7330c5bc012a6aafdcc0188472ed332dc1': Optimizing/ARM: Improve long shifts by 1.
Diffstat (limited to 'compiler/utils/arm/assembler_thumb2.cc')
-rw-r--r--compiler/utils/arm/assembler_thumb2.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc
index 5f82439369..7ad5b440e0 100644
--- a/compiler/utils/arm/assembler_thumb2.cc
+++ b/compiler/utils/arm/assembler_thumb2.cc
@@ -3221,7 +3221,7 @@ void Thumb2Assembler::Ror(Register rd, Register rm, uint32_t shift_imm,
void Thumb2Assembler::Rrx(Register rd, Register rm, Condition cond, SetCc set_cc) {
CheckCondition(cond);
- EmitShift(rd, rm, RRX, rm, cond, set_cc);
+ EmitShift(rd, rm, RRX, 0, cond, set_cc);
}