[wasm] Separate compilation from instantiation

src/assembler.cc

Index: src/assembler.cc
diff --git a/src/assembler.cc b/src/assembler.cc
index 2332408f167e18d048ea72b2a0874877e5641d13..26212a2ad74c1fd371a98526da8482f9353a2fa2 100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -377,6 +377,55 @@ const int kNonstatementPositionTag = 1;
 const int kStatementPositionTag = 2;
 const int kDeoptReasonTag = 3;
 
+void RelocInfo::update_wasm_memory_reference(
+    Address old_base, Address new_base, uint32_t old_size, uint32_t new_size,
+    ICacheFlushMode icache_flush_mode) {
+  DCHECK(IsWasmMemoryReference(rmode_) || IsWasmMemorySizeReference(rmode_));
+  if (IsWasmMemoryReference(rmode_)) {
+    Address updated_reference;
+    DCHECK(old_size == 0 || (old_base <= wasm_memory_reference() &&
+                             wasm_memory_reference() < old_base + old_size));
+    updated_reference = new_base + (wasm_memory_reference() - old_base);
+    if (!(new_size == 0 || (new_base <= updated_reference &&

[titzer, 2016/06/16 23:12:14]

You can use V8_FATAL for this.

+                            updated_reference < new_base + new_size))) {
+      printf("new_size: %u\n", new_size);
+      printf("old_size: %u\n", old_size);
+      printf("wasm_memory_reference(): %p\n",
+             static_cast<void*>(wasm_memory_reference()));
+      printf("new_base: %p\n", static_cast<void*>(new_base));
+      printf("old_base: %p\n", static_cast<void*>(old_base));
+      printf("updated_reference: %p\n", static_cast<void*>(updated_reference));
+
+      DCHECK(false);
+    }
+    UncheckedUpdateWasmMemoryReference(updated_reference, icache_flush_mode);
+  } else if (IsWasmMemorySizeReference(rmode_)) {
+    uint32_t updated_size_reference;
+    DCHECK(old_size == 0 || wasm_memory_size_reference() <= old_size);
+    updated_size_reference =
+        new_size + (wasm_memory_size_reference() - old_size);
+    DCHECK(updated_size_reference <= new_size);
+    UncheckedUpdateWasmMemorySize(updated_size_reference, icache_flush_mode);
+  } else {
+    UNREACHABLE();
+  }
+  if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
+    Assembler::FlushICache(isolate_, pc_, sizeof(int64_t));
+  }
+}
+
+void RelocInfo::update_wasm_global_reference(
+    Address old_base, Address new_base, ICacheFlushMode icache_flush_mode) {
+  DCHECK(IsWasmGlobalReference(rmode_));
+  Address updated_reference;
+  DCHECK(old_base <= wasm_global_reference());
+  updated_reference = new_base + (wasm_global_reference() - old_base);
+  DCHECK(new_base <= updated_reference);
+  UncheckedUpdateWasmMemoryReference(updated_reference, icache_flush_mode);
+  if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
+    Assembler::FlushICache(isolate_, pc_, sizeof(int32_t));
+  }
+}
 
 uint32_t RelocInfoWriter::WriteLongPCJump(uint32_t pc_delta) {
   // Return if the pc_delta can fit in kSmallPCDeltaBits bits.