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

src/compiler/representation-change.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_REPRESENTATION_CHANGE_H_
 #define V8_COMPILER_REPRESENTATION_CHANGE_H_
 
 #include "src/compiler/js-graph.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node-properties-inl.h"
 #include "src/compiler/simplified-operator.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 // The types and representations tracked during representation inference
 // and change insertion.
-// TODO(titzer): First, merge MachineRepresentation and RepType.
+// TODO(titzer): First, merge MachineType and RepType.
 // TODO(titzer): Second, Use the real type system instead of RepType.
 enum RepType {
   // Representations.
   rBit = 1 << 0,
   rWord32 = 1 << 1,
   rWord64 = 1 << 2,
   rFloat64 = 1 << 3,
   rTagged = 1 << 4,
 
   // Types.
@@ skipping 228 matching lines @@
   }
 
   Node* GetWord64RepresentationFor(Node* node, RepTypeUnion output_type) {
     if (output_type & rBit) {
       return node;  // Sloppy comparison -> word64
     }
     // Can't really convert Word64 to anything else. Purported to be internal.
     return TypeError(node, output_type, rWord64);
   }
 
-  static RepType TypeForMachineRepresentation(MachineRepresentation rep) {
-    // TODO(titzer): merge MachineRepresentation and RepType.
+  static RepType TypeForMachineType(MachineType rep) {
+    // TODO(titzer): merge MachineType and RepType.
     switch (rep) {
       case kMachineWord8:
         return rWord32;
       case kMachineWord16:
         return rWord32;
       case kMachineWord32:
         return rWord32;
       case kMachineWord64:
         return rWord64;
       case kMachineFloat64:
@@ skipping 61 matching lines @@
       case IrOpcode::kNumberLessThanOrEqual:
         return machine()->Float64LessThanOrEqual();
       default:
         UNREACHABLE();
         return NULL;
     }
   }
 
   RepType TypeForField(const FieldAccess& access) {
     RepType tElement = static_cast<RepType>(0);  // TODO(titzer)
-    RepType rElement = TypeForMachineRepresentation(access.representation);
+    RepType rElement = TypeForMachineType(access.representation);
     return static_cast<RepType>(tElement | rElement);
   }
 
   RepType TypeForElement(const ElementAccess& access) {
     RepType tElement = static_cast<RepType>(0);  // TODO(titzer)
-    RepType rElement = TypeForMachineRepresentation(access.representation);
+    RepType rElement = TypeForMachineType(access.representation);
     return static_cast<RepType>(tElement | rElement);
   }
 
   RepType TypeForBasePointer(const FieldAccess& access) {
     if (access.tag() != 0) return static_cast<RepType>(tAny | rTagged);
     return kPointerSize == 8 ? rWord64 : rWord32;
   }
 
   RepType TypeForBasePointer(const ElementAccess& access) {
     if (access.tag() != 0) return static_cast<RepType>(tAny | rTagged);
@@ skipping 39 matching lines @@
   JSGraph* jsgraph() { return jsgraph_; }
   Isolate* isolate() { return isolate_; }
   SimplifiedOperatorBuilder* simplified() { return simplified_; }
   MachineOperatorBuilder* machine() { return machine_; }
 };
 }
 }
 }  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_REPRESENTATION_CHANGE_H_