Index: src/x64/stub-cache-x64.cc |
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc |
index 39ff656ec45be81f7fa5c9c633b4dbe92c227981..19c7a55121f322b75f2d1da46449d3878771e4ed 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(StackOperandForReturnAddress(0), scratch); |
__ Move(scratch, Smi::FromInt(0)); |
for (int i = 1; i <= kFastApiCallArguments; i++) { |
danno
2013/08/02 08:48:00
Just change the loop to iterate from 0 to < kFastA
|
- __ movq(Operand(rsp, i * kPointerSize), scratch); |
+ __ movq(StackOperandForReversedArgument(i - 1), scratch); |
} |
} |
@@ -465,22 +465,22 @@ static void GenerateFastApiCall(MacroAssembler* masm, |
__ movq(rsi, FieldOperand(rdi, JSFunction::kContextOffset)); |
// Pass the additional arguments. |
- __ movq(Operand(rsp, 2 * kPointerSize), rdi); |
+ __ movq(StackOperandForReversedArgument(1), 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(StackOperandForReversedArgument(2), rbx); |
} else { |
- __ Move(Operand(rsp, 3 * kPointerSize), call_data); |
+ __ Move(StackOperandForReversedArgument(2), call_data); |
} |
__ movq(kScratchRegister, |
ExternalReference::isolate_address(masm->isolate())); |
- __ movq(Operand(rsp, 4 * kPointerSize), kScratchRegister); |
+ __ movq(StackOperandForReversedArgument(3), kScratchRegister); |
__ LoadRoot(kScratchRegister, Heap::kUndefinedValueRootIndex); |
- __ movq(Operand(rsp, 5 * kPointerSize), kScratchRegister); |
- __ movq(Operand(rsp, 6 * kPointerSize), kScratchRegister); |
+ __ movq(StackOperandForReversedArgument(4), kScratchRegister); |
+ __ movq(StackOperandForReversedArgument(5), kScratchRegister); |
// Prepare arguments. |
STATIC_ASSERT(kFastApiCallArguments == 6); |
@@ -1075,7 +1075,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); |
} |
// Check the maps in the prototype chain. |
@@ -1135,7 +1135,7 @@ Register StubCompiler::CheckPrototypes(Handle<JSObject> object, |
} |
if (save_at_depth == depth) { |
- __ movq(Operand(rsp, kPointerSize), reg); |
+ __ movq(Operand(rsp, kPCOnStackSize), reg); |
} |
// Go to the next object in the prototype chain. |
@@ -1474,7 +1474,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, StackOperandForReceiver(argc)); |
// Check that the maps haven't changed. |
@@ -1540,7 +1540,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, StackOperandForReceiver(argc)); |
// Check that the receiver isn't a smi. |
__ JumpIfSmi(rdx, &miss); |
@@ -1561,7 +1561,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(StackOperandForReceiver(argc), rdx); |
} |
// Invoke the function. |
@@ -1595,7 +1595,7 @@ Handle<Code> CallStubCompiler::CompileArrayCodeCall( |
if (cell.is_null()) { |
// Get the receiver from the stack. |
- __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(rdx, StackOperandForReceiver(argc)); |
// Check that the receiver isn't a smi. |
__ JumpIfSmi(rdx, &miss); |
@@ -1649,7 +1649,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, StackOperandForReceiver(argc)); |
// Check that the receiver isn't a smi. |
__ JumpIfSmi(rdx, &miss); |
@@ -1688,7 +1688,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, StackOperandForReversedArgument(argc - 1)); |
__ JumpIfNotSmi(rcx, &with_write_barrier); |
// Save new length. |
@@ -1723,7 +1723,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall( |
__ cmpl(rax, rcx); |
__ j(greater, &call_builtin); |
- __ movq(rcx, Operand(rsp, argc * kPointerSize)); |
+ __ movq(rcx, StackOperandForReversedArgument(argc - 1)); |
__ StoreNumberToDoubleElements( |
rcx, rdi, rax, xmm0, &call_builtin, argc * kDoubleSize); |
@@ -1800,7 +1800,7 @@ Handle<Code> CallStubCompiler::CompileArrayPushCall( |
__ jmp(&call_builtin); |
} |
- __ movq(rbx, Operand(rsp, argc * kPointerSize)); |
+ __ movq(rbx, StackOperandForReversedArgument(argc - 1)); |
// 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; |
@@ -1849,7 +1849,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, StackOperandForReceiver(argc)); |
// Increment element's and array's sizes. |
__ SmiAddConstant(FieldOperand(rdi, FixedArray::kLengthOffset), |
@@ -1900,7 +1900,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, StackOperandForReceiver(argc)); |
// Check that the receiver isn't a smi. |
__ JumpIfSmi(rdx, &miss); |
@@ -2003,9 +2003,9 @@ Handle<Code> CallStubCompiler::CompileStringCharCodeAtCall( |
Register receiver = rbx; |
Register index = rdi; |
Register result = rax; |
- __ movq(receiver, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(receiver, StackOperandForReceiver(argc)); |
if (argc > 0) { |
- __ movq(index, Operand(rsp, (argc - 0) * kPointerSize)); |
+ __ movq(index, StackOperandForReversedArgument(argc - 1)); |
} else { |
__ LoadRoot(index, Heap::kUndefinedValueRootIndex); |
} |
@@ -2084,9 +2084,9 @@ Handle<Code> CallStubCompiler::CompileStringCharAtCall( |
Register index = rdi; |
Register scratch = rdx; |
Register result = rax; |
- __ movq(receiver, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(receiver, StackOperandForReceiver(argc)); |
if (argc > 0) { |
- __ movq(index, Operand(rsp, (argc - 0) * kPointerSize)); |
+ __ movq(index, StackOperandForReversedArgument(argc - 1)); |
} else { |
__ LoadRoot(index, Heap::kUndefinedValueRootIndex); |
} |
@@ -2145,7 +2145,7 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall( |
GenerateNameCheck(name, &miss); |
if (cell.is_null()) { |
- __ movq(rdx, Operand(rsp, 2 * kPointerSize)); |
+ __ movq(rdx, StackOperandForReversedArgument(1)); |
__ JumpIfSmi(rdx, &miss); |
CheckPrototypes(Handle<JSObject>::cast(object), rdx, holder, rbx, rax, rdi, |
name, &miss); |
@@ -2158,7 +2158,7 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall( |
// Load the char code argument. |
Register code = rbx; |
- __ movq(code, Operand(rsp, 1 * kPointerSize)); |
+ __ movq(code, StackOperandForReversedArgument(0)); |
// Check the code is a smi. |
Label slow; |
@@ -2229,7 +2229,7 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall( |
GenerateNameCheck(name, &miss); |
if (cell.is_null()) { |
- __ movq(rdx, Operand(rsp, 2 * kPointerSize)); |
+ __ movq(rdx, StackOperandForReversedArgument(1)); |
__ JumpIfSmi(rdx, &miss); |
CheckPrototypes(Handle<JSObject>::cast(object), rdx, holder, rbx, rax, rdi, |
name, &miss); |
@@ -2240,7 +2240,7 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall( |
GenerateLoadFunctionFromCell(cell, function, &miss); |
} |
// Load the (only) argument into rax. |
- __ movq(rax, Operand(rsp, 1 * kPointerSize)); |
+ __ movq(rax, StackOperandForReversedArgument(0)); |
// Check if the argument is a smi. |
Label not_smi; |
@@ -2333,7 +2333,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, StackOperandForReceiver(argc)); |
// Check that the receiver isn't a smi. |
__ JumpIfSmi(rdx, &miss_before_stack_reserved); |
@@ -2387,7 +2387,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, StackOperandForReceiver(argc)); |
// Check that the receiver isn't a smi. |
if (check != NUMBER_CHECK) { |
@@ -2411,7 +2411,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(StackOperandForReceiver(argc), rdx); |
} |
break; |
@@ -2538,14 +2538,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, StackOperandForReceiver(argc)); |
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, StackOperandForReceiver(argc)); |
// Check that the function really is a function. |
__ JumpIfSmi(rax, &miss); |
@@ -2556,7 +2556,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(StackOperandForReceiver(argc), rdx); |
} |
// Invoke the function. |
@@ -2611,7 +2611,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(StackOperandForReceiver(argc), rdx); |
} |
// Set up the context (function already in rdi). |