diff options
| author | 2014-07-16 22:00:14 +0000 | |
|---|---|---|
| committer | 2014-07-16 16:25:15 +0000 | |
| commit | ebe8f799c5053f85adffee23cb46851efebbfd92 (patch) | |
| tree | ecec2ccf0ae49dbbac2f7daab6717b0808f172bb /compiler/dex/quick/codegen_util.cc | |
| parent | 403ef95be8c2a91bf73b133cede8ecd2a146cec6 (diff) | |
| parent | 69dfe51b684dd9d510dbcb63295fe180f998efde (diff) | |
Merge "Revert "Revert "Revert "Revert "Add implicit null and stack checks for x86"""""
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 60d25890d4..463f277e54 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1172,9 +1172,12 @@ bool Mir2Lir::BadOverlap(RegLocation rl_src, RegLocation rl_dest) { } LIR *Mir2Lir::OpCmpMemImmBranch(ConditionCode cond, RegStorage temp_reg, RegStorage base_reg, - int offset, int check_value, LIR* target) { + int offset, int check_value, LIR* target, LIR** compare) { // Handle this for architectures that can't compare to memory. - Load32Disp(base_reg, offset, temp_reg); + LIR* inst = Load32Disp(base_reg, offset, temp_reg); + if (compare != nullptr) { + *compare = inst; + } LIR* branch = OpCmpImmBranch(cond, temp_reg, check_value, target); return branch; } |