S390: Upstream changes from the past 2 weeks

src/s390/simulator-s390.h

 // Copyright 2014 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.
 
 // Declares a Simulator for S390 instructions if we are not generating a native
 // S390 binary. This Simulator allows us to run and debug S390 code generation
 // on regular desktop machines.
 // V8 calls into generated code by "calling" the CALL_GENERATED_CODE macro,
 // which will start execution in the Simulator or forwards to the real entry
 // on a S390 hardware platform.
@@ skipping 298 matching lines @@
   bool DecodeTwoByte(Instruction* instr);
   bool DecodeFourByte(Instruction* instr);
   bool DecodeFourByteArithmetic(Instruction* instr);
   bool DecodeFourByteFloatingPoint(Instruction* instr);
   void DecodeFourByteFloatingPointIntConversion(Instruction* instr);
   void DecodeFourByteFloatingPointRound(Instruction* instr);
 
   bool DecodeSixByte(Instruction* instr);
   bool DecodeSixByteArithmetic(Instruction* instr);
   bool S390InstructionDecode(Instruction* instr);
+  void DecodeSixByteBitShift(Instruction* instr);
 
   // Used by the CL**BR instructions.
   template <typename T1, typename T2>
   void SetS390RoundConditionCode(T1 r2_val, T2 max, T2 min) {
     condition_reg_ = 0;
     double r2_dval = static_cast<double>(r2_val);
     double dbl_min = static_cast<double>(min);
     double dbl_max = static_cast<double>(max);
 
     if (r2_dval == 0.0)
@@ skipping 195 matching lines @@
   static inline void UnregisterCTryCatch(v8::internal::Isolate* isolate) {
     Simulator::current(isolate)->PopAddress();
   }
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // !defined(USE_SIMULATOR)
 #endif  // V8_S390_SIMULATOR_S390_H_