| Index: src/x64/builtins-x64.cc
|
| diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
|
| index d34e4f70d9a9c0a425e6cf2db99acf22768a42f7..bfec752809985d7a12c0e7624b8072f2904a70fd 100644
|
| --- a/src/x64/builtins-x64.cc
|
| +++ b/src/x64/builtins-x64.cc
|
| @@ -708,7 +708,7 @@ static void Generate_NotifyDeoptimizedHelper(MacroAssembler* masm,
|
| }
|
|
|
| // Get the full codegen state from the stack and untag it.
|
| - __ SmiToInteger32(r10, Operand(rsp, 1 * kPointerSize));
|
| + __ SmiToInteger32(r10, StackArgumentOperand(1 * kPointerSize));
|
|
|
| // Switch on the state.
|
| Label not_no_registers, not_tos_rax;
|
| @@ -783,7 +783,7 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| // if it is a function.
|
| Label slow, non_function;
|
| // The function to call is at position n+1 on the stack.
|
| - __ movq(rdi, Operand(rsp, rax, times_pointer_size, 1 * kPointerSize));
|
| + __ movq(rdi, StackArgumentOperand(rax, times_pointer_size, 1 * kPointerSize));
|
| __ JumpIfSmi(rdi, &non_function);
|
| __ CmpObjectType(rdi, JS_FUNCTION_TYPE, rcx);
|
| __ j(not_equal, &slow);
|
| @@ -808,7 +808,7 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| __ j(not_zero, &shift_arguments);
|
|
|
| // Compute the receiver in non-strict mode.
|
| - __ movq(rbx, Operand(rsp, rax, times_pointer_size, 0));
|
| + __ movq(rbx, StackArgumentOperand(rax, times_pointer_size, 0));
|
| __ JumpIfSmi(rbx, &convert_to_object, Label::kNear);
|
|
|
| __ CompareRoot(rbx, Heap::kNullValueRootIndex);
|
| @@ -837,7 +837,9 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| }
|
|
|
| // Restore the function to rdi.
|
| - __ movq(rdi, Operand(rsp, rax, times_pointer_size, 1 * kPointerSize));
|
| + __ movq(rdi, StackArgumentOperand(rax,
|
| + times_pointer_size,
|
| + 1 * kPointerSize));
|
| __ jmp(&patch_receiver, Label::kNear);
|
|
|
| // Use the global receiver object from the called function as the
|
| @@ -851,7 +853,7 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| __ movq(rbx, FieldOperand(rbx, GlobalObject::kGlobalReceiverOffset));
|
|
|
| __ bind(&patch_receiver);
|
| - __ movq(Operand(rsp, rax, times_pointer_size, 0), rbx);
|
| + __ movq(StackArgumentOperand(rax, times_pointer_size, 0), rbx);
|
|
|
| __ jmp(&shift_arguments);
|
| }
|
| @@ -868,7 +870,7 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| // CALL_NON_FUNCTION builtin expects the non-function callee as
|
| // receiver, so overwrite the first argument which will ultimately
|
| // become the receiver.
|
| - __ movq(Operand(rsp, rax, times_pointer_size, 0), rdi);
|
| + __ movq(StackArgumentOperand(rax, times_pointer_size, 0), rdi);
|
|
|
| // 4. Shift arguments and return address one slot down on the stack
|
| // (overwriting the original receiver). Adjust argument count to make
|
| @@ -1181,7 +1183,7 @@ void Builtins::Generate_StringConstructCode(MacroAssembler* masm) {
|
| Label no_arguments;
|
| __ testq(rax, rax);
|
| __ j(zero, &no_arguments);
|
| - __ movq(rbx, Operand(rsp, rax, times_pointer_size, 0));
|
| + __ movq(rbx, StackArgumentOperand(rax, times_pointer_size, 0));
|
| __ pop(rcx);
|
| __ lea(rsp, Operand(rsp, rax, times_pointer_size, kPointerSize));
|
| __ push(rcx);
|
|
|