From 1de298f63480e5ff006a09a50dc99d635c639b4d Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 5 Nov 2015 09:59:22 -0800 Subject: parsing fixes --- src/wasm-s-parser.h | 4 ++-- src/wasm-shell.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index 9bffbba0a..e1c87c893 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -382,8 +382,8 @@ public: } case 't': { if (op[1] == 'r') { - if (type == i32) return makeConvert(s, op[6] == 's' ? ConvertOp::TruncSFloat32 : ConvertOp::TruncUFloat32, type); - if (type == i64) return makeConvert(s, op[6] == 's' ? ConvertOp::TruncSFloat64 : ConvertOp::TruncUFloat64, type); + if (op[6] == 's') return makeConvert(s, op[9] == '3' ? ConvertOp::TruncSFloat32 : ConvertOp::TruncSFloat64, type); + if (op[6] == 'u') return makeConvert(s, op[9] == '3' ? ConvertOp::TruncUFloat32 : ConvertOp::TruncUFloat64, type); abort(); } abort_on(op); diff --git a/src/wasm-shell.cpp b/src/wasm-shell.cpp index 808ed2ea4..6761e46d8 100644 --- a/src/wasm-shell.cpp +++ b/src/wasm-shell.cpp @@ -168,7 +168,7 @@ int main(int argc, char **argv) { if (curr.size() >= 3) { expected = builder.parseExpression(*curr[2])->dyn_cast()->value; } - std::cerr << "seen " << result << ", expected " << expected << " from " << *curr[2] << '\n'; + std::cerr << "seen " << result << ", expected " << expected << '\n'; assert(expected == result); } if (id == ASSERT_TRAP) assert(trapped); -- cgit v1.2.3