Convert Linkage to use MachineSignature.

test/cctest/compiler/call-tester.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_CCTEST_COMPILER_CALL_TESTER_H_
 #define V8_CCTEST_COMPILER_CALL_TESTER_H_
 
 #include "src/v8.h"
 
 #include "src/simulator.h"
 
 #if V8_TARGET_ARCH_IA32
 #if __GNUC__
 #define V8_CDECL __attribute__((cdecl))
 #else
 #define V8_CDECL __cdecl
 #endif
 #else
 #define V8_CDECL
 #endif
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-// TODO(titzer): move MachineType selection for C types into machine-type.h
+// TODO(titzer): use c-signature.h instead of ReturnValueTraits
 template <typename R>
 struct ReturnValueTraits {
   static R Cast(uintptr_t r) { return reinterpret_cast<R>(r); }
   static MachineType Representation() {
     // TODO(dcarney): detect when R is of a subclass of Object* instead of this
     // type check.
     while (false) {
       *(static_cast<Object* volatile*>(0)) = static_cast<R>(0);
     }
     return kMachAnyTagged;
@@ skipping 86 matching lines @@
   static uintptr_t Cast(int* r) { return reinterpret_cast<uintptr_t>(r); }
 };
 
 template <typename T>
 struct ParameterTraits<T*> {
   static uintptr_t Cast(void* r) { return reinterpret_cast<uintptr_t>(r); }
 };
 
 class CallHelper {
  public:
-  explicit CallHelper(Isolate* isolate) : isolate_(isolate) { USE(isolate_); }
+  explicit CallHelper(Isolate* isolate, MachineSignature* machine_sig)
+      : machine_sig_(machine_sig), isolate_(isolate) {
+    USE(isolate_);
+  }
   virtual ~CallHelper() {}
 
-  static MachineCallDescriptorBuilder* ToCallDescriptorBuilder(
+  static MachineSignature* MakeMachineSignature(
       Zone* zone, MachineType return_type, MachineType p0 = kMachNone,
       MachineType p1 = kMachNone, MachineType p2 = kMachNone,
       MachineType p3 = kMachNone, MachineType p4 = kMachNone) {
-    const int kSize = 5;
-    MachineType* params = zone->NewArray<MachineType>(kSize);
-    params[0] = p0;
-    params[1] = p1;
-    params[2] = p2;
-    params[3] = p3;
-    params[4] = p4;
-    int parameter_count = 0;
-    for (int i = 0; i < kSize; ++i) {
-      if (params[i] == kMachNone) {
-        break;
-      }
-      parameter_count++;
+    // Count the number of parameters.
+    int param_count = 5;

[Benedikt Meurer, 2014/09/02 08:37:42]

Nit: size_t

[titzer, 2014/09/02 12:13:53]

Done.

+    MachineType types[] = {p0, p1, p2, p3, p4};
+    for (int i = param_count - 1; i >= 0; i--) {

[Benedikt Meurer, 2014/09/02 08:37:42]

for (; param_count != 0 && types[param_count - 1] == kMachNone; --param_count) 
  ;

[titzer, 2014/09/02 12:13:53]

Done.

+      if (types[i] == kMachNone) param_count = i;
     }
-    return new (zone)
-        MachineCallDescriptorBuilder(return_type, parameter_count, params);
+    int return_count = return_type == kMachNone ? 0 : 1;

[Benedikt Meurer, 2014/09/02 08:37:42]

size_t

[titzer, 2014/09/02 12:13:53]

Done.

+
+    // Build the machine signature.
+    MachineSignature::Builder builder(zone, return_count, param_count);
+    if (return_count > 0) builder.AddReturn(return_type);
+    for (int i = 0; i < param_count; i++) {

[Benedikt Meurer, 2014/09/02 08:37:42]

size_t

[titzer, 2014/09/02 12:13:53]

Done.

+      builder.AddParam(types[i]);
+    }
+    return builder.Build();
   }
 
  protected:
-  virtual void VerifyParameters(int parameter_count,
-                                MachineType* parameters) = 0;
+  MachineSignature* machine_sig_;
+  void VerifyParameters(int parameter_count, MachineType* parameter_types) {

[Benedikt Meurer, 2014/09/02 08:37:42]

size_t

+    CHECK_EQ(machine_sig_->ParamCount(), parameter_count);
+    for (int i = 0; i < parameter_count; i++) {

[Benedikt Meurer, 2014/09/02 08:37:42]

size_t

+      CHECK_EQ(machine_sig_->GetParam(i), parameter_types[i]);
+    }
+  }
   virtual byte* Generate() = 0;
 
  private:
 #if USE_SIMULATOR && V8_TARGET_ARCH_ARM64
   uintptr_t CallSimulator(byte* f, Simulator::CallArgument* args) {
     Simulator* simulator = Simulator::current(isolate_);
     return static_cast<uintptr_t>(simulator->CallInt64(f, args));
   }
 
   template <typename R, typename F>
@@ skipping 207 matching lines @@
 
  private:
   CallHelper* helper() { return static_cast<C*>(this); }
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CCTEST_COMPILER_CALL_TESTER_H_