summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-11-29 11:22:48 -0800
committerAlon Zakai <alonzakai@gmail.com>2015-11-29 11:22:48 -0800
commit00a1f43f3c6572a8d7d5a4e71f4e4e49f691be9e (patch)
tree47fd9d20c3ae139574c9d6ec1f9920456fc0eb75 /src
parentddb9959668e64b4bc81153407aef679fc352baaa (diff)
downloadbinaryen-00a1f43f3c6572a8d7d5a4e71f4e4e49f691be9e.tar.gz
binaryen-00a1f43f3c6572a8d7d5a4e71f4e4e49f691be9e.tar.bz2
binaryen-00a1f43f3c6572a8d7d5a4e71f4e4e49f691be9e.zip
handle memory in load_s_expr2wasm
Diffstat (limited to 'src')
-rw-r--r--src/wasm-js.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index aa163ba3c..6858659f6 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -98,6 +98,11 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_s_expr2wasm(char *input, char *mappedG
abort();
});
+ module->memory.initial = EM_ASM_INT_V({
+ return Module['providedTotalMemory']; // we receive the size of memory from emscripten
+ });
+ module->memory.max = (module->exportsMap.find(GROW_WASM_MEMORY) != module->exportsMap.end()) ? -1 : module->memory.initial;
+
// global mapping is done in js in post.js
}