Index: src/mips64/builtins-mips64.cc |
diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc |
index fecf3f7334fd70e7628ed14879df4e3d1619586d..e02fbe353ce0a60fb24a030bff2b81c6f20ee22b 100644 |
--- a/src/mips64/builtins-mips64.cc |
+++ b/src/mips64/builtins-mips64.cc |
@@ -1046,25 +1046,7 @@ void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) { |
} |
-static void Generate_InterpreterNotifyDeoptimizedHelper( |
- MacroAssembler* masm, Deoptimizer::BailoutType type) { |
- // Enter an internal frame. |
- { |
- FrameScope scope(masm, StackFrame::INTERNAL); |
- __ push(kInterpreterAccumulatorRegister); // Save accumulator register. |
- |
- // Pass the deoptimization type to the runtime system. |
- __ li(a1, Operand(Smi::FromInt(static_cast<int>(type)))); |
- __ push(a1); |
- __ CallRuntime(Runtime::kNotifyDeoptimized); |
- |
- __ pop(kInterpreterAccumulatorRegister); // Restore accumulator register. |
- // Tear down internal frame. |
- } |
- |
- // Drop state (we don't use this for interpreter deopts). |
- __ Drop(1); |
- |
+static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) { |
// Initialize register file register and dispatch table register. |
__ Daddu(kInterpreterRegisterFileRegister, fp, |
Operand(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
@@ -1117,6 +1099,30 @@ static void Generate_InterpreterNotifyDeoptimizedHelper( |
} |
+static void Generate_InterpreterNotifyDeoptimizedHelper( |
+ MacroAssembler* masm, Deoptimizer::BailoutType type) { |
+ // Enter an internal frame. |
+ { |
+ FrameScope scope(masm, StackFrame::INTERNAL); |
+ __ push(kInterpreterAccumulatorRegister); // Save accumulator register. |
+ |
+ // Pass the deoptimization type to the runtime system. |
+ __ li(a1, Operand(Smi::FromInt(static_cast<int>(type)))); |
+ __ push(a1); |
+ __ CallRuntime(Runtime::kNotifyDeoptimized); |
+ |
+ __ pop(kInterpreterAccumulatorRegister); // Restore accumulator register. |
+ // Tear down internal frame. |
+ } |
+ |
+ // Drop state (we don't use this for interpreter deopts). |
+ __ Drop(1); |
+ |
+ // Enter the bytecode dispatch. |
+ Generate_EnterBytecodeDispatch(masm); |
+} |
+ |
+ |
void Builtins::Generate_InterpreterNotifyDeoptimized(MacroAssembler* masm) { |
Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::EAGER); |
} |
@@ -1132,6 +1138,11 @@ void Builtins::Generate_InterpreterNotifyLazyDeoptimized(MacroAssembler* masm) { |
} |
+void Builtins::Generate_InterpreterEnterExceptionHandler(MacroAssembler* masm) { |
+ Generate_EnterBytecodeDispatch(masm); |
+} |
+ |
+ |
void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
CallRuntimePassFunction(masm, Runtime::kCompileLazy); |
GenerateTailCallToReturnedCode(masm); |