Revert "ARM: Use the shifter operand to merge in previous shift instructions."

src/arm/constants-arm.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_ARM_CONSTANTS_ARM_H_
 #define V8_ARM_CONSTANTS_ARM_H_
 
 // ARM EABI is required.
 #if defined(__arm__) && !defined(__ARM_EABI__)
 #error ARM EABI support is required.
@@ skipping 218 matching lines @@
   LSL = 0 << 5,   // Logical shift left.
   LSR = 1 << 5,   // Logical shift right.
   ASR = 2 << 5,   // Arithmetic shift right.
   ROR = 3 << 5,   // Rotate right.
 
   // RRX is encoded as ROR with shift_imm == 0.
   // Use a special code to make the distinction. The RRX ShiftOp is only used
   // as an argument, and will never actually be encoded. The Assembler will
   // detect it and emit the correct ROR shift operand with shift_imm == 0.
   RRX = -1,
-  NO_SHIFT = -2,
   kNumberOfShifts = 4
 };
 
 
 // Status register fields.
 enum SRegisterField {
   CPSR_c = CPSR | 1 << 16,
   CPSR_x = CPSR | 1 << 17,
   CPSR_s = CPSR | 1 << 18,
   CPSR_f = CPSR | 1 << 19,
@@ skipping 434 matching lines @@
   static int Number(const char* name, bool* is_double);
 
  private:
   static const char* names_[kNumVFPRegisters];
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_CONSTANTS_ARM_H_