[interpreter] Change interpreter to use an BytecodeArray pointer and and offset.

src/compiler/interpreter-assembler.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/interpreter-assembler.h"
 
 #include <ostream>
 
 #include "src/compiler/graph.h"
 #include "src/compiler/instruction-selector.h"
@@ skipping 42 matching lines @@
     code->Disassemble(interpreter::Bytecodes::ToString(bytecode_), os);
     os << std::flush;
   }
 #endif
 
   code_generated_ = true;
   return code;
 }
 
 
-Node* InterpreterAssembler::BytecodePointer() {
-  return raw_assembler_->Parameter(Linkage::kInterpreterBytecodeParameter);
+Node* InterpreterAssembler::BytecodeArrayPointer() {
+  return raw_assembler_->Parameter(Linkage::kInterpreterBytecodeArrayParameter);
 }
 
 
+Node* InterpreterAssembler::BytecodeOffset() {
+  return raw_assembler_->Parameter(
+      Linkage::kInterpreterBytecodeOffsetParameter);
+}
+
+
 Node* InterpreterAssembler::DispatchTablePointer() {
   return raw_assembler_->Parameter(Linkage::kInterpreterDispatchTableParameter);
 }
 
 
 Node* InterpreterAssembler::FramePointer() {
   return raw_assembler_->LoadFramePointer();
 }
 
 
 Node* InterpreterAssembler::RegisterFrameOffset(int index) {
   DCHECK_LE(index, kMaxRegisterIndex);
   return Int32Constant(kFirstRegisterOffsetFromFp -
                        (index << kPointerSizeLog2));
 }
 
 
 Node* InterpreterAssembler::RegisterFrameOffset(Node* index) {
   return raw_assembler_->Int32Sub(
       Int32Constant(kFirstRegisterOffsetFromFp),
       raw_assembler_->Word32Shl(index, Int32Constant(kPointerSizeLog2)));
 }
 
 
 Node* InterpreterAssembler::BytecodeArg(int delta) {
   DCHECK_LT(delta, interpreter::Bytecodes::NumberOfArguments(bytecode_));
-  return raw_assembler_->Load(kMachUint8, BytecodePointer(),
-                              Int32Constant(1 + delta));
+  return raw_assembler_->Load(
+      kMachUint8, BytecodeArrayPointer(),
+      raw_assembler_->IntPtrAdd(BytecodeOffset(), Int32Constant(1 + delta)));
 }
 
 
 Node* InterpreterAssembler::LoadRegister(int index) {
   return raw_assembler_->Load(kMachPtr, FramePointer(),
                               RegisterFrameOffset(index));
 }
 
 
 Node* InterpreterAssembler::LoadRegister(Node* index) {
   return raw_assembler_->Load(kMachPtr, FramePointer(),
                               RegisterFrameOffset(index));
 }
 
 
 Node* InterpreterAssembler::StoreRegister(Node* value, int index) {
   return raw_assembler_->Store(kMachPtr, FramePointer(),
                                RegisterFrameOffset(index), value);
 }
 
 
 Node* InterpreterAssembler::StoreRegister(Node* value, Node* index) {
   return raw_assembler_->Store(kMachPtr, FramePointer(),
                                RegisterFrameOffset(index), value);
 }
 
 
 Node* InterpreterAssembler::Advance(int delta) {
-  return raw_assembler_->IntPtrAdd(BytecodePointer(), Int32Constant(delta));
+  return raw_assembler_->IntPtrAdd(BytecodeOffset(), Int32Constant(delta));
 }
 
 
 void InterpreterAssembler::Dispatch() {
-  Node* new_bytecode_pointer = Advance(interpreter::Bytecodes::Size(bytecode_));
-  Node* target_bytecode =
-      raw_assembler_->Load(kMachUint8, new_bytecode_pointer);
+  Node* new_bytecode_offset = Advance(interpreter::Bytecodes::Size(bytecode_));
+  Node* target_bytecode = raw_assembler_->Load(
+      kMachUint8, BytecodeArrayPointer(), new_bytecode_offset);
 
   // TODO(rmcilroy): Create a code target dispatch table to avoid conversion
   // from code object on every dispatch.
   Node* target_code_object = raw_assembler_->Load(
       kMachPtr, DispatchTablePointer(),
       raw_assembler_->Word32Shl(target_bytecode,
                                 Int32Constant(kPointerSizeLog2)));
 
   // If the order of the parameters you need to change the call signature below.
-  STATIC_ASSERT(0 == Linkage::kInterpreterBytecodeParameter);
-  STATIC_ASSERT(1 == Linkage::kInterpreterDispatchTableParameter);
-  Node* tail_call = graph()->NewNode(common()->TailCall(call_descriptor()),
-                                     target_code_object, new_bytecode_pointer,
-                                     DispatchTablePointer(), graph()->start(),
-                                     graph()->start());
+  STATIC_ASSERT(0 == Linkage::kInterpreterBytecodeOffsetParameter);
+  STATIC_ASSERT(1 == Linkage::kInterpreterBytecodeArrayParameter);
+  STATIC_ASSERT(2 == Linkage::kInterpreterDispatchTableParameter);
+  Node* tail_call = graph()->NewNode(
+      common()->TailCall(call_descriptor()), target_code_object,
+      new_bytecode_offset, BytecodeArrayPointer(), DispatchTablePointer(),
+      graph()->start(), graph()->start());
   schedule()->AddTailCall(raw_assembler_->CurrentBlock(), tail_call);
 
   // This should always be the end node.
   SetEndInput(tail_call);
 }
 
 
 void InterpreterAssembler::SetEndInput(Node* input) {
   DCHECK(!end_node_);
   end_node_ = input;
@@ skipping 41 matching lines @@
 
 
 Node* InterpreterAssembler::NumberConstant(double value) {
   return raw_assembler_->NumberConstant(value);
 }
 
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8