Index: src/ia32/builtins-ia32.cc |
diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc |
index 4cd00d9f83aeb3ae53e3d30588b024b5da121417..7355e6838d0b90d943232284e6d56522fe365795 100644 |
--- a/src/ia32/builtins-ia32.cc |
+++ b/src/ia32/builtins-ia32.cc |
@@ -603,7 +603,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) { |
__ LoadRoot(ebx, Heap::kInterpreterTableRootIndex); |
__ add(ebx, Immediate(FixedArray::kHeaderSize - kHeapObjectTag)); |
- // Push context as a stack located parameter to the bytecode handler. |
+ // Push dispatch table as a stack located parameter to the bytecode handler. |
DCHECK_EQ(-1, kInterpreterDispatchTableSpillSlot); |
__ push(ebx); |
@@ -733,6 +733,90 @@ 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. |
+ __ Push(Smi::FromInt(static_cast<int>(type))); |
+ |
+ __ CallRuntime(Runtime::kNotifyDeoptimized, 1); |
+ |
+ __ Pop(kInterpreterAccumulatorRegister); // Restore accumulator register. |
+ // Tear down internal frame. |
+ } |
+ |
+ // Initialize register file register. |
+ __ mov(kInterpreterRegisterFileRegister, ebp); |
+ __ add(kInterpreterRegisterFileRegister, |
+ Immediate(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
+ |
+ // Get the bytecode array pointer from the frame. |
+ __ mov(ebx, Operand(kInterpreterRegisterFileRegister, |
+ InterpreterFrameConstants::kFunctionFromRegisterPointer)); |
+ __ mov(ebx, FieldOperand(ebx, JSFunction::kSharedFunctionInfoOffset)); |
+ __ mov(kInterpreterBytecodeArrayRegister, |
+ FieldOperand(ebx, SharedFunctionInfo::kFunctionDataOffset)); |
+ |
+ if (FLAG_debug_code) { |
+ // Check function data field is actually a BytecodeArray object. |
+ __ AssertNotSmi(kInterpreterBytecodeArrayRegister); |
+ __ CmpObjectType(kInterpreterBytecodeArrayRegister, BYTECODE_ARRAY_TYPE, |
+ ebx); |
+ __ Assert(equal, kFunctionDataShouldBeBytecodeArrayOnInterpreterEntry); |
+ } |
+ |
+ // Get the target bytecode offset from the frame. |
+ __ mov( |
+ kInterpreterBytecodeOffsetRegister, |
+ Operand(kInterpreterRegisterFileRegister, |
+ InterpreterFrameConstants::kBytecodeOffsetFromRegisterPointer)); |
+ __ SmiUntag(kInterpreterBytecodeOffsetRegister); |
+ |
+ // Push dispatch table as a stack located parameter to the bytecode handler - |
+ // overwrite the state slot (we don't use these for interpreter deopts). |
+ __ LoadRoot(ebx, Heap::kInterpreterTableRootIndex); |
+ __ add(ebx, Immediate(FixedArray::kHeaderSize - kHeapObjectTag)); |
+ DCHECK_EQ(-1, kInterpreterDispatchTableSpillSlot); |
+ __ mov(ebx, Operand(esp, -2 * kPointerSize)); |
+ |
+ // Dispatch to the target bytecode. |
+ __ movzx_b(esi, Operand(kInterpreterBytecodeArrayRegister, |
+ kInterpreterBytecodeOffsetRegister, times_1, 0)); |
+ __ mov(ebx, Operand(ebx, esi, times_pointer_size, 0)); |
+ |
+ // Get the context from the frame. |
+ // TODO(rmcilroy): Update interpreter frame to expect current context at the |
+ // context slot instead of the function context. |
+ __ mov(kContextRegister, |
+ Operand(kInterpreterRegisterFileRegister, |
+ InterpreterFrameConstants::kContextFromRegisterPointer)); |
+ |
+ // TODO(rmcilroy): Make dispatch table point to code entrys to avoid untagging |
+ // and header removal. |
+ __ add(ebx, Immediate(Code::kHeaderSize - kHeapObjectTag)); |
+ __ jmp(ebx); |
+} |
+ |
+ |
+void Builtins::Generate_InterpreterNotifyDeoptimized(MacroAssembler* masm) { |
+ Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::EAGER); |
+} |
+ |
+ |
+void Builtins::Generate_InterpreterNotifySoftDeoptimized(MacroAssembler* masm) { |
+ Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::SOFT); |
+} |
+ |
+ |
+void Builtins::Generate_InterpreterNotifyLazyDeoptimized(MacroAssembler* masm) { |
+ Generate_InterpreterNotifyDeoptimizedHelper(masm, Deoptimizer::LAZY); |
+} |
+ |
+ |
void Builtins::Generate_CompileLazy(MacroAssembler* masm) { |
CallRuntimePassFunction(masm, Runtime::kCompileLazy); |
GenerateTailCallToReturnedCode(masm); |