S390: Upstream changes from the past 2 weeks

src/compiler/s390/instruction-selector-s390.cc

 // 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.
 
 #include "src/base/adapters.h"
 #include "src/compiler/instruction-selector-impl.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
 #include "src/s390/frames-s390.h"
 
@@ skipping 732 matching lines @@
     if (mleft.right().Is(16) && m.right().Is(16)) {
       Emit(kS390_ExtendSignWord16, g.DefineAsRegister(node),
            g.UseRegister(mleft.left().node()));
       return;
     } else if (mleft.right().Is(24) && m.right().Is(24)) {
       Emit(kS390_ExtendSignWord8, g.DefineAsRegister(node),
            g.UseRegister(mleft.left().node()));
       return;
     }
   }
-  VisitRRO(this, kS390_ShiftRightAlg32, node, kShift32Imm);
+  VisitRRO(this, kS390_ShiftRightArith32, node, kShift32Imm);
 }
 
+#if !V8_TARGET_ARCH_S390X
+void VisitPairShift(InstructionSelector* selector, ArchOpcode opcode,
+                    Node* node) {
+  S390OperandGenerator g(selector);
+  Int32Matcher m(node->InputAt(2));
+  InstructionOperand shift_operand;
+  if (m.HasValue()) {
+    shift_operand = g.UseImmediate(m.node());
+  } else {
+    shift_operand = g.UseUniqueRegister(m.node());
+  }
+
+  InstructionOperand inputs[] = {g.UseRegister(node->InputAt(0)),
+                                 g.UseRegister(node->InputAt(1)),
+                                 shift_operand};
+
+  InstructionOperand outputs[] = {
+      g.DefineSameAsFirst(node),
+      g.DefineAsRegister(NodeProperties::FindProjection(node, 1))};
+
+  selector->Emit(opcode, 2, outputs, 3, inputs);
+}
+
+void InstructionSelector::VisitWord32PairShl(Node* node) {
+  VisitPairShift(this, kS390_ShiftLeftPair, node);
+}
+
+void InstructionSelector::VisitWord32PairShr(Node* node) {
+  VisitPairShift(this, kS390_ShiftRightPair, node);
+}
+
+void InstructionSelector::VisitWord32PairSar(Node* node) {
+  VisitPairShift(this, kS390_ShiftRightArithPair, node);
+}
+#endif
+
 #if V8_TARGET_ARCH_S390X
 void InstructionSelector::VisitWord64Sar(Node* node) {
-  VisitRRO(this, kS390_ShiftRightAlg64, node, kShift64Imm);
+  VisitRRO(this, kS390_ShiftRightArith64, node, kShift64Imm);
 }
 #endif
 
 void InstructionSelector::VisitWord32Ror(Node* node) {
   VisitRRO(this, kS390_RotRight32, node, kShift32Imm);
 }
 
 #if V8_TARGET_ARCH_S390X
 void InstructionSelector::VisitWord64Ror(Node* node) {
   VisitRRO(this, kS390_RotRight64, node, kShift64Imm);
@@ skipping 43 matching lines @@
 void InstructionSelector::VisitInt32Add(Node* node) {
   VisitBinop<Int32BinopMatcher>(this, node, kS390_Add, kInt16Imm);
 }
 
 #if V8_TARGET_ARCH_S390X
 void InstructionSelector::VisitInt64Add(Node* node) {
   VisitBinop<Int64BinopMatcher>(this, node, kS390_Add, kInt16Imm);
 }
 #endif
 
+#if !V8_TARGET_ARCH_S390X
+void InstructionSelector::VisitInt32PairAdd(Node* node) { UNIMPLEMENTED(); }
+#endif
+
 void InstructionSelector::VisitInt32Sub(Node* node) {
   S390OperandGenerator g(this);
   Int32BinopMatcher m(node);
   if (m.left().Is(0)) {
     Emit(kS390_Neg, g.DefineAsRegister(node), g.UseRegister(m.right().node()));
   } else {
     VisitBinop<Int32BinopMatcher>(this, node, kS390_Sub, kInt16Imm_Negate);
   }
 }
 
@@ skipping 788 matching lines @@
                g.UseRegister(input.node()), g.TempImmediate(slot));
         }
       }
       ++slot;
     }
   }
 }
 
 bool InstructionSelector::IsTailCallAddressImmediate() { return false; }
 
+int InstructionSelector::GetTempsCountForTailCallFromJSFunction() { return 3; }
+
 void InstructionSelector::VisitFloat64ExtractLowWord32(Node* node) {
   S390OperandGenerator g(this);
   Emit(kS390_DoubleExtractLowWord32, g.DefineAsRegister(node),
        g.UseRegister(node->InputAt(0)));
 }
 
 void InstructionSelector::VisitFloat64ExtractHighWord32(Node* node) {
   S390OperandGenerator g(this);
   Emit(kS390_DoubleExtractHighWord32, g.DefineAsRegister(node),
        g.UseRegister(node->InputAt(0)));
@@ skipping 39 matching lines @@
          MachineOperatorBuilder::kFloat32RoundTruncate |
          MachineOperatorBuilder::kFloat64RoundTruncate |
          MachineOperatorBuilder::kFloat64RoundTiesAway |
          MachineOperatorBuilder::kWord32Popcnt |
          MachineOperatorBuilder::kWord64Popcnt;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8