Index: src/ia32/builtins-ia32.cc |
diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc |
index ec8a7977ef00525e3c71dd747a990593e4a2c410..34dd73c33159338813c3f3a942430826e60d38e0 100644 |
--- a/src/ia32/builtins-ia32.cc |
+++ b/src/ia32/builtins-ia32.cc |
@@ -613,9 +613,8 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) { |
// Load accumulator, register file, bytecode offset, dispatch table into |
// registers. |
__ LoadRoot(kInterpreterAccumulatorRegister, Heap::kUndefinedValueRootIndex); |
- __ mov(kInterpreterRegisterFileRegister, ebp); |
- __ add(kInterpreterRegisterFileRegister, |
- Immediate(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
+ __ mov(edx, ebp); |
+ __ add(edx, Immediate(InterpreterFrameConstants::kRegisterFileFromFp)); |
__ mov(kInterpreterBytecodeOffsetRegister, |
Immediate(BytecodeArray::kHeaderSize - kHeapObjectTag)); |
__ mov(kInterpreterDispatchTableRegister, |
@@ -643,13 +642,7 @@ 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. |
+ // The return value is in accumulator, which is already in eax. |
// Leave the frame (also dropping the register file). |
__ leave(); |
@@ -752,18 +745,14 @@ void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) { |
static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) { |
- // Initialize register file register and dispatch table register. |
- __ mov(kInterpreterRegisterFileRegister, ebp); |
- __ add(kInterpreterRegisterFileRegister, |
- Immediate(InterpreterFrameConstants::kRegisterFilePointerFromFp)); |
+ // Initialize the dispatch table register. |
__ mov(kInterpreterDispatchTableRegister, |
Immediate(ExternalReference::interpreter_dispatch_table_address( |
masm->isolate()))); |
// Get the bytecode array pointer from the frame. |
__ mov(kInterpreterBytecodeArrayRegister, |
- Operand(kInterpreterRegisterFileRegister, |
- InterpreterFrameConstants::kBytecodeArrayFromRegisterPointer)); |
+ Operand(ebp, InterpreterFrameConstants::kBytecodeArrayFromFp)); |
if (FLAG_debug_code) { |
// Check function data field is actually a BytecodeArray object. |
@@ -774,10 +763,8 @@ static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) { |
} |
// Get the target bytecode offset from the frame. |
- __ mov( |
- kInterpreterBytecodeOffsetRegister, |
- Operand(kInterpreterRegisterFileRegister, |
- InterpreterFrameConstants::kBytecodeOffsetFromRegisterPointer)); |
+ __ mov(kInterpreterBytecodeOffsetRegister, |
+ Operand(ebp, InterpreterFrameConstants::kBytecodeOffsetFromFp)); |
__ SmiUntag(kInterpreterBytecodeOffsetRegister); |
// Dispatch to the target bytecode. |