commit 903989dae724ec0b186ec98c2afd1e074ed41d4d
author Vladimir Marko <vmarko@google.com> Tue Jul 01 17:21:18 2014 +0100
committer Vladimir Marko <vmarko@google.com> Tue Jul 01 17:21:18 2014 +0100
tree 95316a2703266f7fbd918f502b699c122fe1ca5e
parent ec01b768a6c5fc984a235a25e9a49c651d21354a

AArch64: Fix OpRegRegImm64 add/sub for large negative imm.

Bug: 15837964
Change-Id: I401edf687352fae3dca03c0a807dac5750e454f6

compiler/dex/quick/arm64/utility_arm64.cc

diff --git a/compiler/dex/quick/arm64/utility_arm64.cc b/compiler/dex/quick/arm64/utility_arm64.cc
index e248410..50b4a06 100644
--- a/compiler/dex/quick/arm64/utility_arm64.cc
+++ b/compiler/dex/quick/arm64/utility_arm64.cc
@@ -732,7 +732,7 @@
         return NewLIR4(opcode | wide, r_dest.GetReg(), r_src1.GetReg(), abs_value >> 12, 1);
       } else {
         log_imm = -1;
-        alt_opcode = (neg) ? kA64Add4RRre : kA64Sub4RRre;
+        alt_opcode = (op == kOpAdd) ? kA64Add4RRre : kA64Sub4RRre;
         info = EncodeExtend(is_wide ? kA64Uxtx : kA64Uxtw, 0);
       }
       break;