From d98de7569efadb1c654cd53c6404f40b15ad7ae7 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Sat, 28 Nov 2015 14:08:55 -0800 Subject: when using native wasm support, we need to merge the written data with the mem init that wasm provides --- src/js/post.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/js') diff --git a/src/js/post.js b/src/js/post.js index 72cd836ba..e64774c3c 100644 --- a/src/js/post.js +++ b/src/js/post.js @@ -22,7 +22,9 @@ function integrateWasmJS(Module) { var oldBuffer = Module['buffer']; var newBuffer = instance.memory; assert(newBuffer.byteLength >= oldBuffer.byteLength, 'we might fail if we allocated more than TOTAL_MEMORY'); - (new Int8Array(newBuffer)).set(new Int8Array(oldBuffer)); + // the wasm module does write out the memory initialization, in range STATIC_BASE..STATIC_BUMP, so avoid that + (new Int8Array(newBuffer).subarray(0, STATIC_BASE)).set(new Int8Array(oldBuffer).subarray(0, STATIC_BASE)); + (new Int8Array(newBuffer).subarray(STATIC_BASE + STATIC_BUMP)).set(new Int8Array(oldBuffer).subarray(STATIC_BASE + STATIC_BUMP)); updateGlobalBuffer(newBuffer); updateGlobalBufferViews(); Module['reallocBuffer'] = function(size) { -- cgit v1.2.3