Chromium Code Reviews| Index: src/x64/stub-cache-x64.cc |
| diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc |
| index 542018fddd084c20fb9fc1f024a4d8a92e41cccd..2f5bb9bcdf9096c445e292a149406a2d3bcf20e4 100644 |
| --- a/src/x64/stub-cache-x64.cc |
| +++ b/src/x64/stub-cache-x64.cc |
| @@ -415,7 +415,7 @@ static void ReserveSpaceForFastApiCall(MacroAssembler* masm, Register scratch) { |
| __ movq(Operand(rsp, 0), scratch); |
| __ Move(scratch, Smi::FromInt(0)); |
| for (int i = 1; i <= kFastApiCallArguments; i++) { |
| - __ movq(Operand(rsp, i * kPointerSize), scratch); |
| + __ movq(StackOperandForArgument(i * kPointerSize), scratch); |
| } |
| } |
| @@ -464,22 +464,22 @@ static void GenerateFastApiCall(MacroAssembler* masm, |
| __ movq(rsi, FieldOperand(rdi, JSFunction::kContextOffset)); |
| // Pass the additional arguments. |
| - __ movq(Operand(rsp, 2 * kPointerSize), rdi); |
| + __ movq(StackOperandForArgument(2 * kPointerSize), rdi); |
| Handle<CallHandlerInfo> api_call_info = optimization.api_call_info(); |
| Handle<Object> call_data(api_call_info->data(), masm->isolate()); |
| if (masm->isolate()->heap()->InNewSpace(*call_data)) { |
| __ Move(rcx, api_call_info); |
| __ movq(rbx, FieldOperand(rcx, CallHandlerInfo::kDataOffset)); |
| - __ movq(Operand(rsp, 3 * kPointerSize), rbx); |
| + __ movq(StackOperandForArgument(3 * kPointerSize), rbx); |
| } else { |
| - __ Move(Operand(rsp, 3 * kPointerSize), call_data); |
| + __ Move(StackOperandForArgument(3 * kPointerSize), call_data); |
| } |
| __ movq(kScratchRegister, |
| ExternalReference::isolate_address(masm->isolate())); |
| - __ movq(Operand(rsp, 4 * kPointerSize), kScratchRegister); |
| + __ movq(StackOperandForArgument(4 * kPointerSize), kScratchRegister); |
| __ LoadRoot(kScratchRegister, Heap::kUndefinedValueRootIndex); |
| - __ movq(Operand(rsp, 5 * kPointerSize), kScratchRegister); |
| - __ movq(Operand(rsp, 6 * kPointerSize), kScratchRegister); |
| + __ movq(StackOperandForArgument(5 * kPointerSize), kScratchRegister); |
| + __ movq(StackOperandForArgument(6 * kPointerSize), kScratchRegister); |
| // Prepare arguments. |
| STATIC_ASSERT(kFastApiCallArguments == 6); |
| @@ -1074,7 +1074,7 @@ Register StubCompiler::CheckPrototypes(Handle<JSObject> object, |
| int depth = 0; |
| if (save_at_depth == depth) { |
| - __ movq(Operand(rsp, kPointerSize), object_reg); |
| + __ movq(Operand(rsp, kPCOnStackSize), object_reg); |
|
haitao.feng
2013/07/31 00:24:50
Use kPCOnStackSize instead of kPointerSize.
|
| } |
| // Check the maps in the prototype chain. |
| @@ -1134,7 +1134,7 @@ Register StubCompiler::CheckPrototypes(Handle<JSObject> object, |
| } |
| if (save_at_depth == depth) { |
| - __ movq(Operand(rsp, kPointerSize), reg); |
| + __ movq(Operand(rsp, kPCOnStackSize), reg); |
|
haitao.feng
2013/07/31 00:24:50
Use kPCOnStackSize instead of kPointerSize.
|
| } |
| // Go to the next object in the prototype chain. |
| @@ -1473,7 +1473,7 @@ void CallStubCompiler::GenerateGlobalReceiverCheck(Handle<JSObject> object, |
| const int argc = arguments().immediate(); |
| // Get the receiver from the stack. |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the maps haven't changed. |
| @@ -1539,7 +1539,7 @@ Handle<Code> CallStubCompiler::CompileCallField(Handle<JSObject> object, |
| // Get the receiver from the stack. |
| const int argc = arguments().immediate(); |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the receiver isn't a smi. |
| __ JumpIfSmi(rdx, &miss); |
| @@ -1560,7 +1560,7 @@ Handle<Code> CallStubCompiler::CompileCallField(Handle<JSObject> object, |
| // necessary. |
| if (object->IsGlobalObject()) { |
| __ movq(rdx, FieldOperand(rdx, GlobalObject::kGlobalReceiverOffset)); |
| - __ movq(Operand(rsp, (argc + 1) * kPointerSize), rdx); |
| + __ movq(StackOperandForArgument((argc + 1) * kPointerSize), rdx); |
| } |
| // Invoke the function. |
| @@ -1594,7 +1594,7 @@ Handle<Code> CallStubCompiler::CompileArrayCodeCall( |
| if (cell.is_null()) { |
| // Get the receiver from the stack. |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the receiver isn't a smi. |
| __ JumpIfSmi(rdx, &miss); |
| @@ -1648,7 +1648,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall( |
| // Get the receiver from the stack. |
| const int argc = arguments().immediate(); |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the receiver isn't a smi. |
| __ JumpIfSmi(rdx, &miss); |
| @@ -1687,7 +1687,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall( |
| __ j(greater, &attempt_to_grow_elements); |
| // Check if value is a smi. |
| - __ movq(rcx, Operand(rsp, argc * kPointerSize)); |
| + __ movq(rcx, StackOperandForArgument(argc * kPointerSize)); |
| __ JumpIfNotSmi(rcx, &with_write_barrier); |
| // Save new length. |
| @@ -1722,7 +1722,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall( |
| __ cmpl(rax, rcx); |
| __ j(greater, &call_builtin); |
| - __ movq(rcx, Operand(rsp, argc * kPointerSize)); |
| + __ movq(rcx, StackOperandForArgument(argc * kPointerSize)); |
| __ StoreNumberToDoubleElements( |
| rcx, rdi, rax, xmm0, &call_builtin, argc * kDoubleSize); |
| @@ -1799,7 +1799,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall( |
| __ jmp(&call_builtin); |
| } |
| - __ movq(rbx, Operand(rsp, argc * kPointerSize)); |
| + __ movq(rbx, StackOperandForArgument(argc * kPointerSize)); |
| // Growing elements that are SMI-only requires special handling in case |
| // the new element is non-Smi. For now, delegate to the builtin. |
| Label no_fast_elements_check; |
| @@ -1848,7 +1848,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall( |
| __ RecordWrite(rdi, rdx, rbx, kDontSaveFPRegs, OMIT_REMEMBERED_SET); |
| // Restore receiver to rdx as finish sequence assumes it's here. |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Increment element's and array's sizes. |
| __ SmiAddConstant(FieldOperand(rdi, FixedArray::kLengthOffset), |
| @@ -1899,7 +1899,7 @@ Handle<Code> CallStubCompiler::CompileArrayPopCall( |
| // Get the receiver from the stack. |
| const int argc = arguments().immediate(); |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the receiver isn't a smi. |
| __ JumpIfSmi(rdx, &miss); |
| @@ -2002,9 +2002,9 @@ Handle<Code> CallStubCompiler::CompileStringCharCodeAtCall( |
| Register receiver = rbx; |
| Register index = rdi; |
| Register result = rax; |
| - __ movq(receiver, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(receiver, StackOperandForArgument((argc + 1) * kPointerSize)); |
| if (argc > 0) { |
| - __ movq(index, Operand(rsp, (argc - 0) * kPointerSize)); |
| + __ movq(index, StackOperandForArgument((argc - 0) * kPointerSize)); |
|
danno
2013/07/31 07:48:37
just argc, I don't think the "- 0" makes anything
|
| } else { |
| __ LoadRoot(index, Heap::kUndefinedValueRootIndex); |
| } |
| @@ -2083,9 +2083,9 @@ Handle<Code> CallStubCompiler::CompileStringCharAtCall( |
| Register index = rdi; |
| Register scratch = rdx; |
| Register result = rax; |
| - __ movq(receiver, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(receiver, StackOperandForArgument((argc + 1) * kPointerSize)); |
| if (argc > 0) { |
| - __ movq(index, Operand(rsp, (argc - 0) * kPointerSize)); |
| + __ movq(index, StackOperandForArgument((argc - 0) * kPointerSize)); |
|
danno
2013/07/31 07:48:37
just argc, I don't think the "- 0" makes anything
|
| } else { |
| __ LoadRoot(index, Heap::kUndefinedValueRootIndex); |
| } |
| @@ -2144,7 +2144,7 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall( |
| GenerateNameCheck(name, &miss); |
| if (cell.is_null()) { |
| - __ movq(rdx, Operand(rsp, 2 * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument(2 * kPointerSize)); |
| __ JumpIfSmi(rdx, &miss); |
| CheckPrototypes(Handle<JSObject>::cast(object), rdx, holder, rbx, rax, rdi, |
| name, &miss); |
| @@ -2157,7 +2157,7 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall( |
| // Load the char code argument. |
| Register code = rbx; |
| - __ movq(code, Operand(rsp, 1 * kPointerSize)); |
| + __ movq(code, StackOperandForArgument(1 * kPointerSize)); |
| // Check the code is a smi. |
| Label slow; |
| @@ -2228,7 +2228,7 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall( |
| GenerateNameCheck(name, &miss); |
| if (cell.is_null()) { |
| - __ movq(rdx, Operand(rsp, 2 * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument(2 * kPointerSize)); |
| __ JumpIfSmi(rdx, &miss); |
| CheckPrototypes(Handle<JSObject>::cast(object), rdx, holder, rbx, rax, rdi, |
| name, &miss); |
| @@ -2239,7 +2239,7 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall( |
| GenerateLoadFunctionFromCell(cell, function, &miss); |
| } |
| // Load the (only) argument into rax. |
| - __ movq(rax, Operand(rsp, 1 * kPointerSize)); |
| + __ movq(rax, StackOperandForArgument(1 * kPointerSize)); |
| // Check if the argument is a smi. |
| Label not_smi; |
| @@ -2332,7 +2332,7 @@ Handle<Code> CallStubCompiler::CompileFastApiCall( |
| // Get the receiver from the stack. |
| const int argc = arguments().immediate(); |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the receiver isn't a smi. |
| __ JumpIfSmi(rdx, &miss_before_stack_reserved); |
| @@ -2385,7 +2385,7 @@ void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object, |
| // Get the receiver from the stack. |
| const int argc = arguments().immediate(); |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the receiver isn't a smi. |
| if (check != NUMBER_CHECK) { |
| @@ -2409,7 +2409,7 @@ void CallStubCompiler::CompileHandlerFrontend(Handle<Object> object, |
| // necessary. |
| if (object->IsGlobalObject()) { |
| __ movq(rdx, FieldOperand(rdx, GlobalObject::kGlobalReceiverOffset)); |
| - __ movq(Operand(rsp, (argc + 1) * kPointerSize), rdx); |
| + __ movq(StackOperandForArgument((argc + 1) * kPointerSize), rdx); |
| } |
| break; |
| @@ -2536,14 +2536,14 @@ Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object, |
| LookupPostInterceptor(holder, name, &lookup); |
| // Get the receiver from the stack. |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| CallInterceptorCompiler compiler(this, arguments(), rcx, extra_state_); |
| compiler.Compile(masm(), object, holder, name, &lookup, rdx, rbx, rdi, rax, |
| &miss); |
| // Restore receiver. |
| - __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
| + __ movq(rdx, StackOperandForArgument((argc + 1) * kPointerSize)); |
| // Check that the function really is a function. |
| __ JumpIfSmi(rax, &miss); |
| @@ -2554,7 +2554,7 @@ Handle<Code> CallStubCompiler::CompileCallInterceptor(Handle<JSObject> object, |
| // necessary. |
| if (object->IsGlobalObject()) { |
| __ movq(rdx, FieldOperand(rdx, GlobalObject::kGlobalReceiverOffset)); |
| - __ movq(Operand(rsp, (argc + 1) * kPointerSize), rdx); |
| + __ movq(StackOperandForArgument((argc + 1) * kPointerSize), rdx); |
| } |
| // Invoke the function. |
| @@ -2609,7 +2609,7 @@ Handle<Code> CallStubCompiler::CompileCallGlobal( |
| // Patch the receiver on the stack with the global proxy. |
| if (object->IsGlobalObject()) { |
| __ movq(rdx, FieldOperand(rdx, GlobalObject::kGlobalReceiverOffset)); |
| - __ movq(Operand(rsp, (argc + 1) * kPointerSize), rdx); |
| + __ movq(StackOperandForArgument((argc + 1) * kPointerSize), rdx); |
| } |
| // Set up the context (function already in rdi). |