Index: src/arm/interface-descriptors-arm.cc |
diff --git a/src/arm/interface-descriptors-arm.cc b/src/arm/interface-descriptors-arm.cc |
index 581ef88d41f6d4749f3a8c830af70abcf20742f2..665964f89671245dc23e007dfe30cb70b6eb3b85 100644 |
--- a/src/arm/interface-descriptors-arm.cc |
+++ b/src/arm/interface-descriptors-arm.cc |
@@ -62,106 +62,99 @@ const Register GrowArrayElementsDescriptor::ObjectRegister() { return r0; } |
const Register GrowArrayElementsDescriptor::KeyRegister() { return r3; } |
-void FastNewClosureDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void FastNewClosureDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r2}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void FastNewContextDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void FastNewContextDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r1}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void ToNumberDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void ToNumberDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void NumberToStringDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void NumberToStringDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void TypeofDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void TypeofDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r3}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void FastCloneShallowArrayDescriptor::Initialize( |
+void FastCloneShallowArrayDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r3, r2, r1}; |
- Representation representations[] = { |
- Representation::Tagged(), Representation::Tagged(), Representation::Smi(), |
- Representation::Tagged()}; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void FastCloneShallowObjectDescriptor::Initialize( |
+void FastCloneShallowObjectDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r3, r2, r1, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CreateAllocationSiteDescriptor::Initialize( |
+void CreateAllocationSiteDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r2, r3}; |
- Representation representations[] = {Representation::Tagged(), |
- Representation::Tagged(), |
- Representation::Smi()}; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CreateWeakCellDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void CreateWeakCellDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r2, r3, r1}; |
- Representation representations[] = { |
- Representation::Tagged(), Representation::Tagged(), Representation::Smi(), |
- Representation::Tagged()}; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void StoreArrayLiteralElementDescriptor::Initialize( |
+void StoreArrayLiteralElementDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r3, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CallFunctionDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void CallFunctionDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r1}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CallFunctionWithFeedbackDescriptor::Initialize( |
+void CallFunctionWithFeedbackDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r1, r3}; |
- Representation representations[] = {Representation::Tagged(), |
- Representation::Tagged(), |
- Representation::Smi()}; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CallFunctionWithFeedbackAndVectorDescriptor::Initialize( |
+void CallFunctionWithFeedbackAndVectorDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r1, r3, r2}; |
- Representation representations[] = { |
- Representation::Tagged(), Representation::Tagged(), Representation::Smi(), |
- Representation::Tagged()}; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CallConstructDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void CallConstructDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
// r0 : number of arguments |
// r1 : the function to call |
// r2 : feedback vector |
@@ -170,34 +163,34 @@ void CallConstructDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
// TODO(turbofan): So far we don't gather type feedback and hence skip the |
// slot parameter, but ArrayConstructStub needs the vector to be undefined. |
Register registers[] = {cp, r0, r1, r2}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void RegExpConstructResultDescriptor::Initialize( |
+void RegExpConstructResultDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r2, r1, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void TransitionElementsKindDescriptor::Initialize( |
+void TransitionElementsKindDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r0, r1}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void AllocateHeapNumberDescriptor::Initialize( |
+void AllocateHeapNumberDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
// register state |
// cp -- context |
Register registers[] = {cp}; |
- data->Initialize(arraysize(registers), registers, nullptr); |
+ data->InitializePlatformSpecific(arraysize(registers), registers, nullptr); |
} |
-void ArrayConstructorConstantArgCountDescriptor::Initialize( |
+void ArrayConstructorConstantArgCountDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
// register state |
// cp -- context |
@@ -205,80 +198,81 @@ void ArrayConstructorConstantArgCountDescriptor::Initialize( |
// r1 -- function |
// r2 -- allocation site with elements kind |
Register registers[] = {cp, r1, r2}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void ArrayConstructorDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void ArrayConstructorDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
// stack param count needs (constructor pointer, and single argument) |
Register registers[] = {cp, r1, r2, r0}; |
- Representation representations[] = { |
- Representation::Tagged(), Representation::Tagged(), |
- Representation::Tagged(), Representation::Integer32()}; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void InternalArrayConstructorConstantArgCountDescriptor::Initialize( |
- CallInterfaceDescriptorData* data) { |
+void InternalArrayConstructorConstantArgCountDescriptor:: |
+ InitializePlatformSpecific(CallInterfaceDescriptorData* data) { |
// register state |
// cp -- context |
// r0 -- number of arguments |
// r1 -- constructor function |
Register registers[] = {cp, r1}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void InternalArrayConstructorDescriptor::Initialize( |
+void InternalArrayConstructorDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
// stack param count needs (constructor pointer, and single argument) |
Register registers[] = {cp, r1, r0}; |
- Representation representations[] = {Representation::Tagged(), |
- Representation::Tagged(), |
- Representation::Integer32()}; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CompareDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void CompareDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r1, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void CompareNilDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void CompareNilDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void ToBooleanDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void ToBooleanDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void BinaryOpDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void BinaryOpDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r1, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void BinaryOpWithAllocationSiteDescriptor::Initialize( |
+void BinaryOpWithAllocationSiteDescriptor::InitializePlatformSpecific( |
CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r2, r1, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void StringAddDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void StringAddDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = {cp, r1, r0}; |
- data->Initialize(arraysize(registers), registers, NULL); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
-void KeyedDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void KeyedDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
static PlatformInterfaceDescriptor noInlineDescriptor = |
PlatformInterfaceDescriptor(NEVER_INLINE_TARGET_ADDRESS); |
@@ -286,16 +280,13 @@ void KeyedDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
cp, // context |
r2, // key |
}; |
- Representation representations[] = { |
- Representation::Tagged(), // context |
- Representation::Tagged(), // key |
- }; |
- data->Initialize(arraysize(registers), registers, representations, |
- &noInlineDescriptor); |
+ data->InitializePlatformSpecific(arraysize(registers), registers, |
+ &noInlineDescriptor); |
} |
-void NamedDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void NamedDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
static PlatformInterfaceDescriptor noInlineDescriptor = |
PlatformInterfaceDescriptor(NEVER_INLINE_TARGET_ADDRESS); |
@@ -303,16 +294,13 @@ void NamedDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
cp, // context |
r2, // name |
}; |
- Representation representations[] = { |
- Representation::Tagged(), // context |
- Representation::Tagged(), // name |
- }; |
- data->Initialize(arraysize(registers), registers, representations, |
- &noInlineDescriptor); |
+ data->InitializePlatformSpecific(arraysize(registers), registers, |
+ &noInlineDescriptor); |
} |
-void CallHandlerDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void CallHandlerDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
static PlatformInterfaceDescriptor default_descriptor = |
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS); |
@@ -320,16 +308,13 @@ void CallHandlerDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
cp, // context |
r0, // receiver |
}; |
- Representation representations[] = { |
- Representation::Tagged(), // context |
- Representation::Tagged(), // receiver |
- }; |
- data->Initialize(arraysize(registers), registers, representations, |
- &default_descriptor); |
+ data->InitializePlatformSpecific(arraysize(registers), registers, |
+ &default_descriptor); |
} |
-void ArgumentAdaptorDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void ArgumentAdaptorDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
static PlatformInterfaceDescriptor default_descriptor = |
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS); |
@@ -339,18 +324,13 @@ void ArgumentAdaptorDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
r0, // actual number of arguments |
r2, // expected number of arguments |
}; |
- Representation representations[] = { |
- Representation::Tagged(), // context |
- Representation::Tagged(), // JSFunction |
- Representation::Integer32(), // actual number of arguments |
- Representation::Integer32(), // expected number of arguments |
- }; |
- data->Initialize(arraysize(registers), registers, representations, |
- &default_descriptor); |
+ data->InitializePlatformSpecific(arraysize(registers), registers, |
+ &default_descriptor); |
} |
-void ApiFunctionDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void ApiFunctionDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
static PlatformInterfaceDescriptor default_descriptor = |
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS); |
@@ -362,20 +342,13 @@ void ApiFunctionDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
r1, // api_function_address |
r3, // actual number of arguments |
}; |
- Representation representations[] = { |
- Representation::Tagged(), // context |
- Representation::Tagged(), // callee |
- Representation::Tagged(), // call_data |
- Representation::Tagged(), // holder |
- Representation::External(), // api_function_address |
- Representation::Integer32(), // actual number of arguments |
- }; |
- data->Initialize(arraysize(registers), registers, representations, |
- &default_descriptor); |
+ data->InitializePlatformSpecific(arraysize(registers), registers, |
+ &default_descriptor); |
} |
-void ApiAccessorDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void ApiAccessorDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
static PlatformInterfaceDescriptor default_descriptor = |
PlatformInterfaceDescriptor(CAN_INLINE_TARGET_ADDRESS); |
@@ -386,30 +359,19 @@ void ApiAccessorDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
r2, // holder |
r1, // api_function_address |
}; |
- Representation representations[] = { |
- Representation::Tagged(), // context |
- Representation::Tagged(), // callee |
- Representation::Tagged(), // call_data |
- Representation::Tagged(), // holder |
- Representation::External(), // api_function_address |
- }; |
- data->Initialize(arraysize(registers), registers, representations, |
- &default_descriptor); |
+ data->InitializePlatformSpecific(arraysize(registers), registers, |
+ &default_descriptor); |
} |
-void MathRoundVariantDescriptor::Initialize(CallInterfaceDescriptorData* data) { |
+void MathRoundVariantDescriptor::InitializePlatformSpecific( |
+ CallInterfaceDescriptorData* data) { |
Register registers[] = { |
cp, // context |
r1, // math rounding function |
r3, // vector slot id |
}; |
- Representation representations[] = { |
- Representation::Tagged(), // |
- Representation::Tagged(), // |
- Representation::Tagged(), // |
- }; |
- data->Initialize(arraysize(registers), registers, representations); |
+ data->InitializePlatformSpecific(arraysize(registers), registers); |
} |
} // namespace internal |
} // namespace v8 |