aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-01-22 14:35:57 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-01-22 14:35:57 -0800
commitd1521c97f4c189ad3a270010e2b8193147649cfd (patch)
tree77847bbf2939fbbe3ba9b1da179b42ac0e0f1ab6 /src
parent6f3e1629f8a97cbe2aa2ad430df32cc13c616889 (diff)
do not allow adjusting memory size at runtime in asm
Diffstat (limited to 'src')
-rw-r--r--src/preamble.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/preamble.js b/src/preamble.js
index c66146ac..7d600348 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -638,7 +638,11 @@ function enlargeMemory() {
#endif
var TOTAL_STACK = Module['TOTAL_STACK'] || {{{ TOTAL_STACK }}};
+#if ASM_JS == 0
var TOTAL_MEMORY = Module['TOTAL_MEMORY'] || {{{ TOTAL_MEMORY }}};
+#else
+var TOTAL_MEMORY = {{{ TOTAL_MEMORY }}}; // in asm, we hardcode the mask, so cannot adjust memory at runtime
+#endif
var FAST_MEMORY = Module['FAST_MEMORY'] || {{{ FAST_MEMORY }}};
// Initialize the runtime's memory