| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 9b350adeea894569798b2b210c26c287d03086cb..f9856696c7df83c65fd6da08e67326540b6292a7 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -40,7 +40,6 @@ namespace internal {
|
|
|
|
|
| void FastNewClosureStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rbx };
|
| descriptor->register_param_count_ = 1;
|
| @@ -51,7 +50,6 @@ void FastNewClosureStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void FastNewContextStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdi };
|
| descriptor->register_param_count_ = 1;
|
| @@ -61,7 +59,6 @@ void FastNewContextStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void ToNumberStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax };
|
| descriptor->register_param_count_ = 1;
|
| @@ -71,7 +68,6 @@ void ToNumberStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void NumberToStringStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax };
|
| descriptor->register_param_count_ = 1;
|
| @@ -82,7 +78,6 @@ void NumberToStringStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void FastCloneShallowArrayStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax, rbx, rcx };
|
| descriptor->register_param_count_ = 3;
|
| @@ -94,7 +89,6 @@ void FastCloneShallowArrayStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void FastCloneShallowObjectStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax, rbx, rcx, rdx };
|
| descriptor->register_param_count_ = 4;
|
| @@ -105,7 +99,6 @@ void FastCloneShallowObjectStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void CreateAllocationSiteStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rbx, rdx };
|
| descriptor->register_param_count_ = 2;
|
| @@ -115,7 +108,6 @@ void CreateAllocationSiteStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void KeyedLoadFastElementStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx, rax };
|
| descriptor->register_param_count_ = 2;
|
| @@ -126,7 +118,6 @@ void KeyedLoadFastElementStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void KeyedLoadDictionaryElementStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx, rax };
|
| descriptor->register_param_count_ = 2;
|
| @@ -137,7 +128,6 @@ void KeyedLoadDictionaryElementStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void RegExpConstructResultStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rcx, rbx, rax };
|
| descriptor->register_param_count_ = 3;
|
| @@ -148,7 +138,6 @@ void RegExpConstructResultStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void LoadFieldStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax };
|
| descriptor->register_param_count_ = 1;
|
| @@ -158,7 +147,6 @@ void LoadFieldStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void KeyedLoadFieldStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx };
|
| descriptor->register_param_count_ = 1;
|
| @@ -168,7 +156,6 @@ void KeyedLoadFieldStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void StringLengthStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax, rcx };
|
| descriptor->register_param_count_ = 2;
|
| @@ -178,7 +165,6 @@ void StringLengthStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void KeyedStringLengthStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx, rax };
|
| descriptor->register_param_count_ = 2;
|
| @@ -188,7 +174,6 @@ void KeyedStringLengthStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void KeyedStoreFastElementStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx, rcx, rax };
|
| descriptor->register_param_count_ = 3;
|
| @@ -199,7 +184,6 @@ void KeyedStoreFastElementStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void TransitionElementsKindStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax, rbx };
|
| descriptor->register_param_count_ = 2;
|
| @@ -210,7 +194,6 @@ void TransitionElementsKindStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| static void InitializeArrayConstructorDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor,
|
| int constant_stack_parameter_count) {
|
| // register state
|
| @@ -239,7 +222,6 @@ static void InitializeArrayConstructorDescriptor(
|
|
|
|
|
| static void InitializeInternalArrayConstructorDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor,
|
| int constant_stack_parameter_count) {
|
| // register state
|
| @@ -267,49 +249,42 @@ static void InitializeInternalArrayConstructorDescriptor(
|
|
|
|
|
| void ArrayNoArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeArrayConstructorDescriptor(isolate, descriptor, 0);
|
| + InitializeArrayConstructorDescriptor(descriptor, 0);
|
| }
|
|
|
|
|
| void ArraySingleArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeArrayConstructorDescriptor(isolate, descriptor, 1);
|
| + InitializeArrayConstructorDescriptor(descriptor, 1);
|
| }
|
|
|
|
|
| void ArrayNArgumentsConstructorStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeArrayConstructorDescriptor(isolate, descriptor, -1);
|
| + InitializeArrayConstructorDescriptor(descriptor, -1);
|
| }
|
|
|
|
|
| void InternalArrayNoArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeInternalArrayConstructorDescriptor(isolate, descriptor, 0);
|
| + InitializeInternalArrayConstructorDescriptor(descriptor, 0);
|
| }
|
|
|
|
|
| void InternalArraySingleArgumentConstructorStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeInternalArrayConstructorDescriptor(isolate, descriptor, 1);
|
| + InitializeInternalArrayConstructorDescriptor(descriptor, 1);
|
| }
|
|
|
|
|
| void InternalArrayNArgumentsConstructorStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| - InitializeInternalArrayConstructorDescriptor(isolate, descriptor, -1);
|
| + InitializeInternalArrayConstructorDescriptor(descriptor, -1);
|
| }
|
|
|
|
|
| void CompareNilICStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax };
|
| descriptor->register_param_count_ = 1;
|
| @@ -317,12 +292,11 @@ void CompareNilICStub::InitializeInterfaceDescriptor(
|
| descriptor->deoptimization_handler_ =
|
| FUNCTION_ADDR(CompareNilIC_Miss);
|
| descriptor->SetMissHandler(
|
| - ExternalReference(IC_Utility(IC::kCompareNilIC_Miss), isolate));
|
| + ExternalReference(IC_Utility(IC::kCompareNilIC_Miss), isolate()));
|
| }
|
|
|
|
|
| void ToBooleanStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax };
|
| descriptor->register_param_count_ = 1;
|
| @@ -330,12 +304,11 @@ void ToBooleanStub::InitializeInterfaceDescriptor(
|
| descriptor->deoptimization_handler_ =
|
| FUNCTION_ADDR(ToBooleanIC_Miss);
|
| descriptor->SetMissHandler(
|
| - ExternalReference(IC_Utility(IC::kToBooleanIC_Miss), isolate));
|
| + ExternalReference(IC_Utility(IC::kToBooleanIC_Miss), isolate()));
|
| }
|
|
|
|
|
| void StoreGlobalStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx, rcx, rax };
|
| descriptor->register_param_count_ = 3;
|
| @@ -346,7 +319,6 @@ void StoreGlobalStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void ElementsTransitionAndStoreStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rax, rbx, rcx, rdx };
|
| descriptor->register_param_count_ = 4;
|
| @@ -357,19 +329,17 @@ void ElementsTransitionAndStoreStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void BinaryOpICStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx, rax };
|
| descriptor->register_param_count_ = 2;
|
| descriptor->register_params_ = registers;
|
| descriptor->deoptimization_handler_ = FUNCTION_ADDR(BinaryOpIC_Miss);
|
| descriptor->SetMissHandler(
|
| - ExternalReference(IC_Utility(IC::kBinaryOpIC_Miss), isolate));
|
| + ExternalReference(IC_Utility(IC::kBinaryOpIC_Miss), isolate()));
|
| }
|
|
|
|
|
| void BinaryOpWithAllocationSiteStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rcx, rdx, rax };
|
| descriptor->register_param_count_ = 3;
|
| @@ -380,7 +350,6 @@ void BinaryOpWithAllocationSiteStub::InitializeInterfaceDescriptor(
|
|
|
|
|
| void StringAddStub::InitializeInterfaceDescriptor(
|
| - Isolate* isolate,
|
| CodeStubInterfaceDescriptor* descriptor) {
|
| static Register registers[] = { rdx, rax };
|
| descriptor->register_param_count_ = 2;
|
| @@ -481,7 +450,7 @@ void HydrogenCodeStub::GenerateLightweightMiss(MacroAssembler* masm) {
|
| // Update the static counter each time a new code stub is generated.
|
| isolate()->counters()->code_stubs()->Increment();
|
|
|
| - CodeStubInterfaceDescriptor* descriptor = GetInterfaceDescriptor(isolate());
|
| + CodeStubInterfaceDescriptor* descriptor = GetInterfaceDescriptor();
|
| int param_count = descriptor->register_param_count_;
|
| {
|
| // Call the runtime system in a fresh internal frame.
|
| @@ -2399,9 +2368,9 @@ void CodeStub::GenerateFPStubs(Isolate* isolate) {
|
|
|
| void CEntryStub::GenerateAheadOfTime(Isolate* isolate) {
|
| CEntryStub stub(isolate, 1, kDontSaveFPRegs);
|
| - stub.GetCode(isolate);
|
| + stub.GetCode();
|
| CEntryStub save_doubles(isolate, 1, kSaveFPRegs);
|
| - save_doubles.GetCode(isolate);
|
| + save_doubles.GetCode();
|
| }
|
|
|
|
|
| @@ -3647,7 +3616,7 @@ void ICCompareStub::GenerateNumbers(MacroAssembler* masm) {
|
| __ bind(&generic_stub);
|
| ICCompareStub stub(isolate(), op_, CompareIC::GENERIC, CompareIC::GENERIC,
|
| CompareIC::GENERIC);
|
| - __ jmp(stub.GetCode(isolate()), RelocInfo::CODE_TARGET);
|
| + __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);
|
|
|
| __ bind(&maybe_undefined1);
|
| if (Token::IsOrderedRelationalCompareOp(op_)) {
|
| @@ -4117,9 +4086,9 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) {
|
| void StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime(
|
| Isolate* isolate) {
|
| StoreBufferOverflowStub stub1(isolate, kDontSaveFPRegs);
|
| - stub1.GetCode(isolate);
|
| + stub1.GetCode();
|
| StoreBufferOverflowStub stub2(isolate, kSaveFPRegs);
|
| - stub2.GetCode(isolate);
|
| + stub2.GetCode();
|
| }
|
|
|
|
|
| @@ -4403,7 +4372,7 @@ void StoreArrayLiteralElementStub::Generate(MacroAssembler* masm) {
|
|
|
| void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
|
| CEntryStub ces(isolate(), 1, fp_registers_ ? kSaveFPRegs : kDontSaveFPRegs);
|
| - __ Call(ces.GetCode(isolate()), RelocInfo::CODE_TARGET);
|
| + __ Call(ces.GetCode(), RelocInfo::CODE_TARGET);
|
| int parameter_count_offset =
|
| StubFailureTrampolineFrame::kCallerStackParameterCountFrameOffset;
|
| __ movp(rbx, MemOperand(rbp, parameter_count_offset));
|
| @@ -4582,10 +4551,10 @@ static void ArrayConstructorStubAheadOfTimeHelper(Isolate* isolate) {
|
| for (int i = 0; i <= to_index; ++i) {
|
| ElementsKind kind = GetFastElementsKindFromSequenceIndex(i);
|
| T stub(isolate, kind);
|
| - stub.GetCode(isolate);
|
| + stub.GetCode();
|
| if (AllocationSite::GetMode(kind) != DONT_TRACK_ALLOCATION_SITE) {
|
| T stub1(isolate, kind, DISABLE_ALLOCATION_SITES);
|
| - stub1.GetCode(isolate);
|
| + stub1.GetCode();
|
| }
|
| }
|
| }
|
| @@ -4607,11 +4576,11 @@ void InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(
|
| for (int i = 0; i < 2; i++) {
|
| // For internal arrays we only need a few things
|
| InternalArrayNoArgumentConstructorStub stubh1(isolate, kinds[i]);
|
| - stubh1.GetCode(isolate);
|
| + stubh1.GetCode();
|
| InternalArraySingleArgumentConstructorStub stubh2(isolate, kinds[i]);
|
| - stubh2.GetCode(isolate);
|
| + stubh2.GetCode();
|
| InternalArrayNArgumentsConstructorStub stubh3(isolate, kinds[i]);
|
| - stubh3.GetCode(isolate);
|
| + stubh3.GetCode();
|
| }
|
| }
|
|
|
|
|