Index: src/arm/builtins-arm.cc |
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
index 60ed8d0d331d19501b9ab5576f626200ba715671..077408c0141bd74547a508980fc361330ba70db8 100644 |
--- a/src/arm/builtins-arm.cc |
+++ b/src/arm/builtins-arm.cc |
@@ -1059,25 +1059,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. |
- __ mov(r1, Operand(Smi::FromInt(static_cast<int>(type)))); |
- __ push(r1); |
- __ 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. |
__ add(kInterpreterRegisterFileRegister, fp, |
Operand(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
@@ -1127,6 +1109,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. |
+ __ mov(r1, Operand(Smi::FromInt(static_cast<int>(type)))); |
+ __ push(r1); |
+ __ 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); |
} |
@@ -1142,6 +1148,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); |