| Index: src/builtins/x87/builtins-x87.cc
|
| diff --git a/src/builtins/x87/builtins-x87.cc b/src/builtins/x87/builtins-x87.cc
|
| index e766023c67cf90690b936e57cc1b7dc80ce6d6f2..069ca7702ec823d175b7a742c81c3689fd708c49 100644
|
| --- a/src/builtins/x87/builtins-x87.cc
|
| +++ b/src/builtins/x87/builtins-x87.cc
|
| @@ -939,7 +939,7 @@ void Builtins::Generate_InterpreterPushArgsAndConstructArray(
|
| }
|
| }
|
|
|
| -void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
|
| +static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) {
|
| // Set the return address to the correct point in the interpreter entry
|
| // trampoline.
|
| Smi* interpreter_entry_return_pc_offset(
|
| @@ -981,6 +981,31 @@ void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
|
| __ jmp(ebx);
|
| }
|
|
|
| +void Builtins::Generate_InterpreterEnterBytecodeAdvance(MacroAssembler* masm) {
|
| + // Advance the current bytecode offset stored within the given interpreter
|
| + // stack frame. This simulates what all bytecode handlers do upon completion
|
| + // of the underlying operation.
|
| + __ mov(ebx, Operand(ebp, InterpreterFrameConstants::kBytecodeArrayFromFp));
|
| + __ mov(edx, Operand(ebp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
|
| + __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
|
| + {
|
| + FrameScope scope(masm, StackFrame::INTERNAL);
|
| + __ Push(kInterpreterAccumulatorRegister);
|
| + __ Push(ebx); // First argument is the bytecode array.
|
| + __ Push(edx); // Second argument is the bytecode offset.
|
| + __ CallRuntime(Runtime::kInterpreterAdvanceBytecodeOffset);
|
| + __ Move(edx, eax); // Result is the new bytecode offset.
|
| + __ Pop(kInterpreterAccumulatorRegister);
|
| + }
|
| + __ mov(Operand(ebp, InterpreterFrameConstants::kBytecodeOffsetFromFp), edx);
|
| +
|
| + Generate_InterpreterEnterBytecode(masm);
|
| +}
|
| +
|
| +void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
|
| + Generate_InterpreterEnterBytecode(masm);
|
| +}
|
| +
|
| void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- eax : argument count (preserved for callee)
|
|
|