| Index: src/x64/builtins-x64.cc
|
| diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
|
| index 86f29983912491f5299c493f1d599156505d1180..c7d47e1737c0f9ff28e173917ada263a83e85c12 100644
|
| --- a/src/x64/builtins-x64.cc
|
| +++ b/src/x64/builtins-x64.cc
|
| @@ -690,9 +690,8 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| // Load accumulator, register file, bytecode offset, dispatch table into
|
| // registers.
|
| __ LoadRoot(kInterpreterAccumulatorRegister, Heap::kUndefinedValueRootIndex);
|
| - __ movp(kInterpreterRegisterFileRegister, rbp);
|
| - __ addp(kInterpreterRegisterFileRegister,
|
| - Immediate(InterpreterFrameConstants::kRegisterFilePointerFromFp));
|
| + __ movp(r11, rbp);
|
| + __ addp(r11, Immediate(InterpreterFrameConstants::kRegisterFileFromFp));
|
| __ movp(kInterpreterBytecodeOffsetRegister,
|
| Immediate(BytecodeArray::kHeaderSize - kHeapObjectTag));
|
| __ Move(
|
| @@ -720,12 +719,6 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
|
|
|
|
| void Builtins::Generate_InterpreterExitTrampoline(MacroAssembler* masm) {
|
| - // TODO(rmcilroy): List of things not currently dealt with here but done in
|
| - // fullcodegen's EmitReturnSequence.
|
| - // - Supporting FLAG_trace for Runtime::TraceExit.
|
| - // - Support profiler (specifically decrementing profiling_counter
|
| - // appropriately and calling out to HandleInterrupts if necessary).
|
| -
|
| // The return value is in accumulator, which is already in rax.
|
|
|
| // Leave the frame (also dropping the register file).
|
| @@ -825,19 +818,14 @@ void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
|
|
|
|
|
| static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
|
| - // Initialize register file register and dispatch table register.
|
| - __ movp(kInterpreterRegisterFileRegister, rbp);
|
| - __ addp(kInterpreterRegisterFileRegister,
|
| - Immediate(InterpreterFrameConstants::kRegisterFilePointerFromFp));
|
| + // Initialize dispatch table register.
|
| __ Move(
|
| kInterpreterDispatchTableRegister,
|
| ExternalReference::interpreter_dispatch_table_address(masm->isolate()));
|
|
|
| // Get the bytecode array pointer from the frame.
|
| - __ movp(
|
| - kInterpreterBytecodeArrayRegister,
|
| - Operand(kInterpreterRegisterFileRegister,
|
| - InterpreterFrameConstants::kBytecodeArrayFromRegisterPointer));
|
| + __ movp(kInterpreterBytecodeArrayRegister,
|
| + Operand(rbp, InterpreterFrameConstants::kBytecodeArrayFromFp));
|
|
|
| if (FLAG_debug_code) {
|
| // Check function data field is actually a BytecodeArray object.
|
| @@ -848,10 +836,8 @@ static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
|
| }
|
|
|
| // Get the target bytecode offset from the frame.
|
| - __ movp(
|
| - kInterpreterBytecodeOffsetRegister,
|
| - Operand(kInterpreterRegisterFileRegister,
|
| - InterpreterFrameConstants::kBytecodeOffsetFromRegisterPointer));
|
| + __ movp(kInterpreterBytecodeOffsetRegister,
|
| + Operand(rbp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
|
| __ SmiToInteger32(kInterpreterBytecodeOffsetRegister,
|
| kInterpreterBytecodeOffsetRegister);
|
|
|
|
|