Index: src/mips/assembler-mips-inl.h |
diff --git a/src/mips/assembler-mips-inl.h b/src/mips/assembler-mips-inl.h |
index edb70ffa0184527b5cb1fed86f3856c3abae40d8..0103c59abdae8aaaea4dd8509cbc44eec56dc7f2 100644 |
--- a/src/mips/assembler-mips-inl.h |
+++ b/src/mips/assembler-mips-inl.h |
@@ -107,6 +107,11 @@ Address RelocInfo::wasm_memory_reference() { |
return Assembler::target_address_at(pc_, host_); |
} |
+int32_t RelocInfo::wasm_memory_size_reference() { |
+ DCHECK(IsWasmMemorySizeReference(rmode_)); |
+ return reinterpret_cast<int32_t>(Assembler::target_address_at(pc_, host_)); |
+} |
+ |
Address RelocInfo::target_address_address() { |
DCHECK(IsCodeTarget(rmode_) || |
IsRuntimeEntry(rmode_) || |
@@ -157,16 +162,30 @@ void RelocInfo::set_target_address(Address target, |
} |
void RelocInfo::update_wasm_memory_reference( |
- Address old_base, Address new_base, size_t old_size, size_t new_size, |
+ Address old_base, Address new_base, int32_t old_size, int32_t new_size, |
ICacheFlushMode icache_flush_mode) { |
- DCHECK(IsWasmMemoryReference(rmode_)); |
- DCHECK(old_base <= wasm_memory_reference() && |
- wasm_memory_reference() < old_base + old_size); |
- Address updated_reference = new_base + (wasm_memory_reference() - old_base); |
- DCHECK(new_base <= updated_reference && |
- updated_reference < new_base + new_size); |
- Assembler::set_target_address_at(isolate_, pc_, host_, updated_reference, |
- icache_flush_mode); |
+ DCHECK(IsWasmMemoryReference(rmode_) || IsWasmMemorySizeReference(rmode_)); |
+ if (IsWasmMemoryReference(rmode_)) { |
+ Address updated_memory_reference; |
+ DCHECK(old_base <= wasm_memory_reference() && |
+ wasm_memory_reference() < old_base + old_size); |
+ updated_memory_reference = new_base + (wasm_memory_reference() - old_base); |
+ DCHECK(new_base <= updated_memory_reference && |
+ updated_memory_reference < new_base + new_size); |
+ Assembler::set_target_address_at( |
+ isolate_, pc_, host_, updated_memory_reference, icache_flush_mode); |
+ } else if (IsWasmMemorySizeReference(rmode_)) { |
+ int32_t updated_size_reference; |
+ DCHECK(wasm_memory_size_reference() <= old_size); |
+ updated_size_reference = |
+ new_size + (wasm_memory_size_reference() - old_size); |
+ DCHECK(updated_size_reference <= new_size); |
+ Assembler::set_target_address_at( |
+ isolate_, pc_, host_, reinterpret_cast<Address>(updated_size_reference), |
+ icache_flush_mode); |
+ } else { |
+ UNREACHABLE(); |
+ } |
} |
Address Assembler::target_address_from_return_address(Address pc) { |