AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[ia32,root] Preserve kRootRegister (ebx) in JSBuiltinsConstructStub

Browse Source 
Change-Id: I9eda6409d05c59085a09ebc7079b9c12c9877574
Bug: v8:6666
Reviewed-on: https://chromium-review.googlesource.com/1236577
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56116}
This commit is contained in:
Sigurd Schneider 2018-09-21 10:27:26 +02:00 committed by Commit Bot
parent ce7ec6ef0a
commit d968ffa2bc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/builtins/ia32/builtins-ia32.cc
View File

@ -71,6 +71,7 @@ static void GenerateTailCallToReturnedCode(MacroAssembler* masm,
namespace { namespace {
void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) { void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
Assembler::SupportsRootRegisterScope supports_root_register(masm);
// ----------- S t a t e ------------- // ----------- S t a t e -------------
// -- eax: number of arguments // -- eax: number of arguments
// -- edi: constructor function // -- edi: constructor function
@ -91,8 +92,8 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
// The receiver for the builtin/api call. // The receiver for the builtin/api call.
__ PushRoot(RootIndex::kTheHoleValue); __ PushRoot(RootIndex::kTheHoleValue);
// Set up pointer to last argument. // Set up pointer to last argument. We are using esi as scratch register.
__ lea(ebx, Operand(ebp, StandardFrameConstants::kCallerSPOffset)); __ lea(esi, Operand(ebp, StandardFrameConstants::kCallerSPOffset));
// Copy arguments and receiver to the expression stack. // Copy arguments and receiver to the expression stack.
Label loop, entry; Label loop, entry;
@ -101,7 +102,7 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
// -- eax: number of arguments (untagged) // -- eax: number of arguments (untagged)
// -- edi: constructor function // -- edi: constructor function
// -- edx: new target // -- edx: new target
// -- ebx: pointer to last argument // -- esi: pointer to last argument
// -- ecx: counter // -- ecx: counter
// -- sp[0*kPointerSize]: the hole (receiver) // -- sp[0*kPointerSize]: the hole (receiver)
// -- sp[1*kPointerSize]: number of arguments (tagged) // -- sp[1*kPointerSize]: number of arguments (tagged)
@ -109,7 +110,7 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
// ----------------------------------- // -----------------------------------
__ jmp(&entry); __ jmp(&entry);
__ bind(&loop); __ bind(&loop);
__ push(Operand(ebx, ecx, times_4, 0)); __ push(Operand(esi, ecx, times_4, 0));
__ bind(&entry); __ bind(&entry);
__ dec(ecx); __ dec(ecx);
__ j(greater_equal, &loop); __ j(greater_equal, &loop);
@ -119,20 +120,22 @@ void Generate_JSBuiltinsConstructStubHelper(MacroAssembler* masm) {
// edi: constructor function // edi: constructor function
// edx: new target // edx: new target
ParameterCount actual(eax); ParameterCount actual(eax);
// Reload context from the frame.
__ mov(esi, Operand(ebp, ConstructFrameConstants::kContextOffset));
__ InvokeFunction(edi, edx, actual, CALL_FUNCTION); __ InvokeFunction(edi, edx, actual, CALL_FUNCTION);
// Restore context from the frame. // Restore context from the frame.
__ mov(esi, Operand(ebp, ConstructFrameConstants::kContextOffset)); __ mov(esi, Operand(ebp, ConstructFrameConstants::kContextOffset));
// Restore smi-tagged arguments count from the frame. // Restore smi-tagged arguments count from the frame.
__ mov(ebx, Operand(ebp, ConstructFrameConstants::kLengthOffset)); __ mov(edx, Operand(ebp, ConstructFrameConstants::kLengthOffset));
// Leave construct frame. // Leave construct frame.
} }
// Remove caller arguments from the stack and return. // Remove caller arguments from the stack and return.
STATIC_ASSERT(kSmiTagSize == 1 && kSmiTag == 0); STATIC_ASSERT(kSmiTagSize == 1 && kSmiTag == 0);
__ pop(ecx); __ PopReturnAddressTo(ecx);
__ lea(esp, Operand(esp, ebx, times_2, 1 * kPointerSize)); // 1 ~ receiver __ lea(esp, Operand(esp, edx, times_2, 1 * kPointerSize)); // 1 ~ receiver
__ push(ecx); __ PushReturnAddressFrom(ecx);
__ ret(0); __ ret(0);
} }
@ -312,6 +315,7 @@ void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
} }
void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) { void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) {
Assembler::SupportsRootRegisterScope supports_root_register(masm);
Generate_JSBuiltinsConstructStubHelper(masm); Generate_JSBuiltinsConstructStubHelper(masm);
} }
@ -2224,7 +2228,6 @@ void Builtins::Generate_ConstructBoundFunction(MacroAssembler* masm) {
// static // static
void Builtins::Generate_Construct(MacroAssembler* masm) { void Builtins::Generate_Construct(MacroAssembler* masm) {
Assembler::SupportsRootRegisterScope supports_root_register(masm);
// ----------- S t a t e ------------- // ----------- S t a t e -------------
// -- eax : the number of arguments (not including the receiver) // -- eax : the number of arguments (not including the receiver)
// -- edx : the new target (either the same as the constructor or // -- edx : the new target (either the same as the constructor or