From 0522ea7424efab83aa825c323582843a59d1d137 Mon Sep 17 00:00:00 2001 From: "zhengxing.li" Date: Mon, 2 Jan 2017 22:01:14 -0800 Subject: [PATCH] X87: [stubs] Port FastNewObjectStub to TF. port 5b02a98bfada37eafe94373e3fed1e11318d9a27 (r41986) original commit message: In the process, convert from a code stub into a builtin. BUG= Review-Url: https://codereview.chromium.org/2608203002 Cr-Commit-Position: refs/heads/master@{#42018} --- src/builtins/x87/builtins-x87.cc | 12 +-- src/x87/code-stubs-x87.cc | 128 --------------------------- src/x87/interface-descriptors-x87.cc | 6 -- 3 files changed, 6 insertions(+), 140 deletions(-) diff --git a/src/builtins/x87/builtins-x87.cc b/src/builtins/x87/builtins-x87.cc index f75bfc5201..e4762d16ed 100644 --- a/src/builtins/x87/builtins-x87.cc +++ b/src/builtins/x87/builtins-x87.cc @@ -135,8 +135,8 @@ void Generate_JSConstructStubHelper(MacroAssembler* masm, bool is_api_function, // Allocate the new receiver object. __ Push(edi); __ Push(edx); - FastNewObjectStub stub(masm->isolate()); - __ CallStub(&stub); + __ Call(CodeFactory::FastNewObject(masm->isolate()).code(), + RelocInfo::CODE_TARGET); __ mov(ebx, eax); __ Pop(edx); __ Pop(edi); @@ -1938,8 +1938,8 @@ void Builtins::Generate_NumberConstructor_ConstructStub(MacroAssembler* masm) { FrameScope scope(masm, StackFrame::MANUAL); __ EnterBuiltinFrame(esi, edi, ecx); __ Push(ebx); // the first argument - FastNewObjectStub stub(masm->isolate()); - __ CallStub(&stub); + __ Call(CodeFactory::FastNewObject(masm->isolate()).code(), + RelocInfo::CODE_TARGET); __ Pop(FieldOperand(eax, JSValue::kValueOffset)); __ LeaveBuiltinFrame(esi, edi, ecx); } @@ -2101,8 +2101,8 @@ void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) { __ SmiTag(ebx); __ EnterBuiltinFrame(esi, edi, ebx); __ Push(eax); // the first argument - FastNewObjectStub stub(masm->isolate()); - __ CallStub(&stub); + __ Call(CodeFactory::FastNewObject(masm->isolate()).code(), + RelocInfo::CODE_TARGET); __ Pop(FieldOperand(eax, JSValue::kValueOffset)); __ LeaveBuiltinFrame(esi, edi, ebx); __ SmiUntag(ebx); diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc index ee0cb6c883..3025ab0057 100644 --- a/src/x87/code-stubs-x87.cc +++ b/src/x87/code-stubs-x87.cc @@ -3130,134 +3130,6 @@ void InternalArrayConstructorStub::Generate(MacroAssembler* masm) { GenerateCase(masm, FAST_ELEMENTS); } -void FastNewObjectStub::Generate(MacroAssembler* masm) { - // ----------- S t a t e ------------- - // -- edi : target - // -- edx : new target - // -- esi : context - // -- esp[0] : return address - // ----------------------------------- - __ AssertFunction(edi); - __ AssertReceiver(edx); - - // Verify that the new target is a JSFunction. - Label new_object; - __ CmpObjectType(edx, JS_FUNCTION_TYPE, ebx); - __ j(not_equal, &new_object); - - // Load the initial map and verify that it's in fact a map. - __ mov(ecx, FieldOperand(edx, JSFunction::kPrototypeOrInitialMapOffset)); - __ JumpIfSmi(ecx, &new_object); - __ CmpObjectType(ecx, MAP_TYPE, ebx); - __ j(not_equal, &new_object); - - // Fall back to runtime if the target differs from the new target's - // initial map constructor. - __ cmp(edi, FieldOperand(ecx, Map::kConstructorOrBackPointerOffset)); - __ j(not_equal, &new_object); - - // Allocate the JSObject on the heap. - Label allocate, done_allocate; - __ movzx_b(ebx, FieldOperand(ecx, Map::kInstanceSizeOffset)); - __ lea(ebx, Operand(ebx, times_pointer_size, 0)); - __ Allocate(ebx, eax, edi, no_reg, &allocate, NO_ALLOCATION_FLAGS); - __ bind(&done_allocate); - - // Initialize the JSObject fields. - __ mov(FieldOperand(eax, JSObject::kMapOffset), ecx); - __ mov(FieldOperand(eax, JSObject::kPropertiesOffset), - masm->isolate()->factory()->empty_fixed_array()); - __ mov(FieldOperand(eax, JSObject::kElementsOffset), - masm->isolate()->factory()->empty_fixed_array()); - STATIC_ASSERT(JSObject::kHeaderSize == 3 * kPointerSize); - __ lea(ebx, FieldOperand(eax, JSObject::kHeaderSize)); - - // ----------- S t a t e ------------- - // -- eax : result (tagged) - // -- ebx : result fields (untagged) - // -- edi : result end (untagged) - // -- ecx : initial map - // -- esi : context - // -- esp[0] : return address - // ----------------------------------- - - // Perform in-object slack tracking if requested. - Label slack_tracking; - STATIC_ASSERT(Map::kNoSlackTracking == 0); - __ test(FieldOperand(ecx, Map::kBitField3Offset), - Immediate(Map::ConstructionCounter::kMask)); - __ j(not_zero, &slack_tracking, Label::kNear); - { - // Initialize all in-object fields with undefined. - __ LoadRoot(edx, Heap::kUndefinedValueRootIndex); - __ InitializeFieldsWithFiller(ebx, edi, edx); - __ Ret(); - } - __ bind(&slack_tracking); - { - // Decrease generous allocation count. - STATIC_ASSERT(Map::ConstructionCounter::kNext == 32); - __ sub(FieldOperand(ecx, Map::kBitField3Offset), - Immediate(1 << Map::ConstructionCounter::kShift)); - - // Initialize the in-object fields with undefined. - __ movzx_b(edx, FieldOperand(ecx, Map::kUnusedPropertyFieldsOffset)); - __ neg(edx); - __ lea(edx, Operand(edi, edx, times_pointer_size, 0)); - __ LoadRoot(edi, Heap::kUndefinedValueRootIndex); - __ InitializeFieldsWithFiller(ebx, edx, edi); - - // Initialize the remaining (reserved) fields with one pointer filler map. - __ movzx_b(edx, FieldOperand(ecx, Map::kUnusedPropertyFieldsOffset)); - __ lea(edx, Operand(ebx, edx, times_pointer_size, 0)); - __ LoadRoot(edi, Heap::kOnePointerFillerMapRootIndex); - __ InitializeFieldsWithFiller(ebx, edx, edi); - - // Check if we can finalize the instance size. - Label finalize; - STATIC_ASSERT(Map::kSlackTrackingCounterEnd == 1); - __ test(FieldOperand(ecx, Map::kBitField3Offset), - Immediate(Map::ConstructionCounter::kMask)); - __ j(zero, &finalize, Label::kNear); - __ Ret(); - - // Finalize the instance size. - __ bind(&finalize); - { - FrameScope scope(masm, StackFrame::INTERNAL); - __ Push(eax); - __ Push(ecx); - __ CallRuntime(Runtime::kFinalizeInstanceSize); - __ Pop(eax); - } - __ Ret(); - } - - // Fall back to %AllocateInNewSpace. - __ bind(&allocate); - { - FrameScope scope(masm, StackFrame::INTERNAL); - __ SmiTag(ebx); - __ Push(ecx); - __ Push(ebx); - __ CallRuntime(Runtime::kAllocateInNewSpace); - __ Pop(ecx); - } - __ movzx_b(ebx, FieldOperand(ecx, Map::kInstanceSizeOffset)); - __ lea(edi, Operand(eax, ebx, times_pointer_size, 0)); - STATIC_ASSERT(kHeapObjectTag == 1); - __ dec(edi); - __ jmp(&done_allocate); - - // Fall back to %NewObject. - __ bind(&new_object); - __ PopReturnAddressTo(ecx); - __ Push(edi); - __ Push(edx); - __ PushReturnAddressFrom(ecx); - __ TailCallRuntime(Runtime::kNewObject); -} - void FastNewRestParameterStub::Generate(MacroAssembler* masm) { // ----------- S t a t e ------------- // -- edi : function diff --git a/src/x87/interface-descriptors-x87.cc b/src/x87/interface-descriptors-x87.cc index 70b110af5b..26cfd0ec7a 100644 --- a/src/x87/interface-descriptors-x87.cc +++ b/src/x87/interface-descriptors-x87.cc @@ -68,12 +68,6 @@ void FastNewClosureDescriptor::InitializePlatformSpecific( data->InitializePlatformSpecific(arraysize(registers), registers, NULL); } -void FastNewObjectDescriptor::InitializePlatformSpecific( - CallInterfaceDescriptorData* data) { - Register registers[] = {edi, edx}; - data->InitializePlatformSpecific(arraysize(registers), registers); -} - void FastNewRestParameterDescriptor::InitializePlatformSpecific( CallInterfaceDescriptorData* data) { Register registers[] = {edi};