Complete separation of CodeAssembler and CodeStubAssembler

src/compiler/code-assembler.h

 // 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.
 
 #ifndef V8_COMPILER_CODE_ASSEMBLER_H_
 #define V8_COMPILER_CODE_ASSEMBLER_H_
 
 #include <map>
 
 // Clients of this interface shouldn't depend on lots of compiler internals.
@@ skipping 34 matching lines @@
   V(Float64LessThan)                             \
   V(Float64LessThanOrEqual)                      \
   V(Float64GreaterThan)                          \
   V(Float64GreaterThanOrEqual)                   \
   V(Int32GreaterThan)                            \
   V(Int32GreaterThanOrEqual)                     \
   V(Int32LessThan)                               \
   V(Int32LessThanOrEqual)                        \
   V(IntPtrLessThan)                              \
   V(IntPtrLessThanOrEqual)                       \
+  V(IntPtrEqual)                                 \
   V(Uint32LessThan)                              \
   V(UintPtrGreaterThanOrEqual)                   \
   V(WordEqual)                                   \
   V(WordNotEqual)                                \
   V(Word32Equal)                                 \
   V(Word32NotEqual)                              \
   V(Word64Equal)                                 \
   V(Word64NotEqual)
 
 #define CODE_ASSEMBLER_BINARY_OP_LIST(V)   \
@@ skipping 119 matching lines @@
 
   // Constants.
   Node* Int32Constant(int value);
   Node* IntPtrConstant(intptr_t value);
   Node* NumberConstant(double value);
   Node* SmiConstant(Smi* value);
   Node* HeapConstant(Handle<HeapObject> object);
   Node* BooleanConstant(bool value);
   Node* ExternalConstant(ExternalReference address);
   Node* Float64Constant(double value);
   Node* BooleanMapConstant();

[Benedikt Meurer, 2016/04/18 17:56:24]

Maybe these three helpers should move to CodeStubAssembler too?

   Node* EmptyStringConstant();
   Node* HeapNumberMapConstant();
   Node* NaNConstant();
   Node* NoContextConstant();
   Node* NullConstant();
   Node* UndefinedConstant();
 
   Node* Parameter(int value);
   void Return(Node* value);
 
@@ skipping 10 matching lines @@
   Node* LoadFramePointer();
   Node* LoadParentFramePointer();
 
   // Access to the stack pointer
   Node* LoadStackPointer();
 
   // Load raw memory location.
   Node* Load(MachineType rep, Node* base);
   Node* Load(MachineType rep, Node* base, Node* index);
 
+  // Load a value from the root array.
+  Node* LoadRoot(Heap::RootListIndex root_index);
+
   // Store value to raw memory location.
   Node* Store(MachineRepresentation rep, Node* base, Node* value);
   Node* Store(MachineRepresentation rep, Node* base, Node* index, Node* value);
   Node* StoreNoWriteBarrier(MachineRepresentation rep, Node* base, Node* value);
   Node* StoreNoWriteBarrier(MachineRepresentation rep, Node* base, Node* index,
                             Node* value);
 
 // Basic arithmetic operations.
 #define DECLARE_CODE_ASSEMBLER_BINARY_OP(name) Node* name(Node* a, Node* b);
   CODE_ASSEMBLER_BINARY_OP_LIST(DECLARE_CODE_ASSEMBLER_BINARY_OP)
@@ skipping 57 matching lines @@
 
   Node* TailCallStub(Callable const& callable, Node* context, Node* arg1,
                      Node* arg2, size_t result_size = 1);
   Node* TailCallStub(const CallInterfaceDescriptor& descriptor, Node* target,
                      Node* context, Node* arg1, Node* arg2,
                      size_t result_size = 1);
 
   Node* TailCallBytecodeDispatch(const CallInterfaceDescriptor& descriptor,
                                  Node* code_target_address, Node** args);
 
-  // ===========================================================================
-  // Macros
-  // ===========================================================================
-
-  // Tag a Word as a Smi value.
-  Node* SmiTag(Node* value);
-  // Untag a Smi value as a Word.
-  Node* SmiUntag(Node* value);
-
-  // Load a value from the root array.
-  Node* LoadRoot(Heap::RootListIndex root_index);
-
-  // Allocate an object of the given size.
-  Node* Allocate(int size, AllocationFlags flags = kNone);
-  Node* InnerAllocate(Node* previous, int offset);
-
   // Branching helpers.
   void BranchIf(Node* condition, Label* if_true, Label* if_false);
 
 #define BRANCH_HELPER(name)                                                \
   void BranchIf##name(Node* a, Node* b, Label* if_true, Label* if_false) { \
     BranchIf(name(a, b), if_true, if_false);                               \
   }
   CODE_ASSEMBLER_COMPARE_BINARY_OP_LIST(BRANCH_HELPER)
 #undef BRANCH_HELPER
 
@@ skipping 14 matching lines @@
 
  private:
   friend class CodeAssemblerTester;
 
   CodeAssembler(Isolate* isolate, Zone* zone, CallDescriptor* call_descriptor,
                 Code::Flags flags, const char* name);
 
   Node* CallN(CallDescriptor* descriptor, Node* code_target, Node** args);
   Node* TailCallN(CallDescriptor* descriptor, Node* code_target, Node** args);
 
-  Node* AllocateRawAligned(Node* size_in_bytes, AllocationFlags flags,
-                           Node* top_address, Node* limit_address);
-  Node* AllocateRawUnaligned(Node* size_in_bytes, AllocationFlags flags,
-                             Node* top_adddress, Node* limit_address);
-
   base::SmartPointer<RawMachineAssembler> raw_assembler_;
   Code::Flags flags_;
   const char* name_;
   bool code_generated_;
   ZoneVector<Variable::Impl*> variables_;
 
   DISALLOW_COPY_AND_ASSIGN(CodeAssembler);
 };
 
 DEFINE_OPERATORS_FOR_FLAGS(CodeAssembler::AllocationFlags);
@@ skipping 30 matching lines @@
   // Map of variables to the list of value nodes that have been added from each
   // merge path in their order of merging.
   std::map<Variable::Impl*, std::vector<Node*>> variable_merges_;
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_CODE_ASSEMBLER_H_