[turbofan] Factor out common switch-related code in instruction selectors.

src/compiler/instruction-selector.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.
 
 #ifndef V8_COMPILER_INSTRUCTION_SELECTOR_H_
 #define V8_COMPILER_INSTRUCTION_SELECTOR_H_
 
 #include <map>
 
 #include "src/compiler/common-operator.h"
 #include "src/compiler/instruction.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 #include "src/zone-containers.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 // Forward declarations.
 class BasicBlock;
 struct CallBuffer;  // TODO(bmeurer): Remove this.
 class FlagsContinuation;
 class Linkage;
 
+struct SwitchInfo {

[Benedikt Meurer, 2015/03/25 17:52:48]

Please move this struct to the -impl.h file, and add a forward declaration here.

[titzer, 2015/03/26 08:27:37]

Done.

+  int32_t min_value;
+  int32_t max_value;
+  size_t value_range;
+  size_t case_count;
+  int32_t* case_values;
+  BasicBlock** case_branches;
+  BasicBlock* default_branch;
+};
+
 typedef ZoneVector<InstructionOperand> InstructionOperandVector;
 
 
 // Instruction selection generates an InstructionSequence for a given Schedule.
 class InstructionSelector FINAL {
  public:
   // Forward declarations.
   class Features;
 
   InstructionSelector(Zone* zone, size_t node_count, Linkage* linkage,
@@ skipping 91 matching lines @@
   bool IsLive(Node* node) const { return !IsDefined(node) && IsUsed(node); }
 
   int GetVirtualRegister(const Node* node);
   const std::map<NodeId, int> GetVirtualRegistersForTesting() const;
 
   Isolate* isolate() const { return sequence()->isolate(); }
 
  private:
   friend class OperandGenerator;
 
+  void EmitTableSwitch(const SwitchInfo& sw, InstructionOperand& index_operand);
+  void EmitLookupSwitch(const SwitchInfo& sw,
+                        InstructionOperand& value_operand);
+
   // Inform the instruction selection that {node} was just defined.
   void MarkAsDefined(Node* node);
 
   // Inform the instruction selection that {node} has at least one use and we
   // will need to generate code for it.
   void MarkAsUsed(Node* node);
 
   // Checks if {node} is marked as double.
   bool IsDouble(const Node* node) const;
 
@@ skipping 47 matching lines @@
 
   void VisitFinish(Node* node);
   void VisitParameter(Node* node);
   void VisitOsrValue(Node* node);
   void VisitPhi(Node* node);
   void VisitProjection(Node* node);
   void VisitConstant(Node* node);
   void VisitCall(Node* call, BasicBlock* handler);
   void VisitGoto(BasicBlock* target);
   void VisitBranch(Node* input, BasicBlock* tbranch, BasicBlock* fbranch);
-  void VisitSwitch(Node* node, BasicBlock* default_branch,
-                   BasicBlock** case_branches, int32_t* case_values,
-                   size_t case_count, int32_t min_value, int32_t max_value);
+  void VisitSwitch(Node* node, const SwitchInfo& sw);
   void VisitDeoptimize(Node* value);
   void VisitReturn(Node* value);
   void VisitThrow(Node* value);
 
   // ===========================================================================
 
   Schedule* schedule() const { return schedule_; }
   Linkage* linkage() const { return linkage_; }
   InstructionSequence* sequence() const { return sequence_; }
   Zone* instruction_zone() const { return sequence()->zone(); }
@@ skipping 12 matching lines @@
   BoolVector defined_;
   BoolVector used_;
   IntVector virtual_registers_;
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_INSTRUCTION_SELECTOR_H_