Disentangle assembler from isolate.

src/arm64/instructions-arm64.h

 // Copyright 2013 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_ARM64_INSTRUCTIONS_ARM64_H_
 #define V8_ARM64_INSTRUCTIONS_ARM64_H_
 
 #include "src/arm64/constants-arm64.h"
 #include "src/arm64/utils-arm64.h"
+#include "src/assembler.h"
 #include "src/globals.h"
 #include "src/utils.h"
 
 namespace v8 {
 namespace internal {
 
-
 // ISA constants. --------------------------------------------------------------
 
 typedef uint32_t Instr;
 
 // The following macros initialize a float/double variable with a bit pattern
 // without using static initializers: If ARM64_DEFINE_FP_STATICS is defined, the
 // symbol is defined as uint32_t/uint64_t initialized with the desired bit
 // pattern. Otherwise, the same symbol is declared as an external float/double.
 #if defined(ARM64_DEFINE_FP_STATICS)
 #define DEFINE_FLOAT(name, value) extern const uint32_t name = value
@@ skipping 339 matching lines @@
   int64_t ImmPCOffset();
 
   // Find the target of this instruction. 'this' may be a branch or a
   // PC-relative addressing instruction.
   Instruction* ImmPCOffsetTarget();
 
   static bool IsValidImmPCOffset(ImmBranchType branch_type, ptrdiff_t offset);
   bool IsTargetInImmPCOffsetRange(Instruction* target);
   // Patch a PC-relative offset to refer to 'target'. 'this' may be a branch or
   // a PC-relative addressing instruction.
-  void SetImmPCOffsetTarget(Isolate* isolate, Instruction* target);
-  void SetUnresolvedInternalReferenceImmTarget(Isolate* isolate,
+  void SetImmPCOffsetTarget(AssemblerBase::IsolateData isolate_data,
+                            Instruction* target);
+  void SetUnresolvedInternalReferenceImmTarget(AssemblerBase::IsolateData,
                                                Instruction* target);
   // Patch a literal load instruction to load from 'source'.
   void SetImmLLiteral(Instruction* source);
 
   uintptr_t LiteralAddress() {
     int offset = ImmLLiteral() << kLoadLiteralScaleLog2;
     return reinterpret_cast<uintptr_t>(this) + offset;
   }
 
   enum CheckAlignment { NO_CHECK, CHECK_ALIGNMENT };
@@ skipping 16 matching lines @@
     return reinterpret_cast<Instruction*>(src);
   }
 
   V8_INLINE ptrdiff_t DistanceTo(Instruction* target) {
     return reinterpret_cast<Address>(target) - reinterpret_cast<Address>(this);
   }
 
 
   static const int ImmPCRelRangeBitwidth = 21;
   static bool IsValidPCRelOffset(ptrdiff_t offset) { return is_int21(offset); }
-  void SetPCRelImmTarget(Isolate* isolate, Instruction* target);
+  void SetPCRelImmTarget(AssemblerBase::IsolateData isolate_data,
+                         Instruction* target);
   void SetBranchImmTarget(Instruction* target);
 };
 
 
 // Where Instruction looks at instructions generated by the Assembler,
 // InstructionSequence looks at instructions sequences generated by the
 // MacroAssembler.
 class InstructionSequence : public Instruction {
  public:
   static InstructionSequence* At(Address address) {
@@ skipping 106 matching lines @@
   TRACE_DISABLE  = 2 << 6,
   TRACE_OVERRIDE = 3 << 6
 };
 
 
 }  // namespace internal
 }  // namespace v8
 
 
 #endif  // V8_ARM64_INSTRUCTIONS_ARM64_H_