| Index: src/ia32/assembler-ia32-inl.h
|
| diff --git a/src/ia32/assembler-ia32-inl.h b/src/ia32/assembler-ia32-inl.h
|
| index 4ad8ec6d2a468434464f33cb7c785ebf3a1745e9..cd09e928df49702c33199770d8f32fd995b72537 100644
|
| --- a/src/ia32/assembler-ia32-inl.h
|
| +++ b/src/ia32/assembler-ia32-inl.h
|
| @@ -81,6 +81,10 @@ Address RelocInfo::target_address() {
|
| return Assembler::target_address_at(pc_, host_);
|
| }
|
|
|
| +Address RelocInfo::wasm_memory_reference() {
|
| + DCHECK(IsWasmMemoryReference(rmode_));
|
| + return Memory::Address_at(pc_);
|
| +}
|
|
|
| Address RelocInfo::target_address_address() {
|
| DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)
|
| @@ -115,6 +119,20 @@ 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,
|
| + 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;
|
| + if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
|
| + Assembler::FlushICache(isolate_, pc_, sizeof(int32_t));
|
| + }
|
| +}
|
|
|
| Object* RelocInfo::target_object() {
|
| DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
|
| @@ -321,6 +339,10 @@ Immediate::Immediate(int x) {
|
| rmode_ = RelocInfo::NONE32;
|
| }
|
|
|
| +Immediate::Immediate(Address x, RelocInfo::Mode rmode) {
|
| + x_ = reinterpret_cast<int32_t>(x);
|
| + rmode_ = rmode;
|
| +}
|
|
|
| Immediate::Immediate(const ExternalReference& ext) {
|
| x_ = reinterpret_cast<int32_t>(ext.address());
|
|
|