Index: src/ppc/builtins-ppc.cc |
diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc |
index ee5d298edab399eb3b6f16637ce5fc0d3c13d84f..3a433f11a17685484188537a15906fdfad153362 100644 |
--- a/src/ppc/builtins-ppc.cc |
+++ b/src/ppc/builtins-ppc.cc |
@@ -1048,23 +1048,7 @@ void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) { |
} |
-static void Generate_InterpreterNotifyDeoptimizedHelper( |
- MacroAssembler* masm, Deoptimizer::BailoutType type) { |
- // Enter an internal frame. |
- { |
- FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL); |
- // Save accumulator register and pass the deoptimization type to |
- // the runtime system. |
- __ LoadSmiLiteral(r4, Smi::FromInt(static_cast<int>(type))); |
- __ Push(kInterpreterAccumulatorRegister, r4); |
- __ CallRuntime(Runtime::kNotifyDeoptimized); |
- __ pop(kInterpreterAccumulatorRegister); // Restore accumulator register. |
- // Tear down internal frame. |
- } |
- |
- // Drop state (we don't use these for interpreter deopts). |
- __ Drop(1); |
- |
+static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) { |
// Initialize register file register and dispatch table register. |
__ addi(kInterpreterRegisterFileRegister, fp, |
Operand(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
@@ -1114,6 +1098,28 @@ static void Generate_InterpreterNotifyDeoptimizedHelper( |
} |
+static void Generate_InterpreterNotifyDeoptimizedHelper( |
+ MacroAssembler* masm, Deoptimizer::BailoutType type) { |
+ // Enter an internal frame. |
+ { |
+ FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL); |
+ // Save accumulator register and pass the deoptimization type to |
+ // the runtime system. |
+ __ LoadSmiLiteral(r4, Smi::FromInt(static_cast<int>(type))); |
+ __ Push(kInterpreterAccumulatorRegister, r4); |
+ __ CallRuntime(Runtime::kNotifyDeoptimized); |
+ __ pop(kInterpreterAccumulatorRegister); // Restore accumulator register. |
+ // Tear down internal frame. |
+ } |
+ |
+ // Drop state (we don't use these for interpreter deopts). |
+ __ Drop(1); |
+ |
+ // Enter the bytecode dispatch. |
+ Generate_EnterBytecodeDispatch(masm); |
+} |
+ |
+ |
void Builtins::Generate_InterpreterNotifyDeoptimized(MacroAssembler* masm) { |
Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::EAGER); |
} |
@@ -1129,6 +1135,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); |