summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcheck.py2
-rw-r--r--src/wasm-s-parser.h10
2 files changed, 11 insertions, 1 deletions
diff --git a/check.py b/check.py
index 979437346..181b32f68 100755
--- a/check.py
+++ b/check.py
@@ -84,7 +84,7 @@ if len(requested) == 0:
# 'address' : filed issue, test looks invalid
# 'exports', 'int_literals' : has a "return" https://github.com/WebAssembly/spec/issues/164
# 'switch': todo once stable
- spec_tests = [os.path.join('spec', t + '.wast') for t in ['conversions', 'endianness', 'f32_cmp', 'f32', 'f64_cmp', 'f64', 'float_exprs', 'forward', 'func_ptrs', 'functions', 'has_feature', 'i32', 'i64', 'imports', 'int_exprs', 'left-to-right', 'memory_redundancy', 'memory_trap', 'names', 'resizing', 'runaway-recursion']]
+ spec_tests = [os.path.join('spec', t + '.wast') for t in ['conversions', 'endianness', 'f32_cmp', 'f32', 'f64_cmp', 'f64', 'float_exprs', 'forward', 'func_ptrs', 'functions', 'has_feature', 'i32', 'i64', 'imports', 'int_exprs', 'left-to-right', 'memory_redundancy', 'memory_trap', 'names', 'resizing', 'runaway-recursion', 'select']]
else:
spec_tests = requested[:]
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index aa7ef42b9..1ed23b190 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -462,6 +462,7 @@ public:
abort_on(op);
}
case 's': {
+ if (op[1] == 'e') return makeSelect(s, type);
if (op[1] == 'h') {
if (op[2] == 'l') return makeBinary(s, BinaryOp::Shl, type);
return makeBinary(s, op[4] == 'u' ? BinaryOp::ShrU : BinaryOp::ShrS, type);
@@ -580,6 +581,15 @@ private:
return ret;
}
+ Expression* makeSelect(Element& s, WasmType type) {
+ auto ret = allocator.alloc<Select>();
+ ret->condition = parseExpression(s[1]);
+ ret->ifTrue = parseExpression(s[2]);
+ ret->ifFalse = parseExpression(s[3]);
+ ret->type = type;
+ return ret;
+ }
+
Expression* makeHost(Element& s, HostOp op) {
auto ret = allocator.alloc<Host>();
ret->op = op;