src/builtins/ppc/builtins-ppc.cc - Issue 2932833002: PPC/s390: [builtins] Start refactoring the Apply builtin.

Unified Diff: src/builtins/ppc/builtins-ppc.cc

Issue 2932833002: PPC/s390: [builtins] Start refactoring the Apply builtin. (Closed)

Patch Set: s390 port Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: src/builtins/ppc/builtins-ppc.cc

diff --git a/src/builtins/ppc/builtins-ppc.cc b/src/builtins/ppc/builtins-ppc.cc

index 9cf57038344cd6be414f13499ca064401b1be6d3..f8e72639a5c69acfc1ab8478c0660e7a83ac7b44 100644

--- a/src/builtins/ppc/builtins-ppc.cc

+++ b/src/builtins/ppc/builtins-ppc.cc

@@ -1898,31 +1898,31 @@ void Builtins::Generate_FunctionPrototypeApply(MacroAssembler* masm) {

// -- sp[8] : receiver

// -----------------------------------

- // 1. Load receiver into r4, argArray into r3 (if present), remove all

+ // 1. Load receiver into r4, argArray into r5 (if present), remove all

// arguments from the stack (including the receiver), and push thisArg (if

// present) instead.

{

Label skip;

- Register arg_size = r5;

+ Register arg_size = r8;

__ ShiftLeftImm(arg_size, r3, Operand(kPointerSizeLog2));

__ add(new_sp, sp, arg_size);

- __ LoadRoot(r3, Heap::kUndefinedValueRootIndex);

- __ mr(scratch, r3);

+ __ LoadRoot(scratch, Heap::kUndefinedValueRootIndex);

+ __ mr(r5, scratch);

__ LoadP(r4, MemOperand(new_sp, 0)); // receiver

__ cmpi(arg_size, Operand(kPointerSize));

__ blt(&skip);

__ LoadP(scratch, MemOperand(new_sp, 1 * -kPointerSize)); // thisArg

__ beq(&skip);

- __ LoadP(r3, MemOperand(new_sp, 2 * -kPointerSize)); // argArray

+ __ LoadP(r5, MemOperand(new_sp, 2 * -kPointerSize)); // argArray

__ bind(&skip);

__ mr(sp, new_sp);

__ StoreP(scratch, MemOperand(sp, 0));

}

// ----------- S t a t e -------------

- // -- r3 : argArray

+ // -- r5 : argArray

// -- r4 : receiver

// -- sp[0] : thisArg

// -----------------------------------

@@ -1937,13 +1937,12 @@ void Builtins::Generate_FunctionPrototypeApply(MacroAssembler* masm) {

// 3. Tail call with no arguments if argArray is null or undefined.

Label no_arguments;

- __ JumpIfRoot(r3, Heap::kNullValueRootIndex, &no_arguments);

- __ JumpIfRoot(r3, Heap::kUndefinedValueRootIndex, &no_arguments);

+ __ JumpIfRoot(r5, Heap::kNullValueRootIndex, &no_arguments);

+ __ JumpIfRoot(r5, Heap::kUndefinedValueRootIndex, &no_arguments);

- // 4a. Apply the receiver to the given argArray (passing undefined for

- // new.target).

- __ LoadRoot(r6, Heap::kUndefinedValueRootIndex);

- __ Jump(masm->isolate()->builtins()->Apply(), RelocInfo::CODE_TARGET);

+ // 4a. Apply the receiver to the given argArray.

+ __ Jump(masm->isolate()->builtins()->CallWithArrayLike(),

+ RelocInfo::CODE_TARGET);

// 4b. The argArray is either null or undefined, so we tail call without any

// arguments to the receiver.

@@ -2014,19 +2013,19 @@ void Builtins::Generate_ReflectApply(MacroAssembler* masm) {

// -- sp[12] : receiver

// -----------------------------------

- // 1. Load target into r4 (if present), argumentsList into r3 (if present),

+ // 1. Load target into r4 (if present), argumentsList into r5 (if present),

// remove all arguments from the stack (including the receiver), and push

// thisArgument (if present) instead.

{

Label skip;

- Register arg_size = r5;

+ Register arg_size = r8;

__ ShiftLeftImm(arg_size, r3, Operand(kPointerSizeLog2));

__ add(new_sp, sp, arg_size);

__ LoadRoot(r4, Heap::kUndefinedValueRootIndex);

__ mr(scratch, r4);

- __ mr(r3, r4);

+ __ mr(r5, r4);

__ cmpi(arg_size, Operand(kPointerSize));

__ blt(&skip);

__ LoadP(r4, MemOperand(new_sp, 1 * -kPointerSize)); // target

@@ -2034,14 +2033,14 @@ void Builtins::Generate_ReflectApply(MacroAssembler* masm) {

__ LoadP(scratch, MemOperand(new_sp, 2 * -kPointerSize)); // thisArgument

__ cmpi(arg_size, Operand(2 * kPointerSize));

__ beq(&skip);

- __ LoadP(r3, MemOperand(new_sp, 3 * -kPointerSize)); // argumentsList

+ __ LoadP(r5, MemOperand(new_sp, 3 * -kPointerSize)); // argumentsList

__ bind(&skip);

__ mr(sp, new_sp);

__ StoreP(scratch, MemOperand(sp, 0));

}

// ----------- S t a t e -------------

- // -- r3 : argumentsList

+ // -- r5 : argumentsList

// -- r4 : target

// -- sp[0] : thisArgument

// -----------------------------------

@@ -2054,10 +2053,9 @@ void Builtins::Generate_ReflectApply(MacroAssembler* masm) {

__ TestBit(r7, Map::kIsCallable, r0);

__ beq(&target_not_callable, cr0);

- // 3a. Apply the target to the given argumentsList (passing undefined for

- // new.target).

- __ LoadRoot(r6, Heap::kUndefinedValueRootIndex);

- __ Jump(masm->isolate()->builtins()->Apply(), RelocInfo::CODE_TARGET);

+ // 3a. Apply the target to the given argumentsList.

+ __ Jump(masm->isolate()->builtins()->CallWithArrayLike(),

+ RelocInfo::CODE_TARGET);

// 3b. The target is not callable, throw an appropriate TypeError.

__ bind(&target_not_callable);

@@ -2076,18 +2074,18 @@ void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {

// -- sp[12] : receiver

// -----------------------------------

- // 1. Load target into r4 (if present), argumentsList into r3 (if present),

+ // 1. Load target into r4 (if present), argumentsList into r5 (if present),

// new.target into r6 (if present, otherwise use target), remove all

// arguments from the stack (including the receiver), and push thisArgument

// (if present) instead.

{

Label skip;

- Register arg_size = r5;

+ Register arg_size = r8;

__ ShiftLeftImm(arg_size, r3, Operand(kPointerSizeLog2));

__ add(new_sp, sp, arg_size);

__ LoadRoot(r4, Heap::kUndefinedValueRootIndex);

- __ mr(r3, r4);

+ __ mr(r5, r4);

__ mr(r6, r4);

__ StoreP(r4, MemOperand(new_sp, 0)); // receiver (undefined)

__ cmpi(arg_size, Operand(kPointerSize));

@@ -2095,7 +2093,7 @@ void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {

__ LoadP(r4, MemOperand(new_sp, 1 * -kPointerSize)); // target

__ mr(r6, r4); // new.target defaults to target

__ beq(&skip);

- __ LoadP(r3, MemOperand(new_sp, 2 * -kPointerSize)); // argumentsList

+ __ LoadP(r5, MemOperand(new_sp, 2 * -kPointerSize)); // argumentsList

__ cmpi(arg_size, Operand(2 * kPointerSize));

__ beq(&skip);

__ LoadP(r6, MemOperand(new_sp, 3 * -kPointerSize)); // new.target

@@ -2104,7 +2102,7 @@ void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {

}

// ----------- S t a t e -------------

- // -- r3 : argumentsList

+ // -- r5 : argumentsList

// -- r6 : new.target

// -- r4 : target

// -- sp[0] : receiver (undefined)

@@ -2127,7 +2125,8 @@ void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {

__ beq(&new_target_not_constructor, cr0);

// 4a. Construct the target with the given new.target and argumentsList.

- __ Jump(masm->isolate()->builtins()->Apply(), RelocInfo::CODE_TARGET);

+ __ Jump(masm->isolate()->builtins()->ConstructWithArrayLike(),

+ RelocInfo::CODE_TARGET);

// 4b. The target is not a constructor, throw an appropriate TypeError.

__ bind(&target_not_constructor);

@@ -2173,99 +2172,17 @@ static void LeaveArgumentsAdaptorFrame(MacroAssembler* masm) {

}

// static

-void Builtins::Generate_Apply(MacroAssembler* masm) {

+void Builtins::Generate_CallOrConstructVarargs(MacroAssembler* masm,

+ Handle<Code> code) {

// ----------- S t a t e -------------

- // -- r3 : argumentsList

- // -- r4 : target

- // -- r6 : new.target (checked to be constructor or undefined)

- // -- sp[0] : thisArgument

+ // -- r4 : target

+ // -- r3 : number of parameters on the stack (not including the receiver)

+ // -- r5 : arguments list (a FixedArray)

+ // -- r7 : len (number of elements to push from args)

+ // -- r6 : new.target (for [[Construct]])

// -----------------------------------

- // Create the list of arguments from the array-like argumentsList.

- {

- Label create_arguments, create_array, create_holey_array, create_runtime,

- done_create;

- __ JumpIfSmi(r3, &create_runtime);

- // Load the map of argumentsList into r5.

- __ LoadP(r5, FieldMemOperand(r3, HeapObject::kMapOffset));

- // Load native context into r7.

- __ LoadP(r7, NativeContextMemOperand());

- // Check if argumentsList is an (unmodified) arguments object.

- __ LoadP(ip, ContextMemOperand(r7, Context::SLOPPY_ARGUMENTS_MAP_INDEX));

- __ cmp(ip, r5);

- __ beq(&create_arguments);

- __ LoadP(ip, ContextMemOperand(r7, Context::STRICT_ARGUMENTS_MAP_INDEX));

- __ cmp(ip, r5);

- __ beq(&create_arguments);

- // Check if argumentsList is a fast JSArray.

- __ CompareInstanceType(r5, ip, JS_ARRAY_TYPE);

- __ beq(&create_array);

- // Ask the runtime to create the list (actually a FixedArray).

- __ bind(&create_runtime);

- {

- FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);

- __ Push(r4, r6, r3);

- __ CallRuntime(Runtime::kCreateListFromArrayLike);

- __ Pop(r4, r6);

- __ LoadP(r5, FieldMemOperand(r3, FixedArray::kLengthOffset));

- __ SmiUntag(r5);

- }

- __ b(&done_create);

- // Try to create the list from an arguments object.

- __ bind(&create_arguments);

- __ LoadP(r5, FieldMemOperand(r3, JSArgumentsObject::kLengthOffset));

- __ LoadP(r7, FieldMemOperand(r3, JSObject::kElementsOffset));

- __ LoadP(ip, FieldMemOperand(r7, FixedArray::kLengthOffset));

- __ cmp(r5, ip);

- __ bne(&create_runtime);

- __ SmiUntag(r5);

- __ mr(r3, r7);

- __ b(&done_create);

- // For holey JSArrays we need to check that the array prototype chain

- // protector is intact and our prototype is the Array.prototype actually.

- __ bind(&create_holey_array);

- __ LoadP(r5, FieldMemOperand(r5, Map::kPrototypeOffset));

- __ LoadP(r7, ContextMemOperand(r7, Context::INITIAL_ARRAY_PROTOTYPE_INDEX));

- __ cmp(r5, r7);

- __ bne(&create_runtime);

- __ LoadRoot(r7, Heap::kArrayProtectorRootIndex);

- __ LoadP(r5, FieldMemOperand(r7, PropertyCell::kValueOffset));

- __ CmpSmiLiteral(r5, Smi::FromInt(Isolate::kProtectorValid), r0);

- __ bne(&create_runtime);

- __ LoadP(r5, FieldMemOperand(r3, JSArray::kLengthOffset));

- __ LoadP(r3, FieldMemOperand(r3, JSArray::kElementsOffset));

- __ SmiUntag(r5);

- __ b(&done_create);

- // Try to create the list from a JSArray object.

- // -- r5 and r7 must be preserved till bne create_holey_array.

- __ bind(&create_array);

- __ lbz(r8, FieldMemOperand(r5, Map::kBitField2Offset));

- __ DecodeField<Map::ElementsKindBits>(r8);

- STATIC_ASSERT(FAST_SMI_ELEMENTS == 0);

- STATIC_ASSERT(FAST_HOLEY_SMI_ELEMENTS == 1);

- STATIC_ASSERT(FAST_ELEMENTS == 2);

- STATIC_ASSERT(FAST_HOLEY_ELEMENTS == 3);

- __ cmpi(r8, Operand(FAST_HOLEY_ELEMENTS));

- __ bgt(&create_runtime);

- // Only FAST_XXX after this point, FAST_HOLEY_XXX are odd values.

- __ TestBit(r8, Map::kHasNonInstancePrototype, r0);

- __ bne(&create_holey_array, cr0);

- // FAST_SMI_ELEMENTS or FAST_ELEMENTS after this point.

- __ LoadP(r5, FieldMemOperand(r3, JSArray::kLengthOffset));

- __ LoadP(r3, FieldMemOperand(r3, JSArray::kElementsOffset));

- __ SmiUntag(r5);

- __ bind(&done_create);

- }

+ __ AssertFixedArray(r5);

// Check for stack overflow.

{

// Check the stack for overflow. We are not trying to catch interruptions

@@ -2276,53 +2193,40 @@ void Builtins::Generate_Apply(MacroAssembler* masm) {

// here which will cause ip to become negative.

__ sub(ip, sp, ip);

// Check if the arguments will overflow the stack.

- __ ShiftLeftImm(r0, r5, Operand(kPointerSizeLog2));

+ __ ShiftLeftImm(r0, r7, Operand(kPointerSizeLog2));

__ cmp(ip, r0); // Signed comparison.

__ bgt(&done);

__ TailCallRuntime(Runtime::kThrowStackOverflow);

__ bind(&done);

}

- // ----------- S t a t e -------------

- // -- r4 : target

- // -- r3 : args (a FixedArray built from argumentsList)

- // -- r5 : len (number of elements to push from args)

- // -- r6 : new.target (checked to be constructor or undefined)

- // -- sp[0] : thisArgument

- // -----------------------------------

// Push arguments onto the stack (thisArgument is already on the stack).

{

- __ LoadRoot(r9, Heap::kUndefinedValueRootIndex);

Label loop, no_args, skip;

- __ cmpi(r5, Operand::Zero());

+ __ cmpi(r7, Operand::Zero());

__ beq(&no_args);

- __ addi(r3, r3,

+ __ addi(r5, r5,

Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));

- __ mtctr(r5);

+ __ mtctr(r7);

__ bind(&loop);

- __ LoadPU(ip, MemOperand(r3, kPointerSize));

+ __ LoadPU(ip, MemOperand(r5, kPointerSize));

__ CompareRoot(ip, Heap::kTheHoleValueRootIndex);

__ bne(&skip);

- __ mr(ip, r9);

+ __ LoadRoot(ip, Heap::kUndefinedValueRootIndex);

__ bind(&skip);

__ push(ip);

__ bdnz(&loop);

__ bind(&no_args);

- __ mr(r3, r5);

+ __ add(r3, r3, r7);

}

- // Dispatch to Call or Construct depending on whether new.target is undefined.

- {

- __ CompareRoot(r6, Heap::kUndefinedValueRootIndex);

- __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET, eq);

- __ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);

- }

+ // Tail-call to the actual Call or Construct builtin.

+ __ Jump(code, RelocInfo::CODE_TARGET);

}

// static

-void Builtins::Generate_ForwardVarargs(MacroAssembler* masm,

- Handle<Code> code) {

+void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,

+ Handle<Code> code) {

// ----------- S t a t e -------------

// -- r3 : the number of arguments (not including the receiver)

// -- r6 : the new.target (for [[Construct]] calls)

« no previous file with comments | « no previous file | src/builtins/s390/builtins-s390.cc » ('j') | no next file with comments »