Index: src/ia32/assembler-ia32-inl.h |
diff --git a/src/ia32/assembler-ia32-inl.h b/src/ia32/assembler-ia32-inl.h |
index 73ec31fae61e699cb7045ea1b04e771320dc6143..10be8b0faa1a87a1264493d84b41763f3a41740e 100644 |
--- a/src/ia32/assembler-ia32-inl.h |
+++ b/src/ia32/assembler-ia32-inl.h |
@@ -86,6 +86,11 @@ Address RelocInfo::wasm_memory_reference() { |
return Memory::Address_at(pc_); |
} |
+int32_t RelocInfo::wasm_memory_size_reference() { |
+ DCHECK(IsWasmMemorySizeReference(rmode_)); |
+ return Memory::int32_at(pc_); |
+} |
+ |
Address RelocInfo::target_address_address() { |
DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_) |
|| rmode_ == EMBEDDED_OBJECT |
@@ -120,15 +125,27 @@ 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); |
- Memory::Address_at(pc_) = updated_reference; |
+ DCHECK(IsWasmMemoryReference(rmode_) || IsWasmMemorySizeReference(rmode_)); |
+ if (IsWasmMemoryReference(rmode_)) { |
+ Address updated_reference; |
+ DCHECK(old_base <= wasm_memory_reference() && |
+ wasm_memory_reference() < old_base + old_size); |
+ updated_reference = new_base + (wasm_memory_reference() - old_base); |
+ DCHECK(new_base <= updated_reference && |
+ updated_reference < new_base + new_size); |
+ Memory::Address_at(pc_) = updated_reference; |
+ } 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); |
+ Memory::int32_at(pc_) = updated_size_reference; |
+ } else { |
+ UNREACHABLE(); |
+ } |
if (icache_flush_mode != SKIP_ICACHE_FLUSH) { |
Assembler::FlushICache(isolate_, pc_, sizeof(int32_t)); |
} |