| Index: src/ppc/builtins-ppc.cc
|
| diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc
|
| index 18d9332c37369c028086563a014b41eb6e258769..63e8c0f3e35e6d5ff77d72f1bf8518d0961ad050 100644
|
| --- a/src/ppc/builtins-ppc.cc
|
| +++ b/src/ppc/builtins-ppc.cc
|
| @@ -1060,8 +1060,7 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| // Load accumulator, register file, bytecode offset, dispatch table into
|
| // registers.
|
| __ LoadRoot(kInterpreterAccumulatorRegister, Heap::kUndefinedValueRootIndex);
|
| - __ addi(kInterpreterRegisterFileRegister, fp,
|
| - Operand(InterpreterFrameConstants::kRegisterFilePointerFromFp));
|
| + __ addi(r7, fp, Operand(InterpreterFrameConstants::kRegisterFileFromFp));
|
| __ mov(kInterpreterBytecodeOffsetRegister,
|
| Operand(BytecodeArray::kHeaderSize - kHeapObjectTag));
|
| __ mov(kInterpreterDispatchTableRegister,
|
| @@ -1081,12 +1080,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 r3.
|
|
|
| // Leave the frame (also dropping the register file).
|
| @@ -1162,18 +1155,14 @@ void Builtins::Generate_InterpreterPushArgsAndConstruct(MacroAssembler* masm) {
|
|
|
|
|
| static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
|
| - // Initialize register file register and dispatch table register.
|
| - __ addi(kInterpreterRegisterFileRegister, fp,
|
| - Operand(InterpreterFrameConstants::kRegisterFilePointerFromFp));
|
| + // Initialize the dispatch table register.
|
| __ mov(kInterpreterDispatchTableRegister,
|
| Operand(ExternalReference::interpreter_dispatch_table_address(
|
| masm->isolate())));
|
|
|
| // Get the bytecode array pointer from the frame.
|
| - __ LoadP(
|
| - kInterpreterBytecodeArrayRegister,
|
| - MemOperand(kInterpreterRegisterFileRegister,
|
| - InterpreterFrameConstants::kBytecodeArrayFromRegisterPointer));
|
| + __ LoadP(kInterpreterBytecodeArrayRegister,
|
| + MemOperand(fp, InterpreterFrameConstants::kBytecodeArrayFromFp));
|
|
|
| if (FLAG_debug_code) {
|
| // Check function data field is actually a BytecodeArray object.
|
| @@ -1186,9 +1175,7 @@ static void Generate_EnterBytecodeDispatch(MacroAssembler* masm) {
|
|
|
| // Get the target bytecode offset from the frame.
|
| __ LoadP(kInterpreterBytecodeOffsetRegister,
|
| - MemOperand(
|
| - kInterpreterRegisterFileRegister,
|
| - InterpreterFrameConstants::kBytecodeOffsetFromRegisterPointer));
|
| + MemOperand(fp, InterpreterFrameConstants::kBytecodeOffsetFromFp));
|
| __ SmiUntag(kInterpreterBytecodeOffsetRegister);
|
|
|
| // Dispatch to the target bytecode.
|
|
|