Commit ef1031be authored by Igor Sheludko's avatar Igor Sheludko Committed by Commit Bot

Remove unused PlatformInterfaceDescriptor.

Bug: v8:7754
Change-Id: I5de3f1fb1c1c44312238c05f53257ca75136d093
Reviewed-on: https://chromium-review.googlesource.com/1109690
Commit-Queue: Igor Sheludko <ishell@chromium.org>
Reviewed-by: 's avatarClemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53912}
parent 0f5a0719
...@@ -2592,7 +2592,6 @@ v8_source_set("v8_base") { ...@@ -2592,7 +2592,6 @@ v8_source_set("v8_base") {
"src/arm/frame-constants-arm.cc", "src/arm/frame-constants-arm.cc",
"src/arm/frame-constants-arm.h", "src/arm/frame-constants-arm.h",
"src/arm/interface-descriptors-arm.cc", "src/arm/interface-descriptors-arm.cc",
"src/arm/interface-descriptors-arm.h",
"src/arm/macro-assembler-arm.cc", "src/arm/macro-assembler-arm.cc",
"src/arm/macro-assembler-arm.h", "src/arm/macro-assembler-arm.h",
"src/arm/simulator-arm.cc", "src/arm/simulator-arm.cc",
...@@ -2633,7 +2632,6 @@ v8_source_set("v8_base") { ...@@ -2633,7 +2632,6 @@ v8_source_set("v8_base") {
"src/arm64/instrument-arm64.cc", "src/arm64/instrument-arm64.cc",
"src/arm64/instrument-arm64.h", "src/arm64/instrument-arm64.h",
"src/arm64/interface-descriptors-arm64.cc", "src/arm64/interface-descriptors-arm64.cc",
"src/arm64/interface-descriptors-arm64.h",
"src/arm64/macro-assembler-arm64-inl.h", "src/arm64/macro-assembler-arm64-inl.h",
"src/arm64/macro-assembler-arm64.cc", "src/arm64/macro-assembler-arm64.cc",
"src/arm64/macro-assembler-arm64.h", "src/arm64/macro-assembler-arm64.h",
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "src/arm/interface-descriptors-arm.h"
#if V8_TARGET_ARCH_ARM #if V8_TARGET_ARCH_ARM
#include "src/interface-descriptors.h" #include "src/interface-descriptors.h"
...@@ -180,7 +178,7 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -180,7 +178,7 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
...@@ -197,32 +195,24 @@ void BinaryOpDescriptor::InitializePlatformSpecific( ...@@ -197,32 +195,24 @@ void BinaryOpDescriptor::InitializePlatformSpecific(
void ArgumentAdaptorDescriptor::InitializePlatformSpecific( void ArgumentAdaptorDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
static PlatformInterfaceDescriptor default_descriptor =
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS);
Register registers[] = { Register registers[] = {
r1, // JSFunction r1, // JSFunction
r3, // the new target r3, // the new target
r0, // actual number of arguments r0, // actual number of arguments
r2, // expected number of arguments r2, // expected number of arguments
}; };
data->InitializePlatformSpecific(arraysize(registers), registers, data->InitializePlatformSpecific(arraysize(registers), registers);
&default_descriptor);
} }
void ApiCallbackDescriptor::InitializePlatformSpecific( void ApiCallbackDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
static PlatformInterfaceDescriptor default_descriptor =
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS);
Register registers[] = { Register registers[] = {
JavaScriptFrame::context_register(), // callee context JavaScriptFrame::context_register(), // callee context
r4, // call_data r4, // call_data
r2, // holder r2, // holder
r1, // api_function_address r1, // api_function_address
}; };
data->InitializePlatformSpecific(arraysize(registers), registers, data->InitializePlatformSpecific(arraysize(registers), registers);
&default_descriptor);
} }
void InterpreterDispatchDescriptor::InitializePlatformSpecific( void InterpreterDispatchDescriptor::InitializePlatformSpecific(
......
// Copyright 2012 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_ARM_INTERFACE_DESCRIPTORS_ARM_H_
#define V8_ARM_INTERFACE_DESCRIPTORS_ARM_H_
#include "src/interface-descriptors.h"
namespace v8 {
namespace internal {
class PlatformInterfaceDescriptor {
public:
explicit PlatformInterfaceDescriptor(TargetAddressStorageMode storage_mode)
: storage_mode_(storage_mode) {}
TargetAddressStorageMode storage_mode() { return storage_mode_; }
private:
TargetAddressStorageMode storage_mode_;
};
} // namespace internal
} // namespace v8
#endif // V8_ARM_INTERFACE_DESCRIPTORS_ARM_H_
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "src/arm64/interface-descriptors-arm64.h"
#if V8_TARGET_ARCH_ARM64 #if V8_TARGET_ARCH_ARM64
#include "src/interface-descriptors.h" #include "src/interface-descriptors.h"
...@@ -181,7 +179,7 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -181,7 +179,7 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
...@@ -202,32 +200,24 @@ void BinaryOpDescriptor::InitializePlatformSpecific( ...@@ -202,32 +200,24 @@ void BinaryOpDescriptor::InitializePlatformSpecific(
void ArgumentAdaptorDescriptor::InitializePlatformSpecific( void ArgumentAdaptorDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
static PlatformInterfaceDescriptor default_descriptor =
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS);
Register registers[] = { Register registers[] = {
x1, // JSFunction x1, // JSFunction
x3, // the new target x3, // the new target
x0, // actual number of arguments x0, // actual number of arguments
x2, // expected number of arguments x2, // expected number of arguments
}; };
data->InitializePlatformSpecific(arraysize(registers), registers, data->InitializePlatformSpecific(arraysize(registers), registers);
&default_descriptor);
} }
void ApiCallbackDescriptor::InitializePlatformSpecific( void ApiCallbackDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
static PlatformInterfaceDescriptor default_descriptor =
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS);
Register registers[] = { Register registers[] = {
JavaScriptFrame::context_register(), // callee context JavaScriptFrame::context_register(), // callee context
x4, // call_data x4, // call_data
x2, // holder x2, // holder
x1, // api_function_address x1, // api_function_address
}; };
data->InitializePlatformSpecific(arraysize(registers), registers, data->InitializePlatformSpecific(arraysize(registers), registers);
&default_descriptor);
} }
void InterpreterDispatchDescriptor::InitializePlatformSpecific( void InterpreterDispatchDescriptor::InitializePlatformSpecific(
......
// Copyright 2012 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_ARM64_INTERFACE_DESCRIPTORS_ARM64_H_
#define V8_ARM64_INTERFACE_DESCRIPTORS_ARM64_H_
#include "src/interface-descriptors.h"
namespace v8 {
namespace internal {
class PlatformInterfaceDescriptor {
public:
explicit PlatformInterfaceDescriptor(TargetAddressStorageMode storage_mode)
: storage_mode_(storage_mode) {}
TargetAddressStorageMode storage_mode() { return storage_mode_; }
private:
TargetAddressStorageMode storage_mode_;
};
} // namespace internal
} // namespace v8
#endif // V8_ARM64_INTERFACE_DESCRIPTORS_ARM64_H_
...@@ -68,13 +68,13 @@ const Register TypeConversionDescriptor::ArgumentRegister() { return eax; } ...@@ -68,13 +68,13 @@ const Register TypeConversionDescriptor::ArgumentRegister() { return eax; }
void TypeofDescriptor::InitializePlatformSpecific( void TypeofDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {ebx}; Register registers[] = {ebx};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void CallFunctionDescriptor::InitializePlatformSpecific( void CallFunctionDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {edi}; Register registers[] = {edi};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void CallTrampolineDescriptor::InitializePlatformSpecific( void CallTrampolineDescriptor::InitializePlatformSpecific(
...@@ -180,19 +180,19 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -180,19 +180,19 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
// register state // register state
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {edx, eax}; Register registers[] = {edx, eax};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void BinaryOpDescriptor::InitializePlatformSpecific( void BinaryOpDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {edx, eax}; Register registers[] = {edx, eax};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void ArgumentAdaptorDescriptor::InitializePlatformSpecific( void ArgumentAdaptorDescriptor::InitializePlatformSpecific(
......
...@@ -7,11 +7,8 @@ ...@@ -7,11 +7,8 @@
namespace v8 { namespace v8 {
namespace internal { namespace internal {
void CallInterfaceDescriptorData::InitializePlatformSpecific( void CallInterfaceDescriptorData::InitializePlatformSpecific(
int register_parameter_count, const Register* registers, int register_parameter_count, const Register* registers) {
PlatformInterfaceDescriptor* platform_descriptor) {
platform_specific_descriptor_ = platform_descriptor;
register_param_count_ = register_parameter_count; register_param_count_ = register_parameter_count;
// InterfaceDescriptor owns a copy of the registers array. // InterfaceDescriptor owns a copy of the registers array.
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
namespace v8 { namespace v8 {
namespace internal { namespace internal {
class PlatformInterfaceDescriptor;
#define INTERFACE_DESCRIPTOR_LIST(V) \ #define INTERFACE_DESCRIPTOR_LIST(V) \
V(Allocate) \ V(Allocate) \
V(Void) \ V(Void) \
...@@ -81,9 +79,8 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData { ...@@ -81,9 +79,8 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData {
// A copy of the passed in registers and param_representations is made // A copy of the passed in registers and param_representations is made
// and owned by the CallInterfaceDescriptorData. // and owned by the CallInterfaceDescriptorData.
void InitializePlatformSpecific( void InitializePlatformSpecific(int register_parameter_count,
int register_parameter_count, const Register* registers, const Register* registers);
PlatformInterfaceDescriptor* platform_descriptor = nullptr);
// if machine_types is null, then an array of size // if machine_types is null, then an array of size
// (return_count + parameter_count) will be created with // (return_count + parameter_count) will be created with
...@@ -117,9 +114,6 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData { ...@@ -117,9 +114,6 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData {
DCHECK_LT(index, param_count_); DCHECK_LT(index, param_count_);
return machine_types_[return_count_ + index]; return machine_types_[return_count_ + index];
} }
PlatformInterfaceDescriptor* platform_specific_descriptor() const {
return platform_specific_descriptor_;
}
void RestrictAllocatableRegisters(const Register* registers, int num) { void RestrictAllocatableRegisters(const Register* registers, int num) {
DCHECK_EQ(allocatable_registers_, 0); DCHECK_EQ(allocatable_registers_, 0);
...@@ -149,8 +143,6 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData { ...@@ -149,8 +143,6 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData {
Register* register_params_ = nullptr; Register* register_params_ = nullptr;
MachineType* machine_types_ = nullptr; MachineType* machine_types_ = nullptr;
PlatformInterfaceDescriptor* platform_specific_descriptor_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(CallInterfaceDescriptorData); DISALLOW_COPY_AND_ASSIGN(CallInterfaceDescriptorData);
}; };
...@@ -217,11 +209,6 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptor { ...@@ -217,11 +209,6 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptor {
return data()->param_type(index); return data()->param_type(index);
} }
// Some platforms have extra information to associate with the descriptor.
PlatformInterfaceDescriptor* platform_specific_descriptor() const {
return data()->platform_specific_descriptor();
}
RegList allocatable_registers() const { RegList allocatable_registers() const {
return data()->allocatable_registers(); return data()->allocatable_registers();
} }
...@@ -994,11 +981,4 @@ INTERFACE_DESCRIPTOR_LIST(DEF_KEY) ...@@ -994,11 +981,4 @@ INTERFACE_DESCRIPTOR_LIST(DEF_KEY)
} // namespace internal } // namespace internal
} // namespace v8 } // namespace v8
#if V8_TARGET_ARCH_ARM64
#include "src/arm64/interface-descriptors-arm64.h"
#elif V8_TARGET_ARCH_ARM
#include "src/arm/interface-descriptors-arm.h"
#endif
#endif // V8_INTERFACE_DESCRIPTORS_H_ #endif // V8_INTERFACE_DESCRIPTORS_H_
...@@ -67,13 +67,13 @@ const Register TypeConversionDescriptor::ArgumentRegister() { return a0; } ...@@ -67,13 +67,13 @@ const Register TypeConversionDescriptor::ArgumentRegister() { return a0; }
void TypeofDescriptor::InitializePlatformSpecific( void TypeofDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a3}; Register registers[] = {a3};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void CallFunctionDescriptor::InitializePlatformSpecific( void CallFunctionDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a1}; Register registers[] = {a1};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void CallTrampolineDescriptor::InitializePlatformSpecific( void CallTrampolineDescriptor::InitializePlatformSpecific(
...@@ -179,19 +179,19 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -179,19 +179,19 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
// register state // register state
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a1, a0}; Register registers[] = {a1, a0};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void BinaryOpDescriptor::InitializePlatformSpecific( void BinaryOpDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a1, a0}; Register registers[] = {a1, a0};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void ArgumentAdaptorDescriptor::InitializePlatformSpecific( void ArgumentAdaptorDescriptor::InitializePlatformSpecific(
......
...@@ -67,13 +67,13 @@ const Register TypeConversionDescriptor::ArgumentRegister() { return a0; } ...@@ -67,13 +67,13 @@ const Register TypeConversionDescriptor::ArgumentRegister() { return a0; }
void TypeofDescriptor::InitializePlatformSpecific( void TypeofDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a3}; Register registers[] = {a3};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void CallFunctionDescriptor::InitializePlatformSpecific( void CallFunctionDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a1}; Register registers[] = {a1};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void CallTrampolineDescriptor::InitializePlatformSpecific( void CallTrampolineDescriptor::InitializePlatformSpecific(
...@@ -179,19 +179,19 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -179,19 +179,19 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
// register state // register state
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a1, a0}; Register registers[] = {a1, a0};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void BinaryOpDescriptor::InitializePlatformSpecific( void BinaryOpDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
Register registers[] = {a1, a0}; Register registers[] = {a1, a0};
data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); data->InitializePlatformSpecific(arraysize(registers), registers);
} }
void ArgumentAdaptorDescriptor::InitializePlatformSpecific( void ArgumentAdaptorDescriptor::InitializePlatformSpecific(
......
...@@ -178,7 +178,7 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -178,7 +178,7 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
......
...@@ -177,7 +177,7 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -177,7 +177,7 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
......
...@@ -180,7 +180,7 @@ void AbortJSDescriptor::InitializePlatformSpecific( ...@@ -180,7 +180,7 @@ void AbortJSDescriptor::InitializePlatformSpecific(
void AllocateHeapNumberDescriptor::InitializePlatformSpecific( void AllocateHeapNumberDescriptor::InitializePlatformSpecific(
CallInterfaceDescriptorData* data) { CallInterfaceDescriptorData* data) {
data->InitializePlatformSpecific(0, nullptr, nullptr); data->InitializePlatformSpecific(0, nullptr);
} }
void CompareDescriptor::InitializePlatformSpecific( void CompareDescriptor::InitializePlatformSpecific(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment