Unify MachineType and RepType.

src/compiler/machine-operator.h

 // Copyright 2013 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_OPERATOR_H_
 #define V8_COMPILER_MACHINE_OPERATOR_H_
 
 #include "src/compiler/machine-type.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
 #include "src/zone.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 // TODO(turbofan): other write barriers are possible based on type
 enum WriteBarrierKind { kNoWriteBarrier, kFullWriteBarrier };
 
 
 // A Store needs a MachineType and a WriteBarrierKind
 // in order to emit the correct write barrier.
 struct StoreRepresentation {
-  MachineType rep;
+  MachineType machine_type;
   WriteBarrierKind write_barrier_kind;
 };
 
 
 // Interface for building machine-level operators. These operators are
 // machine-level but machine-independent and thus define a language suitable
 // for generating code to run on architectures such as ia32, x64, arm, etc.
 class MachineOperatorBuilder {
  public:
   explicit MachineOperatorBuilder(Zone* zone, MachineType word = pointer_rep())
       : zone_(zone), word_(word) {
-    CHECK(word == kMachineWord32 || word == kMachineWord64);
+    CHECK(word == rWord32 || word == rWord64);
   }
 
 #define SIMPLE(name, properties, inputs, outputs) \
   return new (zone_)                              \
       SimpleOperator(IrOpcode::k##name, properties, inputs, outputs, #name);
 
 #define OP1(name, ptype, pname, properties, inputs, outputs)               \
   return new (zone_)                                                       \
       Operator1<ptype>(IrOpcode::k##name, properties | Operator::kNoThrow, \
                        inputs, outputs, #name, pname)
@@ skipping 89 matching lines @@
   Operator* Float64Sub() { BINOP(Float64Sub); }
   Operator* Float64Mul() { BINOP_C(Float64Mul); }
   Operator* Float64Div() { BINOP(Float64Div); }
   Operator* Float64Mod() { BINOP(Float64Mod); }
 
   // Floating point comparisons complying to IEEE 754.
   Operator* Float64Equal() { BINOP_C(Float64Equal); }
   Operator* Float64LessThan() { BINOP(Float64LessThan); }
   Operator* Float64LessThanOrEqual() { BINOP(Float64LessThanOrEqual); }
 
-  inline bool is32() const { return word_ == kMachineWord32; }
-  inline bool is64() const { return word_ == kMachineWord64; }
+  inline bool is32() const { return word_ == rWord32; }
+  inline bool is64() const { return word_ == rWord64; }
   inline MachineType word() const { return word_; }
 
   static inline MachineType pointer_rep() {
-    return kPointerSize == 8 ? kMachineWord64 : kMachineWord32;
+    return kPointerSize == 8 ? rWord64 : rWord32;
   }
 
 #undef WORD_SIZE
 #undef UNOP
 #undef BINOP
 #undef OP1
 #undef SIMPLE
 
  private:
   Zone* zone_;
   MachineType word_;
 };
 }
 }
 }  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_MACHINE_OPERATOR_H_