[turbofan] Make MachineType a pair of enums.

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 "test/cctest/cctest.h"
 #include "test/cctest/compiler/codegen-tester.h"
 #include "test/cctest/compiler/value-helper.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 273 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(kMachInt32, kMachInt32);
+      RawMachineAssemblerTester<int32_t> m(MachineType::Int32(),
+                                           MachineType::Int32());
       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, kMachInt32);
+        n0 = m.LoadFromPointer(&input_a, MachineType::Int32());
       } else {
         n0 = m.Int32Constant(inputs[i]);
       }
 
       // right = Parameter | Load | Constant
       if (j == -2) {
         n1 = p1;
       } else if (j == -1) {
-        n1 = m.LoadFromPointer(&input_b, kMachInt32);
+        n1 = m.LoadFromPointer(&input_b, MachineType::Int32());
       } 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(kMachInt32, kMachInt32);
+  RawMachineAssemblerTester<int32_t> m(MachineType::Int32(),
+                                       MachineType::Int32());
   Node* p1 = m.Parameter(1);
   CHECK(p1);
   Node* p0 = m.Parameter(0);
   CHECK(p0);
   CHECK_EQ(p0, m.Parameter(0));
   CHECK_EQ(p1, m.Parameter(1));
 }
 
 
 void RunSmiConstant(int32_t v) {
@@ skipping 93 matching lines @@
 TEST(RunHeapNumberConstant) {
   RawMachineAssemblerTester<HeapObject*> m;
   Handle<HeapObject> number = m.isolate()->factory()->NewHeapNumber(100.5);
   m.Return(m.HeapConstant(number));
   HeapObject* result = m.Call();
   CHECK_EQ(result, *number);
 }
 
 
 TEST(RunParam1) {
-  RawMachineAssemblerTester<int32_t> m(kMachInt32);
+  RawMachineAssemblerTester<int32_t> m(MachineType::Int32());
   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(kMachInt32, kMachInt32);
+  RawMachineAssemblerTester<int32_t> m(MachineType::Int32(),
+                                       MachineType::Int32());
   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(kMachInt32, kMachInt32);
+  RawMachineAssemblerTester<int32_t> m(MachineType::Int32(),
+                                       MachineType::Int32());
   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(kMachInt32, kMachInt32, kMachInt32);
+    RawMachineAssemblerTester<int32_t> m(
+        MachineType::Int32(), MachineType::Int32(), MachineType::Int32());
     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 37 matching lines @@
 
 #if V8_TARGET_ARCH_64_BIT
 // TODO(ahaas): run int64 tests on all platforms when supported.
 TEST(RunBufferedRawMachineAssemblerTesterTester) {
   {
     BufferedRawMachineAssemblerTester<int64_t> m;
     m.Return(m.Int64Constant(0x12500000000));
     CHECK_EQ(0x12500000000, m.Call());
   }
   {
-    BufferedRawMachineAssemblerTester<double> m(kMachFloat64);
+    BufferedRawMachineAssemblerTester<double> m(MachineType::Float64());
     m.Return(m.Parameter(0));
     FOR_FLOAT64_INPUTS(i) { CheckDoubleEq(*i, m.Call(*i)); }
   }
   {
-    BufferedRawMachineAssemblerTester<int64_t> m(kMachInt64, kMachInt64);
+    BufferedRawMachineAssemblerTester<int64_t> m(MachineType::Int64(),
+                                                 MachineType::Int64());
     m.Return(m.Int64Add(m.Parameter(0), m.Parameter(1)));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         CHECK_EQ(*i + *j, m.Call(*i, *j));
         CHECK_EQ(*j + *i, m.Call(*j, *i));
       }
     }
   }
   {
-    BufferedRawMachineAssemblerTester<int64_t> m(kMachInt64, kMachInt64,
-                                                 kMachInt64);
+    BufferedRawMachineAssemblerTester<int64_t> m(
+        MachineType::Int64(), MachineType::Int64(), MachineType::Int64());
     m.Return(
         m.Int64Add(m.Int64Add(m.Parameter(0), m.Parameter(1)), m.Parameter(2)));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         CHECK_EQ(*i + *i + *j, m.Call(*i, *i, *j));
         CHECK_EQ(*i + *j + *i, m.Call(*i, *j, *i));
         CHECK_EQ(*j + *i + *i, m.Call(*j, *i, *i));
       }
     }
   }
   {
-    BufferedRawMachineAssemblerTester<int64_t> m(kMachInt64, kMachInt64,
-                                                 kMachInt64, kMachInt64);
+    BufferedRawMachineAssemblerTester<int64_t> m(
+        MachineType::Int64(), MachineType::Int64(), MachineType::Int64(),
+        MachineType::Int64());
     m.Return(m.Int64Add(
         m.Int64Add(m.Int64Add(m.Parameter(0), m.Parameter(1)), m.Parameter(2)),
         m.Parameter(3)));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         CHECK_EQ(*i + *i + *i + *j, m.Call(*i, *i, *i, *j));
         CHECK_EQ(*i + *i + *j + *i, m.Call(*i, *i, *j, *i));
         CHECK_EQ(*i + *j + *i + *i, m.Call(*i, *j, *i, *i));
         CHECK_EQ(*j + *i + *i + *i, m.Call(*j, *i, *i, *i));
       }
     }
   }
   {
     BufferedRawMachineAssemblerTester<void> m;
     int64_t result;
     m.Store(MachineTypeForC<int64_t>(), m.PointerConstant(&result),
             m.Int64Constant(0x12500000000), kNoWriteBarrier);
     m.Return(m.Int32Constant(0));
     m.Call();
     CHECK_EQ(0x12500000000, result);
   }
   {
-    BufferedRawMachineAssemblerTester<void> m(kMachFloat64);
+    BufferedRawMachineAssemblerTester<void> m(MachineType::Float64());
     double result;
     m.Store(MachineTypeForC<double>(), m.PointerConstant(&result),
             m.Parameter(0), kNoWriteBarrier);
     m.Return(m.Int32Constant(0));
     FOR_FLOAT64_INPUTS(i) {
       m.Call(*i);
       CheckDoubleEq(*i, result);
     }
   }
   {
-    BufferedRawMachineAssemblerTester<void> m(kMachInt64, kMachInt64);
+    BufferedRawMachineAssemblerTester<void> m(MachineType::Int64(),
+                                              MachineType::Int64());
     int64_t result;
     m.Store(MachineTypeForC<int64_t>(), m.PointerConstant(&result),
             m.Int64Add(m.Parameter(0), m.Parameter(1)), kNoWriteBarrier);
     m.Return(m.Int32Constant(0));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         m.Call(*i, *j);
         CHECK_EQ(*i + *j, result);
 
         m.Call(*j, *i);
         CHECK_EQ(*j + *i, result);
       }
     }
   }
   {
-    BufferedRawMachineAssemblerTester<void> m(kMachInt64, kMachInt64,
-                                              kMachInt64);
+    BufferedRawMachineAssemblerTester<void> m(
+        MachineType::Int64(), MachineType::Int64(), MachineType::Int64());
     int64_t result;
     m.Store(
         MachineTypeForC<int64_t>(), m.PointerConstant(&result),
         m.Int64Add(m.Int64Add(m.Parameter(0), m.Parameter(1)), m.Parameter(2)),
         kNoWriteBarrier);
     m.Return(m.Int32Constant(0));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         m.Call(*i, *i, *j);
         CHECK_EQ(*i + *i + *j, result);
 
         m.Call(*i, *j, *i);
         CHECK_EQ(*i + *j + *i, result);
 
         m.Call(*j, *i, *i);
         CHECK_EQ(*j + *i + *i, result);
       }
     }
   }
   {
-    BufferedRawMachineAssemblerTester<void> m(kMachInt64, kMachInt64,
-                                              kMachInt64, kMachInt64);
+    BufferedRawMachineAssemblerTester<void> m(
+        MachineType::Int64(), MachineType::Int64(), MachineType::Int64(),
+        MachineType::Int64());
     int64_t result;
     m.Store(MachineTypeForC<int64_t>(), m.PointerConstant(&result),
             m.Int64Add(m.Int64Add(m.Int64Add(m.Parameter(0), m.Parameter(1)),
                                   m.Parameter(2)),
                        m.Parameter(3)),
             kNoWriteBarrier);
     m.Return(m.Int32Constant(0));
     FOR_INT64_INPUTS(i) {
       FOR_INT64_INPUTS(j) {
         m.Call(*i, *i, *i, *j);
         CHECK_EQ(*i + *i + *i + *j, result);
 
         m.Call(*i, *i, *j, *i);
         CHECK_EQ(*i + *i + *j + *i, result);
 
         m.Call(*i, *j, *i, *i);
         CHECK_EQ(*i + *j + *i + *i, result);
 
         m.Call(*j, *i, *i, *i);
         CHECK_EQ(*j + *i + *i + *i, result);
       }
     }
   }
 }
 
 #endif
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8