diff options
Diffstat (limited to 'deps/v8/src/x64/code-stubs-x64.cc')
| -rw-r--r-- | deps/v8/src/x64/code-stubs-x64.cc | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/deps/v8/src/x64/code-stubs-x64.cc b/deps/v8/src/x64/code-stubs-x64.cc index 787c7fb518..3958cf0324 100644 --- a/deps/v8/src/x64/code-stubs-x64.cc +++ b/deps/v8/src/x64/code-stubs-x64.cc @@ -30,7 +30,6 @@ #if defined(V8_TARGET_ARCH_X64) #include "bootstrapper.h" -#include "builtins-decls.h" #include "code-stubs.h" #include "regexp-macro-assembler.h" #include "stub-cache.h" @@ -4273,10 +4272,6 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { Label invoke, handler_entry, exit; Label not_outermost_js, not_outermost_js_2; -#ifdef _WIN64 - const int kCalleeSaveXMMRegisters = 10; - const int kFullXMMRegisterSize = 16; -#endif { // NOLINT. Scope block confuses linter. MacroAssembler::NoRootArrayScope uninitialized_root_register(masm); // Set up frame. @@ -4306,17 +4301,17 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { #ifdef _WIN64 // On Win64 XMM6-XMM15 are callee-save - __ subq(rsp, Immediate(kCalleeSaveXMMRegisters * kFullXMMRegisterSize)); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 0), xmm6); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 1), xmm7); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 2), xmm8); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 3), xmm9); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 4), xmm10); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 5), xmm11); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 6), xmm12); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 7), xmm13); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 8), xmm14); - __ movdqu(Operand(rsp, kFullXMMRegisterSize * 9), xmm15); + __ subq(rsp, Immediate(EntryFrameConstants::kXMMRegistersBlockSize)); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 0), xmm6); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 1), xmm7); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 2), xmm8); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 3), xmm9); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 4), xmm10); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 5), xmm11); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 6), xmm12); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 7), xmm13); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 8), xmm14); + __ movdqu(Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 9), xmm15); #endif // Set up the roots and smi constant registers. @@ -4409,17 +4404,17 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { // Restore callee-saved registers (X64 conventions). #ifdef _WIN64 // On Win64 XMM6-XMM15 are callee-save - __ movdqu(xmm6, Operand(rsp, kFullXMMRegisterSize * 0)); - __ movdqu(xmm7, Operand(rsp, kFullXMMRegisterSize * 1)); - __ movdqu(xmm8, Operand(rsp, kFullXMMRegisterSize * 2)); - __ movdqu(xmm8, Operand(rsp, kFullXMMRegisterSize * 3)); - __ movdqu(xmm10, Operand(rsp, kFullXMMRegisterSize * 4)); - __ movdqu(xmm11, Operand(rsp, kFullXMMRegisterSize * 5)); - __ movdqu(xmm12, Operand(rsp, kFullXMMRegisterSize * 6)); - __ movdqu(xmm13, Operand(rsp, kFullXMMRegisterSize * 7)); - __ movdqu(xmm14, Operand(rsp, kFullXMMRegisterSize * 8)); - __ movdqu(xmm15, Operand(rsp, kFullXMMRegisterSize * 9)); - __ addq(rsp, Immediate(kCalleeSaveXMMRegisters * kFullXMMRegisterSize)); + __ movdqu(xmm6, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 0)); + __ movdqu(xmm7, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 1)); + __ movdqu(xmm8, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 2)); + __ movdqu(xmm9, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 3)); + __ movdqu(xmm10, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 4)); + __ movdqu(xmm11, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 5)); + __ movdqu(xmm12, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 6)); + __ movdqu(xmm13, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 7)); + __ movdqu(xmm14, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 8)); + __ movdqu(xmm15, Operand(rsp, EntryFrameConstants::kXMMRegisterSize * 9)); + __ addq(rsp, Immediate(EntryFrameConstants::kXMMRegistersBlockSize)); #endif __ pop(rbx); |