diff options
| author | Bill Buzbee <buzbee@android.com> | 2014-03-20 14:04:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-20 14:04:52 +0000 |
| commit | 63a4c96e71d6c3223842f4eebd69b269cc491897 (patch) | |
| tree | dc79fe62b1c842b647d3a76d01b60d8b0fba3642 /compiler | |
| parent | ac05eb59b8998b31684b32cc69d2de767d5482cc (diff) | |
| parent | 66da1364425df90e6a03b032ee0a401375e45c39 (diff) | |
| download | art-63a4c96e71d6c3223842f4eebd69b269cc491897.tar.gz art-63a4c96e71d6c3223842f4eebd69b269cc491897.tar.bz2 art-63a4c96e71d6c3223842f4eebd69b269cc491897.zip | |
Merge "Fix GenArithOpInt to work with RA correctly"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/x86/int_x86.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/compiler/dex/quick/x86/int_x86.cc b/compiler/dex/quick/x86/int_x86.cc index a67c43c90e..dcbaad9632 100644 --- a/compiler/dex/quick/x86/int_x86.cc +++ b/compiler/dex/quick/x86/int_x86.cc @@ -2050,8 +2050,16 @@ void X86Mir2Lir::GenArithOpInt(Instruction::Code opcode, RegLocation rl_dest, // We can optimize by moving to result and using memory operands. if (rl_rhs.location != kLocPhysReg) { // Force LHS into result. - rl_result = EvalLoc(rl_dest, kCoreReg, true); - LoadValueDirect(rl_lhs, rl_result.reg.GetReg()); + // We should be careful with order here + // If rl_dest and rl_lhs points to the same VR we should load first + // If the are different we should find a register first for dest + if (mir_graph_->SRegToVReg(rl_dest.s_reg_low) == mir_graph_->SRegToVReg(rl_lhs.s_reg_low)) { + rl_lhs = LoadValue(rl_lhs, kCoreReg); + rl_result = EvalLoc(rl_dest, kCoreReg, true); + } else { + rl_result = EvalLoc(rl_dest, kCoreReg, true); + LoadValueDirect(rl_lhs, rl_result.reg.GetReg()); + } OpRegMem(op, rl_result.reg.GetReg(), rl_rhs); } else if (rl_lhs.location != kLocPhysReg) { // RHS is in a register; LHS is in memory. |