summaryrefslogtreecommitdiff
path: root/src/wasm-js.cpp
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-02-08 13:33:34 -0800
committerAlon Zakai <alonzakai@gmail.com>2016-02-08 13:33:34 -0800
commit2262204746437423211930d83d8ea336be3efac2 (patch)
tree7d85bb4d6ab8531abc074d3a5043fb00963fdb9e /src/wasm-js.cpp
parent271504de91e3f396251041f94c0f29094af92207 (diff)
parent28ac77ff3f5668d543a6c7a99f3e1b1dceff6201 (diff)
downloadbinaryen-2262204746437423211930d83d8ea336be3efac2.tar.gz
binaryen-2262204746437423211930d83d8ea336be3efac2.tar.bz2
binaryen-2262204746437423211930d83d8ea336be3efac2.zip
Merge pull request #189 from WebAssembly/br_if-changes
br_if updates
Diffstat (limited to 'src/wasm-js.cpp')
-rw-r--r--src/wasm-js.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index 067e3fdea..82a74d2ab 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -311,8 +311,8 @@ extern "C" void EMSCRIPTEN_KEEPALIVE call_from_js(const char *target) {
if (wasmJSDebug) std::cout << "call_from_js returning " << ret << '\n';
if (ret.type == none) EM_ASM({ Module['tempReturn'] = undefined });
- else if (ret.type == i32) EM_ASM_({ Module['tempReturn'] = $0 }, ret.i32);
- else if (ret.type == f32) EM_ASM_({ Module['tempReturn'] = $0 }, ret.f32);
- else if (ret.type == f64) EM_ASM_({ Module['tempReturn'] = $0 }, ret.f64);
+ else if (ret.type == i32) EM_ASM_({ Module['tempReturn'] = $0 }, ret.geti32());
+ else if (ret.type == f32) EM_ASM_({ Module['tempReturn'] = $0 }, ret.getf32());
+ else if (ret.type == f64) EM_ASM_({ Module['tempReturn'] = $0 }, ret.getf64());
else abort();
}