| Index: src/s390/builtins-s390.cc
|
| diff --git a/src/ppc/builtins-ppc.cc b/src/s390/builtins-s390.cc
|
| similarity index 63%
|
| copy from src/ppc/builtins-ppc.cc
|
| copy to src/s390/builtins-s390.cc
|
| index d83e82a765ee2274113467ac26891046b0eb9d01..35aaeb95d286b55fe8c861a24eab40f44e29b16c 100644
|
| --- a/src/ppc/builtins-ppc.cc
|
| +++ b/src/s390/builtins-s390.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#if V8_TARGET_ARCH_PPC
|
| +#if V8_TARGET_ARCH_S390
|
|
|
| #include "src/codegen.h"
|
| #include "src/debug/debug.h"
|
| @@ -13,56 +13,53 @@
|
| namespace v8 {
|
| namespace internal {
|
|
|
| -
|
| #define __ ACCESS_MASM(masm)
|
|
|
| -
|
| void Builtins::Generate_Adaptor(MacroAssembler* masm, CFunctionId id,
|
| BuiltinExtraArguments extra_args) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments excluding receiver
|
| - // -- r4 : target
|
| - // -- r6 : new.target
|
| + // -- r2 : number of arguments excluding receiver
|
| + // -- r3 : target
|
| + // -- r5 : new.target
|
| // -- sp[0] : last argument
|
| // -- ...
|
| // -- sp[4 * (argc - 1)] : first argument
|
| // -- sp[4 * argc] : receiver
|
| // -----------------------------------
|
| - __ AssertFunction(r4);
|
| + __ AssertFunction(r3);
|
|
|
| // Make sure we operate in the context of the called function (for example
|
| // ConstructStubs implemented in C++ will be run in the context of the caller
|
| // instead of the callee, due to the way that [[Construct]] is defined for
|
| // ordinary functions).
|
| - __ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
|
| + __ LoadP(cp, FieldMemOperand(r3, JSFunction::kContextOffset));
|
|
|
| // Insert extra arguments.
|
| int num_extra_args = 0;
|
| switch (extra_args) {
|
| case BuiltinExtraArguments::kTarget:
|
| - __ Push(r4);
|
| + __ Push(r3);
|
| ++num_extra_args;
|
| break;
|
| case BuiltinExtraArguments::kNewTarget:
|
| - __ Push(r6);
|
| + __ Push(r5);
|
| ++num_extra_args;
|
| break;
|
| case BuiltinExtraArguments::kTargetAndNewTarget:
|
| - __ Push(r4, r6);
|
| + __ Push(r3, r5);
|
| num_extra_args += 2;
|
| break;
|
| case BuiltinExtraArguments::kNone:
|
| break;
|
| }
|
|
|
| - // JumpToExternalReference expects r3 to contain the number of arguments
|
| + // JumpToExternalReference expects r2 to contain the number of arguments
|
| // including the receiver and the extra arguments.
|
| - __ addi(r3, r3, Operand(num_extra_args + 1));
|
| + __ AddP(r2, r2, Operand(num_extra_args + 1));
|
|
|
| __ JumpToExternalReference(ExternalReference(id, masm->isolate()));
|
| }
|
|
|
| -
|
| // Load the built-in InternalArray function from the current context.
|
| static void GenerateLoadInternalArrayFunction(MacroAssembler* masm,
|
| Register result) {
|
| @@ -70,31 +67,29 @@ static void GenerateLoadInternalArrayFunction(MacroAssembler* masm,
|
| __ LoadNativeContextSlot(Context::INTERNAL_ARRAY_FUNCTION_INDEX, result);
|
| }
|
|
|
| -
|
| // Load the built-in Array function from the current context.
|
| static void GenerateLoadArrayFunction(MacroAssembler* masm, Register result) {
|
| // Load the Array function from the current native context.
|
| __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, result);
|
| }
|
|
|
| -
|
| void Builtins::Generate_InternalArrayCode(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| + // -- r2 : number of arguments
|
| // -- lr : return address
|
| // -- sp[...]: constructor arguments
|
| // -----------------------------------
|
| Label generic_array_code, one_or_more_arguments, two_or_more_arguments;
|
|
|
| // Get the InternalArray function.
|
| - GenerateLoadInternalArrayFunction(masm, r4);
|
| + GenerateLoadInternalArrayFunction(masm, r3);
|
|
|
| if (FLAG_debug_code) {
|
| // Initial map for the builtin InternalArray functions should be maps.
|
| - __ LoadP(r5, FieldMemOperand(r4, JSFunction::kPrototypeOrInitialMapOffset));
|
| - __ TestIfSmi(r5, r0);
|
| + __ LoadP(r4, FieldMemOperand(r3, JSFunction::kPrototypeOrInitialMapOffset));
|
| + __ TestIfSmi(r4);
|
| __ Assert(ne, kUnexpectedInitialMapForInternalArrayFunction, cr0);
|
| - __ CompareObjectType(r5, r6, r7, MAP_TYPE);
|
| + __ CompareObjectType(r4, r5, r6, MAP_TYPE);
|
| __ Assert(eq, kUnexpectedInitialMapForInternalArrayFunction);
|
| }
|
|
|
| @@ -105,40 +100,38 @@ void Builtins::Generate_InternalArrayCode(MacroAssembler* masm) {
|
| __ TailCallStub(&stub);
|
| }
|
|
|
| -
|
| void Builtins::Generate_ArrayCode(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| + // -- r2 : number of arguments
|
| // -- lr : return address
|
| // -- sp[...]: constructor arguments
|
| // -----------------------------------
|
| Label generic_array_code, one_or_more_arguments, two_or_more_arguments;
|
|
|
| // Get the Array function.
|
| - GenerateLoadArrayFunction(masm, r4);
|
| + GenerateLoadArrayFunction(masm, r3);
|
|
|
| if (FLAG_debug_code) {
|
| // Initial map for the builtin Array functions should be maps.
|
| - __ LoadP(r5, FieldMemOperand(r4, JSFunction::kPrototypeOrInitialMapOffset));
|
| - __ TestIfSmi(r5, r0);
|
| + __ LoadP(r4, FieldMemOperand(r3, JSFunction::kPrototypeOrInitialMapOffset));
|
| + __ TestIfSmi(r4);
|
| __ Assert(ne, kUnexpectedInitialMapForArrayFunction, cr0);
|
| - __ CompareObjectType(r5, r6, r7, MAP_TYPE);
|
| + __ CompareObjectType(r4, r5, r6, MAP_TYPE);
|
| __ Assert(eq, kUnexpectedInitialMapForArrayFunction);
|
| }
|
|
|
| - __ mr(r6, r4);
|
| + __ LoadRR(r5, r3);
|
| // Run the native code for the Array function called as a normal function.
|
| // tail call a stub
|
| - __ LoadRoot(r5, Heap::kUndefinedValueRootIndex);
|
| + __ LoadRoot(r4, Heap::kUndefinedValueRootIndex);
|
| ArrayConstructorStub stub(masm->isolate());
|
| __ TailCallStub(&stub);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_MathMaxMin(MacroAssembler* masm, MathMaxMinKind kind) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| + // -- r2 : number of arguments
|
| // -- lr : return address
|
| // -- sp[(argc - n) * 8] : arg[n] (zero-based)
|
| // -- sp[(argc + 1) * 8] : receiver
|
| @@ -150,111 +143,113 @@ void Builtins::Generate_MathMaxMin(MacroAssembler* masm, MathMaxMinKind kind) {
|
| DoubleRegister const reg = (kind == MathMaxMinKind::kMin) ? d2 : d1;
|
|
|
| // Load the accumulator with the default return value (either -Infinity or
|
| - // +Infinity), with the tagged value in r4 and the double value in d1.
|
| - __ LoadRoot(r4, root_index);
|
| - __ lfd(d1, FieldMemOperand(r4, HeapNumber::kValueOffset));
|
| + // +Infinity), with the tagged value in r3 and the double value in d1.
|
| + __ LoadRoot(r3, root_index);
|
| + __ LoadDouble(d1, FieldMemOperand(r3, HeapNumber::kValueOffset));
|
|
|
| // Setup state for loop
|
| - // r5: address of arg[0] + kPointerSize
|
| - // r6: number of slots to drop at exit (arguments + receiver)
|
| - __ ShiftLeftImm(r5, r3, Operand(kPointerSizeLog2));
|
| - __ add(r5, sp, r5);
|
| - __ addi(r6, r3, Operand(1));
|
| + // r4: address of arg[0] + kPointerSize
|
| + // r5: number of slots to drop at exit (arguments + receiver)
|
| + __ ShiftLeftP(r4, r2, Operand(kPointerSizeLog2));
|
| + __ AddP(r4, sp, r4);
|
| + __ AddP(r5, r2, Operand(1));
|
|
|
| Label done_loop, loop;
|
| __ bind(&loop);
|
| {
|
| // Check if all parameters done.
|
| - __ cmpl(r5, sp);
|
| + __ CmpLogicalP(r4, sp);
|
| __ ble(&done_loop);
|
|
|
| - // Load the next parameter tagged value into r3.
|
| - __ LoadPU(r3, MemOperand(r5, -kPointerSize));
|
| + // Load the next parameter tagged value into r2.
|
| + __ lay(r4, MemOperand(r4, -kPointerSize));
|
| + __ LoadP(r2, MemOperand(r4));
|
|
|
| // Load the double value of the parameter into d2, maybe converting the
|
| // parameter to a number first using the ToNumberStub if necessary.
|
| Label convert, convert_smi, convert_number, done_convert;
|
| __ bind(&convert);
|
| - __ JumpIfSmi(r3, &convert_smi);
|
| - __ LoadP(r7, FieldMemOperand(r3, HeapObject::kMapOffset));
|
| - __ JumpIfRoot(r7, Heap::kHeapNumberMapRootIndex, &convert_number);
|
| + __ JumpIfSmi(r2, &convert_smi);
|
| + __ LoadP(r6, FieldMemOperand(r2, HeapObject::kMapOffset));
|
| + __ JumpIfRoot(r6, Heap::kHeapNumberMapRootIndex, &convert_number);
|
| {
|
| // Parameter is not a Number, use the ToNumberStub to convert it.
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ SmiTag(r6);
|
| - __ Push(r4, r5, r6);
|
| + __ SmiTag(r5);
|
| + __ Push(r3, r4, r5);
|
| ToNumberStub stub(masm->isolate());
|
| __ CallStub(&stub);
|
| - __ Pop(r4, r5, r6);
|
| - __ SmiUntag(r6);
|
| + __ Pop(r3, r4, r5);
|
| + __ SmiUntag(r5);
|
| {
|
| // Restore the double accumulator value (d1).
|
| Label done_restore;
|
| - __ SmiToDouble(d1, r4);
|
| - __ JumpIfSmi(r4, &done_restore);
|
| - __ lfd(d1, FieldMemOperand(r4, HeapNumber::kValueOffset));
|
| + __ SmiToDouble(d1, r3);
|
| + __ JumpIfSmi(r3, &done_restore);
|
| + __ LoadDouble(d1, FieldMemOperand(r3, HeapNumber::kValueOffset));
|
| __ bind(&done_restore);
|
| }
|
| }
|
| __ b(&convert);
|
| __ bind(&convert_number);
|
| - __ lfd(d2, FieldMemOperand(r3, HeapNumber::kValueOffset));
|
| + __ LoadDouble(d2, FieldMemOperand(r2, HeapNumber::kValueOffset));
|
| __ b(&done_convert);
|
| __ bind(&convert_smi);
|
| - __ SmiToDouble(d2, r3);
|
| + __ SmiToDouble(d2, r2);
|
| __ bind(&done_convert);
|
|
|
| // Perform the actual comparison with the accumulator value on the left hand
|
| // side (d1) and the next parameter value on the right hand side (d2).
|
| Label compare_nan, compare_swap;
|
| - __ fcmpu(d1, d2);
|
| + __ cdbr(d1, d2);
|
| __ bunordered(&compare_nan);
|
| __ b(cond_done, &loop);
|
| __ b(CommuteCondition(cond_done), &compare_swap);
|
|
|
| // Left and right hand side are equal, check for -0 vs. +0.
|
| - __ TestDoubleIsMinusZero(reg, r7, r8);
|
| + __ TestDoubleIsMinusZero(reg, r6, r7);
|
| __ bne(&loop);
|
|
|
| // Update accumulator. Result is on the right hand side.
|
| __ bind(&compare_swap);
|
| - __ fmr(d1, d2);
|
| - __ mr(r4, r3);
|
| + __ ldr(d1, d2);
|
| + __ LoadRR(r3, r2);
|
| __ b(&loop);
|
|
|
| // At least one side is NaN, which means that the result will be NaN too.
|
| // We still need to visit the rest of the arguments.
|
| __ bind(&compare_nan);
|
| - __ LoadRoot(r4, Heap::kNanValueRootIndex);
|
| - __ lfd(d1, FieldMemOperand(r4, HeapNumber::kValueOffset));
|
| + __ LoadRoot(r3, Heap::kNanValueRootIndex);
|
| + __ LoadDouble(d1, FieldMemOperand(r3, HeapNumber::kValueOffset));
|
| __ b(&loop);
|
| }
|
|
|
| __ bind(&done_loop);
|
| - __ mr(r3, r4);
|
| - __ Drop(r6);
|
| + __ LoadRR(r2, r3);
|
| + __ Drop(r5);
|
| __ Ret();
|
| }
|
|
|
| // static
|
| void Builtins::Generate_NumberConstructor(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| - // -- r4 : constructor function
|
| + // -- r2 : number of arguments
|
| + // -- r3 : constructor function
|
| // -- lr : return address
|
| // -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
|
| // -- sp[argc * 4] : receiver
|
| // -----------------------------------
|
|
|
| - // 1. Load the first argument into r3 and get rid of the rest (including the
|
| + // 1. Load the first argument into r2 and get rid of the rest (including the
|
| // receiver).
|
| Label no_arguments;
|
| {
|
| - __ cmpi(r3, Operand::Zero());
|
| + __ CmpP(r2, Operand::Zero());
|
| __ beq(&no_arguments);
|
| - __ subi(r3, r3, Operand(1));
|
| - __ ShiftLeftImm(r3, r3, Operand(kPointerSizeLog2));
|
| - __ LoadPUX(r3, MemOperand(sp, r3));
|
| + __ SubP(r2, r2, Operand(1));
|
| + __ ShiftLeftP(r2, r2, Operand(kPointerSizeLog2));
|
| + __ la(sp, MemOperand(sp, r2));
|
| + __ LoadP(r2, MemOperand(sp));
|
| __ Drop(2);
|
| }
|
|
|
| @@ -264,112 +259,111 @@ void Builtins::Generate_NumberConstructor(MacroAssembler* masm) {
|
|
|
| // 2b. No arguments, return +0.
|
| __ bind(&no_arguments);
|
| - __ LoadSmiLiteral(r3, Smi::FromInt(0));
|
| + __ LoadSmiLiteral(r2, Smi::FromInt(0));
|
| __ Ret(1);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_NumberConstructor_ConstructStub(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| - // -- r4 : constructor function
|
| - // -- r6 : new target
|
| + // -- r2 : number of arguments
|
| + // -- r3 : constructor function
|
| + // -- r5 : new target
|
| // -- lr : return address
|
| // -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
|
| // -- sp[argc * 4] : receiver
|
| // -----------------------------------
|
|
|
| // 1. Make sure we operate in the context of the called function.
|
| - __ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
|
| + __ LoadP(cp, FieldMemOperand(r3, JSFunction::kContextOffset));
|
|
|
| - // 2. Load the first argument into r5 and get rid of the rest (including the
|
| + // 2. Load the first argument into r4 and get rid of the rest (including the
|
| // receiver).
|
| {
|
| Label no_arguments, done;
|
| - __ cmpi(r3, Operand::Zero());
|
| + __ CmpP(r2, Operand::Zero());
|
| __ beq(&no_arguments);
|
| - __ subi(r3, r3, Operand(1));
|
| - __ ShiftLeftImm(r5, r3, Operand(kPointerSizeLog2));
|
| - __ LoadPUX(r5, MemOperand(sp, r5));
|
| + __ SubP(r2, r2, Operand(1));
|
| + __ ShiftLeftP(r4, r2, Operand(kPointerSizeLog2));
|
| + __ la(sp, MemOperand(sp, r4));
|
| + __ LoadP(r4, MemOperand(sp));
|
| __ Drop(2);
|
| __ b(&done);
|
| __ bind(&no_arguments);
|
| - __ LoadSmiLiteral(r5, Smi::FromInt(0));
|
| + __ LoadSmiLiteral(r4, Smi::FromInt(0));
|
| __ Drop(1);
|
| __ bind(&done);
|
| }
|
|
|
| - // 3. Make sure r5 is a number.
|
| + // 3. Make sure r4 is a number.
|
| {
|
| Label done_convert;
|
| - __ JumpIfSmi(r5, &done_convert);
|
| - __ CompareObjectType(r5, r7, r7, HEAP_NUMBER_TYPE);
|
| + __ JumpIfSmi(r4, &done_convert);
|
| + __ CompareObjectType(r4, r6, r6, HEAP_NUMBER_TYPE);
|
| __ beq(&done_convert);
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ Push(r4, r6);
|
| - __ mr(r3, r5);
|
| + __ Push(r3, r5);
|
| + __ LoadRR(r2, r4);
|
| ToNumberStub stub(masm->isolate());
|
| __ CallStub(&stub);
|
| - __ mr(r5, r3);
|
| - __ Pop(r4, r6);
|
| + __ LoadRR(r4, r2);
|
| + __ Pop(r3, r5);
|
| }
|
| __ bind(&done_convert);
|
| }
|
|
|
| // 4. Check if new target and constructor differ.
|
| Label new_object;
|
| - __ cmp(r4, r6);
|
| + __ CmpP(r3, r5);
|
| __ bne(&new_object);
|
|
|
| // 5. Allocate a JSValue wrapper for the number.
|
| - __ AllocateJSValue(r3, r4, r5, r7, r8, &new_object);
|
| + __ AllocateJSValue(r2, r3, r4, r6, r7, &new_object);
|
| __ Ret();
|
|
|
| // 6. Fallback to the runtime to create new object.
|
| __ bind(&new_object);
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ Push(r5); // first argument
|
| + __ Push(r4); // first argument
|
| FastNewObjectStub stub(masm->isolate());
|
| __ CallStub(&stub);
|
| - __ Pop(r5);
|
| + __ Pop(r4);
|
| }
|
| - __ StoreP(r5, FieldMemOperand(r3, JSValue::kValueOffset), r0);
|
| + __ StoreP(r4, FieldMemOperand(r2, JSValue::kValueOffset), r0);
|
| __ Ret();
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_StringConstructor(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| - // -- r4 : constructor function
|
| + // -- r2 : number of arguments
|
| + // -- r3 : constructor function
|
| // -- lr : return address
|
| // -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
|
| // -- sp[argc * 4] : receiver
|
| // -----------------------------------
|
| -
|
| - // 1. Load the first argument into r3 and get rid of the rest (including the
|
| + // 1. Load the first argument into r2 and get rid of the rest (including the
|
| // receiver).
|
| Label no_arguments;
|
| {
|
| - __ cmpi(r3, Operand::Zero());
|
| + __ CmpP(r2, Operand::Zero());
|
| __ beq(&no_arguments);
|
| - __ subi(r3, r3, Operand(1));
|
| - __ ShiftLeftImm(r3, r3, Operand(kPointerSizeLog2));
|
| - __ LoadPUX(r3, MemOperand(sp, r3));
|
| + __ SubP(r2, r2, Operand(1));
|
| + __ ShiftLeftP(r2, r2, Operand(kPointerSizeLog2));
|
| + __ lay(sp, MemOperand(sp, r2));
|
| + __ LoadP(r2, MemOperand(sp));
|
| __ Drop(2);
|
| }
|
|
|
| - // 2a. At least one argument, return r3 if it's a string, otherwise
|
| + // 2a. At least one argument, return r2 if it's a string, otherwise
|
| // dispatch to appropriate conversion.
|
| Label to_string, symbol_descriptive_string;
|
| {
|
| - __ JumpIfSmi(r3, &to_string);
|
| + __ JumpIfSmi(r2, &to_string);
|
| STATIC_ASSERT(FIRST_NONSTRING_TYPE == SYMBOL_TYPE);
|
| - __ CompareObjectType(r3, r4, r4, FIRST_NONSTRING_TYPE);
|
| + __ CompareObjectType(r2, r3, r3, FIRST_NONSTRING_TYPE);
|
| __ bgt(&to_string);
|
| __ beq(&symbol_descriptive_string);
|
| __ Ret();
|
| @@ -378,133 +372,130 @@ void Builtins::Generate_StringConstructor(MacroAssembler* masm) {
|
| // 2b. No arguments, return the empty string (and pop the receiver).
|
| __ bind(&no_arguments);
|
| {
|
| - __ LoadRoot(r3, Heap::kempty_stringRootIndex);
|
| + __ LoadRoot(r2, Heap::kempty_stringRootIndex);
|
| __ Ret(1);
|
| }
|
|
|
| - // 3a. Convert r3 to a string.
|
| + // 3a. Convert r2 to a string.
|
| __ bind(&to_string);
|
| {
|
| ToStringStub stub(masm->isolate());
|
| __ TailCallStub(&stub);
|
| }
|
| -
|
| - // 3b. Convert symbol in r3 to a string.
|
| + // 3b. Convert symbol in r2 to a string.
|
| __ bind(&symbol_descriptive_string);
|
| {
|
| - __ Push(r3);
|
| + __ Push(r2);
|
| __ TailCallRuntime(Runtime::kSymbolDescriptiveString);
|
| }
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_StringConstructor_ConstructStub(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| - // -- r4 : constructor function
|
| - // -- r6 : new target
|
| + // -- r2 : number of arguments
|
| + // -- r3 : constructor function
|
| + // -- r5 : new target
|
| // -- lr : return address
|
| // -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
|
| // -- sp[argc * 4] : receiver
|
| // -----------------------------------
|
|
|
| // 1. Make sure we operate in the context of the called function.
|
| - __ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
|
| + __ LoadP(cp, FieldMemOperand(r3, JSFunction::kContextOffset));
|
|
|
| - // 2. Load the first argument into r5 and get rid of the rest (including the
|
| + // 2. Load the first argument into r4 and get rid of the rest (including the
|
| // receiver).
|
| {
|
| Label no_arguments, done;
|
| - __ cmpi(r3, Operand::Zero());
|
| + __ CmpP(r2, Operand::Zero());
|
| __ beq(&no_arguments);
|
| - __ subi(r3, r3, Operand(1));
|
| - __ ShiftLeftImm(r5, r3, Operand(kPointerSizeLog2));
|
| - __ LoadPUX(r5, MemOperand(sp, r5));
|
| + __ SubP(r2, r2, Operand(1));
|
| + __ ShiftLeftP(r4, r2, Operand(kPointerSizeLog2));
|
| + __ lay(sp, MemOperand(sp, r4));
|
| + __ LoadP(r4, MemOperand(sp));
|
| __ Drop(2);
|
| __ b(&done);
|
| __ bind(&no_arguments);
|
| - __ LoadRoot(r5, Heap::kempty_stringRootIndex);
|
| + __ LoadRoot(r4, Heap::kempty_stringRootIndex);
|
| __ Drop(1);
|
| __ bind(&done);
|
| }
|
|
|
| - // 3. Make sure r5 is a string.
|
| + // 3. Make sure r4 is a string.
|
| {
|
| Label convert, done_convert;
|
| - __ JumpIfSmi(r5, &convert);
|
| - __ CompareObjectType(r5, r7, r7, FIRST_NONSTRING_TYPE);
|
| + __ JumpIfSmi(r4, &convert);
|
| + __ CompareObjectType(r4, r6, r6, FIRST_NONSTRING_TYPE);
|
| __ blt(&done_convert);
|
| __ bind(&convert);
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| ToStringStub stub(masm->isolate());
|
| - __ Push(r4, r6);
|
| - __ mr(r3, r5);
|
| + __ Push(r3, r5);
|
| + __ LoadRR(r2, r4);
|
| __ CallStub(&stub);
|
| - __ mr(r5, r3);
|
| - __ Pop(r4, r6);
|
| + __ LoadRR(r4, r2);
|
| + __ Pop(r3, r5);
|
| }
|
| __ bind(&done_convert);
|
| }
|
|
|
| // 4. Check if new target and constructor differ.
|
| Label new_object;
|
| - __ cmp(r4, r6);
|
| + __ CmpP(r3, r5);
|
| __ bne(&new_object);
|
|
|
| // 5. Allocate a JSValue wrapper for the string.
|
| - __ AllocateJSValue(r3, r4, r5, r7, r8, &new_object);
|
| + __ AllocateJSValue(r2, r3, r4, r6, r7, &new_object);
|
| __ Ret();
|
|
|
| // 6. Fallback to the runtime to create new object.
|
| __ bind(&new_object);
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ Push(r5); // first argument
|
| + __ Push(r4); // first argument
|
| FastNewObjectStub stub(masm->isolate());
|
| __ CallStub(&stub);
|
| - __ Pop(r5);
|
| + __ Pop(r4);
|
| }
|
| - __ StoreP(r5, FieldMemOperand(r3, JSValue::kValueOffset), r0);
|
| + __ StoreP(r4, FieldMemOperand(r2, JSValue::kValueOffset), r0);
|
| __ Ret();
|
| }
|
|
|
| -
|
| static void GenerateTailCallToSharedCode(MacroAssembler* masm) {
|
| - __ LoadP(ip, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
|
| + __ LoadP(ip, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
|
| __ LoadP(ip, FieldMemOperand(ip, SharedFunctionInfo::kCodeOffset));
|
| - __ addi(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ AddP(ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ JumpToJSEntry(ip);
|
| }
|
|
|
| static void GenerateTailCallToReturnedCode(MacroAssembler* masm,
|
| Runtime::FunctionId function_id) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argument count (preserved for callee)
|
| - // -- r4 : target function (preserved for callee)
|
| - // -- r6 : new target (preserved for callee)
|
| + // -- r2 : argument count (preserved for callee)
|
| + // -- r3 : target function (preserved for callee)
|
| + // -- r5 : new target (preserved for callee)
|
| // -----------------------------------
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| // Push the number of arguments to the callee.
|
| // Push a copy of the target function and the new target.
|
| // Push function as parameter to the runtime call.
|
| - __ SmiTag(r3);
|
| - __ Push(r3, r4, r6, r4);
|
| + __ SmiTag(r2);
|
| + __ Push(r2, r3, r5, r3);
|
|
|
| __ CallRuntime(function_id, 1);
|
| - __ mr(r5, r3);
|
| + __ LoadRR(r4, r2);
|
|
|
| // Restore target function and new target.
|
| - __ Pop(r3, r4, r6);
|
| - __ SmiUntag(r3);
|
| + __ Pop(r2, r3, r5);
|
| + __ SmiUntag(r2);
|
| }
|
| - __ addi(ip, r5, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ AddP(ip, r4, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ JumpToJSEntry(ip);
|
| }
|
|
|
| -
|
| void Builtins::Generate_InOptimizationQueue(MacroAssembler* masm) {
|
| // Checking whether the queued function is ready for install is optional,
|
| // since we come across interrupts and stack checks elsewhere. However,
|
| @@ -512,9 +503,8 @@ void Builtins::Generate_InOptimizationQueue(MacroAssembler* masm) {
|
| // would be quite expensive. A good compromise is to first check against
|
| // stack limit as a cue for an interrupt signal.
|
| Label ok;
|
| - __ LoadRoot(ip, Heap::kStackLimitRootIndex);
|
| - __ cmpl(sp, ip);
|
| - __ bge(&ok);
|
| + __ CmpLogicalP(sp, RootMemOperand(Heap::kStackLimitRootIndex));
|
| + __ bge(&ok, Label::kNear);
|
|
|
| GenerateTailCallToReturnedCode(masm, Runtime::kTryInstallOptimizedCode);
|
|
|
| @@ -522,16 +512,15 @@ void Builtins::Generate_InOptimizationQueue(MacroAssembler* masm) {
|
| GenerateTailCallToSharedCode(masm);
|
| }
|
|
|
| -
|
| static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| bool is_api_function,
|
| bool create_implicit_receiver,
|
| bool check_derived_construct) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments
|
| - // -- r4 : constructor function
|
| - // -- r5 : allocation site or undefined
|
| - // -- r6 : new target
|
| + // -- r2 : number of arguments
|
| + // -- r3 : constructor function
|
| + // -- r4 : allocation site or undefined
|
| + // -- r5 : new target
|
| // -- lr : return address
|
| // -- sp[...]: constructor arguments
|
| // -----------------------------------
|
| @@ -543,74 +532,76 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| FrameAndConstantPoolScope scope(masm, StackFrame::CONSTRUCT);
|
|
|
| // Preserve the incoming parameters on the stack.
|
| - __ AssertUndefinedOrAllocationSite(r5, r7);
|
| + __ AssertUndefinedOrAllocationSite(r4, r6);
|
|
|
| if (!create_implicit_receiver) {
|
| - __ SmiTag(r7, r3, SetRC);
|
| - __ Push(r5, r7);
|
| + __ SmiTag(r6, r2);
|
| + __ LoadAndTestP(r6, r6);
|
| + __ Push(r4, r6);
|
| __ PushRoot(Heap::kTheHoleValueRootIndex);
|
| } else {
|
| - __ SmiTag(r3);
|
| - __ Push(r5, r3);
|
| + __ SmiTag(r2);
|
| + __ Push(r4, r2);
|
|
|
| // Allocate the new receiver object.
|
| - __ Push(r4, r6);
|
| + __ Push(r3, r5);
|
| FastNewObjectStub stub(masm->isolate());
|
| __ CallStub(&stub);
|
| - __ mr(r7, r3);
|
| - __ Pop(r4, r6);
|
| + __ LoadRR(r6, r2);
|
| + __ Pop(r3, r5);
|
|
|
| // ----------- S t a t e -------------
|
| - // -- r4: constructor function
|
| - // -- r6: new target
|
| - // -- r7: newly allocated object
|
| + // -- r3: constructor function
|
| + // -- r5: new target
|
| + // -- r6: newly allocated object
|
| // -----------------------------------
|
|
|
| // Retrieve smi-tagged arguments count from the stack.
|
| - __ LoadP(r3, MemOperand(sp));
|
| - __ SmiUntag(r3, SetRC);
|
| + __ LoadP(r2, MemOperand(sp));
|
| + __ SmiUntag(r2);
|
| + __ LoadAndTestP(r2, r2);
|
|
|
| // Push the allocated receiver to the stack. We need two copies
|
| // because we may have to return the original one and the calling
|
| // conventions dictate that the called function pops the receiver.
|
| - __ Push(r7, r7);
|
| + __ Push(r6, r6);
|
| }
|
|
|
| // Set up pointer to last argument.
|
| - __ addi(r5, fp, Operand(StandardFrameConstants::kCallerSPOffset));
|
| + __ la(r4, MemOperand(fp, StandardFrameConstants::kCallerSPOffset));
|
|
|
| // Copy arguments and receiver to the expression stack.
|
| - // r3: number of arguments
|
| - // r4: constructor function
|
| - // r5: address of last argument (caller sp)
|
| - // r6: new target
|
| - // cr0: condition indicating whether r3 is zero
|
| + // r2: number of arguments
|
| + // r3: constructor function
|
| + // r4: address of last argument (caller sp)
|
| + // r5: new target
|
| + // cr0: condition indicating whether r2 is zero
|
| // sp[0]: receiver
|
| // sp[1]: receiver
|
| // sp[2]: number of arguments (smi-tagged)
|
| Label loop, no_args;
|
| - __ beq(&no_args, cr0);
|
| - __ ShiftLeftImm(ip, r3, Operand(kPointerSizeLog2));
|
| - __ sub(sp, sp, ip);
|
| - __ mtctr(r3);
|
| + __ beq(&no_args);
|
| + __ ShiftLeftP(ip, r2, Operand(kPointerSizeLog2));
|
| + __ SubP(sp, sp, ip);
|
| + __ LoadRR(r1, r2);
|
| __ bind(&loop);
|
| - __ subi(ip, ip, Operand(kPointerSize));
|
| - __ LoadPX(r0, MemOperand(r5, ip));
|
| - __ StorePX(r0, MemOperand(sp, ip));
|
| - __ bdnz(&loop);
|
| + __ lay(ip, MemOperand(ip, -kPointerSize));
|
| + __ LoadP(r0, MemOperand(ip, r4));
|
| + __ StoreP(r0, MemOperand(ip, sp));
|
| + __ BranchOnCount(r1, &loop);
|
| __ bind(&no_args);
|
|
|
| // Call the function.
|
| - // r3: number of arguments
|
| - // r4: constructor function
|
| - // r6: new target
|
| + // r2: number of arguments
|
| + // r3: constructor function
|
| + // r5: new target
|
| if (is_api_function) {
|
| - __ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
|
| + __ LoadP(cp, FieldMemOperand(r3, JSFunction::kContextOffset));
|
| Handle<Code> code = masm->isolate()->builtins()->HandleApiCallConstruct();
|
| __ Call(code, RelocInfo::CODE_TARGET);
|
| } else {
|
| - ParameterCount actual(r3);
|
| - __ InvokeFunction(r4, r6, actual, CALL_FUNCTION,
|
| + ParameterCount actual(r2);
|
| + __ InvokeFunction(r3, r5, actual, CALL_FUNCTION,
|
| CheckDebugStepCallWrapper());
|
| }
|
|
|
| @@ -620,7 +611,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| }
|
|
|
| // Restore context from the frame.
|
| - // r3: result
|
| + // r2: result
|
| // sp[0]: receiver
|
| // sp[1]: number of arguments (smi-tagged)
|
| __ LoadP(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| @@ -632,30 +623,31 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| Label use_receiver, exit;
|
|
|
| // If the result is a smi, it is *not* an object in the ECMA sense.
|
| - // r3: result
|
| + // r2: result
|
| // sp[0]: receiver
|
| - // sp[1]: number of arguments (smi-tagged)
|
| - __ JumpIfSmi(r3, &use_receiver);
|
| + // sp[1]: new.target
|
| + // sp[2]: number of arguments (smi-tagged)
|
| + __ JumpIfSmi(r2, &use_receiver);
|
|
|
| // If the type of the result (stored in its map) is less than
|
| // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
|
| - __ CompareObjectType(r3, r4, r6, FIRST_JS_RECEIVER_TYPE);
|
| + __ CompareObjectType(r2, r3, r5, FIRST_JS_RECEIVER_TYPE);
|
| __ bge(&exit);
|
|
|
| // Throw away the result of the constructor invocation and use the
|
| // on-stack receiver as the result.
|
| __ bind(&use_receiver);
|
| - __ LoadP(r3, MemOperand(sp));
|
| + __ LoadP(r2, MemOperand(sp));
|
|
|
| // Remove receiver from the stack, remove caller arguments, and
|
| // return.
|
| __ bind(&exit);
|
| - // r3: result
|
| + // r2: result
|
| // sp[0]: receiver (newly allocated object)
|
| // sp[1]: number of arguments (smi-tagged)
|
| - __ LoadP(r4, MemOperand(sp, 1 * kPointerSize));
|
| + __ LoadP(r3, MemOperand(sp, 1 * kPointerSize));
|
| } else {
|
| - __ LoadP(r4, MemOperand(sp));
|
| + __ LoadP(r3, MemOperand(sp));
|
| }
|
|
|
| // Leave construct frame.
|
| @@ -666,7 +658,7 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| // from a derived class is neither undefined nor an Object.
|
| if (check_derived_construct) {
|
| Label dont_throw;
|
| - __ JumpIfNotSmi(r3, &dont_throw);
|
| + __ JumpIfNotSmi(r2, &dont_throw);
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| __ CallRuntime(Runtime::kThrowDerivedConstructorReturnedNonObject);
|
| @@ -674,66 +666,59 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| __ bind(&dont_throw);
|
| }
|
|
|
| - __ SmiToPtrArrayOffset(r4, r4);
|
| - __ add(sp, sp, r4);
|
| - __ addi(sp, sp, Operand(kPointerSize));
|
| + __ SmiToPtrArrayOffset(r3, r3);
|
| + __ AddP(sp, sp, r3);
|
| + __ AddP(sp, sp, Operand(kPointerSize));
|
| if (create_implicit_receiver) {
|
| - __ IncrementCounter(isolate->counters()->constructed_objects(), 1, r4, r5);
|
| + __ IncrementCounter(isolate->counters()->constructed_objects(), 1, r3, r4);
|
| }
|
| - __ blr();
|
| + __ Ret();
|
| }
|
|
|
| -
|
| void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
|
| Generate_JSConstructStubHelper(masm, false, true, false);
|
| }
|
|
|
| -
|
| void Builtins::Generate_JSConstructStubApi(MacroAssembler* masm) {
|
| Generate_JSConstructStubHelper(masm, true, false, false);
|
| }
|
|
|
| -
|
| void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) {
|
| Generate_JSConstructStubHelper(masm, false, false, false);
|
| }
|
|
|
| -
|
| void Builtins::Generate_JSBuiltinsConstructStubForDerived(
|
| MacroAssembler* masm) {
|
| Generate_JSConstructStubHelper(masm, false, false, true);
|
| }
|
|
|
| -
|
| void Builtins::Generate_ConstructedNonConstructable(MacroAssembler* masm) {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ push(r4);
|
| + __ push(r3);
|
| __ CallRuntime(Runtime::kThrowConstructedNonConstructable);
|
| }
|
|
|
| -
|
| enum IsTagged { kArgcIsSmiTagged, kArgcIsUntaggedInt };
|
|
|
| -
|
| -// Clobbers r5; preserves all other registers.
|
| +// Clobbers r4; preserves all other registers.
|
| static void Generate_CheckStackOverflow(MacroAssembler* masm, Register argc,
|
| IsTagged argc_is_tagged) {
|
| // Check the stack for overflow. We are not trying to catch
|
| // interruptions (e.g. debug break and preemption) here, so the "real stack
|
| // limit" is checked.
|
| Label okay;
|
| - __ LoadRoot(r5, Heap::kRealStackLimitRootIndex);
|
| - // Make r5 the space we have left. The stack might already be overflowed
|
| - // here which will cause r5 to become negative.
|
| - __ sub(r5, sp, r5);
|
| + __ LoadRoot(r4, Heap::kRealStackLimitRootIndex);
|
| + // Make r4 the space we have left. The stack might already be overflowed
|
| + // here which will cause r4 to become negative.
|
| + __ SubP(r4, sp, r4);
|
| // Check if the arguments will overflow the stack.
|
| if (argc_is_tagged == kArgcIsSmiTagged) {
|
| __ SmiToPtrArrayOffset(r0, argc);
|
| } else {
|
| DCHECK(argc_is_tagged == kArgcIsUntaggedInt);
|
| - __ ShiftLeftImm(r0, argc, Operand(kPointerSizeLog2));
|
| + __ ShiftLeftP(r0, argc, Operand(kPointerSizeLog2));
|
| }
|
| - __ cmp(r5, r0);
|
| + __ CmpP(r4, r0);
|
| __ bgt(&okay); // Signed comparison.
|
|
|
| // Out of stack space.
|
| @@ -742,23 +727,23 @@ static void Generate_CheckStackOverflow(MacroAssembler* masm, Register argc,
|
| __ bind(&okay);
|
| }
|
|
|
| -
|
| static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
|
| bool is_construct) {
|
| // Called from Generate_JS_Entry
|
| - // r3: new.target
|
| - // r4: function
|
| - // r5: receiver
|
| - // r6: argc
|
| - // r7: argv
|
| - // r0,r8-r9, cp may be clobbered
|
| + // r2: new.target
|
| + // r3: function
|
| + // r4: receiver
|
| + // r5: argc
|
| + // r6: argv
|
| + // r0,r7-r9, cp may be clobbered
|
| ProfileEntryHookStub::MaybeCallEntryHook(masm);
|
|
|
| // Clear the context before we push it when entering the internal frame.
|
| - __ li(cp, Operand::Zero());
|
| + __ LoadImmP(cp, Operand::Zero());
|
|
|
| // Enter an internal frame.
|
| {
|
| + // FrameScope ends up calling MacroAssembler::EnterFrame here
|
| FrameScope scope(masm, StackFrame::INTERNAL);
|
|
|
| // Setup the context (we need to use the caller context from the isolate).
|
| @@ -770,42 +755,48 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
|
| __ InitializeRootRegister();
|
|
|
| // Push the function and the receiver onto the stack.
|
| - __ Push(r4, r5);
|
| + __ Push(r3, r4);
|
|
|
| // Check if we have enough stack space to push all arguments.
|
| - // Clobbers r5.
|
| - Generate_CheckStackOverflow(masm, r6, kArgcIsUntaggedInt);
|
| -
|
| - // Copy arguments to the stack in a loop.
|
| - // r4: function
|
| - // r6: argc
|
| - // r7: argv, i.e. points to first arg
|
| - Label loop, entry;
|
| - __ ShiftLeftImm(r0, r6, Operand(kPointerSizeLog2));
|
| - __ add(r5, r7, r0);
|
| - // r5 points past last arg.
|
| - __ b(&entry);
|
| - __ bind(&loop);
|
| - __ LoadP(r8, MemOperand(r7)); // read next parameter
|
| - __ addi(r7, r7, Operand(kPointerSize));
|
| - __ LoadP(r0, MemOperand(r8)); // dereference handle
|
| - __ push(r0); // push parameter
|
| - __ bind(&entry);
|
| - __ cmp(r7, r5);
|
| - __ bne(&loop);
|
| + // Clobbers r4.
|
| + Generate_CheckStackOverflow(masm, r5, kArgcIsUntaggedInt);
|
| +
|
| + // Copy arguments to the stack in a loop from argv to sp.
|
| + // The arguments are actually placed in reverse order on sp
|
| + // compared to argv (i.e. arg1 is highest memory in sp).
|
| + // r3: function
|
| + // r5: argc
|
| + // r6: argv, i.e. points to first arg
|
| + // r7: scratch reg to hold scaled argc
|
| + // r8: scratch reg to hold arg handle
|
| + // r9: scratch reg to hold index into argv
|
| + Label argLoop, argExit;
|
| + intptr_t zero = 0;
|
| + __ ShiftLeftP(r7, r5, Operand(kPointerSizeLog2));
|
| + __ SubRR(sp, r7); // Buy the stack frame to fit args
|
| + __ LoadImmP(r9, Operand(zero)); // Initialize argv index
|
| + __ bind(&argLoop);
|
| + __ CmpPH(r7, Operand(zero));
|
| + __ beq(&argExit, Label::kNear);
|
| + __ lay(r7, MemOperand(r7, -kPointerSize));
|
| + __ LoadP(r8, MemOperand(r9, r6)); // read next parameter
|
| + __ la(r9, MemOperand(r9, kPointerSize)); // r9++;
|
| + __ LoadP(r0, MemOperand(r8)); // dereference handle
|
| + __ StoreP(r0, MemOperand(r7, sp)); // push parameter
|
| + __ b(&argLoop);
|
| + __ bind(&argExit);
|
|
|
| // Setup new.target and argc.
|
| - __ mr(r7, r3);
|
| - __ mr(r3, r6);
|
| - __ mr(r6, r7);
|
| + __ LoadRR(r6, r2);
|
| + __ LoadRR(r2, r5);
|
| + __ LoadRR(r5, r6);
|
|
|
| // Initialize all JavaScript callee-saved registers, since they will be seen
|
| // by the garbage collector as part of handlers.
|
| - __ LoadRoot(r7, Heap::kUndefinedValueRootIndex);
|
| - __ mr(r14, r7);
|
| - __ mr(r15, r7);
|
| - __ mr(r16, r7);
|
| - __ mr(r17, r7);
|
| + __ LoadRoot(r6, Heap::kUndefinedValueRootIndex);
|
| + __ LoadRR(r7, r6);
|
| + __ LoadRR(r8, r6);
|
| + __ LoadRR(r9, r6);
|
|
|
| // Invoke the code.
|
| Handle<Code> builtin = is_construct
|
| @@ -816,30 +807,27 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
|
| // Exit the JS frame and remove the parameters (except function), and
|
| // return.
|
| }
|
| - __ blr();
|
| + __ b(r14);
|
|
|
| - // r3: result
|
| + // r2: result
|
| }
|
|
|
| -
|
| void Builtins::Generate_JSEntryTrampoline(MacroAssembler* masm) {
|
| Generate_JSEntryTrampolineHelper(masm, false);
|
| }
|
|
|
| -
|
| void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
|
| Generate_JSEntryTrampolineHelper(masm, true);
|
| }
|
|
|
| -
|
| // Generate code for entering a JS function with the interpreter.
|
| // On entry to the function the receiver and arguments have been pushed on the
|
| // stack left to right. The actual argument count matches the formal parameter
|
| // count expected by the function.
|
| //
|
| // The live registers are:
|
| -// o r4: the JS function object being called.
|
| -// o r6: the new target
|
| +// o r3: the JS function object being called.
|
| +// o r5: the new target
|
| // o cp: our context
|
| // o pp: the caller's constant pool pointer (if enabled)
|
| // o fp: the caller's frame pointer
|
| @@ -853,50 +841,39 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| // MANUAL indicates that the scope shouldn't actually generate code to set up
|
| // the frame (that is done below).
|
| FrameScope frame_scope(masm, StackFrame::MANUAL);
|
| - __ PushFixedFrame(r4);
|
| - __ addi(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
|
| + __ PushFixedFrame(r3);
|
| + __ AddP(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
|
|
|
| // Get the bytecode array from the function object and load the pointer to the
|
| // first entry into kInterpreterBytecodeRegister.
|
| - __ LoadP(r3, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
|
| - Label array_done;
|
| - Register debug_info = r5;
|
| - DCHECK(!debug_info.is(r3));
|
| - __ LoadP(debug_info,
|
| - FieldMemOperand(r3, SharedFunctionInfo::kDebugInfoOffset));
|
| - // Load original bytecode array or the debug copy.
|
| + __ LoadP(r2, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
|
| __ LoadP(kInterpreterBytecodeArrayRegister,
|
| - FieldMemOperand(r3, SharedFunctionInfo::kFunctionDataOffset));
|
| - __ CmpSmiLiteral(debug_info, DebugInfo::uninitialized(), r0);
|
| - __ beq(&array_done);
|
| - __ LoadP(kInterpreterBytecodeArrayRegister,
|
| - FieldMemOperand(debug_info, DebugInfo::kAbstractCodeIndex));
|
| - __ bind(&array_done);
|
| + FieldMemOperand(r2, SharedFunctionInfo::kFunctionDataOffset));
|
|
|
| if (FLAG_debug_code) {
|
| // Check function data field is actually a BytecodeArray object.
|
| - __ TestIfSmi(kInterpreterBytecodeArrayRegister, r0);
|
| + __ TestIfSmi(kInterpreterBytecodeArrayRegister);
|
| __ Assert(ne, kFunctionDataShouldBeBytecodeArrayOnInterpreterEntry);
|
| - __ CompareObjectType(kInterpreterBytecodeArrayRegister, r3, no_reg,
|
| + __ CompareObjectType(kInterpreterBytecodeArrayRegister, r2, no_reg,
|
| BYTECODE_ARRAY_TYPE);
|
| __ Assert(eq, kFunctionDataShouldBeBytecodeArrayOnInterpreterEntry);
|
| }
|
|
|
| // Push new.target, bytecode array and zero for bytecode array offset.
|
| - __ li(r3, Operand::Zero());
|
| - __ Push(r6, kInterpreterBytecodeArrayRegister, r3);
|
| + __ LoadImmP(r2, Operand::Zero());
|
| + __ Push(r5, kInterpreterBytecodeArrayRegister, r2);
|
|
|
| // Allocate the local and temporary register file on the stack.
|
| {
|
| // Load frame size (word) from the BytecodeArray object.
|
| - __ lwz(r5, FieldMemOperand(kInterpreterBytecodeArrayRegister,
|
| - BytecodeArray::kFrameSizeOffset));
|
| + __ LoadlW(r4, FieldMemOperand(kInterpreterBytecodeArrayRegister,
|
| + BytecodeArray::kFrameSizeOffset));
|
|
|
| // Do a stack check to ensure we don't go over the limit.
|
| Label ok;
|
| - __ sub(r6, sp, r5);
|
| + __ SubP(r5, sp, r4);
|
| __ LoadRoot(r0, Heap::kRealStackLimitRootIndex);
|
| - __ cmpl(r6, r0);
|
| + __ CmpLogicalP(r5, r0);
|
| __ bge(&ok);
|
| __ CallRuntime(Runtime::kThrowStackOverflow);
|
| __ bind(&ok);
|
| @@ -904,13 +881,15 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| // If ok, push undefined as the initial value for all register file entries.
|
| // TODO(rmcilroy): Consider doing more than one push per loop iteration.
|
| Label loop, no_args;
|
| - __ LoadRoot(r6, Heap::kUndefinedValueRootIndex);
|
| - __ ShiftRightImm(r5, r5, Operand(kPointerSizeLog2), SetRC);
|
| - __ beq(&no_args, cr0);
|
| - __ mtctr(r5);
|
| + __ LoadRoot(r5, Heap::kUndefinedValueRootIndex);
|
| + __ ShiftRightP(r4, r4, Operand(kPointerSizeLog2));
|
| + __ LoadAndTestP(r4, r4);
|
| + __ beq(&no_args);
|
| + __ LoadRR(r1, r4);
|
| __ bind(&loop);
|
| - __ push(r6);
|
| - __ bdnz(&loop);
|
| + __ push(r5);
|
| + __ SubP(r1, Operand(1));
|
| + __ bne(&loop);
|
| __ bind(&no_args);
|
| }
|
|
|
| @@ -922,7 +901,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| // Load accumulator, register file, bytecode offset, dispatch table into
|
| // registers.
|
| __ LoadRoot(kInterpreterAccumulatorRegister, Heap::kUndefinedValueRootIndex);
|
| - __ addi(kInterpreterRegisterFileRegister, fp,
|
| + __ AddP(kInterpreterRegisterFileRegister, fp,
|
| Operand(InterpreterFrameConstants::kRegisterFilePointerFromFp));
|
| __ mov(kInterpreterBytecodeOffsetRegister,
|
| Operand(BytecodeArray::kHeaderSize - kHeapObjectTag));
|
| @@ -931,20 +910,19 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| masm->isolate())));
|
|
|
| // Dispatch to the first bytecode handler for the function.
|
| - __ lbzx(r4, MemOperand(kInterpreterBytecodeArrayRegister,
|
| - kInterpreterBytecodeOffsetRegister));
|
| - __ ShiftLeftImm(ip, r4, Operand(kPointerSizeLog2));
|
| - __ LoadPX(ip, MemOperand(kInterpreterDispatchTableRegister, ip));
|
| + __ LoadlB(r3, MemOperand(kInterpreterBytecodeArrayRegister,
|
| + kInterpreterBytecodeOffsetRegister));
|
| + __ ShiftLeftP(ip, r3, Operand(kPointerSizeLog2));
|
| + __ LoadP(ip, MemOperand(kInterpreterDispatchTableRegister, ip));
|
| // TODO(rmcilroy): Make dispatch table point to code entrys to avoid untagging
|
| // and header removal.
|
| - __ addi(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ AddP(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ Call(ip);
|
|
|
| // Even though the first bytecode handler was called, we will never return.
|
| __ Abort(kUnexpectedReturnFromBytecodeHandler);
|
| }
|
|
|
| -
|
| void Builtins::Generate_InterpreterExitTrampoline(MacroAssembler* masm) {
|
| // TODO(rmcilroy): List of things not currently dealt with here but done in
|
| // fullcodegen's EmitReturnSequence.
|
| @@ -952,47 +930,47 @@ void Builtins::Generate_InterpreterExitTrampoline(MacroAssembler* masm) {
|
| // - Support profiler (specifically decrementing profiling_counter
|
| // appropriately and calling out to HandleInterrupts if necessary).
|
|
|
| - // The return value is in accumulator, which is already in r3.
|
| + // The return value is in accumulator, which is already in r2.
|
|
|
| // Leave the frame (also dropping the register file).
|
| __ LeaveFrame(StackFrame::JAVA_SCRIPT);
|
|
|
| // Drop receiver + arguments and return.
|
| - __ lwz(r0, FieldMemOperand(kInterpreterBytecodeArrayRegister,
|
| - BytecodeArray::kParameterSizeOffset));
|
| - __ add(sp, sp, r0);
|
| - __ blr();
|
| + __ LoadlW(r0, FieldMemOperand(kInterpreterBytecodeArrayRegister,
|
| + BytecodeArray::kParameterSizeOffset));
|
| + __ AddP(sp, sp, r0);
|
| + __ Ret();
|
| }
|
|
|
| -
|
| static void Generate_InterpreterPushArgs(MacroAssembler* masm, Register index,
|
| Register count, Register scratch) {
|
| Label loop;
|
| - __ addi(index, index, Operand(kPointerSize)); // Bias up for LoadPU
|
| - __ mtctr(count);
|
| + __ AddP(index, index, Operand(kPointerSize)); // Bias up for LoadPU
|
| + __ LoadRR(r0, count);
|
| __ bind(&loop);
|
| - __ LoadPU(scratch, MemOperand(index, -kPointerSize));
|
| + __ LoadP(scratch, MemOperand(index, -kPointerSize));
|
| + __ lay(index, MemOperand(index, -kPointerSize));
|
| __ push(scratch);
|
| - __ bdnz(&loop);
|
| + __ SubP(r0, Operand(1));
|
| + __ bne(&loop);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_InterpreterPushArgsAndCallImpl(
|
| MacroAssembler* masm, TailCallMode tail_call_mode) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r5 : the address of the first argument to be pushed. Subsequent
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r4 : the address of the first argument to be pushed. Subsequent
|
| // arguments should be consecutive above this, in the same order as
|
| // they are to be pushed onto the stack.
|
| - // -- r4 : the target to call (can be any Object).
|
| + // -- r3 : the target to call (can be any Object).
|
| // -----------------------------------
|
|
|
| - // Calculate number of arguments (add one for receiver).
|
| - __ addi(r6, r3, Operand(1));
|
| + // Calculate number of arguments (AddP one for receiver).
|
| + __ AddP(r5, r2, Operand(1));
|
|
|
| // Push the arguments.
|
| - Generate_InterpreterPushArgs(masm, r5, r6, r7);
|
| + Generate_InterpreterPushArgs(masm, r4, r5, r6);
|
|
|
| // Call the target.
|
| __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny,
|
| @@ -1000,35 +978,33 @@ void Builtins::Generate_InterpreterPushArgsAndCallImpl(
|
| RelocInfo::CODE_TARGET);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argument count (not including receiver)
|
| - // -- r6 : new target
|
| - // -- r4 : constructor to call
|
| - // -- r5 : address of the first argument
|
| + // -- r2 : argument count (not including receiver)
|
| + // -- r5 : new target
|
| + // -- r3 : constructor to call
|
| + // -- r4 : address of the first argument
|
| // -----------------------------------
|
|
|
| // Push a slot for the receiver to be constructed.
|
| - __ li(r0, Operand::Zero());
|
| + __ LoadImmP(r0, Operand::Zero());
|
| __ push(r0);
|
|
|
| // Push the arguments (skip if none).
|
| Label skip;
|
| - __ cmpi(r3, Operand::Zero());
|
| + __ CmpP(r2, Operand::Zero());
|
| __ beq(&skip);
|
| - Generate_InterpreterPushArgs(masm, r5, r3, r7);
|
| + Generate_InterpreterPushArgs(masm, r4, r2, r6);
|
| __ bind(&skip);
|
|
|
| - // Call the constructor with r3, r4, and r6 unmodified.
|
| + // Call the constructor with r2, r3, and r5 unmodified.
|
| __ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
|
| }
|
|
|
| -
|
| static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
|
| // Initialize register file register and dispatch table register.
|
| - __ addi(kInterpreterRegisterFileRegister, fp,
|
| + __ AddP(kInterpreterRegisterFileRegister, fp,
|
| Operand(InterpreterFrameConstants::kRegisterFilePointerFromFp));
|
| __ mov(kInterpreterDispatchTableRegister,
|
| Operand(ExternalReference::interpreter_dispatch_table_address(
|
| @@ -1047,9 +1023,9 @@ static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
|
|
|
| if (FLAG_debug_code) {
|
| // Check function data field is actually a BytecodeArray object.
|
| - __ TestIfSmi(kInterpreterBytecodeArrayRegister, r0);
|
| + __ TestIfSmi(kInterpreterBytecodeArrayRegister);
|
| __ Assert(ne, kFunctionDataShouldBeBytecodeArrayOnInterpreterEntry);
|
| - __ CompareObjectType(kInterpreterBytecodeArrayRegister, r4, no_reg,
|
| + __ CompareObjectType(kInterpreterBytecodeArrayRegister, r3, no_reg,
|
| BYTECODE_ARRAY_TYPE);
|
| __ Assert(eq, kFunctionDataShouldBeBytecodeArrayOnInterpreterEntry);
|
| }
|
| @@ -1062,15 +1038,14 @@ static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
|
| __ SmiUntag(kInterpreterBytecodeOffsetRegister);
|
|
|
| // Dispatch to the target bytecode.
|
| - __ lbzx(r4, MemOperand(kInterpreterBytecodeArrayRegister,
|
| - kInterpreterBytecodeOffsetRegister));
|
| - __ ShiftLeftImm(ip, r4, Operand(kPointerSizeLog2));
|
| - __ LoadPX(ip, MemOperand(kInterpreterDispatchTableRegister, ip));
|
| - __ addi(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ LoadlB(r3, MemOperand(kInterpreterBytecodeArrayRegister,
|
| + kInterpreterBytecodeOffsetRegister));
|
| + __ ShiftLeftP(ip, r3, Operand(kPointerSizeLog2));
|
| + __ LoadP(ip, MemOperand(kInterpreterDispatchTableRegister, ip));
|
| + __ AddP(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ Jump(ip);
|
| }
|
|
|
| -
|
| static void Generate_InterpreterNotifyDeoptimizedHelper(
|
| MacroAssembler* masm, Deoptimizer::BailoutType type) {
|
| // Enter an internal frame.
|
| @@ -1078,8 +1053,8 @@ static void Generate_InterpreterNotifyDeoptimizedHelper(
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
|
|
| // Pass the deoptimization type to the runtime system.
|
| - __ LoadSmiLiteral(r4, Smi::FromInt(static_cast<int>(type)));
|
| - __ Push(r4);
|
| + __ LoadSmiLiteral(r3, Smi::FromInt(static_cast<int>(type)));
|
| + __ Push(r3);
|
| __ CallRuntime(Runtime::kNotifyDeoptimized);
|
| // Tear down internal frame.
|
| }
|
| @@ -1093,17 +1068,14 @@ static void Generate_InterpreterNotifyDeoptimizedHelper(
|
| Generate_EnterBytecodeDispatch(masm);
|
| }
|
|
|
| -
|
| void Builtins::Generate_InterpreterNotifyDeoptimized(MacroAssembler* masm) {
|
| Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::EAGER);
|
| }
|
|
|
| -
|
| void Builtins::Generate_InterpreterNotifySoftDeoptimized(MacroAssembler* masm) {
|
| Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::SOFT);
|
| }
|
|
|
| -
|
| void Builtins::Generate_InterpreterNotifyLazyDeoptimized(MacroAssembler* masm) {
|
| Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::LAZY);
|
| }
|
| @@ -1113,30 +1085,25 @@ void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
|
| // This simulates the initial call to bytecode handlers in interpreter entry
|
| // trampoline. The return will never actually be taken, but our stack walker
|
| // uses this address to determine whether a frame is interpreted.
|
| - __ mov(r0,
|
| + __ mov(r14,
|
| Operand(masm->isolate()->builtins()->InterpreterEntryTrampoline()));
|
| - __ mtlr(r0);
|
|
|
| Generate_EnterBytecodeDispatch(masm);
|
| }
|
|
|
| -
|
| void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
|
| GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy);
|
| }
|
|
|
| -
|
| void Builtins::Generate_CompileOptimized(MacroAssembler* masm) {
|
| GenerateTailCallToReturnedCode(masm,
|
| Runtime::kCompileOptimized_NotConcurrent);
|
| }
|
|
|
| -
|
| void Builtins::Generate_CompileOptimizedConcurrent(MacroAssembler* masm) {
|
| GenerateTailCallToReturnedCode(masm, Runtime::kCompileOptimized_Concurrent);
|
| }
|
|
|
| -
|
| static void GenerateMakeCodeYoungAgainCommon(MacroAssembler* masm) {
|
| // For now, we are relying on the fact that make_code_young doesn't do any
|
| // garbage collection which allows us to save/restore the registers without
|
| @@ -1144,25 +1111,27 @@ static void GenerateMakeCodeYoungAgainCommon(MacroAssembler* masm) {
|
| // internal frame to make the code faster, since we shouldn't have to do stack
|
| // crawls in MakeCodeYoung. This seems a bit fragile.
|
|
|
| - // Point r3 at the start of the PlatformCodeAge sequence.
|
| - __ mr(r3, ip);
|
| + // Point r2 at the start of the PlatformCodeAge sequence.
|
| + __ CleanseP(r14);
|
| + __ SubP(r14, Operand(kCodeAgingSequenceLength));
|
| + __ LoadRR(r2, r14);
|
| +
|
| + __ pop(r14);
|
|
|
| // The following registers must be saved and restored when calling through to
|
| // the runtime:
|
| - // r3 - contains return address (beginning of patch sequence)
|
| - // r4 - isolate
|
| - // r6 - new target
|
| + // r2 - contains return address (beginning of patch sequence)
|
| + // r3 - isolate
|
| + // r5 - new target
|
| // lr - return address
|
| FrameScope scope(masm, StackFrame::MANUAL);
|
| - __ mflr(r0);
|
| - __ MultiPush(r0.bit() | r3.bit() | r4.bit() | r6.bit() | fp.bit());
|
| - __ PrepareCallCFunction(2, 0, r5);
|
| - __ mov(r4, Operand(ExternalReference::isolate_address(masm->isolate())));
|
| + __ MultiPush(r14.bit() | r2.bit() | r3.bit() | r5.bit() | fp.bit());
|
| + __ PrepareCallCFunction(2, 0, r4);
|
| + __ mov(r3, Operand(ExternalReference::isolate_address(masm->isolate())));
|
| __ CallCFunction(
|
| ExternalReference::get_make_code_young_function(masm->isolate()), 2);
|
| - __ MultiPop(r0.bit() | r3.bit() | r4.bit() | r6.bit() | fp.bit());
|
| - __ mtlr(r0);
|
| - __ mr(ip, r3);
|
| + __ MultiPop(r14.bit() | r2.bit() | r3.bit() | r5.bit() | fp.bit());
|
| + __ LoadRR(ip, r2);
|
| __ Jump(ip);
|
| }
|
|
|
| @@ -1178,7 +1147,6 @@ static void GenerateMakeCodeYoungAgainCommon(MacroAssembler* masm) {
|
| CODE_AGE_LIST(DEFINE_CODE_AGE_BUILTIN_GENERATOR)
|
| #undef DEFINE_CODE_AGE_BUILTIN_GENERATOR
|
|
|
| -
|
| void Builtins::Generate_MarkCodeAsExecutedOnce(MacroAssembler* masm) {
|
| // For now, we are relying on the fact that make_code_young doesn't do any
|
| // garbage collection which allows us to save/restore the registers without
|
| @@ -1186,51 +1154,50 @@ void Builtins::Generate_MarkCodeAsExecutedOnce(MacroAssembler* masm) {
|
| // internal frame to make the code faster, since we shouldn't have to do stack
|
| // crawls in MakeCodeYoung. This seems a bit fragile.
|
|
|
| - // Point r3 at the start of the PlatformCodeAge sequence.
|
| - __ mr(r3, ip);
|
| + // Point r2 at the start of the PlatformCodeAge sequence.
|
| + __ CleanseP(r14);
|
| + __ SubP(r14, Operand(kCodeAgingSequenceLength));
|
| + __ LoadRR(r2, r14);
|
| +
|
| + __ pop(r14);
|
|
|
| // The following registers must be saved and restored when calling through to
|
| // the runtime:
|
| - // r3 - contains return address (beginning of patch sequence)
|
| - // r4 - isolate
|
| - // r6 - new target
|
| + // r2 - contains return address (beginning of patch sequence)
|
| + // r3 - isolate
|
| + // r5 - new target
|
| // lr - return address
|
| FrameScope scope(masm, StackFrame::MANUAL);
|
| - __ mflr(r0);
|
| - __ MultiPush(r0.bit() | r3.bit() | r4.bit() | r6.bit() | fp.bit());
|
| - __ PrepareCallCFunction(2, 0, r5);
|
| - __ mov(r4, Operand(ExternalReference::isolate_address(masm->isolate())));
|
| + __ MultiPush(r14.bit() | r2.bit() | r3.bit() | r5.bit() | fp.bit());
|
| + __ PrepareCallCFunction(2, 0, r4);
|
| + __ mov(r3, Operand(ExternalReference::isolate_address(masm->isolate())));
|
| __ CallCFunction(
|
| ExternalReference::get_mark_code_as_executed_function(masm->isolate()),
|
| 2);
|
| - __ MultiPop(r0.bit() | r3.bit() | r4.bit() | r6.bit() | fp.bit());
|
| - __ mtlr(r0);
|
| - __ mr(ip, r3);
|
| + __ MultiPop(r14.bit() | r2.bit() | r3.bit() | r5.bit() | fp.bit());
|
| + __ LoadRR(ip, r2);
|
|
|
| // Perform prologue operations usually performed by the young code stub.
|
| - __ PushFixedFrame(r4);
|
| - __ addi(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp));
|
| + __ PushFixedFrame(r3);
|
| + __ la(fp, MemOperand(sp, StandardFrameConstants::kFixedFrameSizeFromFp));
|
|
|
| // Jump to point after the code-age stub.
|
| - __ addi(r3, ip, Operand(kNoCodeAgeSequenceLength));
|
| - __ Jump(r3);
|
| + __ AddP(r2, ip, Operand(kNoCodeAgeSequenceLength));
|
| + __ Jump(r2);
|
| }
|
|
|
| -
|
| void Builtins::Generate_MarkCodeAsExecutedTwice(MacroAssembler* masm) {
|
| GenerateMakeCodeYoungAgainCommon(masm);
|
| }
|
|
|
| -
|
| void Builtins::Generate_MarkCodeAsToBeExecutedOnce(MacroAssembler* masm) {
|
| Generate_MarkCodeAsExecutedOnce(masm);
|
| }
|
|
|
| -
|
| static void Generate_NotifyStubFailureHelper(MacroAssembler* masm,
|
| SaveFPRegsMode save_doubles) {
|
| {
|
| - FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| + FrameScope scope(masm, StackFrame::INTERNAL);
|
|
|
| // Preserve registers across notification, this is important for compiled
|
| // stubs that tail call the runtime on deopts passing their parameters in
|
| @@ -1241,76 +1208,69 @@ static void Generate_NotifyStubFailureHelper(MacroAssembler* masm,
|
| __ MultiPop(kJSCallerSaved | kCalleeSaved);
|
| }
|
|
|
| - __ addi(sp, sp, Operand(kPointerSize)); // Ignore state
|
| - __ blr(); // Jump to miss handler
|
| + __ la(sp, MemOperand(sp, kPointerSize)); // Ignore state
|
| + __ Ret(); // Jump to miss handler
|
| }
|
|
|
| -
|
| void Builtins::Generate_NotifyStubFailure(MacroAssembler* masm) {
|
| Generate_NotifyStubFailureHelper(masm, kDontSaveFPRegs);
|
| }
|
|
|
| -
|
| void Builtins::Generate_NotifyStubFailureSaveDoubles(MacroAssembler* masm) {
|
| Generate_NotifyStubFailureHelper(masm, kSaveFPRegs);
|
| }
|
|
|
| -
|
| static void Generate_NotifyDeoptimizedHelper(MacroAssembler* masm,
|
| Deoptimizer::BailoutType type) {
|
| {
|
| - FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| + FrameScope scope(masm, StackFrame::INTERNAL);
|
| // Pass the function and deoptimization type to the runtime system.
|
| - __ LoadSmiLiteral(r3, Smi::FromInt(static_cast<int>(type)));
|
| - __ push(r3);
|
| + __ LoadSmiLiteral(r2, Smi::FromInt(static_cast<int>(type)));
|
| + __ push(r2);
|
| __ CallRuntime(Runtime::kNotifyDeoptimized);
|
| }
|
|
|
| - // Get the full codegen state from the stack and untag it -> r9.
|
| - __ LoadP(r9, MemOperand(sp, 0 * kPointerSize));
|
| - __ SmiUntag(r9);
|
| + // Get the full codegen state from the stack and untag it -> r8.
|
| + __ LoadP(r8, MemOperand(sp, 0 * kPointerSize));
|
| + __ SmiUntag(r8);
|
| // Switch on the state.
|
| Label with_tos_register, unknown_state;
|
| - __ cmpi(r9, Operand(FullCodeGenerator::NO_REGISTERS));
|
| + __ CmpP(r8, Operand(FullCodeGenerator::NO_REGISTERS));
|
| __ bne(&with_tos_register);
|
| - __ addi(sp, sp, Operand(1 * kPointerSize)); // Remove state.
|
| + __ la(sp, MemOperand(sp, 1 * kPointerSize)); // Remove state.
|
| __ Ret();
|
|
|
| __ bind(&with_tos_register);
|
| - __ LoadP(r3, MemOperand(sp, 1 * kPointerSize));
|
| - __ cmpi(r9, Operand(FullCodeGenerator::TOS_REG));
|
| + __ LoadP(r2, MemOperand(sp, 1 * kPointerSize));
|
| + __ CmpP(r8, Operand(FullCodeGenerator::TOS_REG));
|
| __ bne(&unknown_state);
|
| - __ addi(sp, sp, Operand(2 * kPointerSize)); // Remove state.
|
| + __ la(sp, MemOperand(sp, 2 * kPointerSize)); // Remove state.
|
| __ Ret();
|
|
|
| __ bind(&unknown_state);
|
| __ stop("no cases left");
|
| }
|
|
|
| -
|
| void Builtins::Generate_NotifyDeoptimized(MacroAssembler* masm) {
|
| Generate_NotifyDeoptimizedHelper(masm, Deoptimizer::EAGER);
|
| }
|
|
|
| -
|
| void Builtins::Generate_NotifySoftDeoptimized(MacroAssembler* masm) {
|
| Generate_NotifyDeoptimizedHelper(masm, Deoptimizer::SOFT);
|
| }
|
|
|
| -
|
| void Builtins::Generate_NotifyLazyDeoptimized(MacroAssembler* masm) {
|
| Generate_NotifyDeoptimizedHelper(masm, Deoptimizer::LAZY);
|
| }
|
|
|
| -
|
| -// Clobbers registers {r7, r8, r9, r10}.
|
| +// Clobbers registers {r6, r7, r8, r9}.
|
| void CompatibleReceiverCheck(MacroAssembler* masm, Register receiver,
|
| Register function_template_info,
|
| Label* receiver_check_failed) {
|
| - Register signature = r7;
|
| - Register map = r8;
|
| - Register constructor = r9;
|
| - Register scratch = r10;
|
| + Register signature = r6;
|
| + Register map = r7;
|
| + Register constructor = r8;
|
| + Register scratch = r9;
|
|
|
| // If there is no signature, return the holder.
|
| __ LoadP(signature, FieldMemOperand(function_template_info,
|
| @@ -1326,7 +1286,7 @@ void CompatibleReceiverCheck(MacroAssembler* masm, Register receiver,
|
|
|
| // Get the constructor, if any.
|
| __ GetMapConstructor(constructor, map, scratch, scratch);
|
| - __ cmpi(scratch, Operand(JS_FUNCTION_TYPE));
|
| + __ CmpP(scratch, Operand(JS_FUNCTION_TYPE));
|
| Label next_prototype;
|
| __ bne(&next_prototype);
|
| Register type = constructor;
|
| @@ -1340,7 +1300,7 @@ void CompatibleReceiverCheck(MacroAssembler* masm, Register receiver,
|
| __ bind(&function_template_loop);
|
|
|
| // If the signatures match, we have a compatible receiver.
|
| - __ cmp(signature, type);
|
| + __ CmpP(signature, type);
|
| __ beq(&receiver_check_passed);
|
|
|
| // If the current type is not a FunctionTemplateInfo, load the next prototype
|
| @@ -1356,9 +1316,9 @@ void CompatibleReceiverCheck(MacroAssembler* masm, Register receiver,
|
|
|
| // Load the next prototype.
|
| __ bind(&next_prototype);
|
| - __ lwz(scratch, FieldMemOperand(map, Map::kBitField3Offset));
|
| - __ DecodeField<Map::HasHiddenPrototype>(scratch, SetRC);
|
| - __ beq(receiver_check_failed, cr0);
|
| + __ LoadlW(scratch, FieldMemOperand(map, Map::kBitField3Offset));
|
| + __ DecodeField<Map::HasHiddenPrototype>(scratch);
|
| + __ beq(receiver_check_failed);
|
|
|
| __ LoadP(receiver, FieldMemOperand(map, Map::kPrototypeOffset));
|
| __ LoadP(map, FieldMemOperand(receiver, HeapObject::kMapOffset));
|
| @@ -1368,11 +1328,10 @@ void CompatibleReceiverCheck(MacroAssembler* masm, Register receiver,
|
| __ bind(&receiver_check_passed);
|
| }
|
|
|
| -
|
| void Builtins::Generate_HandleFastApiCall(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : number of arguments excluding receiver
|
| - // -- r4 : callee
|
| + // -- r2 : number of arguments excluding receiver
|
| + // -- r3 : callee
|
| // -- lr : return address
|
| // -- sp[0] : last argument
|
| // -- ...
|
| @@ -1380,46 +1339,44 @@ void Builtins::Generate_HandleFastApiCall(MacroAssembler* masm) {
|
| // -- sp[4 * argc] : receiver
|
| // -----------------------------------
|
|
|
| -
|
| // Load the FunctionTemplateInfo.
|
| - __ LoadP(r6, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
|
| - __ LoadP(r6, FieldMemOperand(r6, SharedFunctionInfo::kFunctionDataOffset));
|
| + __ LoadP(r5, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
|
| + __ LoadP(r5, FieldMemOperand(r5, SharedFunctionInfo::kFunctionDataOffset));
|
|
|
| // Do the compatible receiver check.
|
| Label receiver_check_failed;
|
| - __ ShiftLeftImm(r11, r3, Operand(kPointerSizeLog2));
|
| - __ LoadPX(r5, MemOperand(sp, r11));
|
| - CompatibleReceiverCheck(masm, r5, r6, &receiver_check_failed);
|
| + __ ShiftLeftP(r1, r2, Operand(kPointerSizeLog2));
|
| + __ LoadP(r4, MemOperand(sp, r1));
|
| + CompatibleReceiverCheck(masm, r4, r5, &receiver_check_failed);
|
|
|
| // Get the callback offset from the FunctionTemplateInfo, and jump to the
|
| // beginning of the code.
|
| - __ LoadP(r7, FieldMemOperand(r6, FunctionTemplateInfo::kCallCodeOffset));
|
| - __ LoadP(r7, FieldMemOperand(r7, CallHandlerInfo::kFastHandlerOffset));
|
| - __ addi(ip, r7, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ LoadP(r6, FieldMemOperand(r5, FunctionTemplateInfo::kCallCodeOffset));
|
| + __ LoadP(r6, FieldMemOperand(r6, CallHandlerInfo::kFastHandlerOffset));
|
| + __ AddP(ip, r6, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ JumpToJSEntry(ip);
|
|
|
| // Compatible receiver check failed: throw an Illegal Invocation exception.
|
| __ bind(&receiver_check_failed);
|
| // Drop the arguments (including the receiver);
|
| - __ addi(r11, r11, Operand(kPointerSize));
|
| - __ add(sp, sp, r11);
|
| + __ AddP(r1, r1, Operand(kPointerSize));
|
| + __ AddP(sp, sp, r1);
|
| __ TailCallRuntime(Runtime::kThrowIllegalInvocation);
|
| }
|
|
|
| -
|
| void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) {
|
| // Lookup the function in the JavaScript frame.
|
| - __ LoadP(r3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| + __ LoadP(r2, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| {
|
| - FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| + FrameScope scope(masm, StackFrame::INTERNAL);
|
| // Pass function as argument.
|
| - __ push(r3);
|
| + __ push(r2);
|
| __ CallRuntime(Runtime::kCompileForOnStackReplacement);
|
| }
|
|
|
| // If the code object is null, just return to the unoptimized code.
|
| Label skip;
|
| - __ CmpSmiLiteral(r3, Smi::FromInt(0), r0);
|
| + __ CmpSmiLiteral(r2, Smi::FromInt(0), r0);
|
| __ bne(&skip);
|
| __ Ret();
|
|
|
| @@ -1427,41 +1384,32 @@ void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) {
|
|
|
| // Load deoptimization data from the code object.
|
| // <deopt_data> = <code>[#deoptimization_data_offset]
|
| - __ LoadP(r4, FieldMemOperand(r3, Code::kDeoptimizationDataOffset));
|
| -
|
| - {
|
| - ConstantPoolUnavailableScope constant_pool_unavailable(masm);
|
| - __ addi(r3, r3, Operand(Code::kHeaderSize - kHeapObjectTag)); // Code start
|
| -
|
| - if (FLAG_enable_embedded_constant_pool) {
|
| - __ LoadConstantPoolPointerRegisterFromCodeTargetAddress(r3);
|
| - }
|
| + __ LoadP(r3, FieldMemOperand(r2, Code::kDeoptimizationDataOffset));
|
|
|
| - // Load the OSR entrypoint offset from the deoptimization data.
|
| - // <osr_offset> = <deopt_data>[#header_size + #osr_pc_offset]
|
| - __ LoadP(r4, FieldMemOperand(
|
| - r4, FixedArray::OffsetOfElementAt(
|
| - DeoptimizationInputData::kOsrPcOffsetIndex)));
|
| - __ SmiUntag(r4);
|
| + // Load the OSR entrypoint offset from the deoptimization data.
|
| + // <osr_offset> = <deopt_data>[#header_size + #osr_pc_offset]
|
| + __ LoadP(
|
| + r3, FieldMemOperand(r3, FixedArray::OffsetOfElementAt(
|
| + DeoptimizationInputData::kOsrPcOffsetIndex)));
|
| + __ SmiUntag(r3);
|
|
|
| - // Compute the target address = code start + osr_offset
|
| - __ add(r0, r3, r4);
|
| + // Compute the target address = code_obj + header_size + osr_offset
|
| + // <entry_addr> = <code_obj> + #header_size + <osr_offset>
|
| + __ AddP(r2, r3);
|
| + __ AddP(r0, r2, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ LoadRR(r14, r0);
|
|
|
| - // And "return" to the OSR entry point of the function.
|
| - __ mtlr(r0);
|
| - __ blr();
|
| - }
|
| + // And "return" to the OSR entry point of the function.
|
| + __ Ret();
|
| }
|
|
|
| -
|
| void Builtins::Generate_OsrAfterStackCheck(MacroAssembler* masm) {
|
| // We check the stack limit as indicator that recompilation might be done.
|
| Label ok;
|
| - __ LoadRoot(ip, Heap::kStackLimitRootIndex);
|
| - __ cmpl(sp, ip);
|
| - __ bge(&ok);
|
| + __ CmpLogicalP(sp, RootMemOperand(Heap::kStackLimitRootIndex));
|
| + __ bge(&ok, Label::kNear);
|
| {
|
| - FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| + FrameScope scope(masm, StackFrame::INTERNAL);
|
| __ CallRuntime(Runtime::kStackGuard);
|
| }
|
| __ Jump(masm->isolate()->builtins()->OnStackReplacement(),
|
| @@ -1471,7 +1419,6 @@ void Builtins::Generate_OsrAfterStackCheck(MacroAssembler* masm) {
|
| __ Ret();
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_DatePrototype_GetField(MacroAssembler* masm,
|
| int field_index) {
|
| @@ -1480,34 +1427,34 @@ void Builtins::Generate_DatePrototype_GetField(MacroAssembler* masm,
|
| // -- sp[0] : receiver
|
| // -----------------------------------
|
|
|
| - // 1. Pop receiver into r3 and check that it's actually a JSDate object.
|
| + // 1. Pop receiver into r2 and check that it's actually a JSDate object.
|
| Label receiver_not_date;
|
| {
|
| - __ Pop(r3);
|
| - __ JumpIfSmi(r3, &receiver_not_date);
|
| - __ CompareObjectType(r3, r4, r5, JS_DATE_TYPE);
|
| + __ Pop(r2);
|
| + __ JumpIfSmi(r2, &receiver_not_date);
|
| + __ CompareObjectType(r2, r3, r4, JS_DATE_TYPE);
|
| __ bne(&receiver_not_date);
|
| }
|
|
|
| // 2. Load the specified date field, falling back to the runtime as necessary.
|
| if (field_index == JSDate::kDateValue) {
|
| - __ LoadP(r3, FieldMemOperand(r3, JSDate::kValueOffset));
|
| + __ LoadP(r2, FieldMemOperand(r2, JSDate::kValueOffset));
|
| } else {
|
| if (field_index < JSDate::kFirstUncachedField) {
|
| Label stamp_mismatch;
|
| - __ mov(r4, Operand(ExternalReference::date_cache_stamp(masm->isolate())));
|
| - __ LoadP(r4, MemOperand(r4));
|
| - __ LoadP(ip, FieldMemOperand(r3, JSDate::kCacheStampOffset));
|
| - __ cmp(r4, ip);
|
| + __ mov(r3, Operand(ExternalReference::date_cache_stamp(masm->isolate())));
|
| + __ LoadP(r3, MemOperand(r3));
|
| + __ LoadP(ip, FieldMemOperand(r2, JSDate::kCacheStampOffset));
|
| + __ CmpP(r3, ip);
|
| __ bne(&stamp_mismatch);
|
| - __ LoadP(r3, FieldMemOperand(
|
| - r3, JSDate::kValueOffset + field_index * kPointerSize));
|
| + __ LoadP(r2, FieldMemOperand(
|
| + r2, JSDate::kValueOffset + field_index * kPointerSize));
|
| __ Ret();
|
| __ bind(&stamp_mismatch);
|
| }
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ PrepareCallCFunction(2, r4);
|
| - __ LoadSmiLiteral(r4, Smi::FromInt(field_index));
|
| + __ PrepareCallCFunction(2, r3);
|
| + __ LoadSmiLiteral(r3, Smi::FromInt(field_index));
|
| __ CallCFunction(
|
| ExternalReference::get_date_field_function(masm->isolate()), 2);
|
| }
|
| @@ -1518,118 +1465,115 @@ void Builtins::Generate_DatePrototype_GetField(MacroAssembler* masm,
|
| __ TailCallRuntime(Runtime::kThrowNotDateError);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_FunctionPrototypeApply(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argc
|
| + // -- r2 : argc
|
| // -- sp[0] : argArray
|
| // -- sp[4] : thisArg
|
| // -- sp[8] : receiver
|
| // -----------------------------------
|
|
|
| - // 1. Load receiver into r4, argArray into r3 (if present), remove all
|
| + // 1. Load receiver into r3, argArray into r2 (if present), remove all
|
| // arguments from the stack (including the receiver), and push thisArg (if
|
| // present) instead.
|
| {
|
| Label skip;
|
| - Register arg_size = r5;
|
| - Register new_sp = r6;
|
| - Register scratch = r7;
|
| - __ ShiftLeftImm(arg_size, r3, Operand(kPointerSizeLog2));
|
| - __ add(new_sp, sp, arg_size);
|
| - __ LoadRoot(r3, Heap::kUndefinedValueRootIndex);
|
| - __ mr(scratch, r3);
|
| - __ LoadP(r4, MemOperand(new_sp, 0)); // receiver
|
| - __ cmpi(arg_size, Operand(kPointerSize));
|
| + Register arg_size = r4;
|
| + Register new_sp = r5;
|
| + Register scratch = r6;
|
| + __ ShiftLeftP(arg_size, r2, Operand(kPointerSizeLog2));
|
| + __ AddP(new_sp, sp, arg_size);
|
| + __ LoadRoot(r2, Heap::kUndefinedValueRootIndex);
|
| + __ LoadRR(scratch, r2);
|
| + __ LoadP(r3, MemOperand(new_sp, 0)); // receiver
|
| + __ CmpP(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(r2, MemOperand(new_sp, 2 * -kPointerSize)); // argArray
|
| __ bind(&skip);
|
| - __ mr(sp, new_sp);
|
| + __ LoadRR(sp, new_sp);
|
| __ StoreP(scratch, MemOperand(sp, 0));
|
| }
|
|
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argArray
|
| - // -- r4 : receiver
|
| + // -- r2 : argArray
|
| + // -- r3 : receiver
|
| // -- sp[0] : thisArg
|
| // -----------------------------------
|
|
|
| // 2. Make sure the receiver is actually callable.
|
| Label receiver_not_callable;
|
| - __ JumpIfSmi(r4, &receiver_not_callable);
|
| - __ LoadP(r7, FieldMemOperand(r4, HeapObject::kMapOffset));
|
| - __ lbz(r7, FieldMemOperand(r7, Map::kBitFieldOffset));
|
| - __ TestBit(r7, Map::kIsCallable, r0);
|
| - __ beq(&receiver_not_callable, cr0);
|
| + __ JumpIfSmi(r3, &receiver_not_callable);
|
| + __ LoadP(r6, FieldMemOperand(r3, HeapObject::kMapOffset));
|
| + __ LoadlB(r6, FieldMemOperand(r6, Map::kBitFieldOffset));
|
| + __ TestBit(r6, Map::kIsCallable);
|
| + __ beq(&receiver_not_callable);
|
|
|
| // 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(r2, Heap::kNullValueRootIndex, &no_arguments);
|
| + __ JumpIfRoot(r2, Heap::kUndefinedValueRootIndex, &no_arguments);
|
|
|
| // 4a. Apply the receiver to the given argArray (passing undefined for
|
| // new.target).
|
| - __ LoadRoot(r6, Heap::kUndefinedValueRootIndex);
|
| + __ LoadRoot(r5, Heap::kUndefinedValueRootIndex);
|
| __ Jump(masm->isolate()->builtins()->Apply(), RelocInfo::CODE_TARGET);
|
|
|
| // 4b. The argArray is either null or undefined, so we tail call without any
|
| // arguments to the receiver.
|
| __ bind(&no_arguments);
|
| {
|
| - __ li(r3, Operand::Zero());
|
| + __ LoadImmP(r2, Operand::Zero());
|
| __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
|
| }
|
|
|
| // 4c. The receiver is not callable, throw an appropriate TypeError.
|
| __ bind(&receiver_not_callable);
|
| {
|
| - __ StoreP(r4, MemOperand(sp, 0));
|
| + __ StoreP(r3, MemOperand(sp, 0));
|
| __ TailCallRuntime(Runtime::kThrowApplyNonFunction);
|
| }
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_FunctionPrototypeCall(MacroAssembler* masm) {
|
| // 1. Make sure we have at least one argument.
|
| - // r3: actual number of arguments
|
| + // r2: actual number of arguments
|
| {
|
| Label done;
|
| - __ cmpi(r3, Operand::Zero());
|
| - __ bne(&done);
|
| + __ CmpP(r2, Operand::Zero());
|
| + __ bne(&done, Label::kNear);
|
| __ PushRoot(Heap::kUndefinedValueRootIndex);
|
| - __ addi(r3, r3, Operand(1));
|
| + __ AddP(r2, Operand(1));
|
| __ bind(&done);
|
| }
|
|
|
| + // r2: actual number of arguments
|
| // 2. Get the callable to call (passed as receiver) from the stack.
|
| - // r3: actual number of arguments
|
| - __ ShiftLeftImm(r5, r3, Operand(kPointerSizeLog2));
|
| - __ LoadPX(r4, MemOperand(sp, r5));
|
| + __ ShiftLeftP(r4, r2, Operand(kPointerSizeLog2));
|
| + __ LoadP(r3, MemOperand(sp, r4));
|
|
|
| // 3. Shift arguments and return address one slot down on the stack
|
| // (overwriting the original receiver). Adjust argument count to make
|
| // the original first argument the new receiver.
|
| - // r3: actual number of arguments
|
| - // r4: callable
|
| + // r2: actual number of arguments
|
| + // r3: callable
|
| {
|
| Label loop;
|
| // Calculate the copy start address (destination). Copy end address is sp.
|
| - __ add(r5, sp, r5);
|
| + __ AddP(r4, sp, r4);
|
|
|
| -
|
| - __ mtctr(r3);
|
| __ bind(&loop);
|
| - __ LoadP(ip, MemOperand(r5, -kPointerSize));
|
| - __ StoreP(ip, MemOperand(r5));
|
| - __ subi(r5, r5, Operand(kPointerSize));
|
| - __ bdnz(&loop);
|
| + __ LoadP(ip, MemOperand(r4, -kPointerSize));
|
| + __ StoreP(ip, MemOperand(r4));
|
| + __ SubP(r4, Operand(kPointerSize));
|
| + __ CmpP(r4, sp);
|
| + __ bne(&loop);
|
| // Adjust the actual number of arguments and remove the top element
|
| // (which is a copy of the last argument).
|
| - __ subi(r3, r3, Operand(1));
|
| + __ SubP(r2, Operand(1));
|
| __ pop();
|
| }
|
|
|
| @@ -1637,128 +1581,126 @@ void Builtins::Generate_FunctionPrototypeCall(MacroAssembler* masm) {
|
| __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
|
| }
|
|
|
| -
|
| void Builtins::Generate_ReflectApply(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argc
|
| + // -- r2 : argc
|
| // -- sp[0] : argumentsList
|
| // -- sp[4] : thisArgument
|
| // -- sp[8] : target
|
| // -- sp[12] : receiver
|
| // -----------------------------------
|
|
|
| - // 1. Load target into r4 (if present), argumentsList into r3 (if present),
|
| + // 1. Load target into r3 (if present), argumentsList into r2 (if present),
|
| // remove all arguments from the stack (including the receiver), and push
|
| // thisArgument (if present) instead.
|
| {
|
| Label skip;
|
| - Register arg_size = r5;
|
| - Register new_sp = r6;
|
| - Register scratch = r7;
|
| - __ ShiftLeftImm(arg_size, r3, Operand(kPointerSizeLog2));
|
| - __ add(new_sp, sp, arg_size);
|
| - __ LoadRoot(r4, Heap::kUndefinedValueRootIndex);
|
| - __ mr(scratch, r4);
|
| - __ mr(r3, r4);
|
| - __ cmpi(arg_size, Operand(kPointerSize));
|
| + Register arg_size = r4;
|
| + Register new_sp = r5;
|
| + Register scratch = r6;
|
| + __ ShiftLeftP(arg_size, r2, Operand(kPointerSizeLog2));
|
| + __ AddP(new_sp, sp, arg_size);
|
| + __ LoadRoot(r3, Heap::kUndefinedValueRootIndex);
|
| + __ LoadRR(scratch, r3);
|
| + __ LoadRR(r2, r3);
|
| + __ CmpP(arg_size, Operand(kPointerSize));
|
| __ blt(&skip);
|
| - __ LoadP(r4, MemOperand(new_sp, 1 * -kPointerSize)); // target
|
| + __ LoadP(r3, MemOperand(new_sp, 1 * -kPointerSize)); // target
|
| __ beq(&skip);
|
| __ LoadP(scratch, MemOperand(new_sp, 2 * -kPointerSize)); // thisArgument
|
| - __ cmpi(arg_size, Operand(2 * kPointerSize));
|
| + __ CmpP(arg_size, Operand(2 * kPointerSize));
|
| __ beq(&skip);
|
| - __ LoadP(r3, MemOperand(new_sp, 3 * -kPointerSize)); // argumentsList
|
| + __ LoadP(r2, MemOperand(new_sp, 3 * -kPointerSize)); // argumentsList
|
| __ bind(&skip);
|
| - __ mr(sp, new_sp);
|
| + __ LoadRR(sp, new_sp);
|
| __ StoreP(scratch, MemOperand(sp, 0));
|
| }
|
|
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argumentsList
|
| - // -- r4 : target
|
| + // -- r2 : argumentsList
|
| + // -- r3 : target
|
| // -- sp[0] : thisArgument
|
| // -----------------------------------
|
|
|
| // 2. Make sure the target is actually callable.
|
| Label target_not_callable;
|
| - __ JumpIfSmi(r4, &target_not_callable);
|
| - __ LoadP(r7, FieldMemOperand(r4, HeapObject::kMapOffset));
|
| - __ lbz(r7, FieldMemOperand(r7, Map::kBitFieldOffset));
|
| - __ TestBit(r7, Map::kIsCallable, r0);
|
| - __ beq(&target_not_callable, cr0);
|
| + __ JumpIfSmi(r3, &target_not_callable);
|
| + __ LoadP(r6, FieldMemOperand(r3, HeapObject::kMapOffset));
|
| + __ LoadlB(r6, FieldMemOperand(r6, Map::kBitFieldOffset));
|
| + __ TestBit(r6, Map::kIsCallable);
|
| + __ beq(&target_not_callable);
|
|
|
| // 3a. Apply the target to the given argumentsList (passing undefined for
|
| // new.target).
|
| - __ LoadRoot(r6, Heap::kUndefinedValueRootIndex);
|
| + __ LoadRoot(r5, Heap::kUndefinedValueRootIndex);
|
| __ Jump(masm->isolate()->builtins()->Apply(), RelocInfo::CODE_TARGET);
|
|
|
| // 3b. The target is not callable, throw an appropriate TypeError.
|
| __ bind(&target_not_callable);
|
| {
|
| - __ StoreP(r4, MemOperand(sp, 0));
|
| + __ StoreP(r3, MemOperand(sp, 0));
|
| __ TailCallRuntime(Runtime::kThrowApplyNonFunction);
|
| }
|
| }
|
|
|
| -
|
| void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argc
|
| + // -- r2 : argc
|
| // -- sp[0] : new.target (optional)
|
| // -- sp[4] : argumentsList
|
| // -- sp[8] : target
|
| // -- sp[12] : receiver
|
| // -----------------------------------
|
|
|
| - // 1. Load target into r4 (if present), argumentsList into r3 (if present),
|
| - // new.target into r6 (if present, otherwise use target), remove all
|
| + // 1. Load target into r3 (if present), argumentsList into r2 (if present),
|
| + // new.target into r5 (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 new_sp = r7;
|
| - __ ShiftLeftImm(arg_size, r3, Operand(kPointerSizeLog2));
|
| - __ add(new_sp, sp, arg_size);
|
| - __ LoadRoot(r4, Heap::kUndefinedValueRootIndex);
|
| - __ mr(r3, r4);
|
| - __ mr(r6, r4);
|
| - __ StoreP(r4, MemOperand(new_sp, 0)); // receiver (undefined)
|
| - __ cmpi(arg_size, Operand(kPointerSize));
|
| + Register arg_size = r4;
|
| + Register new_sp = r6;
|
| + __ ShiftLeftP(arg_size, r2, Operand(kPointerSizeLog2));
|
| + __ AddP(new_sp, sp, arg_size);
|
| + __ LoadRoot(r3, Heap::kUndefinedValueRootIndex);
|
| + __ LoadRR(r2, r3);
|
| + __ LoadRR(r5, r3);
|
| + __ StoreP(r3, MemOperand(new_sp, 0)); // receiver (undefined)
|
| + __ CmpP(arg_size, Operand(kPointerSize));
|
| __ blt(&skip);
|
| - __ LoadP(r4, MemOperand(new_sp, 1 * -kPointerSize)); // target
|
| - __ mr(r6, r4); // new.target defaults to target
|
| + __ LoadP(r3, MemOperand(new_sp, 1 * -kPointerSize)); // target
|
| + __ LoadRR(r5, r3); // new.target defaults to target
|
| __ beq(&skip);
|
| - __ LoadP(r3, MemOperand(new_sp, 2 * -kPointerSize)); // argumentsList
|
| - __ cmpi(arg_size, Operand(2 * kPointerSize));
|
| + __ LoadP(r2, MemOperand(new_sp, 2 * -kPointerSize)); // argumentsList
|
| + __ CmpP(arg_size, Operand(2 * kPointerSize));
|
| __ beq(&skip);
|
| - __ LoadP(r6, MemOperand(new_sp, 3 * -kPointerSize)); // new.target
|
| + __ LoadP(r5, MemOperand(new_sp, 3 * -kPointerSize)); // new.target
|
| __ bind(&skip);
|
| - __ mr(sp, new_sp);
|
| + __ LoadRR(sp, new_sp);
|
| }
|
|
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argumentsList
|
| - // -- r6 : new.target
|
| - // -- r4 : target
|
| + // -- r2 : argumentsList
|
| + // -- r5 : new.target
|
| + // -- r3 : target
|
| // -- sp[0] : receiver (undefined)
|
| // -----------------------------------
|
|
|
| // 2. Make sure the target is actually a constructor.
|
| Label target_not_constructor;
|
| - __ JumpIfSmi(r4, &target_not_constructor);
|
| - __ LoadP(r7, FieldMemOperand(r4, HeapObject::kMapOffset));
|
| - __ lbz(r7, FieldMemOperand(r7, Map::kBitFieldOffset));
|
| - __ TestBit(r7, Map::kIsConstructor, r0);
|
| - __ beq(&target_not_constructor, cr0);
|
| + __ JumpIfSmi(r3, &target_not_constructor);
|
| + __ LoadP(r6, FieldMemOperand(r3, HeapObject::kMapOffset));
|
| + __ LoadlB(r6, FieldMemOperand(r6, Map::kBitFieldOffset));
|
| + __ TestBit(r6, Map::kIsConstructor);
|
| + __ beq(&target_not_constructor);
|
|
|
| // 3. Make sure the target is actually a constructor.
|
| Label new_target_not_constructor;
|
| - __ JumpIfSmi(r6, &new_target_not_constructor);
|
| - __ LoadP(r7, FieldMemOperand(r6, HeapObject::kMapOffset));
|
| - __ lbz(r7, FieldMemOperand(r7, Map::kBitFieldOffset));
|
| - __ TestBit(r7, Map::kIsConstructor, r0);
|
| - __ beq(&new_target_not_constructor, cr0);
|
| + __ JumpIfSmi(r5, &new_target_not_constructor);
|
| + __ LoadP(r6, FieldMemOperand(r5, HeapObject::kMapOffset));
|
| + __ LoadlB(r6, FieldMemOperand(r6, Map::kBitFieldOffset));
|
| + __ TestBit(r6, Map::kIsConstructor);
|
| + __ beq(&new_target_not_constructor);
|
|
|
| // 4a. Construct the target with the given new.target and argumentsList.
|
| __ Jump(masm->isolate()->builtins()->Apply(), RelocInfo::CODE_TARGET);
|
| @@ -1766,140 +1708,145 @@ void Builtins::Generate_ReflectConstruct(MacroAssembler* masm) {
|
| // 4b. The target is not a constructor, throw an appropriate TypeError.
|
| __ bind(&target_not_constructor);
|
| {
|
| - __ StoreP(r4, MemOperand(sp, 0));
|
| + __ StoreP(r3, MemOperand(sp, 0));
|
| __ TailCallRuntime(Runtime::kThrowCalledNonCallable);
|
| }
|
|
|
| // 4c. The new.target is not a constructor, throw an appropriate TypeError.
|
| __ bind(&new_target_not_constructor);
|
| {
|
| - __ StoreP(r6, MemOperand(sp, 0));
|
| + __ StoreP(r5, MemOperand(sp, 0));
|
| __ TailCallRuntime(Runtime::kThrowCalledNonCallable);
|
| }
|
| }
|
|
|
| -
|
| static void ArgumentAdaptorStackCheck(MacroAssembler* masm,
|
| Label* stack_overflow) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : actual number of arguments
|
| - // -- r4 : function (passed through to callee)
|
| - // -- r5 : expected number of arguments
|
| - // -- r6 : new target (passed through to callee)
|
| + // -- r2 : actual number of arguments
|
| + // -- r3 : function (passed through to callee)
|
| + // -- r4 : expected number of arguments
|
| + // -- r5 : new target (passed through to callee)
|
| // -----------------------------------
|
| // Check the stack for overflow. We are not trying to catch
|
| // interruptions (e.g. debug break and preemption) here, so the "real stack
|
| // limit" is checked.
|
| - __ LoadRoot(r8, Heap::kRealStackLimitRootIndex);
|
| - // Make r8 the space we have left. The stack might already be overflowed
|
| - // here which will cause r8 to become negative.
|
| - __ sub(r8, sp, r8);
|
| + __ LoadRoot(r7, Heap::kRealStackLimitRootIndex);
|
| + // Make r7 the space we have left. The stack might already be overflowed
|
| + // here which will cause r7 to become negative.
|
| + __ SubP(r7, sp, r7);
|
| // Check if the arguments will overflow the stack.
|
| - __ ShiftLeftImm(r0, r5, Operand(kPointerSizeLog2));
|
| - __ cmp(r8, r0);
|
| + __ ShiftLeftP(r0, r4, Operand(kPointerSizeLog2));
|
| + __ CmpP(r7, r0);
|
| __ ble(stack_overflow); // Signed comparison.
|
| }
|
|
|
| -
|
| static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) {
|
| - __ SmiTag(r3);
|
| - __ LoadSmiLiteral(r7, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
|
| - __ mflr(r0);
|
| - __ push(r0);
|
| - if (FLAG_enable_embedded_constant_pool) {
|
| - __ Push(fp, kConstantPoolRegister, r7, r4, r3);
|
| - } else {
|
| - __ Push(fp, r7, r4, r3);
|
| - }
|
| - __ addi(fp, sp, Operand(StandardFrameConstants::kFixedFrameSizeFromFp +
|
| - kPointerSize));
|
| + __ SmiTag(r2);
|
| + __ LoadSmiLiteral(r6, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
|
| + // Stack updated as such:
|
| + // old SP --->
|
| + // R14 Return Addr
|
| + // Old FP <--- New FP
|
| + // Argument Adapter SMI
|
| + // Function
|
| + // ArgC as SMI <--- New SP
|
| + __ lay(sp, MemOperand(sp, -5 * kPointerSize));
|
| +
|
| + // Cleanse the top nibble of 31-bit pointers.
|
| + __ CleanseP(r14);
|
| + __ StoreP(r14, MemOperand(sp, 4 * kPointerSize));
|
| + __ StoreP(fp, MemOperand(sp, 3 * kPointerSize));
|
| + __ StoreP(r6, MemOperand(sp, 2 * kPointerSize));
|
| + __ StoreP(r3, MemOperand(sp, 1 * kPointerSize));
|
| + __ StoreP(r2, MemOperand(sp, 0 * kPointerSize));
|
| + __ la(fp, MemOperand(sp, StandardFrameConstants::kFixedFrameSizeFromFp +
|
| + kPointerSize));
|
| }
|
|
|
| -
|
| static void LeaveArgumentsAdaptorFrame(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : result being passed through
|
| + // -- r2 : result being passed through
|
| // -----------------------------------
|
| // Get the number of arguments passed (as a smi), tear down the frame and
|
| // then tear down the parameters.
|
| - __ LoadP(r4, MemOperand(fp, -(StandardFrameConstants::kFixedFrameSizeFromFp +
|
| + __ LoadP(r3, MemOperand(fp, -(StandardFrameConstants::kFixedFrameSizeFromFp +
|
| kPointerSize)));
|
| int stack_adjustment = kPointerSize; // adjust for receiver
|
| __ LeaveFrame(StackFrame::ARGUMENTS_ADAPTOR, stack_adjustment);
|
| - __ SmiToPtrArrayOffset(r0, r4);
|
| - __ add(sp, sp, r0);
|
| + __ SmiToPtrArrayOffset(r3, r3);
|
| + __ lay(sp, MemOperand(sp, r3));
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_Apply(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : argumentsList
|
| - // -- r4 : target
|
| - // -- r6 : new.target (checked to be constructor or undefined)
|
| + // -- r2 : argumentsList
|
| + // -- r3 : target
|
| + // -- r5 : new.target (checked to be constructor or undefined)
|
| // -- sp[0] : thisArgument
|
| // -----------------------------------
|
|
|
| // Create the list of arguments from the array-like argumentsList.
|
| {
|
| Label create_arguments, create_array, create_runtime, done_create;
|
| - __ JumpIfSmi(r3, &create_runtime);
|
| + __ JumpIfSmi(r2, &create_runtime);
|
|
|
| - // Load the map of argumentsList into r5.
|
| - __ LoadP(r5, FieldMemOperand(r3, HeapObject::kMapOffset));
|
| + // Load the map of argumentsList into r4.
|
| + __ LoadP(r4, FieldMemOperand(r2, HeapObject::kMapOffset));
|
|
|
| - // Load native context into r7.
|
| - __ LoadP(r7, NativeContextMemOperand());
|
| + // Load native context into r6.
|
| + __ LoadP(r6, NativeContextMemOperand());
|
|
|
| // Check if argumentsList is an (unmodified) arguments object.
|
| - __ LoadP(ip, ContextMemOperand(r7, Context::SLOPPY_ARGUMENTS_MAP_INDEX));
|
| - __ cmp(ip, r5);
|
| + __ LoadP(ip, ContextMemOperand(r6, Context::SLOPPY_ARGUMENTS_MAP_INDEX));
|
| + __ CmpP(ip, r4);
|
| __ beq(&create_arguments);
|
| - __ LoadP(ip, ContextMemOperand(r7, Context::STRICT_ARGUMENTS_MAP_INDEX));
|
| - __ cmp(ip, r5);
|
| + __ LoadP(ip, ContextMemOperand(r6, Context::STRICT_ARGUMENTS_MAP_INDEX));
|
| + __ CmpP(ip, r4);
|
| __ beq(&create_arguments);
|
|
|
| // Check if argumentsList is a fast JSArray.
|
| - __ CompareInstanceType(r5, ip, JS_ARRAY_TYPE);
|
| + __ CompareInstanceType(r4, 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);
|
| + __ Push(r3, r5, r2);
|
| __ CallRuntime(Runtime::kCreateListFromArrayLike);
|
| - __ Pop(r4, r6);
|
| - __ LoadP(r5, FieldMemOperand(r3, FixedArray::kLengthOffset));
|
| - __ SmiUntag(r5);
|
| + __ Pop(r3, r5);
|
| + __ LoadP(r4, FieldMemOperand(r2, FixedArray::kLengthOffset));
|
| + __ SmiUntag(r4);
|
| }
|
| __ 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);
|
| + __ LoadP(r4, FieldMemOperand(r2, JSArgumentsObject::kLengthOffset));
|
| + __ LoadP(r6, FieldMemOperand(r2, JSObject::kElementsOffset));
|
| + __ LoadP(ip, FieldMemOperand(r6, FixedArray::kLengthOffset));
|
| + __ CmpP(r4, ip);
|
| __ bne(&create_runtime);
|
| - __ SmiUntag(r5);
|
| - __ mr(r3, r7);
|
| + __ SmiUntag(r4);
|
| + __ LoadRR(r2, r6);
|
| __ b(&done_create);
|
|
|
| // Try to create the list from a JSArray object.
|
| __ bind(&create_array);
|
| - __ lbz(r5, FieldMemOperand(r5, Map::kBitField2Offset));
|
| - __ DecodeField<Map::ElementsKindBits>(r5);
|
| + __ LoadlB(r4, FieldMemOperand(r4, Map::kBitField2Offset));
|
| + __ DecodeField<Map::ElementsKindBits>(r4);
|
| STATIC_ASSERT(FAST_SMI_ELEMENTS == 0);
|
| STATIC_ASSERT(FAST_HOLEY_SMI_ELEMENTS == 1);
|
| STATIC_ASSERT(FAST_ELEMENTS == 2);
|
| - __ cmpi(r5, Operand(FAST_ELEMENTS));
|
| + __ CmpP(r4, Operand(FAST_ELEMENTS));
|
| __ bgt(&create_runtime);
|
| - __ cmpi(r5, Operand(FAST_HOLEY_SMI_ELEMENTS));
|
| + __ CmpP(r4, Operand(FAST_HOLEY_SMI_ELEMENTS));
|
| __ beq(&create_runtime);
|
| - __ LoadP(r5, FieldMemOperand(r3, JSArray::kLengthOffset));
|
| - __ LoadP(r3, FieldMemOperand(r3, JSArray::kElementsOffset));
|
| - __ SmiUntag(r5);
|
| + __ LoadP(r4, FieldMemOperand(r2, JSArray::kLengthOffset));
|
| + __ LoadP(r2, FieldMemOperand(r2, JSArray::kElementsOffset));
|
| + __ SmiUntag(r4);
|
|
|
| __ bind(&done_create);
|
| }
|
| @@ -1912,42 +1859,43 @@ void Builtins::Generate_Apply(MacroAssembler* masm) {
|
| __ LoadRoot(ip, Heap::kRealStackLimitRootIndex);
|
| // Make ip the space we have left. The stack might already be overflowed
|
| // here which will cause ip to become negative.
|
| - __ sub(ip, sp, ip);
|
| + __ SubP(ip, sp, ip);
|
| // Check if the arguments will overflow the stack.
|
| - __ ShiftLeftImm(r0, r5, Operand(kPointerSizeLog2));
|
| - __ cmp(ip, r0); // Signed comparison.
|
| + __ ShiftLeftP(r0, r4, Operand(kPointerSizeLog2));
|
| + __ CmpP(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)
|
| + // -- r3 : target
|
| + // -- r2 : args (a FixedArray built from argumentsList)
|
| + // -- r4 : len (number of elements to push from args)
|
| + // -- r5 : new.target (checked to be constructor or undefined)
|
| // -- sp[0] : thisArgument
|
| // -----------------------------------
|
|
|
| // Push arguments onto the stack (thisArgument is already on the stack).
|
| {
|
| Label loop, no_args;
|
| - __ cmpi(r5, Operand::Zero());
|
| + __ CmpP(r4, Operand::Zero());
|
| __ beq(&no_args);
|
| - __ addi(r3, r3,
|
| + __ AddP(r2, r2,
|
| Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
|
| - __ mtctr(r5);
|
| + __ LoadRR(r1, r4);
|
| __ bind(&loop);
|
| - __ LoadPU(r0, MemOperand(r3, kPointerSize));
|
| + __ LoadP(r0, MemOperand(r2, kPointerSize));
|
| + __ la(r2, MemOperand(r2, kPointerSize));
|
| __ push(r0);
|
| - __ bdnz(&loop);
|
| + __ BranchOnCount(r1, &loop);
|
| __ bind(&no_args);
|
| - __ mr(r3, r5);
|
| + __ LoadRR(r2, r4);
|
| }
|
|
|
| // Dispatch to Call or Construct depending on whether new.target is undefined.
|
| {
|
| - __ CompareRoot(r6, Heap::kUndefinedValueRootIndex);
|
| + __ CompareRoot(r5, Heap::kUndefinedValueRootIndex);
|
| __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET, eq);
|
| __ Jump(masm->isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
|
| }
|
| @@ -1993,8 +1941,8 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg,
|
| ExternalReference debug_is_active =
|
| ExternalReference::debug_is_active_address(masm->isolate());
|
| __ mov(scratch1, Operand(debug_is_active));
|
| - __ lbz(scratch1, MemOperand(scratch1));
|
| - __ cmpi(scratch1, Operand::Zero());
|
| + __ LoadlB(scratch1, MemOperand(scratch1));
|
| + __ CmpP(scratch1, Operand::Zero());
|
| __ bne(&done);
|
|
|
| // Drop possible interpreter handler/stub frame.
|
| @@ -2016,7 +1964,7 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg,
|
| __ bne(&no_arguments_adaptor);
|
|
|
| // Drop arguments adaptor frame and load arguments count.
|
| - __ mr(fp, scratch2);
|
| + __ LoadRR(fp, scratch2);
|
| __ LoadP(scratch1,
|
| MemOperand(fp, ArgumentsAdaptorFrameConstants::kLengthOffset));
|
| __ SmiUntag(scratch1);
|
| @@ -2027,32 +1975,32 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg,
|
| __ LoadP(scratch1, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| __ LoadP(scratch1,
|
| FieldMemOperand(scratch1, JSFunction::kSharedFunctionInfoOffset));
|
| - __ LoadWordArith(
|
| - scratch1, FieldMemOperand(
|
| - scratch1, SharedFunctionInfo::kFormalParameterCountOffset));
|
| -#if !V8_TARGET_ARCH_PPC64
|
| + __ LoadW(scratch1,
|
| + FieldMemOperand(scratch1,
|
| + SharedFunctionInfo::kFormalParameterCountOffset));
|
| +#if !V8_TARGET_ARCH_S390X
|
| __ SmiUntag(scratch1);
|
| #endif
|
|
|
| __ bind(&formal_parameter_count_loaded);
|
|
|
| // Calculate the end of destination area where we will put the arguments
|
| - // after we drop current frame. We add kPointerSize to count the receiver
|
| + // after we drop current frame. We AddP kPointerSize to count the receiver
|
| // argument which is not included into formal parameters count.
|
| Register dst_reg = scratch2;
|
| - __ ShiftLeftImm(dst_reg, scratch1, Operand(kPointerSizeLog2));
|
| - __ add(dst_reg, fp, dst_reg);
|
| - __ addi(dst_reg, dst_reg,
|
| + __ ShiftLeftP(dst_reg, scratch1, Operand(kPointerSizeLog2));
|
| + __ AddP(dst_reg, fp, dst_reg);
|
| + __ AddP(dst_reg, dst_reg,
|
| Operand(StandardFrameConstants::kCallerSPOffset + kPointerSize));
|
|
|
| Register src_reg = scratch1;
|
| - __ ShiftLeftImm(src_reg, args_reg, Operand(kPointerSizeLog2));
|
| - __ add(src_reg, sp, src_reg);
|
| + __ ShiftLeftP(src_reg, args_reg, Operand(kPointerSizeLog2));
|
| + __ AddP(src_reg, sp, src_reg);
|
| // Count receiver argument as well (not included in args_reg).
|
| - __ addi(src_reg, src_reg, Operand(kPointerSize));
|
| + __ AddP(src_reg, src_reg, Operand(kPointerSize));
|
|
|
| if (FLAG_debug_code) {
|
| - __ cmpl(src_reg, dst_reg);
|
| + __ CmpLogicalP(src_reg, dst_reg);
|
| __ Check(lt, kStackAccessBelowStackPointer);
|
| }
|
|
|
| @@ -2067,15 +2015,20 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg,
|
| // so they must be pre-decremented in the loop.
|
| Register tmp_reg = scratch3;
|
| Label loop;
|
| - __ addi(tmp_reg, args_reg, Operand(1)); // +1 for receiver
|
| - __ mtctr(tmp_reg);
|
| + DCHECK(!src_reg.is(r1));
|
| + DCHECK(!dst_reg.is(r1));
|
| + DCHECK(!tmp_reg.is(r1));
|
| +
|
| + __ AddP(r1, args_reg, Operand(1)); // +1 for receiver
|
| __ bind(&loop);
|
| - __ LoadPU(tmp_reg, MemOperand(src_reg, -kPointerSize));
|
| - __ StorePU(tmp_reg, MemOperand(dst_reg, -kPointerSize));
|
| - __ bdnz(&loop);
|
| + __ lay(src_reg, MemOperand(src_reg, -kPointerSize));
|
| + __ LoadP(tmp_reg, MemOperand(src_reg));
|
| + __ lay(dst_reg, MemOperand(dst_reg, -kPointerSize));
|
| + __ StoreP(tmp_reg, MemOperand(dst_reg));
|
| + __ BranchOnCount(r1, &loop);
|
|
|
| // Leave current frame.
|
| - __ mr(sp, dst_reg);
|
| + __ LoadRR(sp, dst_reg);
|
|
|
| __ bind(&done);
|
| }
|
| @@ -2086,56 +2039,56 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
|
| ConvertReceiverMode mode,
|
| TailCallMode tail_call_mode) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the function to call (checked to be a JSFunction)
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the function to call (checked to be a JSFunction)
|
| // -----------------------------------
|
| - __ AssertFunction(r4);
|
| + __ AssertFunction(r3);
|
|
|
| // See ES6 section 9.2.1 [[Call]] ( thisArgument, argumentsList)
|
| // Check that the function is not a "classConstructor".
|
| Label class_constructor;
|
| - __ LoadP(r5, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
|
| - __ lwz(r6, FieldMemOperand(r5, SharedFunctionInfo::kCompilerHintsOffset));
|
| - __ TestBitMask(r6, SharedFunctionInfo::kClassConstructorBits, r0);
|
| - __ bne(&class_constructor, cr0);
|
| + __ LoadP(r4, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
|
| + __ LoadlW(r5, FieldMemOperand(r4, SharedFunctionInfo::kCompilerHintsOffset));
|
| + __ TestBitMask(r5, SharedFunctionInfo::kClassConstructorBits, r0);
|
| + __ bne(&class_constructor);
|
|
|
| // Enter the context of the function; ToObject has to run in the function
|
| // context, and we also need to take the global proxy from the function
|
| // context in case of conversion.
|
| - __ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
|
| + __ LoadP(cp, FieldMemOperand(r3, JSFunction::kContextOffset));
|
| // We need to convert the receiver for non-native sloppy mode functions.
|
| Label done_convert;
|
| - __ andi(r0, r6, Operand((1 << SharedFunctionInfo::kStrictModeBit) |
|
| + __ AndP(r0, r5, Operand((1 << SharedFunctionInfo::kStrictModeBit) |
|
| (1 << SharedFunctionInfo::kNativeBit)));
|
| - __ bne(&done_convert, cr0);
|
| + __ bne(&done_convert);
|
| {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the function to call (checked to be a JSFunction)
|
| - // -- r5 : the shared function info.
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the function to call (checked to be a JSFunction)
|
| + // -- r4 : the shared function info.
|
| // -- cp : the function context.
|
| // -----------------------------------
|
|
|
| if (mode == ConvertReceiverMode::kNullOrUndefined) {
|
| // Patch receiver to global proxy.
|
| - __ LoadGlobalProxy(r6);
|
| + __ LoadGlobalProxy(r5);
|
| } else {
|
| Label convert_to_object, convert_receiver;
|
| - __ ShiftLeftImm(r6, r3, Operand(kPointerSizeLog2));
|
| - __ LoadPX(r6, MemOperand(sp, r6));
|
| - __ JumpIfSmi(r6, &convert_to_object);
|
| + __ ShiftLeftP(r5, r2, Operand(kPointerSizeLog2));
|
| + __ LoadP(r5, MemOperand(sp, r5));
|
| + __ JumpIfSmi(r5, &convert_to_object);
|
| STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
|
| - __ CompareObjectType(r6, r7, r7, FIRST_JS_RECEIVER_TYPE);
|
| + __ CompareObjectType(r5, r6, r6, FIRST_JS_RECEIVER_TYPE);
|
| __ bge(&done_convert);
|
| if (mode != ConvertReceiverMode::kNotNullOrUndefined) {
|
| Label convert_global_proxy;
|
| - __ JumpIfRoot(r6, Heap::kUndefinedValueRootIndex,
|
| + __ JumpIfRoot(r5, Heap::kUndefinedValueRootIndex,
|
| &convert_global_proxy);
|
| - __ JumpIfNotRoot(r6, Heap::kNullValueRootIndex, &convert_to_object);
|
| + __ JumpIfNotRoot(r5, Heap::kNullValueRootIndex, &convert_to_object);
|
| __ bind(&convert_global_proxy);
|
| {
|
| // Patch receiver to global proxy.
|
| - __ LoadGlobalProxy(r6);
|
| + __ LoadGlobalProxy(r5);
|
| }
|
| __ b(&convert_receiver);
|
| }
|
| @@ -2145,91 +2098,91 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
|
| // TODO(bmeurer): Inline the allocation here to avoid building the frame
|
| // in the fast case? (fall back to AllocateInNewSpace?)
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ SmiTag(r3);
|
| - __ Push(r3, r4);
|
| - __ mr(r3, r6);
|
| + __ SmiTag(r2);
|
| + __ Push(r2, r3);
|
| + __ LoadRR(r2, r5);
|
| ToObjectStub stub(masm->isolate());
|
| __ CallStub(&stub);
|
| - __ mr(r6, r3);
|
| - __ Pop(r3, r4);
|
| - __ SmiUntag(r3);
|
| + __ LoadRR(r5, r2);
|
| + __ Pop(r2, r3);
|
| + __ SmiUntag(r2);
|
| }
|
| - __ LoadP(r5, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
|
| + __ LoadP(r4, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
|
| __ bind(&convert_receiver);
|
| }
|
| - __ ShiftLeftImm(r7, r3, Operand(kPointerSizeLog2));
|
| - __ StorePX(r6, MemOperand(sp, r7));
|
| + __ ShiftLeftP(r6, r2, Operand(kPointerSizeLog2));
|
| + __ StoreP(r5, MemOperand(sp, r6));
|
| }
|
| __ bind(&done_convert);
|
|
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the function to call (checked to be a JSFunction)
|
| - // -- r5 : the shared function info.
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the function to call (checked to be a JSFunction)
|
| + // -- r4 : the shared function info.
|
| // -- cp : the function context.
|
| // -----------------------------------
|
|
|
| if (tail_call_mode == TailCallMode::kAllow) {
|
| - PrepareForTailCall(masm, r3, r6, r7, r8);
|
| + PrepareForTailCall(masm, r2, r5, r6, r7);
|
| }
|
|
|
| - __ LoadWordArith(
|
| - r5, FieldMemOperand(r5, SharedFunctionInfo::kFormalParameterCountOffset));
|
| -#if !V8_TARGET_ARCH_PPC64
|
| - __ SmiUntag(r5);
|
| + __ LoadW(
|
| + r4, FieldMemOperand(r4, SharedFunctionInfo::kFormalParameterCountOffset));
|
| +#if !V8_TARGET_ARCH_S390X
|
| + __ SmiUntag(r4);
|
| #endif
|
| - ParameterCount actual(r3);
|
| - ParameterCount expected(r5);
|
| - __ InvokeFunctionCode(r4, no_reg, expected, actual, JUMP_FUNCTION,
|
| + ParameterCount actual(r2);
|
| + ParameterCount expected(r4);
|
| + __ InvokeFunctionCode(r3, no_reg, expected, actual, JUMP_FUNCTION,
|
| CheckDebugStepCallWrapper());
|
|
|
| // The function is a "classConstructor", need to raise an exception.
|
| __ bind(&class_constructor);
|
| {
|
| FrameAndConstantPoolScope frame(masm, StackFrame::INTERNAL);
|
| - __ push(r4);
|
| + __ push(r3);
|
| __ CallRuntime(Runtime::kThrowConstructorNonCallableError);
|
| }
|
| }
|
|
|
| -
|
| namespace {
|
|
|
| void Generate_PushBoundArguments(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : target (checked to be a JSBoundFunction)
|
| - // -- r6 : new.target (only in case of [[Construct]])
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : target (checked to be a JSBoundFunction)
|
| + // -- r5 : new.target (only in case of [[Construct]])
|
| // -----------------------------------
|
|
|
| - // Load [[BoundArguments]] into r5 and length of that into r7.
|
| + // Load [[BoundArguments]] into r4 and length of that into r6.
|
| Label no_bound_arguments;
|
| - __ LoadP(r5, FieldMemOperand(r4, JSBoundFunction::kBoundArgumentsOffset));
|
| - __ LoadP(r7, FieldMemOperand(r5, FixedArray::kLengthOffset));
|
| - __ SmiUntag(r7, SetRC);
|
| - __ beq(&no_bound_arguments, cr0);
|
| + __ LoadP(r4, FieldMemOperand(r3, JSBoundFunction::kBoundArgumentsOffset));
|
| + __ LoadP(r6, FieldMemOperand(r4, FixedArray::kLengthOffset));
|
| + __ SmiUntag(r6);
|
| + __ LoadAndTestP(r6, r6);
|
| + __ beq(&no_bound_arguments);
|
| {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : target (checked to be a JSBoundFunction)
|
| - // -- r5 : the [[BoundArguments]] (implemented as FixedArray)
|
| - // -- r6 : new.target (only in case of [[Construct]])
|
| - // -- r7 : the number of [[BoundArguments]]
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : target (checked to be a JSBoundFunction)
|
| + // -- r4 : the [[BoundArguments]] (implemented as FixedArray)
|
| + // -- r5 : new.target (only in case of [[Construct]])
|
| + // -- r6 : the number of [[BoundArguments]]
|
| // -----------------------------------
|
|
|
| // Reserve stack space for the [[BoundArguments]].
|
| {
|
| Label done;
|
| - __ mr(r9, sp); // preserve previous stack pointer
|
| - __ ShiftLeftImm(r10, r7, Operand(kPointerSizeLog2));
|
| - __ sub(sp, sp, r10);
|
| + __ LoadRR(r8, sp); // preserve previous stack pointer
|
| + __ ShiftLeftP(r9, r6, Operand(kPointerSizeLog2));
|
| + __ SubP(sp, sp, r9);
|
| // Check the stack for overflow. We are not trying to catch interruptions
|
| // (i.e. debug break and preemption) here, so check the "real stack
|
| // limit".
|
| __ CompareRoot(sp, Heap::kRealStackLimitRootIndex);
|
| __ bgt(&done); // Signed comparison.
|
| // Restore the stack pointer.
|
| - __ mr(sp, r9);
|
| + __ LoadRR(sp, r8);
|
| {
|
| FrameScope scope(masm, StackFrame::MANUAL);
|
| __ EnterFrame(StackFrame::INTERNAL);
|
| @@ -2239,35 +2192,36 @@ void Generate_PushBoundArguments(MacroAssembler* masm) {
|
| }
|
|
|
| // Relocate arguments down the stack.
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r9 : the previous stack pointer
|
| - // -- r10: the size of the [[BoundArguments]]
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r8 : the previous stack pointer
|
| + // -- r9: the size of the [[BoundArguments]]
|
| {
|
| Label skip, loop;
|
| - __ li(r8, Operand::Zero());
|
| - __ cmpi(r3, Operand::Zero());
|
| + __ LoadImmP(r7, Operand::Zero());
|
| + __ CmpP(r2, Operand::Zero());
|
| __ beq(&skip);
|
| - __ mtctr(r3);
|
| + __ LoadRR(r1, r2);
|
| __ bind(&loop);
|
| - __ LoadPX(r0, MemOperand(r9, r8));
|
| - __ StorePX(r0, MemOperand(sp, r8));
|
| - __ addi(r8, r8, Operand(kPointerSize));
|
| - __ bdnz(&loop);
|
| + __ LoadP(r0, MemOperand(r8, r7));
|
| + __ StoreP(r0, MemOperand(sp, r7));
|
| + __ AddP(r7, r7, Operand(kPointerSize));
|
| + __ BranchOnCount(r1, &loop);
|
| __ bind(&skip);
|
| }
|
|
|
| // Copy [[BoundArguments]] to the stack (below the arguments).
|
| {
|
| Label loop;
|
| - __ addi(r5, r5, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| - __ add(r5, r5, r10);
|
| - __ mtctr(r7);
|
| + __ AddP(r4, r4, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| + __ AddP(r4, r4, r9);
|
| + __ LoadRR(r1, r6);
|
| __ bind(&loop);
|
| - __ LoadPU(r0, MemOperand(r5, -kPointerSize));
|
| - __ StorePX(r0, MemOperand(sp, r8));
|
| - __ addi(r8, r8, Operand(kPointerSize));
|
| - __ bdnz(&loop);
|
| - __ add(r3, r3, r7);
|
| + __ LoadP(r0, MemOperand(r4, -kPointerSize));
|
| + __ lay(r4, MemOperand(r4, -kPointerSize));
|
| + __ StoreP(r0, MemOperand(sp, r7));
|
| + __ AddP(r7, r7, Operand(kPointerSize));
|
| + __ BranchOnCount(r1, &loop);
|
| + __ AddP(r2, r2, r6);
|
| }
|
| }
|
| __ bind(&no_bound_arguments);
|
| @@ -2275,69 +2229,67 @@ void Generate_PushBoundArguments(MacroAssembler* masm) {
|
|
|
| } // namespace
|
|
|
| -
|
| // static
|
| void Builtins::Generate_CallBoundFunctionImpl(MacroAssembler* masm,
|
| TailCallMode tail_call_mode) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the function to call (checked to be a JSBoundFunction)
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the function to call (checked to be a JSBoundFunction)
|
| // -----------------------------------
|
| - __ AssertBoundFunction(r4);
|
| + __ AssertBoundFunction(r3);
|
|
|
| if (tail_call_mode == TailCallMode::kAllow) {
|
| - PrepareForTailCall(masm, r3, r6, r7, r8);
|
| + PrepareForTailCall(masm, r2, r5, r6, r7);
|
| }
|
|
|
| // Patch the receiver to [[BoundThis]].
|
| - __ LoadP(ip, FieldMemOperand(r4, JSBoundFunction::kBoundThisOffset));
|
| - __ ShiftLeftImm(r0, r3, Operand(kPointerSizeLog2));
|
| - __ StorePX(ip, MemOperand(sp, r0));
|
| + __ LoadP(ip, FieldMemOperand(r3, JSBoundFunction::kBoundThisOffset));
|
| + __ ShiftLeftP(r1, r2, Operand(kPointerSizeLog2));
|
| + __ StoreP(ip, MemOperand(sp, r1));
|
|
|
| // Push the [[BoundArguments]] onto the stack.
|
| Generate_PushBoundArguments(masm);
|
|
|
| // Call the [[BoundTargetFunction]] via the Call builtin.
|
| - __ LoadP(r4,
|
| - FieldMemOperand(r4, JSBoundFunction::kBoundTargetFunctionOffset));
|
| + __ LoadP(r3,
|
| + FieldMemOperand(r3, JSBoundFunction::kBoundTargetFunctionOffset));
|
| __ mov(ip, Operand(ExternalReference(Builtins::kCall_ReceiverIsAny,
|
| masm->isolate())));
|
| __ LoadP(ip, MemOperand(ip));
|
| - __ addi(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ AddP(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ JumpToJSEntry(ip);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode,
|
| TailCallMode tail_call_mode) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the target to call (can be any Object).
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the target to call (can be any Object).
|
| // -----------------------------------
|
|
|
| Label non_callable, non_function, non_smi;
|
| - __ JumpIfSmi(r4, &non_callable);
|
| + __ JumpIfSmi(r3, &non_callable);
|
| __ bind(&non_smi);
|
| - __ CompareObjectType(r4, r7, r8, JS_FUNCTION_TYPE);
|
| + __ CompareObjectType(r3, r6, r7, JS_FUNCTION_TYPE);
|
| __ Jump(masm->isolate()->builtins()->CallFunction(mode, tail_call_mode),
|
| RelocInfo::CODE_TARGET, eq);
|
| - __ cmpi(r8, Operand(JS_BOUND_FUNCTION_TYPE));
|
| + __ CmpP(r7, Operand(JS_BOUND_FUNCTION_TYPE));
|
| __ Jump(masm->isolate()->builtins()->CallBoundFunction(tail_call_mode),
|
| RelocInfo::CODE_TARGET, eq);
|
| - __ cmpi(r8, Operand(JS_PROXY_TYPE));
|
| + __ CmpP(r7, Operand(JS_PROXY_TYPE));
|
| __ bne(&non_function);
|
|
|
| // 0. Prepare for tail call if necessary.
|
| if (tail_call_mode == TailCallMode::kAllow) {
|
| - PrepareForTailCall(masm, r3, r6, r7, r8);
|
| + PrepareForTailCall(masm, r2, r5, r6, r7);
|
| }
|
|
|
| // 1. Runtime fallback for Proxy [[Call]].
|
| - __ Push(r4);
|
| + __ Push(r3);
|
| // Increase the arguments size to include the pushed function and the
|
| // existing receiver on the stack.
|
| - __ addi(r3, r3, Operand(2));
|
| + __ AddP(r2, r2, Operand(2));
|
| // Tail-call to the runtime.
|
| __ JumpToExternalReference(
|
| ExternalReference(Runtime::kJSProxyCall, masm->isolate()));
|
| @@ -2346,14 +2298,14 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode,
|
| // not we raise an exception).
|
| __ bind(&non_function);
|
| // Check if target has a [[Call]] internal method.
|
| - __ lbz(r7, FieldMemOperand(r7, Map::kBitFieldOffset));
|
| - __ TestBit(r7, Map::kIsCallable, r0);
|
| - __ beq(&non_callable, cr0);
|
| + __ LoadlB(r6, FieldMemOperand(r6, Map::kBitFieldOffset));
|
| + __ TestBit(r6, Map::kIsCallable, r0);
|
| + __ beq(&non_callable);
|
| // Overwrite the original receiver the (original) target.
|
| - __ ShiftLeftImm(r8, r3, Operand(kPointerSizeLog2));
|
| - __ StorePX(r4, MemOperand(sp, r8));
|
| + __ ShiftLeftP(r7, r2, Operand(kPointerSizeLog2));
|
| + __ StoreP(r3, MemOperand(sp, r7));
|
| // Let the "call_as_function_delegate" take care of the rest.
|
| - __ LoadNativeContextSlot(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, r4);
|
| + __ LoadNativeContextSlot(Context::CALL_AS_FUNCTION_DELEGATE_INDEX, r3);
|
| __ Jump(masm->isolate()->builtins()->CallFunction(
|
| ConvertReceiverMode::kNotNullOrUndefined, tail_call_mode),
|
| RelocInfo::CODE_TARGET);
|
| @@ -2362,124 +2314,120 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode,
|
| __ bind(&non_callable);
|
| {
|
| FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| - __ Push(r4);
|
| + __ Push(r3);
|
| __ CallRuntime(Runtime::kThrowCalledNonCallable);
|
| }
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_ConstructFunction(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the constructor to call (checked to be a JSFunction)
|
| - // -- r6 : the new target (checked to be a constructor)
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the constructor to call (checked to be a JSFunction)
|
| + // -- r5 : the new target (checked to be a constructor)
|
| // -----------------------------------
|
| - __ AssertFunction(r4);
|
| + __ AssertFunction(r3);
|
|
|
| // Calling convention for function specific ConstructStubs require
|
| - // r5 to contain either an AllocationSite or undefined.
|
| - __ LoadRoot(r5, Heap::kUndefinedValueRootIndex);
|
| + // r4 to contain either an AllocationSite or undefined.
|
| + __ LoadRoot(r4, Heap::kUndefinedValueRootIndex);
|
|
|
| // Tail call to the function-specific construct stub (still in the caller
|
| // context at this point).
|
| - __ LoadP(r7, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
|
| - __ LoadP(r7, FieldMemOperand(r7, SharedFunctionInfo::kConstructStubOffset));
|
| - __ addi(ip, r7, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ LoadP(r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
|
| + __ LoadP(r6, FieldMemOperand(r6, SharedFunctionInfo::kConstructStubOffset));
|
| + __ AddP(ip, r6, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ JumpToJSEntry(ip);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_ConstructBoundFunction(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the function to call (checked to be a JSBoundFunction)
|
| - // -- r6 : the new target (checked to be a constructor)
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the function to call (checked to be a JSBoundFunction)
|
| + // -- r5 : the new target (checked to be a constructor)
|
| // -----------------------------------
|
| - __ AssertBoundFunction(r4);
|
| + __ AssertBoundFunction(r3);
|
|
|
| // Push the [[BoundArguments]] onto the stack.
|
| Generate_PushBoundArguments(masm);
|
|
|
| // Patch new.target to [[BoundTargetFunction]] if new.target equals target.
|
| Label skip;
|
| - __ cmp(r4, r6);
|
| + __ CmpP(r3, r5);
|
| __ bne(&skip);
|
| - __ LoadP(r6,
|
| - FieldMemOperand(r4, JSBoundFunction::kBoundTargetFunctionOffset));
|
| + __ LoadP(r5,
|
| + FieldMemOperand(r3, JSBoundFunction::kBoundTargetFunctionOffset));
|
| __ bind(&skip);
|
|
|
| // Construct the [[BoundTargetFunction]] via the Construct builtin.
|
| - __ LoadP(r4,
|
| - FieldMemOperand(r4, JSBoundFunction::kBoundTargetFunctionOffset));
|
| + __ LoadP(r3,
|
| + FieldMemOperand(r3, JSBoundFunction::kBoundTargetFunctionOffset));
|
| __ mov(ip, Operand(ExternalReference(Builtins::kConstruct, masm->isolate())));
|
| __ LoadP(ip, MemOperand(ip));
|
| - __ addi(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| + __ AddP(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ JumpToJSEntry(ip);
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_ConstructProxy(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the constructor to call (checked to be a JSProxy)
|
| - // -- r6 : the new target (either the same as the constructor or
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the constructor to call (checked to be a JSProxy)
|
| + // -- r5 : the new target (either the same as the constructor or
|
| // the JSFunction on which new was invoked initially)
|
| // -----------------------------------
|
|
|
| // Call into the Runtime for Proxy [[Construct]].
|
| - __ Push(r4, r6);
|
| + __ Push(r3, r5);
|
| // Include the pushed new_target, constructor and the receiver.
|
| - __ addi(r3, r3, Operand(3));
|
| + __ AddP(r2, r2, Operand(3));
|
| // Tail-call to the runtime.
|
| __ JumpToExternalReference(
|
| ExternalReference(Runtime::kJSProxyConstruct, masm->isolate()));
|
| }
|
|
|
| -
|
| // static
|
| void Builtins::Generate_Construct(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : the number of arguments (not including the receiver)
|
| - // -- r4 : the constructor to call (can be any Object)
|
| - // -- r6 : the new target (either the same as the constructor or
|
| + // -- r2 : the number of arguments (not including the receiver)
|
| + // -- r3 : the constructor to call (can be any Object)
|
| + // -- r5 : the new target (either the same as the constructor or
|
| // the JSFunction on which new was invoked initially)
|
| // -----------------------------------
|
|
|
| // Check if target is a Smi.
|
| Label non_constructor;
|
| - __ JumpIfSmi(r4, &non_constructor);
|
| + __ JumpIfSmi(r3, &non_constructor);
|
|
|
| // Dispatch based on instance type.
|
| - __ CompareObjectType(r4, r7, r8, JS_FUNCTION_TYPE);
|
| + __ CompareObjectType(r3, r6, r7, JS_FUNCTION_TYPE);
|
| __ Jump(masm->isolate()->builtins()->ConstructFunction(),
|
| RelocInfo::CODE_TARGET, eq);
|
|
|
| // Check if target has a [[Construct]] internal method.
|
| - __ lbz(r5, FieldMemOperand(r7, Map::kBitFieldOffset));
|
| - __ TestBit(r5, Map::kIsConstructor, r0);
|
| - __ beq(&non_constructor, cr0);
|
| + __ LoadlB(r4, FieldMemOperand(r6, Map::kBitFieldOffset));
|
| + __ TestBit(r4, Map::kIsConstructor);
|
| + __ beq(&non_constructor);
|
|
|
| // Only dispatch to bound functions after checking whether they are
|
| // constructors.
|
| - __ cmpi(r8, Operand(JS_BOUND_FUNCTION_TYPE));
|
| + __ CmpP(r7, Operand(JS_BOUND_FUNCTION_TYPE));
|
| __ Jump(masm->isolate()->builtins()->ConstructBoundFunction(),
|
| RelocInfo::CODE_TARGET, eq);
|
|
|
| // Only dispatch to proxies after checking whether they are constructors.
|
| - __ cmpi(r8, Operand(JS_PROXY_TYPE));
|
| + __ CmpP(r7, Operand(JS_PROXY_TYPE));
|
| __ Jump(masm->isolate()->builtins()->ConstructProxy(), RelocInfo::CODE_TARGET,
|
| eq);
|
|
|
| // Called Construct on an exotic Object with a [[Construct]] internal method.
|
| {
|
| // Overwrite the original receiver with the (original) target.
|
| - __ ShiftLeftImm(r8, r3, Operand(kPointerSizeLog2));
|
| - __ StorePX(r4, MemOperand(sp, r8));
|
| + __ ShiftLeftP(r7, r2, Operand(kPointerSizeLog2));
|
| + __ StoreP(r3, MemOperand(sp, r7));
|
| // Let the "call_as_constructor_delegate" take care of the rest.
|
| - __ LoadNativeContextSlot(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, r4);
|
| + __ LoadNativeContextSlot(Context::CALL_AS_CONSTRUCTOR_DELEGATE_INDEX, r3);
|
| __ Jump(masm->isolate()->builtins()->CallFunction(),
|
| RelocInfo::CODE_TARGET);
|
| }
|
| @@ -2491,22 +2439,21 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
|
| RelocInfo::CODE_TARGET);
|
| }
|
|
|
| -
|
| void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- r3 : actual number of arguments
|
| - // -- r4 : function (passed through to callee)
|
| - // -- r5 : expected number of arguments
|
| - // -- r6 : new target (passed through to callee)
|
| + // -- r2 : actual number of arguments
|
| + // -- r3 : function (passed through to callee)
|
| + // -- r4 : expected number of arguments
|
| + // -- r5 : new target (passed through to callee)
|
| // -----------------------------------
|
|
|
| Label invoke, dont_adapt_arguments, stack_overflow;
|
|
|
| Label enough, too_few;
|
| - __ LoadP(ip, FieldMemOperand(r4, JSFunction::kCodeEntryOffset));
|
| - __ cmp(r3, r5);
|
| + __ LoadP(ip, FieldMemOperand(r3, JSFunction::kCodeEntryOffset));
|
| + __ CmpP(r2, r4);
|
| __ blt(&too_few);
|
| - __ cmpi(r5, Operand(SharedFunctionInfo::kDontAdaptArgumentsSentinel));
|
| + __ CmpP(r4, Operand(SharedFunctionInfo::kDontAdaptArgumentsSentinel));
|
| __ beq(&dont_adapt_arguments);
|
|
|
| { // Enough parameters: actual >= expected
|
| @@ -2514,33 +2461,33 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
|
| EnterArgumentsAdaptorFrame(masm);
|
| ArgumentAdaptorStackCheck(masm, &stack_overflow);
|
|
|
| - // Calculate copy start address into r3 and copy end address into r7.
|
| - // r3: actual number of arguments as a smi
|
| - // r4: function
|
| - // r5: expected number of arguments
|
| - // r6: new target (passed through to callee)
|
| + // Calculate copy start address into r2 and copy end address into r6.
|
| + // r2: actual number of arguments as a smi
|
| + // r3: function
|
| + // r4: expected number of arguments
|
| + // r5: new target (passed through to callee)
|
| // ip: code entry to call
|
| - __ SmiToPtrArrayOffset(r3, r3);
|
| - __ add(r3, r3, fp);
|
| + __ SmiToPtrArrayOffset(r2, r2);
|
| + __ AddP(r2, fp);
|
| // adjust for return address and receiver
|
| - __ addi(r3, r3, Operand(2 * kPointerSize));
|
| - __ ShiftLeftImm(r7, r5, Operand(kPointerSizeLog2));
|
| - __ sub(r7, r3, r7);
|
| + __ AddP(r2, r2, Operand(2 * kPointerSize));
|
| + __ ShiftLeftP(r6, r4, Operand(kPointerSizeLog2));
|
| + __ SubP(r6, r2, r6);
|
|
|
| // Copy the arguments (including the receiver) to the new stack frame.
|
| - // r3: copy start address
|
| - // r4: function
|
| - // r5: expected number of arguments
|
| - // r6: new target (passed through to callee)
|
| - // r7: copy end address
|
| + // r2: copy start address
|
| + // r3: function
|
| + // r4: expected number of arguments
|
| + // r5: new target (passed through to callee)
|
| + // r6: copy end address
|
| // ip: code entry to call
|
|
|
| Label copy;
|
| __ bind(©);
|
| - __ LoadP(r0, MemOperand(r3, 0));
|
| + __ LoadP(r0, MemOperand(r2, 0));
|
| __ push(r0);
|
| - __ cmp(r3, r7); // Compare before moving to next argument.
|
| - __ subi(r3, r3, Operand(kPointerSize));
|
| + __ CmpP(r2, r6); // Compare before moving to next argument.
|
| + __ lay(r2, MemOperand(r2, -kPointerSize));
|
| __ bne(©);
|
|
|
| __ b(&invoke);
|
| @@ -2551,20 +2498,21 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
|
|
|
| // If the function is strong we need to throw an error.
|
| Label no_strong_error;
|
| - __ LoadP(r7, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
|
| - __ lwz(r8, FieldMemOperand(r7, SharedFunctionInfo::kCompilerHintsOffset));
|
| - __ TestBit(r8, SharedFunctionInfo::kStrongModeBit, r0);
|
| - __ beq(&no_strong_error, cr0);
|
| + __ LoadP(r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
|
| + __ LoadlW(r7,
|
| + FieldMemOperand(r6, SharedFunctionInfo::kCompilerHintsOffset));
|
| + __ TestBit(r7, SharedFunctionInfo::kStrongModeBit, r0);
|
| + __ beq(&no_strong_error);
|
|
|
| // What we really care about is the required number of arguments.
|
| - __ lwz(r7, FieldMemOperand(r7, SharedFunctionInfo::kLengthOffset));
|
| -#if V8_TARGET_ARCH_PPC64
|
| + __ LoadlW(r6, FieldMemOperand(r6, SharedFunctionInfo::kLengthOffset));
|
| +#if V8_TARGET_ARCH_S390X
|
| // See commment near kLenghtOffset in src/objects.h
|
| - __ srawi(r7, r7, kSmiTagSize);
|
| + __ ShiftRightArith(r6, r6, Operand(kSmiTagSize));
|
| #else
|
| - __ SmiUntag(r7);
|
| + __ SmiUntag(r6);
|
| #endif
|
| - __ cmp(r3, r7);
|
| + __ CmpP(r2, r6);
|
| __ bge(&no_strong_error);
|
|
|
| {
|
| @@ -2578,54 +2526,53 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
|
| ArgumentAdaptorStackCheck(masm, &stack_overflow);
|
|
|
| // Calculate copy start address into r0 and copy end address is fp.
|
| - // r3: actual number of arguments as a smi
|
| - // r4: function
|
| - // r5: expected number of arguments
|
| - // r6: new target (passed through to callee)
|
| + // r2: actual number of arguments as a smi
|
| + // r3: function
|
| + // r4: expected number of arguments
|
| + // r5: new target (passed through to callee)
|
| // ip: code entry to call
|
| - __ SmiToPtrArrayOffset(r3, r3);
|
| - __ add(r3, r3, fp);
|
| + __ SmiToPtrArrayOffset(r2, r2);
|
| + __ lay(r2, MemOperand(r2, fp));
|
|
|
| // Copy the arguments (including the receiver) to the new stack frame.
|
| - // r3: copy start address
|
| - // r4: function
|
| - // r5: expected number of arguments
|
| - // r6: new target (passed through to callee)
|
| + // r2: copy start address
|
| + // r3: function
|
| + // r4: expected number of arguments
|
| + // r5: new target (passed through to callee)
|
| // ip: code entry to call
|
| Label copy;
|
| __ bind(©);
|
| // Adjust load for return address and receiver.
|
| - __ LoadP(r0, MemOperand(r3, 2 * kPointerSize));
|
| + __ LoadP(r0, MemOperand(r2, 2 * kPointerSize));
|
| __ push(r0);
|
| - __ cmp(r3, fp); // Compare before moving to next argument.
|
| - __ subi(r3, r3, Operand(kPointerSize));
|
| + __ CmpP(r2, fp); // Compare before moving to next argument.
|
| + __ lay(r2, MemOperand(r2, -kPointerSize));
|
| __ bne(©);
|
|
|
| // Fill the remaining expected arguments with undefined.
|
| - // r4: function
|
| - // r5: expected number of arguments
|
| - // r6: new target (passed through to callee)
|
| + // r3: function
|
| + // r4: expected number of argumentus
|
| // ip: code entry to call
|
| __ LoadRoot(r0, Heap::kUndefinedValueRootIndex);
|
| - __ ShiftLeftImm(r7, r5, Operand(kPointerSizeLog2));
|
| - __ sub(r7, fp, r7);
|
| + __ ShiftLeftP(r6, r4, Operand(kPointerSizeLog2));
|
| + __ SubP(r6, fp, r6);
|
| // Adjust for frame.
|
| - __ subi(r7, r7, Operand(StandardFrameConstants::kFixedFrameSizeFromFp +
|
| + __ SubP(r6, r6, Operand(StandardFrameConstants::kFixedFrameSizeFromFp +
|
| 2 * kPointerSize));
|
|
|
| Label fill;
|
| __ bind(&fill);
|
| __ push(r0);
|
| - __ cmp(sp, r7);
|
| + __ CmpP(sp, r6);
|
| __ bne(&fill);
|
| }
|
|
|
| // Call the entry point.
|
| __ bind(&invoke);
|
| - __ mr(r3, r5);
|
| - // r3 : expected number of arguments
|
| - // r4 : function (passed through to callee)
|
| - // r6 : new target (passed through to callee)
|
| + __ LoadRR(r2, r4);
|
| + // r2 : expected number of arguments
|
| + // r3 : function (passed through to callee)
|
| + // r5 : new target (passed through to callee)
|
| __ CallJSEntry(ip);
|
|
|
| // Store offset of return address for deoptimizer.
|
| @@ -2633,8 +2580,7 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
|
|
|
| // Exit frame and return.
|
| LeaveArgumentsAdaptorFrame(masm);
|
| - __ blr();
|
| -
|
| + __ Ret();
|
|
|
| // -------------------------------------------
|
| // Dont adapt arguments.
|
| @@ -2650,9 +2596,9 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
|
| }
|
| }
|
|
|
| -
|
| #undef __
|
| +
|
| } // namespace internal
|
| } // namespace v8
|
|
|
| -#endif // V8_TARGET_ARCH_PPC
|
| +#endif // V8_TARGET_ARCH_S390
|
|
|
Chromium Code Reviews
Issue 1725243004:
S390: Initial impl of S390 asm, masm, code-stubs,... (Closed)
Base URL: https://chromium.googlesource.com/v8/v8.git@master