summaryrefslogtreecommitdiff
path: root/src/wasm-js.cpp
diff options
context:
space:
mode:
authorDan Gohman <sunfish@mozilla.com>2016-05-13 11:20:28 -0700
committerAlon Zakai <alonzakai@gmail.com>2016-05-13 11:20:28 -0700
commit348565b6a9a823c0fee30c96d8d783810d540a78 (patch)
treeabb41a1a8220d5631003fa3b0b72a1060f09bd62 /src/wasm-js.cpp
parent4a720eca42c463d53db1c81f9957a3e5d9011836 (diff)
downloadbinaryen-348565b6a9a823c0fee30c96d8d783810d540a78.tar.gz
binaryen-348565b6a9a823c0fee30c96d8d783810d540a78.tar.bz2
binaryen-348565b6a9a823c0fee30c96d8d783810d540a78.zip
Fix the maximum memory size to be valid. (#492)
Diffstat (limited to 'src/wasm-js.cpp')
-rw-r--r--src/wasm-js.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index 6626f46e1..80eaaa720 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -76,7 +76,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm2wasm(char *input) {
exit(EXIT_FAILURE);
}
module->memory.initial = providedMemory / Memory::kPageSize;
- module->memory.max = pre.memoryGrowth ? -1 : module->memory.initial;
+ module->memory.max = pre.memoryGrowth ? Memory::kMaxSize : module->memory.initial;
if (wasmJSDebug) std::cerr << "wasming...\n";
asm2wasm = new Asm2WasmBuilder(*module, pre.memoryGrowth, debug, false /* TODO: support imprecise? */);
@@ -110,7 +110,7 @@ void finalizeModule() {
exit(EXIT_FAILURE);
}
module->memory.initial = providedMemory / Memory::kPageSize;
- module->memory.max = module->checkExport(GROW_WASM_MEMORY) ? -1 : module->memory.initial;
+ module->memory.max = module->checkExport(GROW_WASM_MEMORY) ? Memory::kMaxSize : module->memory.initial;
// global mapping is done in js in post.js
}