diff options
| author | JF Bastien <jfb@chromium.org> | 2016-01-13 10:48:44 -0800 |
|---|---|---|
| committer | JF Bastien <jfb@chromium.org> | 2016-01-13 10:48:44 -0800 |
| commit | 80d0b8eb31b1bb15ecd2245ef6ad57ca4d3a2575 (patch) | |
| tree | d6dc07b081ed5c7e3a44bf1827c9b7d285d1a456 /src/wasm-js.cpp | |
| parent | 2a0404579a2c061a965e2ac032801e250ab7f2bc (diff) | |
| parent | 3da40ef949ddfac78df2db33e6b35e14f54cb78c (diff) | |
| download | binaryen-80d0b8eb31b1bb15ecd2245ef6ad57ca4d3a2575.tar.gz binaryen-80d0b8eb31b1bb15ecd2245ef6ad57ca4d3a2575.tar.bz2 binaryen-80d0b8eb31b1bb15ecd2245ef6ad57ca4d3a2575.zip | |
Merge branch 'master' of github.com:WebAssembly/binaryen
Diffstat (limited to 'src/wasm-js.cpp')
| -rw-r--r-- | src/wasm-js.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp index 760f00c46..b767b8a25 100644 --- a/src/wasm-js.cpp +++ b/src/wasm-js.cpp @@ -72,7 +72,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm2wasm(char *input) { module->memory.max = pre.memoryGrowth ? -1 : module->memory.initial; if (wasmJSDebug) std::cerr << "wasming...\n"; - asm2wasm = new Asm2WasmBuilder(*module, pre.memoryGrowth); + asm2wasm = new Asm2WasmBuilder(*module, pre.memoryGrowth, debug); asm2wasm->processAsm(asmjs); if (wasmJSDebug) std::cerr << "optimizing...\n"; @@ -190,7 +190,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() { if (wasmJSDebug) std::cout << "calling import returning " << ret << '\n'; - switch (import->type.result) { + switch (import->type->result) { case none: return Literal(0); case i32: return Literal((int32_t)ret); case f32: return Literal((float)ret); |