diff options
| author | buzbee <buzbee@google.com> | 2014-04-08 04:47:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-08 04:47:11 +0000 |
| commit | 1512ea155cbe0a4b33776b0320c1ce38583ab09b (patch) | |
| tree | 84c235566f72c3e383786e81534fa1182976cb28 /compiler | |
| parent | 476fe7c81c0d6b060be5cde4c44a2bb8b0b8ffd2 (diff) | |
| parent | a1983d4dab10b0cc51e9d1b6bcafa9a723fabcd9 (diff) | |
| download | art-1512ea155cbe0a4b33776b0320c1ce38583ab09b.tar.gz art-1512ea155cbe0a4b33776b0320c1ce38583ab09b.tar.bz2 art-1512ea155cbe0a4b33776b0320c1ce38583ab09b.zip | |
Merge "Quick compiler: fix CmpLong pair handling"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/arm/int_arm.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/dex/quick/arm/int_arm.cc b/compiler/dex/quick/arm/int_arm.cc index c80297bc0..8b4171de1 100644 --- a/compiler/dex/quick/arm/int_arm.cc +++ b/compiler/dex/quick/arm/int_arm.cc @@ -90,8 +90,7 @@ void ArmMir2Lir::OpEndIT(LIR* it) { * neg rX * done: */ -void ArmMir2Lir::GenCmpLong(RegLocation rl_dest, RegLocation rl_src1, - RegLocation rl_src2) { +void ArmMir2Lir::GenCmpLong(RegLocation rl_dest, RegLocation rl_src1, RegLocation rl_src2) { LIR* target1; LIR* target2; rl_src1 = LoadValueWide(rl_src1, kCoreReg); @@ -101,7 +100,7 @@ void ArmMir2Lir::GenCmpLong(RegLocation rl_dest, RegLocation rl_src1, OpRegReg(kOpCmp, rl_src1.reg.GetHigh(), rl_src2.reg.GetHigh()); LIR* branch1 = OpCondBranch(kCondLt, NULL); LIR* branch2 = OpCondBranch(kCondGt, NULL); - OpRegRegReg(kOpSub, t_reg, rl_src1.reg, rl_src2.reg); + OpRegRegReg(kOpSub, t_reg, rl_src1.reg.GetLow(), rl_src2.reg.GetLow()); LIR* branch3 = OpCondBranch(kCondEq, NULL); LIR* it = OpIT(kCondHi, "E"); |