[turbofan] Remove architecture-specific linkage files and LinkageTraits. Use...

[turbofan] Remove architecture-specific linkage files and LinkageTraits. Use macro-assembler-defined constants.

R=mstarzinger@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1272883003

Cr-Commit-Position: refs/heads/master@{#30063}

BUILD.gn

@@ -741,7 +741,6 @@ source_set("v8_base") {
     "src/compiler/js-typed-lowering.h",
     "src/compiler/jump-threading.cc",
     "src/compiler/jump-threading.h",
-    "src/compiler/linkage-impl.h",
     "src/compiler/linkage.cc",
     "src/compiler/linkage.h",
     "src/compiler/liveness-analyzer.cc",
@@ -1227,7 +1226,6 @@ source_set("v8_base") {
       "src/compiler/ia32/code-generator-ia32.cc",
       "src/compiler/ia32/instruction-codes-ia32.h",
       "src/compiler/ia32/instruction-selector-ia32.cc",
-      "src/compiler/ia32/linkage-ia32.cc",
       "src/debug/ia32/debug-ia32.cc",
       "src/full-codegen/ia32/full-codegen-ia32.cc",
       "src/ic/ia32/access-compiler-ia32.cc",
@@ -1265,7 +1263,6 @@ source_set("v8_base") {
       "src/compiler/x64/code-generator-x64.cc",
       "src/compiler/x64/instruction-codes-x64.h",
       "src/compiler/x64/instruction-selector-x64.cc",
-      "src/compiler/x64/linkage-x64.cc",
       "src/debug/x64/debug-x64.cc",
       "src/full-codegen/x64/full-codegen-x64.cc",
       "src/ic/x64/access-compiler-x64.cc",
@@ -1308,7 +1305,6 @@ source_set("v8_base") {
       "src/compiler/arm/code-generator-arm.cc",
       "src/compiler/arm/instruction-codes-arm.h",
       "src/compiler/arm/instruction-selector-arm.cc",
-      "src/compiler/arm/linkage-arm.cc",
       "src/debug/arm/debug-arm.cc",
       "src/full-codegen/arm/full-codegen-arm.cc",
       "src/ic/arm/access-compiler-arm.cc",
@@ -1361,7 +1357,6 @@ source_set("v8_base") {
       "src/compiler/arm64/code-generator-arm64.cc",
       "src/compiler/arm64/instruction-codes-arm64.h",
       "src/compiler/arm64/instruction-selector-arm64.cc",
-      "src/compiler/arm64/linkage-arm64.cc",
       "src/debug/arm64/debug-arm64.cc",
       "src/full-codegen/arm64/full-codegen-arm64.cc",
       "src/ic/arm64/access-compiler-arm64.cc",
@@ -1403,7 +1398,6 @@ source_set("v8_base") {
       "src/compiler/mips/code-generator-mips.cc",
       "src/compiler/mips/instruction-codes-mips.h",
       "src/compiler/mips/instruction-selector-mips.cc",
-      "src/compiler/mips/linkage-mips.cc",
       "src/debug/mips/debug-mips.cc",
       "src/full-codegen/mips/full-codegen-mips.cc",
       "src/ic/mips/access-compiler-mips.cc",

src/arm/macro-assembler-arm.h

@@ -13,6 +13,17 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+const Register kReturnRegister0 = {kRegister_r0_Code};
+const Register kReturnRegister1 = {kRegister_r1_Code};
+const Register kJSFunctionRegister = {kRegister_r1_Code};
+const Register kContextRegister = {kRegister_r7_Code};
+const Register kInterpreterBytecodeOffsetRegister = {kRegister_r5_Code};
+const Register kInterpreterBytecodeArrayRegister = {kRegister_r6_Code};
+const Register kInterpreterDispatchTableRegister = {kRegister_r8_Code};
+const Register kRuntimeCallFunctionRegister = {kRegister_r1_Code};
+const Register kRuntimeCallArgCountRegister = {kRegister_r0_Code};
+
 // ----------------------------------------------------------------------------
 // Static helper functions
 
@@ -26,15 +37,6 @@ inline MemOperand FieldMemOperand(Register object, int offset) {
 const Register cp = { kRegister_r7_Code };  // JavaScript context pointer.
 const Register pp = { kRegister_r8_Code };  // Constant pool pointer.
 const Register kRootRegister = { kRegister_r10_Code };  // Roots array pointer.
-const Register kInterpreterBytecodeOffsetRegister = {
-    kRegister_r5_Code  // Interpreter bytecode offset.
-};
-const Register kInterpreterBytecodeArrayRegister = {
-    kRegister_r6_Code  // Interpreter bytecode array pointer.
-};
-const Register kInterpreterDispatchTableRegister = {
-    kRegister_r8_Code  // Interpreter dispatch table.
-};
 
 // Flags used for AllocateHeapNumber
 enum TaggingMode {

src/arm64/assembler-arm64.h

@@ -400,9 +400,6 @@ ALIAS_REGISTER(Register, fp, x29);
 ALIAS_REGISTER(Register, lr, x30);
 ALIAS_REGISTER(Register, xzr, x31);
 ALIAS_REGISTER(Register, wzr, w31);
-ALIAS_REGISTER(Register, kInterpreterBytecodeOffsetRegister, x19);
-ALIAS_REGISTER(Register, kInterpreterBytecodeArrayRegister, x20);
-ALIAS_REGISTER(Register, kInterpreterDispatchTableRegister, x21);
 
 // Keeps the 0 double value.
 ALIAS_REGISTER(FPRegister, fp_zero, d15);

src/arm64/macro-assembler-arm64.h

@@ -34,6 +34,18 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+// TODO(titzer): arm64 is a pain for aliasing; get rid of these macros
+#define kReturnRegister0 x0
+#define kReturnRegister1 x1
+#define kJSFunctionRegister x1
+#define kContextRegister cp
+#define kInterpreterBytecodeOffsetRegister x19
+#define kInterpreterBytecodeArrayRegister x20
+#define kInterpreterDispatchTableRegister x21
+#define kRuntimeCallFunctionRegister x1
+#define kRuntimeCallArgCountRegister x0
+
 #define LS_MACRO_LIST(V)                                      \
   V(Ldrb, Register&, rt, LDRB_w)                              \
   V(Strb, Register&, rt, STRB_w)                              \

src/compiler/arm/linkage-arm.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct ArmLinkageHelperTraits {
-  static Register ReturnValueReg() { return r0; }
-  static Register ReturnValue2Reg() { return r1; }
-  static Register JSCallFunctionReg() { return r1; }
-  static Register ContextReg() { return cp; }
-  static Register InterpreterBytecodeOffsetReg() {
-    return kInterpreterBytecodeOffsetRegister;
-  }
-  static Register InterpreterBytecodeArrayReg() {
-    return kInterpreterBytecodeArrayRegister;
-  }
-  static Register InterpreterDispatchTableReg() {
-    return kInterpreterDispatchTableRegister;
-  }
-  static Register RuntimeCallFunctionReg() { return r1; }
-  static Register RuntimeCallArgCountReg() { return r0; }
-};
-
-
-typedef LinkageHelper<ArmLinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/compiler/arm64/linkage-arm64.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct Arm64LinkageHelperTraits {
-  static Register ReturnValueReg() { return x0; }
-  static Register ReturnValue2Reg() { return x1; }
-  static Register JSCallFunctionReg() { return x1; }
-  static Register ContextReg() { return cp; }
-  static Register InterpreterBytecodeOffsetReg() {
-    return kInterpreterBytecodeOffsetRegister;
-  }
-  static Register InterpreterBytecodeArrayReg() {
-    return kInterpreterBytecodeArrayRegister;
-  }
-  static Register InterpreterDispatchTableReg() {
-    return kInterpreterDispatchTableRegister;
-  }
-  static Register RuntimeCallFunctionReg() { return x1; }
-  static Register RuntimeCallArgCountReg() { return x0; }
-};
-
-
-typedef LinkageHelper<Arm64LinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/compiler/c-linkage.cc

@@ -14,32 +14,22 @@ namespace internal {
 namespace compiler {
 
 namespace {
-// Platform-specific configuration for C calling convention.
 LinkageLocation regloc(Register reg) {
   return LinkageLocation::ForRegister(Register::ToAllocationIndex(reg));
 }
 
 
-LinkageLocation stackloc(int i) {
-  DCHECK_LT(i, 0);
-  return LinkageLocation::ForCallerFrameSlot(i);
-}
-
-
+// Platform-specific configuration for C calling convention.
 #if V8_TARGET_ARCH_IA32
 // ===========================================================================
 // == ia32 ===================================================================
 // ===========================================================================
-#define RETURN_REGISTER_0 eax
-#define RETURN_REGISTER_1 edx
 #define CALLEE_SAVE_REGISTERS esi.bit() | edi.bit() | ebx.bit()
 
 #elif V8_TARGET_ARCH_X64
 // ===========================================================================
 // == x64 ====================================================================
 // ===========================================================================
-#define RETURN_REGISTER_0 rax
-#define RETURN_REGISTER_1 rdx
 
 #ifdef _WIN64
 // == x64 windows ============================================================
@@ -64,8 +54,6 @@ LinkageLocation stackloc(int i) {
 // ===========================================================================
 // == x87 ====================================================================
 // ===========================================================================
-#define RETURN_REGISTER_0 eax
-#define RETURN_REGISTER_1 edx
 #define CALLEE_SAVE_REGISTERS esi.bit() | edi.bit() | ebx.bit()
 
 #elif V8_TARGET_ARCH_ARM
@@ -73,8 +61,6 @@ LinkageLocation stackloc(int i) {
 // == arm ====================================================================
 // ===========================================================================
 #define PARAM_REGISTERS r0, r1, r2, r3
-#define RETURN_REGISTER_0 r0
-#define RETURN_REGISTER_1 r1
 #define CALLEE_SAVE_REGISTERS \
   r4.bit() | r5.bit() | r6.bit() | r7.bit() | r8.bit() | r9.bit() | r10.bit()
 #define CALLEE_SAVE_FP_REGISTERS                                  \
@@ -88,8 +74,6 @@ LinkageLocation stackloc(int i) {
 // == arm64 ====================================================================
 // ===========================================================================
 #define PARAM_REGISTERS x0, x1, x2, x3, x4, x5, x6, x7
-#define RETURN_REGISTER_0 x0
-#define RETURN_REGISTER_1 x1
 #define CALLEE_SAVE_REGISTERS                                     \
   (1 << x19.code()) | (1 << x20.code()) | (1 << x21.code()) |     \
       (1 << x22.code()) | (1 << x23.code()) | (1 << x24.code()) | \
@@ -107,8 +91,6 @@ LinkageLocation stackloc(int i) {
 // == mips ===================================================================
 // ===========================================================================
 #define PARAM_REGISTERS a0, a1, a2, a3
-#define RETURN_REGISTER_0 v0
-#define RETURN_REGISTER_1 v1
 #define CALLEE_SAVE_REGISTERS                                                  \
   s0.bit() | s1.bit() | s2.bit() | s3.bit() | s4.bit() | s5.bit() | s6.bit() | \
       s7.bit()
@@ -120,8 +102,6 @@ LinkageLocation stackloc(int i) {
 // == mips64 =================================================================
 // ===========================================================================
 #define PARAM_REGISTERS a0, a1, a2, a3, a4, a5, a6, a7
-#define RETURN_REGISTER_0 v0
-#define RETURN_REGISTER_1 v1
 #define CALLEE_SAVE_REGISTERS                                                  \
   s0.bit() | s1.bit() | s2.bit() | s3.bit() | s4.bit() | s5.bit() | s6.bit() | \
       s7.bit()
@@ -133,8 +113,6 @@ LinkageLocation stackloc(int i) {
 // == ppc & ppc64 ============================================================
 // ===========================================================================
 #define PARAM_REGISTERS r3, r4, r5, r6, r7, r8, r9, r10
-#define RETURN_REGISTER_0 r3
-#define RETURN_REGISTER_1 r4
 #define CALLEE_SAVE_REGISTERS                                                 \
   r14.bit() | r15.bit() | r16.bit() | r17.bit() | r18.bit() | r19.bit() |     \
       r20.bit() | r21.bit() | r22.bit() | r23.bit() | r24.bit() | r25.bit() | \
@@ -148,7 +126,7 @@ LinkageLocation stackloc(int i) {
 // ===========================================================================
 // == unknown ================================================================
 // ===========================================================================
-// Don't define anything. The below code will dynamically fail.
+#define UNSUPPORTED_C_LINKAGE 1
 #endif
 }  // namespace
 
@@ -173,22 +151,22 @@ CallDescriptor* Linkage::GetSimplifiedCDescriptor(
   }
 #endif
 
-#ifdef RETURN_REGISTER_0
+#ifdef UNSUPPORTED_C_LINKAGE
+  // This method should not be called on unknown architectures.
+  V8_Fatal(__FILE__, __LINE__,
+           "requested C call descriptor on unsupported architecture");
+  return nullptr;
+#endif
+
   // Add return location(s).
   CHECK(locations.return_count_ <= 2);
 
   if (locations.return_count_ > 0) {
-    locations.AddReturn(regloc(RETURN_REGISTER_0));
+    locations.AddReturn(regloc(kReturnRegister0));
   }
   if (locations.return_count_ > 1) {
-    locations.AddReturn(regloc(RETURN_REGISTER_1));
+    locations.AddReturn(regloc(kReturnRegister1));
   }
-#else
-  // This method should not be called on unknown architectures.
-  V8_Fatal(__FILE__, __LINE__,
-           "requested C call descriptor on unsupported architecture");
-  return nullptr;
-#endif
 
   const int parameter_count = static_cast<int>(msig->parameter_count());
 
@@ -211,7 +189,8 @@ CallDescriptor* Linkage::GetSimplifiedCDescriptor(
     if (i < kParamRegisterCount) {
       locations.AddParam(regloc(kParamRegisters[i]));
     } else {
-      locations.AddParam(stackloc(-1 - stack_offset));
+      locations.AddParam(
+          LinkageLocation::ForCallerFrameSlot(-1 - stack_offset));
       stack_offset++;
     }
   }

src/compiler/ia32/linkage-ia32.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct IA32LinkageHelperTraits {
-  static Register ReturnValueReg() { return eax; }
-  static Register ReturnValue2Reg() { return edx; }
-  static Register JSCallFunctionReg() { return edi; }
-  static Register ContextReg() { return esi; }
-  static Register InterpreterBytecodeOffsetReg() { return ecx; }
-  static Register InterpreterBytecodeArrayReg() { return edi; }
-  static Register InterpreterDispatchTableReg() { return ebx; }
-  static Register RuntimeCallFunctionReg() { return ebx; }
-  static Register RuntimeCallArgCountReg() { return eax; }
-};
-
-typedef LinkageHelper<IA32LinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/compiler/linkage.h

@@ -20,6 +20,8 @@ class CallInterfaceDescriptor;
 
 namespace compiler {
 
+const RegList kNoCalleeSaved = 0;
+
 class Node;
 class OsrHelper;
 

src/compiler/mips/linkage-mips.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct MipsLinkageHelperTraits {
-  static Register ReturnValueReg() { return v0; }
-  static Register ReturnValue2Reg() { return v1; }
-  static Register JSCallFunctionReg() { return a1; }
-  static Register ContextReg() { return cp; }
-  static Register InterpreterBytecodeOffsetReg() {
-    return kInterpreterBytecodeOffsetRegister;
-  }
-  static Register InterpreterBytecodeArrayReg() {
-    return kInterpreterBytecodeArrayRegister;
-  }
-  static Register InterpreterDispatchTableReg() {
-    return kInterpreterDispatchTableRegister;
-  }
-  static Register RuntimeCallFunctionReg() { return a1; }
-  static Register RuntimeCallArgCountReg() { return a0; }
-};
-
-
-typedef LinkageHelper<MipsLinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/compiler/mips64/linkage-mips64.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct MipsLinkageHelperTraits {
-  static Register ReturnValueReg() { return v0; }
-  static Register ReturnValue2Reg() { return v1; }
-  static Register JSCallFunctionReg() { return a1; }
-  static Register ContextReg() { return cp; }
-  static Register InterpreterBytecodeOffsetReg() {
-    return kInterpreterBytecodeOffsetRegister;
-  }
-  static Register InterpreterBytecodeArrayReg() {
-    return kInterpreterBytecodeArrayRegister;
-  }
-  static Register InterpreterDispatchTableReg() {
-    return kInterpreterDispatchTableRegister;
-  }
-  static Register RuntimeCallFunctionReg() { return a1; }
-  static Register RuntimeCallArgCountReg() { return a0; }
-};
-
-
-typedef LinkageHelper<MipsLinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/compiler/ppc/linkage-ppc.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct PPCLinkageHelperTraits {
-  static Register ReturnValueReg() { return r3; }
-  static Register ReturnValue2Reg() { return r4; }
-  static Register JSCallFunctionReg() { return r4; }
-  static Register ContextReg() { return cp; }
-  static Register InterpreterBytecodeOffsetReg() {
-    return kInterpreterBytecodeOffsetRegister;
-  }
-  static Register InterpreterBytecodeArrayReg() {
-    return kInterpreterBytecodeArrayRegister;
-  }
-  static Register InterpreterDispatchTableReg() {
-    return kInterpreterDispatchTableRegister;
-  }
-  static Register RuntimeCallFunctionReg() { return r4; }
-  static Register RuntimeCallArgCountReg() { return r3; }
-};
-
-
-typedef LinkageHelper<PPCLinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/compiler/x64/linkage-x64.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct X64LinkageHelperTraits {
-  static Register ReturnValueReg() { return rax; }
-  static Register ReturnValue2Reg() { return rdx; }
-  static Register JSCallFunctionReg() { return rdi; }
-  static Register ContextReg() { return rsi; }
-  static Register InterpreterBytecodeOffsetReg() { return r12; }
-  static Register InterpreterBytecodeArrayReg() { return r14; }
-  static Register InterpreterDispatchTableReg() { return r15; }
-  static Register RuntimeCallFunctionReg() { return rbx; }
-  static Register RuntimeCallArgCountReg() { return rax; }
-};
-
-typedef LinkageHelper<X64LinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/compiler/x87/linkage-x87.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/assembler.h"
-#include "src/code-stubs.h"
-#include "src/compiler/linkage.h"
-#include "src/compiler/linkage-impl.h"
-#include "src/zone.h"
-
-namespace v8 {
-namespace internal {
-namespace compiler {
-
-struct X87LinkageHelperTraits {
-  static Register ReturnValueReg() { return eax; }
-  static Register ReturnValue2Reg() { return edx; }
-  static Register JSCallFunctionReg() { return edi; }
-  static Register ContextReg() { return esi; }
-  static Register InterpreterBytecodeOffsetReg() { return ecx; }
-  static Register InterpreterBytecodeArrayReg() { return edi; }
-  static Register InterpreterDispatchTableReg() { return ebx; }
-  static Register RuntimeCallFunctionReg() { return ebx; }
-  static Register RuntimeCallArgCountReg() { return eax; }
-};
-
-typedef LinkageHelper<X87LinkageHelperTraits> LH;
-
-CallDescriptor* Linkage::GetJSCallDescriptor(Zone* zone, bool is_osr,
-                                             int parameter_count,
-                                             CallDescriptor::Flags flags) {
-  return LH::GetJSCallDescriptor(zone, is_osr, parameter_count, flags);
-}
-
-
-CallDescriptor* Linkage::GetRuntimeCallDescriptor(
-    Zone* zone, Runtime::FunctionId function, int parameter_count,
-    Operator::Properties properties) {
-  return LH::GetRuntimeCallDescriptor(zone, function, parameter_count,
-                                      properties);
-}
-
-
-CallDescriptor* Linkage::GetStubCallDescriptor(
-    Isolate* isolate, Zone* zone, const CallInterfaceDescriptor& descriptor,
-    int stack_parameter_count, CallDescriptor::Flags flags,
-    Operator::Properties properties, MachineType return_type) {
-  return LH::GetStubCallDescriptor(isolate, zone, descriptor,
-                                   stack_parameter_count, flags, properties,
-                                   return_type);
-}
-
-
-CallDescriptor* Linkage::GetInterpreterDispatchDescriptor(Zone* zone) {
-  return LH::GetInterpreterDispatchDescriptor(zone);
-}
-
-}  // namespace compiler
-}  // namespace internal
-}  // namespace v8

src/ia32/macro-assembler-ia32.h

@@ -13,6 +13,17 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+const Register kReturnRegister0 = {kRegister_eax_Code};
+const Register kReturnRegister1 = {kRegister_edx_Code};
+const Register kJSFunctionRegister = {kRegister_edi_Code};
+const Register kContextRegister = {kRegister_esi_Code};
+const Register kInterpreterBytecodeOffsetRegister = {kRegister_ecx_Code};
+const Register kInterpreterBytecodeArrayRegister = {kRegister_edi_Code};
+const Register kInterpreterDispatchTableRegister = {kRegister_ebx_Code};
+const Register kRuntimeCallFunctionRegister = {kRegister_ebx_Code};
+const Register kRuntimeCallArgCountRegister = {kRegister_eax_Code};
+
 // Convenience for platform-independent signatures.  We do not normally
 // distinguish memory operands from other operands on ia32.
 typedef Operand MemOperand;

src/mips/assembler-mips.h

@@ -332,9 +332,6 @@ const FPURegister f31 = { 31 };
 #define cp s7
 #define kLithiumScratchReg s3
 #define kLithiumScratchReg2 s4
-#define kInterpreterBytecodeOffsetRegister t4
-#define kInterpreterBytecodeArrayRegister t5
-#define kInterpreterDispatchTableRegister t6
 #define kLithiumScratchDouble f30
 #define kDoubleRegZero f28
 // Used on mips32r6 for compare operations.

src/mips/macro-assembler-mips.h

@@ -12,6 +12,17 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+const Register kReturnRegister0 = {kRegister_v0_Code};
+const Register kReturnRegister1 = {kRegister_v1_Code};
+const Register kJSFunctionRegister = {kRegister_a1_Code};
+const Register kContextRegister = {Register::kCpRegister};
+const Register kInterpreterBytecodeOffsetRegister = {kRegister_t4_Code};
+const Register kInterpreterBytecodeArrayRegister = {kRegister_t5_Code};
+const Register kInterpreterDispatchTableRegister = {kRegister_t6_Code};
+const Register kRuntimeCallFunctionRegister = {kRegister_a1_Code};
+const Register kRuntimeCallArgCountRegister = {kRegister_a0_Code};
+
 // Forward declaration.
 class JumpTarget;
 

src/mips64/assembler-mips64.h

@@ -324,9 +324,6 @@ const FPURegister f31 = { 31 };
 #define cp s7
 #define kLithiumScratchReg s3
 #define kLithiumScratchReg2 s4
-#define kInterpreterBytecodeOffsetRegister t0
-#define kInterpreterBytecodeArrayRegister t1
-#define kInterpreterDispatchTableRegister t2
 #define kLithiumScratchDouble f30
 #define kDoubleRegZero f28
 // Used on mips64r6 for compare operations.

src/mips64/macro-assembler-mips64.h

@@ -12,6 +12,17 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+const Register kReturnRegister0 = {kRegister_v0_Code};
+const Register kReturnRegister1 = {kRegister_v1_Code};
+const Register kJSFunctionRegister = {kRegister_a1_Code};
+const Register kContextRegister = {kRegister_s7_Code};
+const Register kInterpreterBytecodeOffsetRegister = {kRegister_t0_Code};
+const Register kInterpreterBytecodeArrayRegister = {kRegister_t1_Code};
+const Register kInterpreterDispatchTableRegister = {kRegister_t2_Code};
+const Register kRuntimeCallFunctionRegister = {kRegister_a1_Code};
+const Register kRuntimeCallArgCountRegister = {kRegister_a0_Code};
+
 // Forward declaration.
 class JumpTarget;
 

src/ppc/assembler-ppc.h

@@ -292,15 +292,6 @@ const Register fp = {kRegister_fp_Code};
 const Register cp = {kRegister_r30_Code};  // JavaScript context pointer
 const Register kRootRegister = {kRegister_r29_Code};  // Roots array pointer.
 const Register kConstantPoolRegister = {kRegister_r28_Code};  // Constant pool
-const Register kInterpreterBytecodeOffsetRegister = {
-    kRegister_r14_Code  // Interpreter bytecode offset.
-};
-const Register kInterpreterBytecodeArrayRegister = {
-    kRegister_r15_Code  // Interpreter bytecode array pointer.
-};
-const Register kInterpreterDispatchTableRegister = {
-    kRegister_r16_Code  // Interpreter dispatch table.
-};
 
 // Double word FP register.
 struct DoubleRegister {

src/ppc/macro-assembler-ppc.h

@@ -13,6 +13,17 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+const Register kReturnRegister0 = {kRegister_r3_Code};
+const Register kReturnRegister1 = {kRegister_r4_Code};
+const Register kJSFunctionRegister = {kRegister_r4_Code};
+const Register kContextRegister = {kRegister_r30_Code};
+const Register kInterpreterBytecodeOffsetRegister = {kRegister_r14_Code};
+const Register kInterpreterBytecodeArrayRegister = {kRegister_r15_Code};
+const Register kInterpreterDispatchTableRegister = {kRegister_r16_Code};
+const Register kRuntimeCallFunctionRegister = {kRegister_r4_Code};
+const Register kRuntimeCallArgCountRegister = {kRegister_r3_Code};
+
 // ----------------------------------------------------------------------------
 // Static helper functions
 

src/x64/macro-assembler-x64.h

@@ -14,6 +14,17 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+const Register kReturnRegister0 = {kRegister_rax_Code};
+const Register kReturnRegister1 = {kRegister_rdx_Code};
+const Register kJSFunctionRegister = {kRegister_rdi_Code};
+const Register kContextRegister = {kRegister_rsi_Code};
+const Register kInterpreterBytecodeOffsetRegister = {kRegister_r12_Code};
+const Register kInterpreterBytecodeArrayRegister = {kRegister_r14_Code};
+const Register kInterpreterDispatchTableRegister = {kRegister_r15_Code};
+const Register kRuntimeCallFunctionRegister = {kRegister_rbx_Code};
+const Register kRuntimeCallArgCountRegister = {kRegister_rax_Code};
+
 // Default scratch register used by MacroAssembler (and other code that needs
 // a spare register). The register isn't callee save, and not used by the
 // function calling convention.

src/x87/macro-assembler-x87.h

@@ -13,6 +13,17 @@
 namespace v8 {
 namespace internal {
 
+// Give alias names to registers for calling conventions.
+const Register kReturnRegister0 = {kRegister_eax_Code};
+const Register kReturnRegister1 = {kRegister_edx_Code};
+const Register kJSFunctionRegister = {kRegister_edi_Code};
+const Register kContextRegister = {kRegister_esi_Code};
+const Register kInterpreterBytecodeOffsetRegister = {kRegister_ecx_Code};
+const Register kInterpreterBytecodeArrayRegister = {kRegister_edi_Code};
+const Register kInterpreterDispatchTableRegister = {kRegister_ebx_Code};
+const Register kRuntimeCallFunctionRegister = {kRegister_ebx_Code};
+const Register kRuntimeCallArgCountRegister = {kRegister_eax_Code};
+
 // Convenience for platform-independent signatures.  We do not normally
 // distinguish memory operands from other operands on ia32.
 typedef Operand MemOperand;

tools/gyp/v8.gyp

@@ -532,7 +532,6 @@
         '../../src/compiler/js-typed-lowering.h',
         '../../src/compiler/jump-threading.cc',
         '../../src/compiler/jump-threading.h',
-        '../../src/compiler/linkage-impl.h',
         '../../src/compiler/linkage.cc',
         '../../src/compiler/linkage.h',
         '../../src/compiler/liveness-analyzer.cc',
@@ -1034,7 +1033,6 @@
             '../../src/compiler/arm/code-generator-arm.cc',
             '../../src/compiler/arm/instruction-codes-arm.h',
             '../../src/compiler/arm/instruction-selector-arm.cc',
-            '../../src/compiler/arm/linkage-arm.cc',
             '../../src/debug/arm/debug-arm.cc',
             '../../src/full-codegen/arm/full-codegen-arm.cc',
             '../../src/ic/arm/access-compiler-arm.cc',
@@ -1091,7 +1089,6 @@
             '../../src/compiler/arm64/code-generator-arm64.cc',
             '../../src/compiler/arm64/instruction-codes-arm64.h',
             '../../src/compiler/arm64/instruction-selector-arm64.cc',
-            '../../src/compiler/arm64/linkage-arm64.cc',
             '../../src/debug/arm64/debug-arm64.cc',
             '../../src/full-codegen/arm64/full-codegen-arm64.cc',
             '../../src/ic/arm64/access-compiler-arm64.cc',
@@ -1130,7 +1127,6 @@
             '../../src/compiler/ia32/code-generator-ia32.cc',
             '../../src/compiler/ia32/instruction-codes-ia32.h',
             '../../src/compiler/ia32/instruction-selector-ia32.cc',
-            '../../src/compiler/ia32/linkage-ia32.cc',
             '../../src/debug/ia32/debug-ia32.cc',
             '../../src/full-codegen/ia32/full-codegen-ia32.cc',
             '../../src/ic/ia32/access-compiler-ia32.cc',
@@ -1169,7 +1165,6 @@
             '../../src/compiler/x87/code-generator-x87.cc',
             '../../src/compiler/x87/instruction-codes-x87.h',
             '../../src/compiler/x87/instruction-selector-x87.cc',
-            '../../src/compiler/x87/linkage-x87.cc',
             '../../src/debug/x87/debug-x87.cc',
             '../../src/full-codegen/x87/full-codegen-x87.cc',
             '../../src/ic/x87/access-compiler-x87.cc',
@@ -1212,7 +1207,6 @@
             '../../src/compiler/mips/code-generator-mips.cc',
             '../../src/compiler/mips/instruction-codes-mips.h',
             '../../src/compiler/mips/instruction-selector-mips.cc',
-            '../../src/compiler/mips/linkage-mips.cc',
             '../../src/full-codegen/mips/full-codegen-mips.cc',
             '../../src/debug/mips/debug-mips.cc',
             '../../src/ic/mips/access-compiler-mips.cc',
@@ -1255,7 +1249,6 @@
             '../../src/compiler/mips64/code-generator-mips64.cc',
             '../../src/compiler/mips64/instruction-codes-mips64.h',
             '../../src/compiler/mips64/instruction-selector-mips64.cc',
-            '../../src/compiler/mips64/linkage-mips64.cc',
             '../../src/debug/mips64/debug-mips64.cc',
             '../../src/full-codegen/mips64/full-codegen-mips64.cc',
             '../../src/ic/mips64/access-compiler-mips64.cc',
@@ -1305,7 +1298,6 @@
             '../../src/compiler/x64/code-generator-x64.cc',
             '../../src/compiler/x64/instruction-codes-x64.h',
             '../../src/compiler/x64/instruction-selector-x64.cc',
-            '../../src/compiler/x64/linkage-x64.cc',
           ],
         }],
         ['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', {
@@ -1342,7 +1334,6 @@
             '../../src/compiler/ppc/code-generator-ppc.cc',
             '../../src/compiler/ppc/instruction-codes-ppc.h',
             '../../src/compiler/ppc/instruction-selector-ppc.cc',
-            '../../src/compiler/ppc/linkage-ppc.cc',
             '../../src/debug/ppc/debug-ppc.cc',
             '../../src/full-codegen/ppc/full-codegen-ppc.cc',
             '../../src/ic/ppc/access-compiler-ppc.cc',