| Index: src/builtins/arm/builtins-arm.cc
|
| diff --git a/src/builtins/arm/builtins-arm.cc b/src/builtins/arm/builtins-arm.cc
|
| index f535ae785aa20fb89b4a73f915a19f7d8246f36c..69339b86b0ba4afbd9a46b7c171b27b8e31f50f2 100644
|
| --- a/src/builtins/arm/builtins-arm.cc
|
| +++ b/src/builtins/arm/builtins-arm.cc
|
| @@ -1296,7 +1296,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(
|
| @@ -1337,6 +1337,29 @@ void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
|
| __ mov(pc, ip);
|
| }
|
|
|
| +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.
|
| + __ ldr(r1, MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
|
| + __ ldr(r2, MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
|
| + __ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| + {
|
| + FrameScope scope(masm, StackFrame::INTERNAL);
|
| + __ Push(kInterpreterAccumulatorRegister, r1, r2);
|
| + __ CallRuntime(Runtime::kInterpreterAdvanceBytecodeOffset);
|
| + __ mov(r2, r0); // Result is the new bytecode offset.
|
| + __ Pop(kInterpreterAccumulatorRegister);
|
| + }
|
| + __ str(r2, MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
|
| +
|
| + Generate_InterpreterEnterBytecode(masm);
|
| +}
|
| +
|
| +void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
|
| + Generate_InterpreterEnterBytecode(masm);
|
| +}
|
| +
|
| void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| // -- r0 : argument count (preserved for callee)
|
|
|