| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index f70271bd506ecb9148a7773dc566c3f379b6c63c..8a744ae6c536ec5acc12a4fcbbcd3e24f7914f2c 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -1351,13 +1351,13 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| {
|
| AllowExternalCallThatCantCauseGC scope(masm);
|
| __ PrepareCallCFunction(0, 2, scratch);
|
| - __ SetCallCDoubleArguments(double_base, double_exponent);
|
| + __ MovToFloatParameters(double_base, double_exponent);
|
| __ CallCFunction(
|
| ExternalReference::power_double_double_function(masm->isolate()),
|
| 0, 2);
|
| }
|
| __ pop(lr);
|
| - __ GetCFunctionDoubleResult(double_result);
|
| + __ MovFromFloatResult(double_result);
|
| __ jmp(&done);
|
|
|
| __ bind(&int_exponent_convert);
|
| @@ -1425,13 +1425,13 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| {
|
| AllowExternalCallThatCantCauseGC scope(masm);
|
| __ PrepareCallCFunction(0, 2, scratch);
|
| - __ SetCallCDoubleArguments(double_base, double_exponent);
|
| + __ MovToFloatParameters(double_base, double_exponent);
|
| __ CallCFunction(
|
| ExternalReference::power_double_double_function(masm->isolate()),
|
| 0, 2);
|
| }
|
| __ pop(lr);
|
| - __ GetCFunctionDoubleResult(double_result);
|
| + __ MovFromFloatResult(double_result);
|
|
|
| __ bind(&done);
|
| __ IncrementCounter(counters->math_pow(), 1, scratch, scratch2);
|
| @@ -3182,29 +3182,11 @@ void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| // r2 : cache cell for call target
|
| Label slow, non_function;
|
|
|
| - // The receiver might implicitly be the global object. This is
|
| - // indicated by passing the hole as the receiver to the call
|
| - // function stub.
|
| - if (ReceiverMightBeImplicit()) {
|
| - Label call;
|
| - // Get the receiver from the stack.
|
| - // function, receiver [, arguments]
|
| - __ ldr(r4, MemOperand(sp, argc_ * kPointerSize));
|
| - // Call as function is indicated with the hole.
|
| - __ CompareRoot(r4, Heap::kTheHoleValueRootIndex);
|
| - __ b(ne, &call);
|
| - // Patch the receiver on the stack with the global receiver object.
|
| - __ ldr(r3,
|
| - MemOperand(cp, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX)));
|
| - __ ldr(r3, FieldMemOperand(r3, GlobalObject::kGlobalReceiverOffset));
|
| - __ str(r3, MemOperand(sp, argc_ * kPointerSize));
|
| - __ bind(&call);
|
| - }
|
| -
|
| // Check that the function is really a JavaScript function.
|
| // r1: pushed function (to be verified)
|
| __ JumpIfSmi(r1, &non_function);
|
| - // Get the map of the function object.
|
| +
|
| + // Goto slow case if we do not have a function.
|
| __ CompareObjectType(r1, r3, r3, JS_FUNCTION_TYPE);
|
| __ b(ne, &slow);
|
|
|
| @@ -3216,17 +3198,6 @@ void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| // r1: pushed function
|
| ParameterCount actual(argc_);
|
|
|
| - if (ReceiverMightBeImplicit()) {
|
| - Label call_as_function;
|
| - __ CompareRoot(r4, Heap::kTheHoleValueRootIndex);
|
| - __ b(eq, &call_as_function);
|
| - __ InvokeFunction(r1,
|
| - actual,
|
| - JUMP_FUNCTION,
|
| - NullCallWrapper(),
|
| - CALL_AS_METHOD);
|
| - __ bind(&call_as_function);
|
| - }
|
| __ InvokeFunction(r1,
|
| actual,
|
| JUMP_FUNCTION,
|
| @@ -3251,7 +3222,7 @@ void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| __ mov(r0, Operand(argc_ + 1, RelocInfo::NONE32));
|
| __ mov(r2, Operand::Zero());
|
| __ GetBuiltinEntry(r3, Builtins::CALL_FUNCTION_PROXY);
|
| - __ SetCallKind(r5, CALL_AS_METHOD);
|
| + __ SetCallKind(r5, CALL_AS_FUNCTION);
|
| {
|
| Handle<Code> adaptor =
|
| masm->isolate()->builtins()->ArgumentsAdaptorTrampoline();
|
| @@ -3265,7 +3236,7 @@ void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| __ mov(r0, Operand(argc_)); // Set up the number of arguments.
|
| __ mov(r2, Operand::Zero());
|
| __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION);
|
| - __ SetCallKind(r5, CALL_AS_METHOD);
|
| + __ SetCallKind(r5, CALL_AS_FUNCTION);
|
| __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
|
| RelocInfo::CODE_TARGET);
|
| }
|
| @@ -5536,9 +5507,7 @@ template<class T>
|
| static void CreateArrayDispatch(MacroAssembler* masm,
|
| AllocationSiteOverrideMode mode) {
|
| if (mode == DISABLE_ALLOCATION_SITES) {
|
| - T stub(GetInitialFastElementsKind(),
|
| - CONTEXT_CHECK_REQUIRED,
|
| - mode);
|
| + T stub(GetInitialFastElementsKind(), mode);
|
| __ TailCallStub(&stub);
|
| } else if (mode == DONT_OVERRIDE) {
|
| int last_index = GetSequenceIndexFromFastElementsKind(
|
| @@ -5589,13 +5558,11 @@ static void CreateArrayDispatchOneArgument(MacroAssembler* masm,
|
| ElementsKind holey_initial = GetHoleyElementsKind(initial);
|
|
|
| ArraySingleArgumentConstructorStub stub_holey(holey_initial,
|
| - CONTEXT_CHECK_REQUIRED,
|
| DISABLE_ALLOCATION_SITES);
|
| __ TailCallStub(&stub_holey);
|
|
|
| __ bind(&normal_sequence);
|
| ArraySingleArgumentConstructorStub stub(initial,
|
| - CONTEXT_CHECK_REQUIRED,
|
| DISABLE_ALLOCATION_SITES);
|
| __ TailCallStub(&stub);
|
| } else if (mode == DONT_OVERRIDE) {
|
| @@ -5639,19 +5606,14 @@ static void CreateArrayDispatchOneArgument(MacroAssembler* masm,
|
|
|
| template<class T>
|
| static void ArrayConstructorStubAheadOfTimeHelper(Isolate* isolate) {
|
| - ElementsKind initial_kind = GetInitialFastElementsKind();
|
| - ElementsKind initial_holey_kind = GetHoleyElementsKind(initial_kind);
|
| -
|
| int to_index = GetSequenceIndexFromFastElementsKind(
|
| TERMINAL_FAST_ELEMENTS_KIND);
|
| for (int i = 0; i <= to_index; ++i) {
|
| ElementsKind kind = GetFastElementsKindFromSequenceIndex(i);
|
| T stub(kind);
|
| stub.GetCode(isolate);
|
| - if (AllocationSite::GetMode(kind) != DONT_TRACK_ALLOCATION_SITE ||
|
| - (!FLAG_track_allocation_sites &&
|
| - (kind == initial_kind || kind == initial_holey_kind))) {
|
| - T stub1(kind, CONTEXT_CHECK_REQUIRED, DISABLE_ALLOCATION_SITES);
|
| + if (AllocationSite::GetMode(kind) != DONT_TRACK_ALLOCATION_SITE) {
|
| + T stub1(kind, DISABLE_ALLOCATION_SITES);
|
| stub1.GetCode(isolate);
|
| }
|
| }
|
|
|