Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Unified Diff: src/interpreter/interpreter-assembler.h

Issue 1673333004: [Interpreter] Make InterpreterAssembler a subclass of CodeStubAssembler. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Address review comments. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/interpreter/interpreter.cc ('k') | src/interpreter/interpreter-assembler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/interpreter/interpreter-assembler.h
diff --git a/src/compiler/interpreter-assembler.h b/src/interpreter/interpreter-assembler.h
similarity index 41%
rename from src/compiler/interpreter-assembler.h
rename to src/interpreter/interpreter-assembler.h
index f666171d89b21bf40fa278663a211b798043008d..03b62259cfad67b87288f11add540aa2c813c045 100644
--- a/src/compiler/interpreter-assembler.h
+++ b/src/interpreter/interpreter-assembler.h
@@ -2,169 +2,131 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef V8_COMPILER_INTERPRETER_ASSEMBLER_H_
-#define V8_COMPILER_INTERPRETER_ASSEMBLER_H_
+#ifndef V8_INTERPRETER_INTERPRETER_ASSEMBLER_H_
+#define V8_INTERPRETER_INTERPRETER_ASSEMBLER_H_
-// Clients of this interface shouldn't depend on lots of compiler internals.
-// Do not include anything from src/compiler here!
#include "src/allocation.h"
#include "src/base/smart-pointers.h"
#include "src/builtins.h"
+#include "src/compiler/code-stub-assembler.h"
#include "src/frames.h"
#include "src/interpreter/bytecodes.h"
#include "src/runtime/runtime.h"
namespace v8 {
namespace internal {
+namespace interpreter {
-class CallInterfaceDescriptor;
-class Isolate;
-class Zone;
-
-namespace compiler {
-
-class CallDescriptor;
-class Graph;
-class Node;
-class Operator;
-class RawMachineAssembler;
-class Schedule;
-
-class InterpreterAssembler {
+class InterpreterAssembler : public compiler::CodeStubAssembler {
public:
- InterpreterAssembler(Isolate* isolate, Zone* zone,
- interpreter::Bytecode bytecode);
+ InterpreterAssembler(Isolate* isolate, Zone* zone, Bytecode bytecode);
virtual ~InterpreterAssembler();
- Handle<Code> GenerateCode();
-
// Returns the count immediate for bytecode operand |operand_index| in the
// current bytecode.
- Node* BytecodeOperandCount(int operand_index);
+ compiler::Node* BytecodeOperandCount(int operand_index);
// Returns the index immediate for bytecode operand |operand_index| in the
// current bytecode.
- Node* BytecodeOperandIdx(int operand_index);
+ compiler::Node* BytecodeOperandIdx(int operand_index);
// Returns the Imm8 immediate for bytecode operand |operand_index| in the
// current bytecode.
- Node* BytecodeOperandImm(int operand_index);
+ compiler::Node* BytecodeOperandImm(int operand_index);
// Returns the register index for bytecode operand |operand_index| in the
// current bytecode.
- Node* BytecodeOperandReg(int operand_index);
+ compiler::Node* BytecodeOperandReg(int operand_index);
// Accumulator.
- Node* GetAccumulator();
- void SetAccumulator(Node* value);
+ compiler::Node* GetAccumulator();
+ void SetAccumulator(compiler::Node* value);
// Context.
- Node* GetContext();
- void SetContext(Node* value);
+ compiler::Node* GetContext();
+ void SetContext(compiler::Node* value);
// Loads from and stores to the interpreter register file.
- Node* LoadRegister(int offset);
- Node* LoadRegister(interpreter::Register reg);
- Node* LoadRegister(Node* reg_index);
- Node* StoreRegister(Node* value, int offset);
- Node* StoreRegister(Node* value, interpreter::Register reg);
- Node* StoreRegister(Node* value, Node* reg_index);
+ compiler::Node* LoadRegister(int offset);
+ compiler::Node* LoadRegister(Register reg);
+ compiler::Node* LoadRegister(compiler::Node* reg_index);
+ compiler::Node* StoreRegister(compiler::Node* value, int offset);
+ compiler::Node* StoreRegister(compiler::Node* value, Register reg);
+ compiler::Node* StoreRegister(compiler::Node* value,
+ compiler::Node* reg_index);
// Returns the next consecutive register.
- Node* NextRegister(Node* reg_index);
+ compiler::Node* NextRegister(compiler::Node* reg_index);
// Returns the location in memory of the register |reg_index| in the
// interpreter register file.
- Node* RegisterLocation(Node* reg_index);
-
- // Constants.
- Node* Int32Constant(int value);
- Node* IntPtrConstant(intptr_t value);
- Node* NumberConstant(double value);
- Node* HeapConstant(Handle<HeapObject> object);
- Node* BooleanConstant(bool value);
-
- // Tag and untag Smi values.
- Node* SmiTag(Node* value);
- Node* SmiUntag(Node* value);
-
- // Basic arithmetic operations.
- Node* IntPtrAdd(Node* a, Node* b);
- Node* IntPtrSub(Node* a, Node* b);
- Node* Int32Sub(Node* a, Node* b);
- Node* WordShl(Node* value, int shift);
+ compiler::Node* RegisterLocation(compiler::Node* reg_index);
// Load constant at |index| in the constant pool.
- Node* LoadConstantPoolEntry(Node* index);
+ compiler::Node* LoadConstantPoolEntry(compiler::Node* index);
// Load an element from a fixed array on the heap.
- Node* LoadFixedArrayElement(Node* fixed_array, int index);
+ compiler::Node* LoadFixedArrayElement(compiler::Node* fixed_array, int index);
// Load a field from an object on the heap.
- Node* LoadObjectField(Node* object, int offset);
+ compiler::Node* LoadObjectField(compiler::Node* object, int offset);
// Load |slot_index| from |context|.
- Node* LoadContextSlot(Node* context, int slot_index);
- Node* LoadContextSlot(Node* context, Node* slot_index);
+ compiler::Node* LoadContextSlot(compiler::Node* context, int slot_index);
+ compiler::Node* LoadContextSlot(compiler::Node* context,
+ compiler::Node* slot_index);
// Stores |value| into |slot_index| of |context|.
- Node* StoreContextSlot(Node* context, Node* slot_index, Node* value);
+ compiler::Node* StoreContextSlot(compiler::Node* context,
+ compiler::Node* slot_index,
+ compiler::Node* value);
// Load the TypeFeedbackVector for the current function.
- Node* LoadTypeFeedbackVector();
+ compiler::Node* LoadTypeFeedbackVector();
- // Project the output value at index |index|
- Node* Projection(int index, Node* node);
+ // Call JSFunction or Callable |function| with |arg_count|
+ // arguments (not including receiver) and the first argument
+ // located at |first_arg|.
+ compiler::Node* CallJS(compiler::Node* function, compiler::Node* context,
+ compiler::Node* first_arg, compiler::Node* arg_count);
// Call constructor |constructor| with |arg_count| arguments (not
// including receiver) and the first argument located at
// |first_arg|. The |new_target| is the same as the
// |constructor| for the new keyword, but differs for the super
// keyword.
- Node* CallConstruct(Node* new_target, Node* constructor, Node* first_arg,
- Node* arg_count);
+ compiler::Node* CallConstruct(compiler::Node* constructor,
+ compiler::Node* context,
+ compiler::Node* new_target,
+ compiler::Node* first_arg,
+ compiler::Node* arg_count);
- // Call JSFunction or Callable |function| with |arg_count|
- // arguments (not including receiver) and the first argument
+ // Call runtime function with |arg_count| arguments and the first argument
// located at |first_arg|.
- Node* CallJS(Node* function, Node* first_arg, Node* arg_count);
-
- // Call an IC code stub.
- Node* CallIC(CallInterfaceDescriptor descriptor, Node* target, Node* arg1,
- Node* arg2, Node* arg3);
- Node* CallIC(CallInterfaceDescriptor descriptor, Node* target, Node* arg1,
- Node* arg2, Node* arg3, Node* arg4);
- Node* CallIC(CallInterfaceDescriptor descriptor, Node* target, Node* arg1,
- Node* arg2, Node* arg3, Node* arg4, Node* arg5);
-
- // Call runtime function.
- Node* CallRuntime(Node* function_id, Node* first_arg, Node* arg_count,
- int return_size = 1);
- Node* CallRuntime(Runtime::FunctionId function_id);
- Node* CallRuntime(Runtime::FunctionId function_id, Node* arg1);
- Node* CallRuntime(Runtime::FunctionId function_id, Node* arg1, Node* arg2);
- Node* CallRuntime(Runtime::FunctionId function_id, Node* arg1, Node* arg2,
- Node* arg3);
- Node* CallRuntime(Runtime::FunctionId function_id, Node* arg1, Node* arg2,
- Node* arg3, Node* arg4);
+ compiler::Node* CallRuntimeN(compiler::Node* function_id,
+ compiler::Node* context,
+ compiler::Node* first_arg,
+ compiler::Node* arg_count, int return_size = 1);
// Jump relative to the current bytecode by |jump_offset|.
- void Jump(Node* jump_offset);
+ void Jump(compiler::Node* jump_offset);
// Jump relative to the current bytecode by |jump_offset| if the
// |condition| is true. Helper function for JumpIfWordEqual and
// JumpIfWordNotEqual.
- void JumpConditional(Node* condition, Node* jump_offset);
+ void JumpConditional(compiler::Node* condition, compiler::Node* jump_offset);
// Jump relative to the current bytecode by |jump_offset| if the
// word values |lhs| and |rhs| are equal.
- void JumpIfWordEqual(Node* lhs, Node* rhs, Node* jump_offset);
+ void JumpIfWordEqual(compiler::Node* lhs, compiler::Node* rhs,
+ compiler::Node* jump_offset);
// Jump relative to the current bytecode by |jump_offset| if the
// word values |lhs| and |rhs| are not equal.
- void JumpIfWordNotEqual(Node* lhs, Node* rhs, Node* jump_offset);
+ void JumpIfWordNotEqual(compiler::Node* lhs, compiler::Node* rhs,
+ compiler::Node* jump_offset);
// Perform a stack guard check.
void StackCheck();
// Returns from the function.
- void Return();
+ void InterpreterReturn();
// Dispatch to the bytecode.
void Dispatch();
@@ -175,67 +137,56 @@ class InterpreterAssembler {
protected:
static bool TargetSupportsUnalignedAccess();
- // Protected helpers (for testing) which delegate to RawMachineAssembler.
- CallDescriptor* call_descriptor() const;
- Graph* graph();
-
private:
// Returns a raw pointer to start of the register file on the stack.
- Node* RegisterFileRawPointer();
+ compiler::Node* RegisterFileRawPointer();
// Returns a tagged pointer to the current function's BytecodeArray object.
- Node* BytecodeArrayTaggedPointer();
+ compiler::Node* BytecodeArrayTaggedPointer();
// Returns the offset from the BytecodeArrayPointer of the current bytecode.
- Node* BytecodeOffset();
+ compiler::Node* BytecodeOffset();
// Returns a raw pointer to first entry in the interpreter dispatch table.
- Node* DispatchTableRawPointer();
+ compiler::Node* DispatchTableRawPointer();
// Saves and restores interpreter bytecode offset to the interpreter stack
// frame when performing a call.
- void CallPrologue();
+ void CallPrologue() override;
+ void CallEpilogue() override;
// Traces the current bytecode by calling |function_id|.
void TraceBytecode(Runtime::FunctionId function_id);
// Returns the offset of register |index| relative to RegisterFilePointer().
- Node* RegisterFrameOffset(Node* index);
-
- Node* SmiShiftBitsConstant();
- Node* BytecodeOperand(int operand_index);
- Node* BytecodeOperandSignExtended(int operand_index);
- Node* BytecodeOperandShort(int operand_index);
- Node* BytecodeOperandShortSignExtended(int operand_index);
+ compiler::Node* RegisterFrameOffset(compiler::Node* index);
- Node* CallN(CallDescriptor* descriptor, Node* code_target, Node** args);
- Node* CallIC(CallInterfaceDescriptor descriptor, Node* target, Node** args);
+ compiler::Node* BytecodeOperand(int operand_index);
+ compiler::Node* BytecodeOperandSignExtended(int operand_index);
+ compiler::Node* BytecodeOperandShort(int operand_index);
+ compiler::Node* BytecodeOperandShortSignExtended(int operand_index);
// Returns BytecodeOffset() advanced by delta bytecodes. Note: this does not
// update BytecodeOffset() itself.
- Node* Advance(int delta);
- Node* Advance(Node* delta);
+ compiler::Node* Advance(int delta);
+ compiler::Node* Advance(compiler::Node* delta);
// Starts next instruction dispatch at |new_bytecode_offset|.
- void DispatchTo(Node* new_bytecode_offset);
+ void DispatchTo(compiler::Node* new_bytecode_offset);
// Abort operations for debug code.
- void AbortIfWordNotEqual(Node* lhs, Node* rhs, BailoutReason bailout_reason);
-
- // Private helpers which delegate to RawMachineAssembler.
- Isolate* isolate();
- Zone* zone();
-
- interpreter::Bytecode bytecode_;
- base::SmartPointer<RawMachineAssembler> raw_assembler_;
+ void AbortIfWordNotEqual(compiler::Node* lhs, compiler::Node* rhs,
+ BailoutReason bailout_reason);
- Node* accumulator_;
- Node* context_;
+ Bytecode bytecode_;
+ compiler::Node* accumulator_;
+ compiler::Node* context_;
- bool code_generated_;
+ bool disable_stack_check_across_call_;
+ compiler::Node* stack_pointer_before_call_;
DISALLOW_COPY_AND_ASSIGN(InterpreterAssembler);
};
-} // namespace compiler
+} // namespace interpreter
} // namespace internal
} // namespace v8
-#endif // V8_COMPILER_INTERPRETER_ASSEMBLER_H_
+#endif // V8_INTERPRETER_INTERPRETER_ASSEMBLER_H_
« no previous file with comments | « src/interpreter/interpreter.cc ('k') | src/interpreter/interpreter-assembler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698