Unify MachineType and RepType.

test/compiler-unittests/arm64/instruction-selector-arm64-unittest.cc

 // 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.
 
 #include <list>
 
 #include "test/compiler-unittests/instruction-selector-unittest.h"
 
 #include "test/cctest/compiler/instruction-selector-tester.h"
 
@@ skipping 59 matching lines @@
     {&RawMachineAssembler::Int64Div, "Int64Div", kArm64Idiv},
     {&RawMachineAssembler::Int32UDiv, "Int32UDiv", kArm64Udiv32},
     {&RawMachineAssembler::Int64UDiv, "Int64UDiv", kArm64Udiv}};
 
 }  // namespace
 
 
 // TODO(all): Use TEST_P, see instruction-selector-arm-unittest.cc.
 TEST_F(InstructionSelectorTest, LogicalWithParameter) {
   TRACED_FOREACH(DPI, dpi, kLogicalInstructions) {
-    StreamBuilder m(this, kMachineWord32, kMachineWord32, kMachineWord32);
+    StreamBuilder m(this, kMachInt32, kMachInt32, kMachInt32);
     m.Return((m.*dpi.constructor)(m.Parameter(0), m.Parameter(1)));
     Stream s = m.Build();
     ASSERT_EQ(1U, s.size());
     EXPECT_EQ(dpi.arch_opcode, s[0]->arch_opcode());
   }
 }
 
 
 // TODO(all): Use TEST_P, see instruction-selector-arm-unittest.cc.
 TEST_F(InstructionSelectorTest, AddSubWithParameter) {
   TRACED_FOREACH(DPI, dpi, kAddSubInstructions) {
-    StreamBuilder m(this, kMachineWord32, kMachineWord32, kMachineWord32);
+    StreamBuilder m(this, kMachInt32, kMachInt32, kMachInt32);
     m.Return((m.*dpi.constructor)(m.Parameter(0), m.Parameter(1)));
     Stream s = m.Build();
     ASSERT_EQ(1U, s.size());
     EXPECT_EQ(dpi.arch_opcode, s[0]->arch_opcode());
   }
 }
 
 
 // TODO(all): Use TEST_P, see instruction-selector-arm-unittest.cc.
 TEST_F(InstructionSelectorTest, AddSubWithImmediate) {
   AddSubImmediates immediates;
   TRACED_FOREACH(DPI, dpi, kAddSubInstructions) {
     for (AddSubImmediates::const_iterator j = immediates.begin();
          j != immediates.end(); ++j) {
       int32_t imm = *j;
       SCOPED_TRACE(::testing::Message() << "imm = " << imm);
-      StreamBuilder m(this, kMachineWord32, kMachineWord32);
+      StreamBuilder m(this, kMachInt32, kMachInt32);
       m.Return((m.*dpi.constructor)(m.Parameter(0), m.Int32Constant(imm)));
       Stream s = m.Build();
       ASSERT_EQ(1U, s.size());
       EXPECT_EQ(dpi.arch_opcode, s[0]->arch_opcode());
       EXPECT_TRUE(s[0]->InputAt(1)->IsImmediate());
     }
   }
 }
 
 
 // TODO(all): Use TEST_P, see instruction-selector-arm-unittest.cc.
 TEST_F(InstructionSelectorTest, MulDivWithParameter) {
   TRACED_FOREACH(DPI, dpi, kMulDivInstructions) {
-    StreamBuilder m(this, kMachineWord32, kMachineWord32, kMachineWord32);
+    StreamBuilder m(this, kMachInt32, kMachInt32, kMachInt32);
     m.Return((m.*dpi.constructor)(m.Parameter(0), m.Parameter(1)));
     Stream s = m.Build();
     ASSERT_EQ(1U, s.size());
     EXPECT_EQ(dpi.arch_opcode, s[0]->arch_opcode());
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8