Move MachineRepresentation to machine-type.h and rename to MachineType in preparation for merging i…

src/compiler/machine-node-factory.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_MACHINE_NODE_FACTORY_H_
 #define V8_COMPILER_MACHINE_NODE_FACTORY_H_
 
 #ifdef USE_SIMULATOR
 #define MACHINE_ASSEMBLER_SUPPORTS_CALL_C 0
 #else
 #define MACHINE_ASSEMBLER_SUPPORTS_CALL_C 1
 #endif
 
 #include "src/v8.h"
 
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 class MachineCallDescriptorBuilder : public ZoneObject {
  public:
-  MachineCallDescriptorBuilder(MachineRepresentation return_type,
-                               int parameter_count,
-                               const MachineRepresentation* parameter_types)
+  MachineCallDescriptorBuilder(MachineType return_type, int parameter_count,
+                               const MachineType* parameter_types)
       : return_type_(return_type),
         parameter_count_(parameter_count),
         parameter_types_(parameter_types) {}
 
   int parameter_count() const { return parameter_count_; }
-  const MachineRepresentation* parameter_types() const {
-    return parameter_types_;
-  }
+  const MachineType* parameter_types() const { return parameter_types_; }
 
   CallDescriptor* BuildCallDescriptor(Zone* zone) {
     return Linkage::GetSimplifiedCDescriptor(zone, parameter_count_,
                                              return_type_, parameter_types_);
   }
 
  private:
-  const MachineRepresentation return_type_;
+  const MachineType return_type_;
   const int parameter_count_;
-  const MachineRepresentation* const parameter_types_;
+  const MachineType* const parameter_types_;
 };
 
 
 #define ZONE() static_cast<NodeFactory*>(this)->zone()
 #define COMMON() static_cast<NodeFactory*>(this)->common()
 #define MACHINE() static_cast<NodeFactory*>(this)->machine()
 #define NEW_NODE_0(op) static_cast<NodeFactory*>(this)->NewNode(op)
 #define NEW_NODE_1(op, a) static_cast<NodeFactory*>(this)->NewNode(op, a)
 #define NEW_NODE_2(op, a, b) static_cast<NodeFactory*>(this)->NewNode(op, a, b)
 #define NEW_NODE_3(op, a, b, c) \
@@ skipping 27 matching lines @@
     PrintableUnique<Object> val =
         PrintableUnique<Object>::CreateUninitialized(ZONE(), object);
     return NEW_NODE_0(COMMON()->HeapConstant(val));
   }
 
   Node* Projection(int index, Node* a) {
     return NEW_NODE_1(COMMON()->Projection(index), a);
   }
 
   // Memory Operations.
-  Node* Load(MachineRepresentation rep, Node* base) {
+  Node* Load(MachineType rep, Node* base) {
     return Load(rep, base, Int32Constant(0));
   }
-  Node* Load(MachineRepresentation rep, Node* base, Node* index) {
+  Node* Load(MachineType rep, Node* base, Node* index) {
     return NEW_NODE_2(MACHINE()->Load(rep), base, index);
   }
-  void Store(MachineRepresentation rep, Node* base, Node* value) {
+  void Store(MachineType rep, Node* base, Node* value) {
     Store(rep, base, Int32Constant(0), value);
   }
-  void Store(MachineRepresentation rep, Node* base, Node* index, Node* value) {
+  void Store(MachineType rep, Node* base, Node* index, Node* value) {
     NEW_NODE_3(MACHINE()->Store(rep, kNoWriteBarrier), base, index, value);
   }
   // Arithmetic Operations.
   Node* WordAnd(Node* a, Node* b) {
     return NEW_NODE_2(MACHINE()->WordAnd(), a, b);
   }
   Node* WordOr(Node* a, Node* b) {
     return NEW_NODE_2(MACHINE()->WordOr(), a, b);
   }
   Node* WordXor(Node* a, Node* b) {
@@ skipping 234 matching lines @@
   }
   Node* ChangeFloat64ToInt32(Node* a) {
     return NEW_NODE_1(MACHINE()->ChangeFloat64ToInt32(), a);
   }
   Node* ChangeFloat64ToUint32(Node* a) {
     return NEW_NODE_1(MACHINE()->ChangeFloat64ToUint32(), a);
   }
 
 #ifdef MACHINE_ASSEMBLER_SUPPORTS_CALL_C
   // Call to C.
-  Node* CallC(Node* function_address, MachineRepresentation return_type,
-              MachineRepresentation* arg_types, Node** args, int n_args) {
+  Node* CallC(Node* function_address, MachineType return_type,
+              MachineType* arg_types, Node** args, int n_args) {
     CallDescriptor* descriptor = Linkage::GetSimplifiedCDescriptor(
         ZONE(), n_args, return_type, arg_types);
     Node** passed_args =
         static_cast<Node**>(alloca((n_args + 1) * sizeof(args[0])));
     passed_args[0] = function_address;
     for (int i = 0; i < n_args; ++i) {
       passed_args[i + 1] = args[i];
     }
     return NEW_NODE_2(COMMON()->Call(descriptor), n_args + 1, passed_args);
   }
 #endif
 };
 
 #undef NEW_NODE_0
 #undef NEW_NODE_1
 #undef NEW_NODE_2
 #undef NEW_NODE_3
 #undef MACHINE
 #undef COMMON
 #undef ZONE
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_MACHINE_NODE_FACTORY_H_