diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-03-03 10:45:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-03 10:45:10 +0000 |
| commit | cc261bfd336eddac18b85d4eb47f6c905d495241 (patch) | |
| tree | 575a2c4b89c0080e80ee17faf8d7b096c01d86e3 /compiler/dex/quick/arm/call_arm.cc | |
| parent | 1179b7b770c096e93442b9c6afea4730283256f0 (diff) | |
| parent | dbb8c49d540edd2a39076093163c7218f03aa502 (diff) | |
| download | android_art-cc261bfd336eddac18b85d4eb47f6c905d495241.tar.gz android_art-cc261bfd336eddac18b85d4eb47f6c905d495241.tar.bz2 android_art-cc261bfd336eddac18b85d4eb47f6c905d495241.zip | |
Merge "Remove non-existent ARM insn kThumb2SubsRRI12."
Diffstat (limited to 'compiler/dex/quick/arm/call_arm.cc')
| -rw-r--r-- | compiler/dex/quick/arm/call_arm.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/quick/arm/call_arm.cc b/compiler/dex/quick/arm/call_arm.cc index b36dde98b2..9f75422a49 100644 --- a/compiler/dex/quick/arm/call_arm.cc +++ b/compiler/dex/quick/arm/call_arm.cc @@ -85,7 +85,8 @@ void ArmMir2Lir::GenSparseSwitch(MIR* mir, uint32_t table_offset, LIR* switch_branch = NewLIR1(kThumb2AddPCR, r_disp); tab_rec->anchor = switch_branch; // Needs to use setflags encoding here - NewLIR3(kThumb2SubsRRI12, r_idx, r_idx, 1); + OpRegRegImm(kOpSub, r_idx, r_idx, 1); // For value == 1, this should set flags. + DCHECK(last_lir_insn_->u.m.def_mask & ENCODE_CCODE); OpCondBranch(kCondNe, target); } |