From d984d25273c512b0a2de9f60fadbf26500a7abbd Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Wed, 30 Mar 2016 16:34:49 -0700 Subject: fix wasm.js loads of aligned i64s --- src/wasm-js.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp index ab6f02d16..151803db1 100644 --- a/src/wasm-js.cpp +++ b/src/wasm-js.cpp @@ -286,6 +286,10 @@ extern "C" void EMSCRIPTEN_KEEPALIVE instantiate() { } else { ret = EM_ASM_INT({ return Module['info'].parent['HEAPU32'][$0 >> 2] }, addr); } + } else if (load->bytes == 8) { + uint32_t low = EM_ASM_INT({ return Module['info'].parent['HEAP32'][$0 >> 2] }, addr); + uint32_t high = EM_ASM_INT({ return Module['info'].parent['HEAP32'][$0 >> 2] }, addr + 4); + return Literal(int64_t(low) | (int64_t(high) << 32)); } else abort(); return load->type == i32 ? Literal(ret) : Literal(int64_t(ret)); } else { -- cgit v1.2.3