summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-11-01 19:16:37 -0800
committerAlon Zakai <alonzakai@gmail.com>2015-11-01 19:16:37 -0800
commit90304bf9703e768fcdf87914e6117f87beea3f59 (patch)
treee13eb9d6aaf652388ea61b88667306e1ef3c1380
parentc8cbfbeb8d1cc108bbb0f1a7f145a50c06059c0e (diff)
downloadbinaryen-90304bf9703e768fcdf87914e6117f87beea3f59.tar.gz
binaryen-90304bf9703e768fcdf87914e6117f87beea3f59.tar.bz2
binaryen-90304bf9703e768fcdf87914e6117f87beea3f59.zip
tell emcc to leave <1024 for our use
-rwxr-xr-xemcc_to_wasm.js.sh2
-rw-r--r--src/asm2wasm.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/emcc_to_wasm.js.sh b/emcc_to_wasm.js.sh
index ac01b1638..528871746 100755
--- a/emcc_to_wasm.js.sh
+++ b/emcc_to_wasm.js.sh
@@ -3,7 +3,7 @@
set -e
echo "calling emcc"
-emcc -o a.html --separate-asm -profiling -s TOTAL_MEMORY=67108864 $@
+emcc -o a.html --separate-asm -profiling -s TOTAL_MEMORY=67108864 -s GLOBAL_BASE=1024 $@
# we now have a.asm.js and a.js
diff --git a/src/asm2wasm.h b/src/asm2wasm.h
index 6cd951dbb..3aef520c3 100644
--- a/src/asm2wasm.h
+++ b/src/asm2wasm.h
@@ -179,7 +179,7 @@ class Asm2WasmBuilder {
}
public:
- Asm2WasmBuilder(Module& wasm) : wasm(wasm), nextGlobal(8), maxGlobal(1000) {}
+ Asm2WasmBuilder(Module& wasm) : wasm(wasm), nextGlobal(8), maxGlobal(1000) {} // XXX sync with emcc
void processAsm(Ref ast);
void optimize();