update wasm.js

WebAssembly · Feb 3, 2017 · 3e75a78 · 3e75a78
1 parent 7d800b2
commit 3e75a78
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/bin/wasm.js b/bin/wasm.js
diff --git a/build-js.sh b/build-js.sh
@@ -61,9 +61,13 @@ echo "building wasm.js"
 "$EMSCRIPTEN/em++" \
   $EMCC_ARGS \
   src/wasm-js.cpp \
+  src/ast/ExpressionAnalyzer.cpp \
+  src/ast/ExpressionManipulator.cpp \
   src/passes/pass.cpp \
+  src/passes/DeadCodeElimination.cpp \
   src/passes/Print.cpp \
   src/passes/LegalizeJSInterface.cpp \
+  src/passes/Vacuum.cpp \
   src/emscripten-optimizer/parser.cpp \
   src/emscripten-optimizer/simple_ast.cpp \
   src/emscripten-optimizer/optimizer-shared.cpp \

diff --git a/src/mixed_arena.h b/src/mixed_arena.h
@@ -19,6 +19,7 @@
 
 #include <atomic>
 #include <cassert>
+#include <cstdlib>
 #include <memory>
 #include <mutex>
 #include <thread>

diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
@@ -59,6 +59,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm2wasm(char *input) {
   prepare2wasm();
 
   Asm2WasmPreProcessor pre;
+  pre.debugInfo = true; // FIXME: we must do this, as the input asm.js might have debug info
   input = pre.process(input);
 
   // proceed to parse and wasmify
@@ -79,7 +80,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm2wasm(char *input) {
   module->memory.max = pre.memoryGrowth ? Address(Memory::kMaxSize) : module->memory.initial;
 
   if (wasmJSDebug) std::cerr << "wasming...\n";
-  asm2wasm = new Asm2WasmBuilder(*module, pre.memoryGrowth, debug, false /* TODO: support imprecise? */, PassOptions(), false /* TODO: support optimizing? */, false /* TODO: support asm2wasm-i64? */);
+  asm2wasm = new Asm2WasmBuilder(*module, pre, debug, false /* TODO: support imprecise? */, PassOptions(), false /* TODO: support optimizing? */, false /* TODO: support asm2wasm-i64? */);
   asm2wasm->processAsm(asmjs);
 }