Index: src/mips64/assembler-mips64.h |
diff --git a/src/mips64/assembler-mips64.h b/src/mips64/assembler-mips64.h |
index f0f54aab1c509c122af24fe5ff51ece66abcb862..da2163ed50dc82e36fd2f83f1e4774586d3abda7 100644 |
--- a/src/mips64/assembler-mips64.h |
+++ b/src/mips64/assembler-mips64.h |
@@ -442,30 +442,28 @@ class Assembler : public AssemblerBase { |
// Read/Modify the code target address in the branch/call instruction at pc. |
static Address target_address_at(Address pc); |
- static void set_target_address_at(Address pc, |
- Address target, |
- ICacheFlushMode icache_flush_mode = |
- FLUSH_ICACHE_IF_NEEDED); |
+ static void set_target_address_at( |
+ Isolate* isolate, Address pc, Address target, |
+ ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED); |
// On MIPS there is no Constant Pool so we skip that parameter. |
INLINE(static Address target_address_at(Address pc, Address constant_pool)) { |
return target_address_at(pc); |
} |
INLINE(static void set_target_address_at( |
- Address pc, Address constant_pool, Address target, |
+ Isolate* isolate, Address pc, Address constant_pool, Address target, |
ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED)) { |
- set_target_address_at(pc, target, icache_flush_mode); |
+ set_target_address_at(isolate, pc, target, icache_flush_mode); |
} |
INLINE(static Address target_address_at(Address pc, Code* code)) { |
Address constant_pool = code ? code->constant_pool() : NULL; |
return target_address_at(pc, constant_pool); |
} |
- INLINE(static void set_target_address_at(Address pc, |
- Code* code, |
- Address target, |
- ICacheFlushMode icache_flush_mode = |
- FLUSH_ICACHE_IF_NEEDED)) { |
+ INLINE(static void set_target_address_at( |
+ Isolate* isolate, Address pc, Code* code, Address target, |
+ ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED)) { |
Address constant_pool = code ? code->constant_pool() : NULL; |
- set_target_address_at(pc, constant_pool, target, icache_flush_mode); |
+ set_target_address_at(isolate, pc, constant_pool, target, |
+ icache_flush_mode); |
} |
// Return the code target address at a call site from the return address |
@@ -480,16 +478,17 @@ class Assembler : public AssemblerBase { |
// This is for calls and branches within generated code. The serializer |
// has already deserialized the lui/ori instructions etc. |
inline static void deserialization_set_special_target_at( |
- Address instruction_payload, Code* code, Address target) { |
+ Isolate* isolate, Address instruction_payload, Code* code, |
+ Address target) { |
set_target_address_at( |
- instruction_payload - kInstructionsFor64BitConstant * kInstrSize, |
- code, |
+ isolate, |
+ instruction_payload - kInstructionsFor64BitConstant * kInstrSize, code, |
target); |
} |
// This sets the internal reference at the pc. |
inline static void deserialization_set_target_internal_reference_at( |
- Address pc, Address target, |
+ Isolate* isolate, Address pc, Address target, |
RelocInfo::Mode mode = RelocInfo::INTERNAL_REFERENCE); |
// Size of an instruction. |