diff options
| author | 2015-03-17 21:19:02 +0000 | |
|---|---|---|
| committer | 2015-03-17 21:19:03 +0000 | |
| commit | 8c36c1af046ba8ed2c4bad19453e02fd2a5cb5ba (patch) | |
| tree | 8818477b32aee45aa535afafa7ef57424417bb7b /compiler | |
| parent | da8196db7bb8f84faed05f0010baf0c261cc950d (diff) | |
| parent | b7f2be9238e49db5d163d23e956d1bbec25da013 (diff) | |
Merge "Revert "Forbid the use of shifts in ShifterOperand in Thumb2""
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/utils/arm/assembler_arm.h | 4 | ||||
| -rw-r--r-- | compiler/utils/arm/assembler_thumb2.cc | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h index dd0dba2df4..8730f52eca 100644 --- a/compiler/utils/arm/assembler_arm.h +++ b/compiler/utils/arm/assembler_arm.h @@ -100,10 +100,6 @@ class ShifterOperand { return rm_; } - Register GetSecondRegister() const { - return rs_; - } - enum Type { kUnknown = -1, kRegister, diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc index eb5b4540f9..6d0571e263 100644 --- a/compiler/utils/arm/assembler_thumb2.cc +++ b/compiler/utils/arm/assembler_thumb2.cc @@ -921,8 +921,6 @@ void Thumb2Assembler::Emit16BitDataProcessing(Condition cond, use_immediate = true; immediate = so.GetImmediate(); } else { - CHECK(!(so.IsRegister() && so.IsShift() && so.GetSecondRegister() != kNoRegister)) - << "No register-shifted register instruction available in thumb"; // Adjust rn and rd: only two registers will be emitted. switch (opcode) { case AND: |