Unify MachineType and RepType.

test/cctest/compiler/codegen-tester.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 "src/v8.h"
 
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
 #include "test/cctest/compiler/value-helper.h"
 
@@ skipping 275 matching lines @@
 
 
 void Int32BinopInputShapeTester::TestAllInputShapes() {
   std::vector<int32_t> inputs = ValueHelper::int32_vector();
   int num_int_inputs = static_cast<int>(inputs.size());
   if (num_int_inputs > 16) num_int_inputs = 16;  // limit to 16 inputs
 
   for (int i = -2; i < num_int_inputs; i++) {    // for all left shapes
     for (int j = -2; j < num_int_inputs; j++) {  // for all right shapes
       if (i >= 0 && j >= 0) break;               // No constant/constant combos
-      RawMachineAssemblerTester<int32_t> m(kMachineWord32, kMachineWord32);
+      RawMachineAssemblerTester<int32_t> m(kMachInt32, kMachInt32);
       Node* p0 = m.Parameter(0);
       Node* p1 = m.Parameter(1);
       Node* n0;
       Node* n1;
 
       // left = Parameter | Load | Constant
       if (i == -2) {
         n0 = p0;
       } else if (i == -1) {
-        n0 = m.LoadFromPointer(&input_a, kMachineWord32);
+        n0 = m.LoadFromPointer(&input_a, kMachInt32);
       } else {
         n0 = m.Int32Constant(inputs[i]);
       }
 
       // right = Parameter | Load | Constant
       if (j == -2) {
         n1 = p1;
       } else if (j == -1) {
-        n1 = m.LoadFromPointer(&input_b, kMachineWord32);
+        n1 = m.LoadFromPointer(&input_b, kMachInt32);
       } else {
         n1 = m.Int32Constant(inputs[j]);
       }
 
       gen->gen(&m, n0, n1);
 
       if (false) printf("Int32BinopInputShapeTester i=%d, j=%d\n", i, j);
       if (i >= 0) {
         input_a = inputs[i];
         RunRight(&m);
@@ skipping 37 matching lines @@
   FOR_UINT32_INPUTS(i) {
     input_b = *i;
     int32_t expect = gen->expected(input_a, input_b);
     if (false) printf("  cmp(a=%d, b=%d) ?== %d\n", input_a, input_b, expect);
     CHECK_EQ(expect, m->Call(input_a, input_b));
   }
 }
 
 
 TEST(ParametersEqual) {
-  RawMachineAssemblerTester<int32_t> m(kMachineWord32, kMachineWord32);
+  RawMachineAssemblerTester<int32_t> m(kMachInt32, kMachInt32);
   Node* p1 = m.Parameter(1);
   CHECK_NE(NULL, p1);
   Node* p0 = m.Parameter(0);
   CHECK_NE(NULL, p0);
   CHECK_EQ(p0, m.Parameter(0));
   CHECK_EQ(p1, m.Parameter(1));
 }
 
 
 #if V8_TURBOFAN_TARGET
@@ skipping 95 matching lines @@
 TEST(RunHeapNumberConstant) {
   RawMachineAssemblerTester<Object*> m;
   Handle<Object> number = m.isolate()->factory()->NewHeapNumber(100.5);
   m.Return(m.HeapConstant(number));
   Object* result = m.Call();
   CHECK_EQ(result, *number);
 }
 
 
 TEST(RunParam1) {
-  RawMachineAssemblerTester<int32_t> m(kMachineWord32);
+  RawMachineAssemblerTester<int32_t> m(kMachInt32);
   m.Return(m.Parameter(0));
 
   FOR_INT32_INPUTS(i) {
     int32_t result = m.Call(*i);
     CHECK_EQ(*i, result);
   }
 }
 
 
 TEST(RunParam2_1) {
-  RawMachineAssemblerTester<int32_t> m(kMachineWord32, kMachineWord32);
+  RawMachineAssemblerTester<int32_t> m(kMachInt32, kMachInt32);
   Node* p0 = m.Parameter(0);
   Node* p1 = m.Parameter(1);
   m.Return(p0);
   USE(p1);
 
   FOR_INT32_INPUTS(i) {
     int32_t result = m.Call(*i, -9999);
     CHECK_EQ(*i, result);
   }
 }
 
 
 TEST(RunParam2_2) {
-  RawMachineAssemblerTester<int32_t> m(kMachineWord32, kMachineWord32);
+  RawMachineAssemblerTester<int32_t> m(kMachInt32, kMachInt32);
   Node* p0 = m.Parameter(0);
   Node* p1 = m.Parameter(1);
   m.Return(p1);
   USE(p0);
 
   FOR_INT32_INPUTS(i) {
     int32_t result = m.Call(-7777, *i);
     CHECK_EQ(*i, result);
   }
 }
 
 
 TEST(RunParam3) {
   for (int i = 0; i < 3; i++) {
-    RawMachineAssemblerTester<int32_t> m(kMachineWord32, kMachineWord32,
-                                         kMachineWord32);
+    RawMachineAssemblerTester<int32_t> m(kMachInt32, kMachInt32, kMachInt32);
     Node* nodes[] = {m.Parameter(0), m.Parameter(1), m.Parameter(2)};
     m.Return(nodes[i]);
 
     int p[] = {-99, -77, -88};
     FOR_INT32_INPUTS(j) {
       p[i] = *j;
       int32_t result = m.Call(p[0], p[1], p[2]);
       CHECK_EQ(*j, result);
     }
   }
@@ skipping 28 matching lines @@
   {
     RawMachineAssemblerTester<int32_t> m;
     Float64BinopTester bt(&m);
     bt.AddReturn(bt.param1);
 
     FOR_FLOAT64_INPUTS(i) { CHECK_EQ(*i, bt.call(-11.25, *i)); }
   }
 }
 
 #endif  // V8_TURBOFAN_TARGET