diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2016-03-30 15:34:57 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2016-03-30 15:55:29 -0700 |
| commit | 292269159ceab5d2443d6931b9cc6f0163665a65 (patch) | |
| tree | 5857c69e8e933de02c29a1f26b25718ed1c7ab6b /src/wasm-js.cpp | |
| parent | cb71620e64a267bb39412b3b578379835feb64b2 (diff) | |
| download | binaryen-292269159ceab5d2443d6931b9cc6f0163665a65.tar.gz binaryen-292269159ceab5d2443d6931b9cc6f0163665a65.tar.bz2 binaryen-292269159ceab5d2443d6931b9cc6f0163665a65.zip | |
fix wasm.js loads of i64 that read <8 bytes
Diffstat (limited to 'src/wasm-js.cpp')
| -rw-r--r-- | src/wasm-js.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp index d978e4a2a..ab6f02d16 100644 --- a/src/wasm-js.cpp +++ b/src/wasm-js.cpp @@ -267,26 +267,27 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() { } // nicely aligned if (!isWasmTypeFloat(load->type)) { + int32_t ret; if (load->bytes == 1) { if (load->signed_) { - return Literal(EM_ASM_INT({ return Module['info'].parent['HEAP8'][$0] }, addr)); + ret = EM_ASM_INT({ return Module['info'].parent['HEAP8'][$0] }, addr); } else { - return Literal(EM_ASM_INT({ return Module['info'].parent['HEAPU8'][$0] }, addr)); + ret = EM_ASM_INT({ return Module['info'].parent['HEAPU8'][$0] }, addr); } } else if (load->bytes == 2) { if (load->signed_) { - return Literal(EM_ASM_INT({ return Module['info'].parent['HEAP16'][$0 >> 1] }, addr)); + ret = EM_ASM_INT({ return Module['info'].parent['HEAP16'][$0 >> 1] }, addr); } else { - return Literal(EM_ASM_INT({ return Module['info'].parent['HEAPU16'][$0 >> 1] }, addr)); + ret = EM_ASM_INT({ return Module['info'].parent['HEAPU16'][$0 >> 1] }, addr); } } else if (load->bytes == 4) { if (load->signed_) { - return Literal(EM_ASM_INT({ return Module['info'].parent['HEAP32'][$0 >> 2] }, addr)); + ret = EM_ASM_INT({ return Module['info'].parent['HEAP32'][$0 >> 2] }, addr); } else { - return Literal(EM_ASM_INT({ return Module['info'].parent['HEAPU32'][$0 >> 2] }, addr)); + ret = EM_ASM_INT({ return Module['info'].parent['HEAPU32'][$0 >> 2] }, addr); } - } - abort(); + } else abort(); + return load->type == i32 ? Literal(ret) : Literal(int64_t(ret)); } else { if (load->bytes == 4) { return Literal((float)EM_ASM_DOUBLE({ return Module['info'].parent['HEAPF32'][$0 >> 2] }, addr)); |