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

X87: Preserve argument count for calls.

Browse Source 
port 5de27c343bbf898ca87246caa1e83e533ec44561(r33865)

  original commit message:
  Calls use registers for target, new_target and argument count.
  We don't always respect argument count. It didn't bite us in the past
  because the code paths where we clobbered it never used it, though
  in future it could be an issue.

BUG=

Review URL: https://codereview.chromium.org/1698823002

Cr-Commit-Position: refs/heads/master@{#33984}
This commit is contained in:
zhengxing.li 2016-02-15 01:45:48 -08:00 committed by Commit bot
parent 125ac66bf6
commit 63a59fa341
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/x87/builtins-x87.cc
View File

@ -60,39 +60,43 @@ void Builtins::Generate_Adaptor(MacroAssembler* masm,
__ JumpToExternalReference(ExternalReference(id, masm->isolate())); __ JumpToExternalReference(ExternalReference(id, masm->isolate()));
} }
static void GenerateTailCallToReturnedCode(MacroAssembler* masm,
static void CallRuntimePassFunction( Runtime::FunctionId function_id) {
MacroAssembler* masm, Runtime::FunctionId function_id) {
// ----------- S t a t e ------------- // ----------- S t a t e -------------
// -- eax : argument count (preserved for callee)
// -- edx : new target (preserved for callee) // -- edx : new target (preserved for callee)
// -- edi : target function (preserved for callee) // -- edi : target function (preserved for callee)
// ----------------------------------- // -----------------------------------
{
FrameScope scope(masm, StackFrame::INTERNAL);
// Push the number of arguments to the callee.
__ SmiTag(eax);
__ push(eax);
// Push a copy of the target function and the new target.
__ push(edi);
__ push(edx);
// Function is also the parameter to the runtime call.
__ push(edi);
FrameScope scope(masm, StackFrame::INTERNAL); __ CallRuntime(function_id, 1);
// Push a copy of the target function and the new target. __ mov(ebx, eax);
__ push(edi);
__ push(edx);
// Function is also the parameter to the runtime call.
__ push(edi);
__ CallRuntime(function_id, 1); // Restore target function and new target.
// Restore target function and new target. __ pop(edx);
__ pop(edx); __ pop(edi);
__ pop(edi); __ pop(eax);
__ SmiUntag(eax);
}
__ lea(ebx, FieldOperand(ebx, Code::kHeaderSize));
__ jmp(ebx);
} }
static void GenerateTailCallToSharedCode(MacroAssembler* masm) { static void GenerateTailCallToSharedCode(MacroAssembler* masm) {
__ mov(eax, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset)); __ mov(ebx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));
__ mov(eax, FieldOperand(eax, SharedFunctionInfo::kCodeOffset)); __ mov(ebx, FieldOperand(ebx, SharedFunctionInfo::kCodeOffset));
__ lea(eax, FieldOperand(eax, Code::kHeaderSize)); __ lea(ebx, FieldOperand(ebx, Code::kHeaderSize));
__ jmp(eax); __ jmp(ebx);
}
static void GenerateTailCallToReturnedCode(MacroAssembler* masm) {
__ lea(eax, FieldOperand(eax, Code::kHeaderSize));
__ jmp(eax);
} }
@ -108,14 +112,12 @@ void Builtins::Generate_InOptimizationQueue(MacroAssembler* masm) {
__ cmp(esp, Operand::StaticVariable(stack_limit)); __ cmp(esp, Operand::StaticVariable(stack_limit));
__ j(above_equal, &ok, Label::kNear); __ j(above_equal, &ok, Label::kNear);
CallRuntimePassFunction(masm, Runtime::kTryInstallOptimizedCode); GenerateTailCallToReturnedCode(masm, Runtime::kTryInstallOptimizedCode);
GenerateTailCallToReturnedCode(masm);
__ bind(&ok); __ bind(&ok);
GenerateTailCallToSharedCode(masm); GenerateTailCallToSharedCode(masm);
} }
static void Generate_JSConstructStubHelper(MacroAssembler* masm, static void Generate_JSConstructStubHelper(MacroAssembler* masm,
bool is_api_function, bool is_api_function,
bool create_implicit_receiver, bool create_implicit_receiver,
@ -852,20 +854,18 @@ void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
void Builtins::Generate_CompileLazy(MacroAssembler* masm) { void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
CallRuntimePassFunction(masm, Runtime::kCompileLazy); GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy);
GenerateTailCallToReturnedCode(masm);
} }
void Builtins::Generate_CompileOptimized(MacroAssembler* masm) { void Builtins::Generate_CompileOptimized(MacroAssembler* masm) {
CallRuntimePassFunction(masm, Runtime::kCompileOptimized_NotConcurrent); GenerateTailCallToReturnedCode(masm,
GenerateTailCallToReturnedCode(masm); Runtime::kCompileOptimized_NotConcurrent);
} }
void Builtins::Generate_CompileOptimizedConcurrent(MacroAssembler* masm) { void Builtins::Generate_CompileOptimizedConcurrent(MacroAssembler* masm) {
CallRuntimePassFunction(masm, Runtime::kCompileOptimized_Concurrent); GenerateTailCallToReturnedCode(masm, Runtime::kCompileOptimized_Concurrent);
GenerateTailCallToReturnedCode(masm);
} }