S390: Upstream changes from the past 2 weeks

src/compiler/s390/instruction-codes-s390.h

 // Copyright 2015 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_COMPILER_S390_INSTRUCTION_CODES_S390_H_
 #define V8_COMPILER_S390_INSTRUCTION_CODES_S390_H_
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 // S390-specific opcodes that specify which assembly sequence to emit.
 // Most opcodes specify a single instruction.
 #define TARGET_ARCH_OPCODE_LIST(V) \
   V(S390_And)                      \
   V(S390_AndComplement)            \
   V(S390_Or)                       \
   V(S390_OrComplement)             \
   V(S390_Xor)                      \
   V(S390_ShiftLeft32)              \
   V(S390_ShiftLeft64)              \
+  V(S390_ShiftLeftPair)            \
   V(S390_ShiftRight32)             \
   V(S390_ShiftRight64)             \
-  V(S390_ShiftRightAlg32)          \
-  V(S390_ShiftRightAlg64)          \
+  V(S390_ShiftRightPair)           \
+  V(S390_ShiftRightArith32)        \
+  V(S390_ShiftRightArith64)        \
+  V(S390_ShiftRightArithPair)      \
   V(S390_RotRight32)               \
   V(S390_RotRight64)               \
   V(S390_Not)                      \
   V(S390_RotLeftAndMask32)         \
   V(S390_RotLeftAndClear64)        \
   V(S390_RotLeftAndClearLeft64)    \
   V(S390_RotLeftAndClearRight64)   \
   V(S390_Add)                      \
   V(S390_AddWithOverflow32)        \
   V(S390_AddFloat)                 \
@@ skipping 109 matching lines @@
 // MRR = [register + register]
 #define TARGET_ADDRESSING_MODE_LIST(V) \
   V(MRI) /* [%r0 + K] */               \
   V(MRR) /* [%r0 + %r1] */
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_S390_INSTRUCTION_CODES_S390_H_