| Index: src/mips64/code-stubs-mips64.cc
|
| diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
|
| index 3080b32738ec987d3873b07fd456ee4d3bdb4ad5..65f808fc46eb950a2503ccdb1ae33553fda0ec42 100644
|
| --- a/src/mips64/code-stubs-mips64.cc
|
| +++ b/src/mips64/code-stubs-mips64.cc
|
| @@ -20,7 +20,7 @@ void FastNewClosureStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a2 };
|
| descriptor->Initialize(
|
| - ARRAY_SIZE(registers), registers,
|
| + MajorKey(), ARRAY_SIZE(registers), registers,
|
| Runtime::FunctionForId(Runtime::kNewClosureFromStubFailure)->entry);
|
| }
|
|
|
| @@ -28,14 +28,14 @@ void FastNewClosureStub::InitializeInterfaceDescriptor(
|
| void FastNewContextStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a1 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers);
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
|
| }
|
|
|
|
|
| void ToNumberStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a0 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers);
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
|
| }
|
|
|
|
|
| @@ -43,7 +43,7 @@ void NumberToStringStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a0 };
|
| descriptor->Initialize(
|
| - ARRAY_SIZE(registers), registers,
|
| + MajorKey(), ARRAY_SIZE(registers), registers,
|
| Runtime::FunctionForId(Runtime::kNumberToStringRT)->entry);
|
| }
|
|
|
| @@ -57,7 +57,7 @@ void FastCloneShallowArrayStub::InitializeInterfaceDescriptor(
|
| Representation::Smi(),
|
| Representation::Tagged() };
|
| descriptor->Initialize(
|
| - ARRAY_SIZE(registers), registers,
|
| + MajorKey(), ARRAY_SIZE(registers), registers,
|
| Runtime::FunctionForId(Runtime::kCreateArrayLiteralStubBailout)->entry,
|
| representations);
|
| }
|
| @@ -67,7 +67,7 @@ void FastCloneShallowObjectStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a3, a2, a1, a0 };
|
| descriptor->Initialize(
|
| - ARRAY_SIZE(registers), registers,
|
| + MajorKey(), ARRAY_SIZE(registers), registers,
|
| Runtime::FunctionForId(Runtime::kCreateObjectLiteral)->entry);
|
| }
|
|
|
| @@ -75,7 +75,7 @@ void FastCloneShallowObjectStub::InitializeInterfaceDescriptor(
|
| void CreateAllocationSiteStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a2, a3 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers);
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
|
| }
|
|
|
|
|
| @@ -83,7 +83,7 @@ void RegExpConstructResultStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a2, a1, a0 };
|
| descriptor->Initialize(
|
| - ARRAY_SIZE(registers), registers,
|
| + MajorKey(), ARRAY_SIZE(registers), registers,
|
| Runtime::FunctionForId(Runtime::kRegExpConstructResult)->entry);
|
| }
|
|
|
| @@ -93,7 +93,7 @@ void TransitionElementsKindStub::InitializeInterfaceDescriptor(
|
| Register registers[] = { cp, a0, a1 };
|
| Address entry =
|
| Runtime::FunctionForId(Runtime::kTransitionElementsKind)->entry;
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
|
| FUNCTION_ADDR(entry));
|
| }
|
|
|
| @@ -101,7 +101,7 @@ void TransitionElementsKindStub::InitializeInterfaceDescriptor(
|
| void CompareNilICStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a0 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
|
| FUNCTION_ADDR(CompareNilIC_Miss));
|
| descriptor->SetMissHandler(
|
| ExternalReference(IC_Utility(IC::kCompareNilIC_Miss), isolate()));
|
| @@ -112,7 +112,7 @@ const Register InterfaceDescriptor::ContextRegister() { return cp; }
|
|
|
|
|
| static void InitializeArrayConstructorDescriptor(
|
| - CodeStubInterfaceDescriptor* descriptor,
|
| + CodeStub::Major major, CodeStubInterfaceDescriptor* descriptor,
|
| int constant_stack_parameter_count) {
|
| // register state
|
| // cp -- context
|
| @@ -124,10 +124,8 @@ static void InitializeArrayConstructorDescriptor(
|
|
|
| if (constant_stack_parameter_count == 0) {
|
| Register registers[] = { cp, a1, a2 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| - deopt_handler,
|
| - NULL,
|
| - constant_stack_parameter_count,
|
| + descriptor->Initialize(major, ARRAY_SIZE(registers), registers,
|
| + deopt_handler, NULL, constant_stack_parameter_count,
|
| JS_FUNCTION_STUB_MODE);
|
| } else {
|
| // stack param count needs (constructor pointer, and single argument)
|
| @@ -137,19 +135,16 @@ static void InitializeArrayConstructorDescriptor(
|
| Representation::Tagged(),
|
| Representation::Tagged(),
|
| Representation::Integer32() };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| - a0,
|
| - deopt_handler,
|
| - representations,
|
| + descriptor->Initialize(major, ARRAY_SIZE(registers), registers, a0,
|
| + deopt_handler, representations,
|
| constant_stack_parameter_count,
|
| - JS_FUNCTION_STUB_MODE,
|
| - PASS_ARGUMENTS);
|
| + JS_FUNCTION_STUB_MODE, PASS_ARGUMENTS);
|
| }
|
| }
|
|
|
|
|
| static void InitializeInternalArrayConstructorDescriptor(
|
| - CodeStubInterfaceDescriptor* descriptor,
|
| + CodeStub::Major major, CodeStubInterfaceDescriptor* descriptor,
|
| int constant_stack_parameter_count) {
|
| // register state
|
| // cp -- context
|
| @@ -160,10 +155,8 @@ static void InitializeInternalArrayConstructorDescriptor(
|
|
|
| if (constant_stack_parameter_count == 0) {
|
| Register registers[] = { cp, a1 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| - deopt_handler,
|
| - NULL,
|
| - constant_stack_parameter_count,
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
|
| + deopt_handler, NULL, constant_stack_parameter_count,
|
| JS_FUNCTION_STUB_MODE);
|
| } else {
|
| // stack param count needs (constructor pointer, and single argument)
|
| @@ -172,39 +165,36 @@ static void InitializeInternalArrayConstructorDescriptor(
|
| Representation::Tagged(),
|
| Representation::Tagged(),
|
| Representation::Integer32() };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| - a0,
|
| - deopt_handler,
|
| - representations,
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers, a0,
|
| + deopt_handler, representations,
|
| constant_stack_parameter_count,
|
| - JS_FUNCTION_STUB_MODE,
|
| - PASS_ARGUMENTS);
|
| + JS_FUNCTION_STUB_MODE, PASS_ARGUMENTS);
|
| }
|
| }
|
|
|
|
|
| void ArrayNoArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeArrayConstructorDescriptor(descriptor, 0);
|
| + InitializeArrayConstructorDescriptor(MajorKey(), descriptor, 0);
|
| }
|
|
|
|
|
| void ArraySingleArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeArrayConstructorDescriptor(descriptor, 1);
|
| + InitializeArrayConstructorDescriptor(MajorKey(), descriptor, 1);
|
| }
|
|
|
|
|
| void ArrayNArgumentsConstructorStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeArrayConstructorDescriptor(descriptor, -1);
|
| + InitializeArrayConstructorDescriptor(MajorKey(), descriptor, -1);
|
| }
|
|
|
|
|
| void ToBooleanStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a0 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
|
| FUNCTION_ADDR(ToBooleanIC_Miss));
|
| descriptor->SetMissHandler(
|
| ExternalReference(IC_Utility(IC::kToBooleanIC_Miss), isolate()));
|
| @@ -213,26 +203,26 @@ void ToBooleanStub::InitializeInterfaceDescriptor(
|
|
|
| void InternalArrayNoArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeInternalArrayConstructorDescriptor(descriptor, 0);
|
| + InitializeInternalArrayConstructorDescriptor(MajorKey(), descriptor, 0);
|
| }
|
|
|
|
|
| void InternalArraySingleArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeInternalArrayConstructorDescriptor(descriptor, 1);
|
| + InitializeInternalArrayConstructorDescriptor(MajorKey(), descriptor, 1);
|
| }
|
|
|
|
|
| void InternalArrayNArgumentsConstructorStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeInternalArrayConstructorDescriptor(descriptor, -1);
|
| + InitializeInternalArrayConstructorDescriptor(MajorKey(), descriptor, -1);
|
| }
|
|
|
|
|
| void BinaryOpICStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a1, a0 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
|
| FUNCTION_ADDR(BinaryOpIC_Miss));
|
| descriptor->SetMissHandler(
|
| ExternalReference(IC_Utility(IC::kBinaryOpIC_Miss), isolate()));
|
| @@ -242,7 +232,7 @@ void BinaryOpICStub::InitializeInterfaceDescriptor(
|
| void BinaryOpWithAllocationSiteStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a2, a1, a0 };
|
| - descriptor->Initialize(ARRAY_SIZE(registers), registers,
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
|
| FUNCTION_ADDR(BinaryOpIC_MissWithAllocationSite));
|
| }
|
|
|
| @@ -250,9 +240,8 @@ void BinaryOpWithAllocationSiteStub::InitializeInterfaceDescriptor(
|
| void StringAddStub::InitializeInterfaceDescriptor(
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| Register registers[] = { cp, a1, a0 };
|
| - descriptor->Initialize(
|
| - ARRAY_SIZE(registers), registers,
|
| - Runtime::FunctionForId(Runtime::kStringAdd)->entry);
|
| + descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
|
| + Runtime::FunctionForId(Runtime::kStringAdd)->entry);
|
| }
|
|
|
|
|
|
|