summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-12-06 17:55:15 -0800
committerAlon Zakai <alonzakai@gmail.com>2015-12-06 17:56:19 -0800
commit095de9bebfff3e609cfeddd57248a0b6f74b5663 (patch)
tree3f2a59f4e8351d9dfe89f28a1cda6e7738988369 /src
parent52c8004d2b5c7bbd059ee36089e5724498933fc5 (diff)
downloadbinaryen-095de9bebfff3e609cfeddd57248a0b6f74b5663.tar.gz
binaryen-095de9bebfff3e609cfeddd57248a0b6f74b5663.tar.bz2
binaryen-095de9bebfff3e609cfeddd57248a0b6f74b5663.zip
coerce loads in wasm2asm
Diffstat (limited to 'src')
-rw-r--r--src/wasm2asm.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/wasm2asm.h b/src/wasm2asm.h
index 415c904c7..f0bc201a0 100644
--- a/src/wasm2asm.h
+++ b/src/wasm2asm.h
@@ -680,19 +680,22 @@ Ref Wasm2AsmBuilder::processFunctionBody(Expression* curr, IString result) {
// normal load
assert(curr->bytes == curr->align); // TODO: unaligned, i64
Ref ptr = visit(curr->ptr, EXPRESSION_RESULT);
+ Ref ret;
switch (curr->type) {
case i32: {
switch (curr->bytes) {
- case 1: return ValueBuilder::makeSub(ValueBuilder::makeName(curr->signed_ ? HEAP8 : HEAPU8 ), ValueBuilder::makePtrShift(ptr, 0));
- case 2: return ValueBuilder::makeSub(ValueBuilder::makeName(curr->signed_ ? HEAP16 : HEAPU16), ValueBuilder::makePtrShift(ptr, 1));
- case 4: return ValueBuilder::makeSub(ValueBuilder::makeName(curr->signed_ ? HEAP32 : HEAPU32), ValueBuilder::makePtrShift(ptr, 2));
+ case 1: ret = ValueBuilder::makeSub(ValueBuilder::makeName(curr->signed_ ? HEAP8 : HEAPU8 ), ValueBuilder::makePtrShift(ptr, 0)); break;
+ case 2: ret = ValueBuilder::makeSub(ValueBuilder::makeName(curr->signed_ ? HEAP16 : HEAPU16), ValueBuilder::makePtrShift(ptr, 1)); break;
+ case 4: ret = ValueBuilder::makeSub(ValueBuilder::makeName(curr->signed_ ? HEAP32 : HEAPU32), ValueBuilder::makePtrShift(ptr, 2)); break;
default: abort();
}
+ break;
}
- case f32: return ValueBuilder::makeSub(ValueBuilder::makeName(HEAPF32), ValueBuilder::makePtrShift(ptr, 2));
- case f64: return ValueBuilder::makeSub(ValueBuilder::makeName(HEAPF64), ValueBuilder::makePtrShift(ptr, 3));
+ case f32: ret = ValueBuilder::makeSub(ValueBuilder::makeName(HEAPF32), ValueBuilder::makePtrShift(ptr, 2)); break;
+ case f64: ret = ValueBuilder::makeSub(ValueBuilder::makeName(HEAPF64), ValueBuilder::makePtrShift(ptr, 3)); break;
default: abort();
}
+ return makeAsmCoercion(ret, wasmToAsmType(curr->type));
}
Ref visitStore(Store *curr) override {
if (isStatement(curr)) {