Update SIMD support (#1553)

* Update testsuite

* Update test results

* Disallow lane nums with optional + for simd ops

* Update simd support

* Mark `test/spec/func.txt` as failing

Co-authored-by: Darin Morrison <darinmorrison@users.noreply.github.com>

15 files changed, 1210 insertions, 850 deletions

diff --git a/test/spec/func.txt b/test/spec/bad-func.txt
index 841379e3..f8d10300 100644
--- a/test/spec/func.txt
+++ b/test/spec/bad-func.txt
@@ -1,243 +1,245 @@
 ;;; TOOL: run-interp-spec
 ;;; STDIN_FILE: third_party/testsuite/func.wast
+;;; ERROR: 1
 (;; STDOUT ;;;
 out/test/spec/func.wast:436: assert_invalid passed:
   0000000: error: function type variable out of range: 2 (max 2)
   000001a: error: OnFunction callback failed
-out/test/spec/func.wast:520: assert_malformed passed:
-  out/test/spec/func/func.4.wat:1:76: error: unexpected token "param", expected an instr.
+out/test/spec/func.wast:448: expected module to be malformed: "out/test/spec/func/func.3.wat"
+out/test/spec/func.wast:560: assert_malformed passed:
+  out/test/spec/func/func.6.wat:1:76: error: unexpected token "param", expected an instr.
   ... i32) (result i32)))(func (type $sig) (result i32) (param i32) (i32.const 0))
                                                          ^^^^^
-out/test/spec/func.wast:527: assert_malformed passed:
-  out/test/spec/func/func.5.wat:1:63: error: unexpected token "type", expected an instr.
+out/test/spec/func.wast:567: assert_malformed passed:
+  out/test/spec/func/func.7.wat:1:63: error: unexpected token "type", expected an instr.
   ... i32) (result i32)))(func (param i32) (type $sig) (result i32) (i32.const 0))
                                             ^^^^
-out/test/spec/func.wast:534: assert_malformed passed:
-  out/test/spec/func/func.6.wat:1:76: error: unexpected token "type", expected an instr.
+out/test/spec/func.wast:574: assert_malformed passed:
+  out/test/spec/func/func.8.wat:1:76: error: unexpected token "type", expected an instr.
   ... i32) (result i32)))(func (param i32) (result i32) (type $sig) (i32.const 0))
                                                          ^^^^
-out/test/spec/func.wast:541: assert_malformed passed:
-  out/test/spec/func/func.7.wat:1:64: error: unexpected token "type", expected an instr.
+out/test/spec/func.wast:581: assert_malformed passed:
+  out/test/spec/func/func.9.wat:1:64: error: unexpected token "type", expected an instr.
   ... i32) (result i32)))(func (result i32) (type $sig) (param i32) (i32.const 0))
                                              ^^^^
-out/test/spec/func.wast:548: assert_malformed passed:
-  out/test/spec/func/func.8.wat:1:64: error: unexpected token "param", expected an instr.
+out/test/spec/func.wast:588: assert_malformed passed:
+  out/test/spec/func/func.10.wat:1:64: error: unexpected token "param", expected an instr.
   ... i32) (result i32)))(func (result i32) (param i32) (type $sig) (i32.const 0))
                                              ^^^^^
-  out/test/spec/func/func.8.wat:1:85: error: unexpected token ), expected (.
+  out/test/spec/func/func.10.wat:1:85: error: unexpected token ), expected (.
   ... i32) (result i32)))(func (result i32) (param i32) (type $sig) (i32.const 0))
                                                                   ^
-out/test/spec/func.wast:555: assert_malformed passed:
-  out/test/spec/func/func.9.wat:1:21: error: unexpected token "param", expected an instr.
+out/test/spec/func.wast:595: assert_malformed passed:
+  out/test/spec/func/func.11.wat:1:21: error: unexpected token "param", expected an instr.
   (func (result i32) (param i32) (i32.const 0))
                       ^^^^^
-out/test/spec/func.wast:562: assert_malformed passed:
-  out/test/spec/func/func.10.wat:1:20: error: expected 0 results, got 1
+out/test/spec/func.wast:602: assert_malformed passed:
+  out/test/spec/func/func.12.wat:1:20: error: expected 0 results, got 1
   (type $sig (func))(func (type $sig) (result i32) (i32.const 0))
                      ^^^^
-out/test/spec/func.wast:569: assert_malformed passed:
-  out/test/spec/func/func.11.wat:1:45: error: expected 1 arguments, got 0
+out/test/spec/func.wast:609: assert_malformed passed:
+  out/test/spec/func/func.13.wat:1:45: error: expected 1 arguments, got 0
   ...g (func (param i32) (result i32)))(func (type $sig) (result i32) (i32.cons...
                                         ^^^^
-out/test/spec/func.wast:576: assert_malformed passed:
-  out/test/spec/func/func.12.wat:1:45: error: expected 1 results, got 0
+out/test/spec/func.wast:616: assert_malformed passed:
+  out/test/spec/func/func.14.wat:1:45: error: expected 1 results, got 0
   ...g (func (param i32) (result i32)))(func (type $sig) (param i32) (i32.const...
                                         ^^^^
-out/test/spec/func.wast:583: assert_malformed passed:
-  out/test/spec/func/func.13.wat:1:49: error: expected 2 arguments, got 1
+out/test/spec/func.wast:623: assert_malformed passed:
+  out/test/spec/func/func.15.wat:1:49: error: expected 2 arguments, got 1
   ...unc (param i32 i32) (result i32)))(func (type $sig) (param i32) (result i3...
                                         ^^^^
-out/test/spec/func.wast:594: assert_invalid passed:
+out/test/spec/func.wast:634: assert_invalid passed:
   error: type mismatch in implicit return, expected [i64] but got [i32]
   000001d: error: EndFunctionBody callback failed
-out/test/spec/func.wast:598: assert_invalid passed:
+out/test/spec/func.wast:638: assert_invalid passed:
   error: type mismatch in i32.eqz, expected [i32] but got [f32]
   000001c: error: OnConvertExpr callback failed
-out/test/spec/func.wast:602: assert_invalid passed:
+out/test/spec/func.wast:642: assert_invalid passed:
   error: type mismatch in f64.neg, expected [f64] but got [i64]
   000001e: error: OnUnaryExpr callback failed
-out/test/spec/func.wast:610: assert_invalid passed:
+out/test/spec/func.wast:650: assert_invalid passed:
   error: type mismatch in implicit return, expected [i64] but got [i32]
   000001c: error: EndFunctionBody callback failed
-out/test/spec/func.wast:614: assert_invalid passed:
+out/test/spec/func.wast:654: assert_invalid passed:
   error: type mismatch in i32.eqz, expected [i32] but got [f32]
   000001b: error: OnConvertExpr callback failed
-out/test/spec/func.wast:618: assert_invalid passed:
+out/test/spec/func.wast:658: assert_invalid passed:
   error: type mismatch in f64.neg, expected [f64] but got [i64]
   000001c: error: OnUnaryExpr callback failed
-out/test/spec/func.wast:626: assert_invalid passed:
+out/test/spec/func.wast:666: assert_invalid passed:
   error: type mismatch in implicit return, expected [i32] but got []
   0000019: error: EndFunctionBody callback failed
-out/test/spec/func.wast:630: assert_invalid passed:
+out/test/spec/func.wast:670: assert_invalid passed:
   error: type mismatch in implicit return, expected [i64] but got []
   0000019: error: EndFunctionBody callback failed
-out/test/spec/func.wast:634: assert_invalid passed:
+out/test/spec/func.wast:674: assert_invalid passed:
   error: type mismatch in implicit return, expected [f32] but got []
   0000019: error: EndFunctionBody callback failed
-out/test/spec/func.wast:638: assert_invalid passed:
+out/test/spec/func.wast:678: assert_invalid passed:
   error: type mismatch in implicit return, expected [f64] but got []
   0000019: error: EndFunctionBody callback failed
-out/test/spec/func.wast:642: assert_invalid passed:
+out/test/spec/func.wast:682: assert_invalid passed:
   error: type mismatch in implicit return, expected [f64, i32] but got []
   000001a: error: EndFunctionBody callback failed
-out/test/spec/func.wast:647: assert_invalid passed:
+out/test/spec/func.wast:687: assert_invalid passed:
   error: type mismatch in implicit return, expected [i32] but got []
   000001a: error: EndFunctionBody callback failed
-out/test/spec/func.wast:653: assert_invalid passed:
+out/test/spec/func.wast:693: assert_invalid passed:
   error: type mismatch in implicit return, expected [i32, i32] but got []
   000001b: error: EndFunctionBody callback failed
-out/test/spec/func.wast:659: assert_invalid passed:
+out/test/spec/func.wast:699: assert_invalid passed:
   error: type mismatch in function, expected [] but got [i32]
   000001a: error: EndFunctionBody callback failed
-out/test/spec/func.wast:665: assert_invalid passed:
+out/test/spec/func.wast:705: assert_invalid passed:
   error: type mismatch in function, expected [] but got [i32, i64]
   000001c: error: EndFunctionBody callback failed
-out/test/spec/func.wast:671: assert_invalid passed:
+out/test/spec/func.wast:711: assert_invalid passed:
   error: type mismatch in implicit return, expected [i32] but got [f32]
   000001e: error: EndFunctionBody callback failed
-out/test/spec/func.wast:677: assert_invalid passed:
+out/test/spec/func.wast:717: assert_invalid passed:
   error: type mismatch in implicit return, expected [f32, f32] but got [f32]
   000001f: error: EndFunctionBody callback failed
-out/test/spec/func.wast:683: assert_invalid passed:
+out/test/spec/func.wast:723: assert_invalid passed:
   error: type mismatch in function, expected [] but got [f32]
   0000023: error: EndFunctionBody callback failed
-out/test/spec/func.wast:690: assert_invalid passed:
+out/test/spec/func.wast:730: assert_invalid passed:
   error: type mismatch in return, expected [i32] but got []
   0000019: error: OnReturnExpr callback failed
-out/test/spec/func.wast:696: assert_invalid passed:
+out/test/spec/func.wast:736: assert_invalid passed:
   error: type mismatch in return, expected [i32, i32] but got []
   000001a: error: OnReturnExpr callback failed
-out/test/spec/func.wast:702: assert_invalid passed:
+out/test/spec/func.wast:742: assert_invalid passed:
   error: type mismatch in return, expected [i32] but got []
   000001a: error: OnReturnExpr callback failed
-out/test/spec/func.wast:708: assert_invalid passed:
+out/test/spec/func.wast:748: assert_invalid passed:
   error: type mismatch in return, expected [i32, i64] but got []
   000001b: error: OnReturnExpr callback failed
-out/test/spec/func.wast:714: assert_invalid passed:
+out/test/spec/func.wast:754: assert_invalid passed:
   error: type mismatch in return, expected [i32] but got [i64]
   000001b: error: OnReturnExpr callback failed
-out/test/spec/func.wast:720: assert_invalid passed:
+out/test/spec/func.wast:760: assert_invalid passed:
   error: type mismatch in return, expected [i64, i64] but got [i64]
   000001c: error: OnReturnExpr callback failed
-out/test/spec/func.wast:727: assert_invalid passed:
+out/test/spec/func.wast:767: assert_invalid passed:
   error: type mismatch in return, expected [i32] but got []
   0000019: error: OnReturnExpr callback failed
-out/test/spec/func.wast:733: assert_invalid passed:
+out/test/spec/func.wast:773: assert_invalid passed:
   error: type mismatch in return, expected [i32, i32] but got []
   000001a: error: OnReturnExpr callback failed
-out/test/spec/func.wast:739: assert_invalid passed:
+out/test/spec/func.wast:779: assert_invalid passed:
   error: type mismatch in return, expected [i32, i32] but got [i32]
   000001c: error: OnReturnExpr callback failed
-out/test/spec/func.wast:745: assert_invalid passed:
+out/test/spec/func.wast:785: assert_invalid passed:
   error: type mismatch in return, expected [i32] but got []
   000001a: error: OnReturnExpr callback failed
-out/test/spec/func.wast:751: assert_invalid passed:
+out/test/spec/func.wast:791: assert_invalid passed:
   error: type mismatch in return, expected [i32, i32] but got []
   000001b: error: OnReturnExpr callback failed
-out/test/spec/func.wast:757: assert_invalid passed:
+out/test/spec/func.wast:797: assert_invalid passed:
   error: type mismatch in return, expected [i32] but got [i64]
   000001b: error: OnReturnExpr callback failed
-out/test/spec/func.wast:763: assert_invalid passed:
+out/test/spec/func.wast:803: assert_invalid passed:
   error: type mismatch in return, expected [i32, i32] but got [i64]
   000001c: error: OnReturnExpr callback failed
-out/test/spec/func.wast:769: assert_invalid passed:
+out/test/spec/func.wast:809: assert_invalid passed:
   error: type mismatch in return, expected [i32] but got [i64]
   000001b: error: OnReturnExpr callback failed
-out/test/spec/func.wast:775: assert_invalid passed:
+out/test/spec/func.wast:815: assert_invalid passed:
   error: type mismatch in return, expected [i32, i32] but got [i32]
   000001c: error: OnReturnExpr callback failed
-out/test/spec/func.wast:782: assert_invalid passed:
+out/test/spec/func.wast:822: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got []
   000001a: error: OnBrExpr callback failed
-out/test/spec/func.wast:788: assert_invalid passed:
+out/test/spec/func.wast:828: assert_invalid passed:
   error: type mismatch in br, expected [i32, i32] but got []
   000001b: error: OnBrExpr callback failed
-out/test/spec/func.wast:794: assert_invalid passed:
+out/test/spec/func.wast:834: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got [f32]
   000001f: error: OnBrExpr callback failed
-out/test/spec/func.wast:800: assert_invalid passed:
+out/test/spec/func.wast:840: assert_invalid passed:
   error: type mismatch in br, expected [i32, i32] but got [i32]
   000001d: error: OnBrExpr callback failed
-out/test/spec/func.wast:806: assert_invalid passed:
+out/test/spec/func.wast:846: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got []
   000001a: error: OnBrExpr callback failed
-out/test/spec/func.wast:812: assert_invalid passed:
+out/test/spec/func.wast:852: assert_invalid passed:
   error: type mismatch in br, expected [i32, i32] but got []
   000001b: error: OnBrExpr callback failed
-out/test/spec/func.wast:818: assert_invalid passed:
+out/test/spec/func.wast:858: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got [i64]
   000001c: error: OnBrExpr callback failed
-out/test/spec/func.wast:824: assert_invalid passed:
+out/test/spec/func.wast:864: assert_invalid passed:
   error: type mismatch in br, expected [i32, i32] but got [i32]
   000001d: error: OnBrExpr callback failed
-out/test/spec/func.wast:830: assert_invalid passed:
+out/test/spec/func.wast:870: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got [i64]
   000001c: error: OnBrExpr callback failed
-out/test/spec/func.wast:837: assert_invalid passed:
+out/test/spec/func.wast:877: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got []
   000001c: error: OnBrExpr callback failed
-out/test/spec/func.wast:843: assert_invalid passed:
+out/test/spec/func.wast:883: assert_invalid passed:
   error: type mismatch in br, expected [i32, i32] but got []
   000001d: error: OnBrExpr callback failed
-out/test/spec/func.wast:849: assert_invalid passed:
+out/test/spec/func.wast:889: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got []
   000001d: error: OnBrExpr callback failed
-out/test/spec/func.wast:855: assert_invalid passed:
+out/test/spec/func.wast:895: assert_invalid passed:
   error: type mismatch in br, expected [i32, i32] but got []
   000001e: error: OnBrExpr callback failed
-out/test/spec/func.wast:861: assert_invalid passed:
+out/test/spec/func.wast:901: assert_invalid passed:
   error: type mismatch in br, expected [i32] but got [i64]
   000001e: error: OnBrExpr callback failed
-out/test/spec/func.wast:867: assert_invalid passed:
+out/test/spec/func.wast:907: assert_invalid passed:
   error: type mismatch in br, expected [i32, i32] but got [i32]
   000001f: error: OnBrExpr callback failed
-out/test/spec/func.wast:877: assert_malformed passed:
-  out/test/spec/func/func.62.wat:1:14: error: unexpected token "local", expected an instr.
+out/test/spec/func.wast:917: assert_malformed passed:
+  out/test/spec/func/func.64.wat:1:14: error: unexpected token "local", expected an instr.
   (func (nop) (local i32))
                ^^^^^
-out/test/spec/func.wast:881: assert_malformed passed:
-  out/test/spec/func/func.63.wat:1:14: error: unexpected token "param", expected an instr.
+out/test/spec/func.wast:921: assert_malformed passed:
+  out/test/spec/func/func.65.wat:1:14: error: unexpected token "param", expected an instr.
   (func (nop) (param i32))
                ^^^^^
-out/test/spec/func.wast:885: assert_malformed passed:
-  out/test/spec/func/func.64.wat:1:14: error: unexpected token "result", expected an instr.
+out/test/spec/func.wast:925: assert_malformed passed:
+  out/test/spec/func/func.66.wat:1:14: error: unexpected token "result", expected an instr.
   (func (nop) (result i32))
                ^^^^^^
-out/test/spec/func.wast:889: assert_malformed passed:
-  out/test/spec/func/func.65.wat:1:20: error: unexpected token "param", expected an instr.
+out/test/spec/func.wast:929: assert_malformed passed:
+  out/test/spec/func/func.67.wat:1:20: error: unexpected token "param", expected an instr.
   (func (local i32) (param i32))
                      ^^^^^
-out/test/spec/func.wast:893: assert_malformed passed:
-  out/test/spec/func/func.66.wat:1:20: error: unexpected token "result", expected an instr.
+out/test/spec/func.wast:933: assert_malformed passed:
+  out/test/spec/func/func.68.wat:1:20: error: unexpected token "result", expected an instr.
   (func (local i32) (result i32) (local.get 0))
                      ^^^^^^
-out/test/spec/func.wast:897: assert_malformed passed:
-  out/test/spec/func/func.67.wat:1:21: error: unexpected token "param", expected an instr.
+out/test/spec/func.wast:937: assert_malformed passed:
+  out/test/spec/func/func.69.wat:1:21: error: unexpected token "param", expected an instr.
   (func (result i32) (param i32) (local.get 0))
                       ^^^^^
-out/test/spec/func.wast:903: assert_malformed passed:
-  out/test/spec/func/func.68.wat:1:13: error: redefinition of function "$foo"
+out/test/spec/func.wast:943: assert_malformed passed:
+  out/test/spec/func/func.70.wat:1:13: error: redefinition of function "$foo"
   (func $foo)(func $foo)
               ^^^^
-out/test/spec/func.wast:907: assert_malformed passed:
-  out/test/spec/func/func.69.wat:1:28: error: redefinition of function "$foo"
+out/test/spec/func.wast:947: assert_malformed passed:
+  out/test/spec/func/func.71.wat:1:28: error: redefinition of function "$foo"
   (import "" "" (func $foo))(func $foo)
                              ^^^^
-out/test/spec/func.wast:911: assert_malformed passed:
-  out/test/spec/func/func.70.wat:1:28: error: redefinition of function "$foo"
+out/test/spec/func.wast:951: assert_malformed passed:
+  out/test/spec/func/func.72.wat:1:28: error: redefinition of function "$foo"
   (import "" "" (func $foo))(import "" "" (func $foo))
                              ^^^^^^
-out/test/spec/func.wast:916: assert_malformed passed:
-  out/test/spec/func/func.71.wat:1:31: error: redefinition of parameter "$foo"
+out/test/spec/func.wast:956: assert_malformed passed:
+  out/test/spec/func/func.73.wat:1:31: error: redefinition of parameter "$foo"
   (func (param $foo i32) (param $foo i32))
                                 ^^^^
-out/test/spec/func.wast:918: assert_malformed passed:
-  out/test/spec/func/func.72.wat:1:31: error: redefinition of parameter "$foo"
+out/test/spec/func.wast:958: assert_malformed passed:
+  out/test/spec/func/func.74.wat:1:31: error: redefinition of parameter "$foo"
   (func (param $foo i32) (local $foo i32))
                                 ^^^^
-out/test/spec/func.wast:920: assert_malformed passed:
-  out/test/spec/func/func.73.wat:1:31: error: redefinition of local "$foo"
+out/test/spec/func.wast:960: assert_malformed passed:
+  out/test/spec/func/func.75.wat:1:31: error: redefinition of local "$foo"
   (func (local $foo i32) (local $foo i32))
                                 ^^^^
-164/164 tests passed.
+167/168 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/binary-leb128.txt b/test/spec/binary-leb128.txt
index 00fd0c3b..2246ea34 100644
--- a/test/spec/binary-leb128.txt
+++ b/test/spec/binary-leb128.txt
@@ -113,5 +113,7 @@ out/test/spec/binary-leb128.wast:945: assert_malformed passed:
   000000e: error: unable to read i64 leb128: init_expr i64.const value
 out/test/spec/binary-leb128.wast:955: assert_malformed passed:
   000000e: error: unable to read i64 leb128: init_expr i64.const value
-56/56 tests passed.
+out/test/spec/binary-leb128.wast:987: assert_malformed passed:
+  0000019: error: unable to read u32 leb128: opcode
+57/57 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/binary.txt b/test/spec/binary.txt
index 629c719b..4ecfc351 100644
--- a/test/spec/binary.txt
+++ b/test/spec/binary.txt
@@ -57,82 +57,118 @@ out/test/spec/binary.wast:44: assert_malformed passed:
   0000008: error: bad wasm file version: 0x10000 (expected 0x1)
 out/test/spec/binary.wast:45: assert_malformed passed:
   0000008: error: bad wasm file version: 0x1000000 (expected 0x1)
+out/test/spec/binary.wast:48: assert_malformed passed:
+  000000a: error: invalid section code: 12
+out/test/spec/binary.wast:49: assert_malformed passed:
+  000000a: error: invalid section code: 127
 out/test/spec/binary.wast:50: assert_malformed passed:
+  000000a: error: invalid section code: 128
+out/test/spec/binary.wast:51: assert_malformed passed:
+  000000a: error: invalid section code: 129
+out/test/spec/binary.wast:52: assert_malformed passed:
+  000000a: error: invalid section code: 255
+out/test/spec/binary.wast:57: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/binary.wast:69: assert_malformed passed:
+out/test/spec/binary.wast:76: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/binary.wast:88: assert_malformed passed:
+out/test/spec/binary.wast:95: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/binary.wast:106: assert_malformed passed:
+out/test/spec/binary.wast:113: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/binary.wast:124: assert_malformed passed:
+out/test/spec/binary.wast:131: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/binary.wast:143: assert_malformed passed:
+out/test/spec/binary.wast:150: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/binary.wast:163: assert_malformed passed:
+out/test/spec/binary.wast:170: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/binary.wast:183: assert_malformed passed:
+out/test/spec/binary.wast:190: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/binary.wast:202: assert_malformed passed:
+out/test/spec/binary.wast:209: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/binary.wast:221: assert_malformed passed:
+out/test/spec/binary.wast:228: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/binary.wast:241: assert_malformed passed:
+out/test/spec/binary.wast:248: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/binary.wast:260: assert_malformed passed:
+out/test/spec/binary.wast:267: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/binary.wast:279: assert_malformed passed:
+out/test/spec/binary.wast:286: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/binary.wast:297: assert_malformed passed:
+out/test/spec/binary.wast:304: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/binary.wast:315: assert_malformed passed:
+out/test/spec/binary.wast:322: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/binary.wast:334: assert_malformed passed:
+out/test/spec/binary.wast:341: assert_malformed passed:
   000001c: error: local count must be < 0x10000000
-out/test/spec/binary.wast:366: assert_malformed passed:
+out/test/spec/binary.wast:373: assert_malformed passed:
   0000013: error: function signature count != function body count
-out/test/spec/binary.wast:376: assert_malformed passed:
+out/test/spec/binary.wast:383: assert_malformed passed:
   000000b: error: function signature count != function body count
-out/test/spec/binary.wast:385: assert_malformed passed:
+out/test/spec/binary.wast:392: assert_malformed passed:
   0000016: error: function signature count != function body count
-out/test/spec/binary.wast:396: assert_malformed passed:
+out/test/spec/binary.wast:403: assert_malformed passed:
   0000015: error: function signature count != function body count
-out/test/spec/binary.wast:425: assert_malformed passed:
+out/test/spec/binary.wast:432: assert_malformed passed:
   000000a: error: invalid section size: extends past end
-out/test/spec/binary.wast:436: assert_malformed passed:
+out/test/spec/binary.wast:443: assert_malformed passed:
   000000e: error: unfinished section (expected end: 0x11)
-out/test/spec/binary.wast:455: assert_malformed passed:
+out/test/spec/binary.wast:462: assert_malformed passed:
+  000000e: error: invalid import event kind: exceptions not allowed
+out/test/spec/binary.wast:472: assert_malformed passed:
+  000000e: error: invalid import event kind: exceptions not allowed
+out/test/spec/binary.wast:483: assert_malformed passed:
+  000000e: error: malformed import kind: 5
+out/test/spec/binary.wast:493: assert_malformed passed:
+  000000e: error: malformed import kind: 5
+out/test/spec/binary.wast:504: assert_malformed passed:
+  000000e: error: malformed import kind: 128
+out/test/spec/binary.wast:514: assert_malformed passed:
+  000000e: error: malformed import kind: 128
+out/test/spec/binary.wast:527: assert_malformed passed:
   0000027: error: unable to read u32 leb128: string length
-out/test/spec/binary.wast:474: assert_malformed passed:
+out/test/spec/binary.wast:546: assert_malformed passed:
   000002b: error: unfinished section (expected end: 0x40)
-out/test/spec/binary.wast:505: assert_malformed passed:
+out/test/spec/binary.wast:577: assert_malformed passed:
   000000b: error: invalid table count 1, only 0 bytes left in section
-out/test/spec/binary.wast:521: assert_malformed passed:
+out/test/spec/binary.wast:587: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 112
+out/test/spec/binary.wast:596: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 112
+out/test/spec/binary.wast:606: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 112
+out/test/spec/binary.wast:624: assert_malformed passed:
   000000b: error: invalid memory count 1, only 0 bytes left in section
-out/test/spec/binary.wast:537: assert_malformed passed:
+out/test/spec/binary.wast:634: assert_malformed passed:
+  000000c: error: memory may not be shared: threads not allowed
+out/test/spec/binary.wast:642: assert_malformed passed:
+  000000c: error: memory may not be shared: threads not allowed
+out/test/spec/binary.wast:651: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 129
+out/test/spec/binary.wast:660: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 129
+out/test/spec/binary.wast:677: assert_malformed passed:
   0000010: error: unable to read i32 leb128: global type
-out/test/spec/binary.wast:548: assert_malformed passed:
+out/test/spec/binary.wast:688: assert_malformed passed:
   0000010: error: unfinished section (expected end: 0x15)
-out/test/spec/binary.wast:571: assert_malformed passed:
+out/test/spec/binary.wast:711: assert_malformed passed:
   000001b: error: unable to read u32 leb128: string length
-out/test/spec/binary.wast:592: assert_malformed passed:
+out/test/spec/binary.wast:732: assert_malformed passed:
   000001b: error: unfinished section (expected end: 0x20)
-out/test/spec/binary.wast:626: assert_malformed passed:
+out/test/spec/binary.wast:766: assert_malformed passed:
   0000021: error: unable to read u32 leb128: elem segment flags
-out/test/spec/binary.wast:644: assert_malformed passed:
+out/test/spec/binary.wast:784: assert_malformed passed:
   0000021: error: unfinished section (expected end: 0x27)
-out/test/spec/binary.wast:670: assert_malformed passed:
+out/test/spec/binary.wast:810: assert_malformed passed:
   0000016: error: unable to read u32 leb128: data segment flags
-out/test/spec/binary.wast:683: assert_malformed passed:
+out/test/spec/binary.wast:823: assert_malformed passed:
   0000016: error: unfinished section (expected end: 0x1c)
-out/test/spec/binary.wast:696: assert_malformed passed:
+out/test/spec/binary.wast:836: assert_malformed passed:
   0000015: error: unable to read data: data segment data
-out/test/spec/binary.wast:710: assert_malformed passed:
+out/test/spec/binary.wast:850: assert_malformed passed:
   000001a: error: unfinished section (expected end: 0x1b)
-out/test/spec/binary.wast:741: assert_malformed passed:
+out/test/spec/binary.wast:881: assert_malformed passed:
   error: function type variable out of range: 11 (max 1)
   0000025: error: OnBlockExpr callback failed
-out/test/spec/binary.wast:776: assert_malformed passed:
+out/test/spec/binary.wast:916: assert_malformed passed:
   0000017: error: multiple Start sections
-66/66 tests passed.
+84/84 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/bulk-memory-operations/binary.txt b/test/spec/bulk-memory-operations/binary.txt
index fe18ce7e..8435472f 100644
--- a/test/spec/bulk-memory-operations/binary.txt
+++ b/test/spec/bulk-memory-operations/binary.txt
@@ -58,125 +58,131 @@ out/test/spec/bulk-memory-operations/binary.wast:44: assert_malformed passed:
   0000008: error: bad wasm file version: 0x10000 (expected 0x1)
 out/test/spec/bulk-memory-operations/binary.wast:45: assert_malformed passed:
   0000008: error: bad wasm file version: 0x1000000 (expected 0x1)
-out/test/spec/bulk-memory-operations/binary.wast:140: assert_malformed passed:
-  000000c: error: unable to read u32 leb128: memory initial page count
-out/test/spec/bulk-memory-operations/binary.wast:150: assert_malformed passed:
-  000000e: error: unable to read i32 leb128: init_expr i32.const value
-out/test/spec/bulk-memory-operations/binary.wast:160: assert_malformed passed:
-  000000e: error: unable to read i32 leb128: init_expr i32.const value
-out/test/spec/bulk-memory-operations/binary.wast:171: assert_malformed passed:
-  000000e: error: unable to read i64 leb128: init_expr i64.const value
-out/test/spec/bulk-memory-operations/binary.wast:181: assert_malformed passed:
-  000000e: error: unable to read i64 leb128: init_expr i64.const value
-out/test/spec/bulk-memory-operations/binary.wast:193: assert_malformed passed:
-  000000c: error: unable to read u32 leb128: memory initial page count
-out/test/spec/bulk-memory-operations/binary.wast:201: assert_malformed passed:
-  000000c: error: unable to read u32 leb128: memory initial page count
-out/test/spec/bulk-memory-operations/binary.wast:211: assert_malformed passed:
-  000000e: error: unable to read i32 leb128: init_expr i32.const value
-out/test/spec/bulk-memory-operations/binary.wast:221: assert_malformed passed:
-  000000e: error: unable to read i32 leb128: init_expr i32.const value
-out/test/spec/bulk-memory-operations/binary.wast:231: assert_malformed passed:
-  000000e: error: unable to read i32 leb128: init_expr i32.const value
-out/test/spec/bulk-memory-operations/binary.wast:241: assert_malformed passed:
-  000000e: error: unable to read i32 leb128: init_expr i32.const value
-out/test/spec/bulk-memory-operations/binary.wast:252: assert_malformed passed:
-  000000e: error: unable to read i64 leb128: init_expr i64.const value
-out/test/spec/bulk-memory-operations/binary.wast:262: assert_malformed passed:
-  000000e: error: unable to read i64 leb128: init_expr i64.const value
-out/test/spec/bulk-memory-operations/binary.wast:272: assert_malformed passed:
-  000000e: error: unable to read i64 leb128: init_expr i64.const value
-out/test/spec/bulk-memory-operations/binary.wast:282: assert_malformed passed:
-  000000e: error: unable to read i64 leb128: init_expr i64.const value
-out/test/spec/bulk-memory-operations/binary.wast:295: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:48: assert_malformed passed:
+  000000a: error: invalid section code: 13
+out/test/spec/bulk-memory-operations/binary.wast:49: assert_malformed passed:
+  000000a: error: invalid section code: 127
+out/test/spec/bulk-memory-operations/binary.wast:50: assert_malformed passed:
+  000000a: error: invalid section code: 128
+out/test/spec/bulk-memory-operations/binary.wast:51: assert_malformed passed:
+  000000a: error: invalid section code: 129
+out/test/spec/bulk-memory-operations/binary.wast:52: assert_malformed passed:
+  000000a: error: invalid section code: 255
+out/test/spec/bulk-memory-operations/binary.wast:56: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:314: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:75: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:333: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:94: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:351: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:112: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:369: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:130: assert_malformed passed:
   0000022: error: call_indirect reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:388: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:149: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:408: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:169: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:428: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:189: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:447: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:208: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:466: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:227: assert_malformed passed:
   0000020: error: memory.grow reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:486: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:247: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:505: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:266: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:524: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:285: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:542: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:303: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:560: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:321: assert_malformed passed:
   000001e: error: memory.size reserved value must be 0
-out/test/spec/bulk-memory-operations/binary.wast:579: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:340: assert_malformed passed:
   000001c: error: local count must be < 0x10000000
-out/test/spec/bulk-memory-operations/binary.wast:611: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:372: assert_malformed passed:
   0000013: error: function signature count != function body count
-out/test/spec/bulk-memory-operations/binary.wast:621: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:382: assert_malformed passed:
   000000b: error: function signature count != function body count
-out/test/spec/bulk-memory-operations/binary.wast:630: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:391: assert_malformed passed:
   0000016: error: function signature count != function body count
-out/test/spec/bulk-memory-operations/binary.wast:641: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:402: assert_malformed passed:
   0000015: error: function signature count != function body count
-out/test/spec/bulk-memory-operations/binary.wast:664: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:425: assert_malformed passed:
   000000e: error: data segment count does not equal count in DataCount section
-out/test/spec/bulk-memory-operations/binary.wast:674: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:435: assert_malformed passed:
   000000e: error: data segment count does not equal count in DataCount section
-out/test/spec/bulk-memory-operations/binary.wast:684: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:445: assert_malformed passed:
   0000024: error: memory.init requires data count section
-out/test/spec/bulk-memory-operations/binary.wast:706: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:467: assert_malformed passed:
   000001e: error: data.drop requires data count section
-out/test/spec/bulk-memory-operations/binary.wast:725: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:486: assert_malformed passed:
   0000024: error: expected ref.null or ref.func in passive element segment
   0000025: error: expected END opcode after element expression
-out/test/spec/bulk-memory-operations/binary.wast:751: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:512: assert_malformed passed:
   0000022: error: table elem type must be a reference type
-out/test/spec/bulk-memory-operations/binary.wast:832: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:593: assert_malformed passed:
   000000a: error: invalid section size: extends past end
-out/test/spec/bulk-memory-operations/binary.wast:843: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:604: assert_malformed passed:
   000000e: error: unfinished section (expected end: 0x11)
-out/test/spec/bulk-memory-operations/binary.wast:862: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:623: assert_malformed passed:
+  000000e: error: invalid import event kind: exceptions not allowed
+out/test/spec/bulk-memory-operations/binary.wast:633: assert_malformed passed:
+  000000e: error: invalid import event kind: exceptions not allowed
+out/test/spec/bulk-memory-operations/binary.wast:644: assert_malformed passed:
+  000000e: error: malformed import kind: 5
+out/test/spec/bulk-memory-operations/binary.wast:654: assert_malformed passed:
+  000000e: error: malformed import kind: 5
+out/test/spec/bulk-memory-operations/binary.wast:665: assert_malformed passed:
+  000000e: error: malformed import kind: 128
+out/test/spec/bulk-memory-operations/binary.wast:675: assert_malformed passed:
+  000000e: error: malformed import kind: 128
+out/test/spec/bulk-memory-operations/binary.wast:688: assert_malformed passed:
   0000027: error: unable to read u32 leb128: string length
-out/test/spec/bulk-memory-operations/binary.wast:881: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:707: assert_malformed passed:
   000002b: error: unfinished section (expected end: 0x40)
-out/test/spec/bulk-memory-operations/binary.wast:912: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:738: assert_malformed passed:
   000000b: error: invalid table count 1, only 0 bytes left in section
-out/test/spec/bulk-memory-operations/binary.wast:928: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:748: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 112
+out/test/spec/bulk-memory-operations/binary.wast:757: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 112
+out/test/spec/bulk-memory-operations/binary.wast:767: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 112
+out/test/spec/bulk-memory-operations/binary.wast:785: assert_malformed passed:
   000000b: error: invalid memory count 1, only 0 bytes left in section
-out/test/spec/bulk-memory-operations/binary.wast:944: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:795: assert_malformed passed:
+  000000c: error: memory may not be shared: threads not allowed
+out/test/spec/bulk-memory-operations/binary.wast:803: assert_malformed passed:
+  000000c: error: memory may not be shared: threads not allowed
+out/test/spec/bulk-memory-operations/binary.wast:812: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 129
+out/test/spec/bulk-memory-operations/binary.wast:821: assert_malformed passed:
+  000000c: error: malformed memory limits flag: 129
+out/test/spec/bulk-memory-operations/binary.wast:838: assert_malformed passed:
   0000010: error: unable to read i32 leb128: global type
-out/test/spec/bulk-memory-operations/binary.wast:955: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:849: assert_malformed passed:
   0000010: error: unfinished section (expected end: 0x15)
-out/test/spec/bulk-memory-operations/binary.wast:978: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:872: assert_malformed passed:
   000001b: error: unable to read u32 leb128: string length
-out/test/spec/bulk-memory-operations/binary.wast:999: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:893: assert_malformed passed:
   000001b: error: unfinished section (expected end: 0x20)
-out/test/spec/bulk-memory-operations/binary.wast:1033: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:927: assert_malformed passed:
   0000021: error: unable to read u32 leb128: elem segment flags
-out/test/spec/bulk-memory-operations/binary.wast:1051: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:945: assert_malformed passed:
   0000021: error: unfinished section (expected end: 0x27)
-out/test/spec/bulk-memory-operations/binary.wast:1077: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:971: assert_malformed passed:
   0000016: error: unable to read u32 leb128: data segment flags
-out/test/spec/bulk-memory-operations/binary.wast:1090: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:984: assert_malformed passed:
   0000016: error: unfinished section (expected end: 0x1c)
-out/test/spec/bulk-memory-operations/binary.wast:1103: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:997: assert_malformed passed:
   0000015: error: unable to read data: data segment data
-out/test/spec/bulk-memory-operations/binary.wast:1117: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:1011: assert_malformed passed:
   000001a: error: unfinished section (expected end: 0x1b)
-out/test/spec/bulk-memory-operations/binary.wast:1148: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:1042: assert_malformed passed:
   error: function type variable out of range: 11 (max 1)
   0000025: error: OnBlockExpr callback failed
-out/test/spec/bulk-memory-operations/binary.wast:1183: assert_malformed passed:
+out/test/spec/bulk-memory-operations/binary.wast:1077: assert_malformed passed:
   0000017: error: multiple Start sections
-87/87 tests passed.
+90/90 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_align.txt b/test/spec/simd/simd_align.txt
index 0ccd62ef..55f62832 100644
--- a/test/spec/simd/simd_align.txt
+++ b/test/spec/simd/simd_align.txt
@@ -69,146 +69,146 @@ out/test/spec/simd/simd_align.wast:135: assert_malformed passed:
   (memory 0) (func (v128.store align=7 (i32.const 0) (v128.const i32x4 0 0 0 0)))
                                ^^^^^^^
 out/test/spec/simd/simd_align.wast:141: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.62.wat:1:49: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (i16x8.load8x8_s align=-1 (i32.const 0)))
-                                                  ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.62.wat:1:72: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (i16x8.load8x8_s align=-1 (i32.const 0)))
-                                                                         ^
+  out/test/spec/simd/simd_align/simd_align.62.wat:1:48: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load8x8_s align=-1 (i32.const 0)))
+                                                 ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.62.wat:1:71: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load8x8_s align=-1 (i32.const 0)))
+                                                                        ^
 out/test/spec/simd/simd_align.wast:147: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.63.wat:1:49: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i16x8.load8x8_s align=0 (i32.const 0)))
-                                                  ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.63.wat:1:48: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load8x8_s align=0 (i32.const 0)))
+                                                 ^^^^^^^
 out/test/spec/simd/simd_align.wast:153: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.64.wat:1:49: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i16x8.load8x8_s align=7 (i32.const 0)))
-                                                  ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.64.wat:1:48: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load8x8_s align=7 (i32.const 0)))
+                                                 ^^^^^^^
 out/test/spec/simd/simd_align.wast:159: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.65.wat:1:49: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (i16x8.load8x8_u align=-1 (i32.const 0)))
-                                                  ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.65.wat:1:72: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (i16x8.load8x8_u align=-1 (i32.const 0)))
-                                                                         ^
+  out/test/spec/simd/simd_align/simd_align.65.wat:1:48: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load8x8_u align=-1 (i32.const 0)))
+                                                 ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.65.wat:1:71: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load8x8_u align=-1 (i32.const 0)))
+                                                                        ^
 out/test/spec/simd/simd_align.wast:165: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.66.wat:1:49: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i16x8.load8x8_u align=0 (i32.const 0)))
-                                                  ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.66.wat:1:48: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load8x8_u align=0 (i32.const 0)))
+                                                 ^^^^^^^
 out/test/spec/simd/simd_align.wast:171: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.67.wat:1:49: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i16x8.load8x8_u align=7 (i32.const 0)))
-                                                  ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.67.wat:1:48: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load8x8_u align=7 (i32.const 0)))
+                                                 ^^^^^^^
 out/test/spec/simd/simd_align.wast:177: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.68.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (i32x4.load16x4_s align=-1 (i32.const 0)))
-                                                   ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.68.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (i32x4.load16x4_s align=-1 (i32.const 0)))
-                                                                          ^
+  out/test/spec/simd/simd_align/simd_align.68.wat:1:49: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load16x4_s align=-1 (i32.const 0)))
+                                                  ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.68.wat:1:72: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load16x4_s align=-1 (i32.const 0)))
+                                                                         ^
 out/test/spec/simd/simd_align.wast:183: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.69.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i32x4.load16x4_s align=0 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.69.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load16x4_s align=0 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:189: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.70.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i32x4.load16x4_s align=7 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.70.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load16x4_s align=7 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:195: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.71.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (i32x4.load16x4_u align=-1 (i32.const 0)))
-                                                   ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.71.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (i32x4.load16x4_u align=-1 (i32.const 0)))
-                                                                          ^
+  out/test/spec/simd/simd_align/simd_align.71.wat:1:49: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load16x4_u align=-1 (i32.const 0)))
+                                                  ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.71.wat:1:72: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load16x4_u align=-1 (i32.const 0)))
+                                                                         ^
 out/test/spec/simd/simd_align.wast:201: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.72.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i32x4.load16x4_u align=0 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.72.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load16x4_u align=0 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:207: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.73.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i32x4.load16x4_u align=7 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.73.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load16x4_u align=7 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:213: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.74.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (i64x2.load32x2_s align=-1 (i32.const 0)))
-                                                   ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.74.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (i64x2.load32x2_s align=-1 (i32.const 0)))
-                                                                          ^
+  out/test/spec/simd/simd_align/simd_align.74.wat:1:49: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load32x2_s align=-1 (i32.const 0)))
+                                                  ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.74.wat:1:72: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load32x2_s align=-1 (i32.const 0)))
+                                                                         ^
 out/test/spec/simd/simd_align.wast:219: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.75.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i64x2.load32x2_s align=0 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.75.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load32x2_s align=0 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:225: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.76.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i64x2.load32x2_s align=7 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.76.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load32x2_s align=7 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:231: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.77.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (i64x2.load32x2_u align=-1 (i32.const 0)))
-                                                   ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.77.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (i64x2.load32x2_u align=-1 (i32.const 0)))
-                                                                          ^
+  out/test/spec/simd/simd_align/simd_align.77.wat:1:49: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load32x2_u align=-1 (i32.const 0)))
+                                                  ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.77.wat:1:72: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load32x2_u align=-1 (i32.const 0)))
+                                                                         ^
 out/test/spec/simd/simd_align.wast:237: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.78.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i64x2.load32x2_u align=0 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.78.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load32x2_u align=0 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:243: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.79.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (i64x2.load32x2_u align=7 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.79.wat:1:49: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load32x2_u align=7 (i32.const 0)))
+                                                  ^^^^^^^
 out/test/spec/simd/simd_align.wast:249: assert_malformed passed:
   out/test/spec/simd/simd_align/simd_align.80.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (v8x16.load_splat align=-1 (i32.const 0)))
+  (memory 1) (func (result v128) (v128.load8_splat align=-1 (i32.const 0)))
                                                    ^^^^^^^^
   out/test/spec/simd/simd_align/simd_align.80.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (v8x16.load_splat align=-1 (i32.const 0)))
+  (memory 1) (func (result v128) (v128.load8_splat align=-1 (i32.const 0)))
                                                                           ^
 out/test/spec/simd/simd_align.wast:255: assert_malformed passed:
   out/test/spec/simd/simd_align/simd_align.81.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (v8x16.load_splat align=0 (i32.const 0)))
+  (memory 1) (func (result v128) (v128.load8_splat align=0 (i32.const 0)))
                                                    ^^^^^^^
 out/test/spec/simd/simd_align.wast:261: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.82.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (v16x8.load_splat align=-1 (i32.const 0)))
-                                                   ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.82.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (v16x8.load_splat align=-1 (i32.const 0)))
-                                                                          ^
+  out/test/spec/simd/simd_align/simd_align.82.wat:1:51: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load16_splat align=-1 (i32.const 0)))
+                                                    ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.82.wat:1:74: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load16_splat align=-1 (i32.const 0)))
+                                                                           ^
 out/test/spec/simd/simd_align.wast:267: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.83.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (v16x8.load_splat align=0 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.83.wat:1:51: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load16_splat align=0 (i32.const 0)))
+                                                    ^^^^^^^
 out/test/spec/simd/simd_align.wast:273: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.84.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (v32x4.load_splat align=-1 (i32.const 0)))
-                                                   ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.84.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (v32x4.load_splat align=-1 (i32.const 0)))
-                                                                          ^
+  out/test/spec/simd/simd_align/simd_align.84.wat:1:51: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load32_splat align=-1 (i32.const 0)))
+                                                    ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.84.wat:1:74: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load32_splat align=-1 (i32.const 0)))
+                                                                           ^
 out/test/spec/simd/simd_align.wast:279: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.85.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (v32x4.load_splat align=0 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.85.wat:1:51: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load32_splat align=0 (i32.const 0)))
+                                                    ^^^^^^^
 out/test/spec/simd/simd_align.wast:285: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.86.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (v32x4.load_splat align=3 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.86.wat:1:51: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load32_splat align=3 (i32.const 0)))
+                                                    ^^^^^^^
 out/test/spec/simd/simd_align.wast:291: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.87.wat:1:50: error: unexpected token align=-1, expected ).
-  (memory 1) (func (result v128) (v64x2.load_splat align=-1 (i32.const 0)))
-                                                   ^^^^^^^^
-  out/test/spec/simd/simd_align/simd_align.87.wat:1:73: error: unexpected token ), expected EOF.
-  (memory 1) (func (result v128) (v64x2.load_splat align=-1 (i32.const 0)))
-                                                                          ^
+  out/test/spec/simd/simd_align/simd_align.87.wat:1:51: error: unexpected token align=-1, expected ).
+  (memory 1) (func (result v128) (v128.load64_splat align=-1 (i32.const 0)))
+                                                    ^^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.87.wat:1:74: error: unexpected token ), expected EOF.
+  (memory 1) (func (result v128) (v128.load64_splat align=-1 (i32.const 0)))
+                                                                           ^
 out/test/spec/simd/simd_align.wast:297: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.88.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (v64x2.load_splat align=0 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.88.wat:1:51: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load64_splat align=0 (i32.const 0)))
+                                                    ^^^^^^^
 out/test/spec/simd/simd_align.wast:303: assert_malformed passed:
-  out/test/spec/simd/simd_align/simd_align.89.wat:1:50: error: alignment must be power-of-two
-  (memory 1) (func (result v128) (v64x2.load_splat align=7 (i32.const 0)))
-                                                   ^^^^^^^
+  out/test/spec/simd/simd_align/simd_align.89.wat:1:51: error: alignment must be power-of-two
+  (memory 1) (func (result v128) (v128.load64_splat align=7 (i32.const 0)))
+                                                    ^^^^^^^
 54/54 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_boolean.txt b/test/spec/simd/simd_boolean.txt
index b93a1b6f..1f1fa696 100644
--- a/test/spec/simd/simd_boolean.txt
+++ b/test/spec/simd/simd_boolean.txt
@@ -2,57 +2,57 @@
 ;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_boolean.wast
 ;;; ARGS*: --enable-simd
 (;; STDOUT ;;;
-out/test/spec/simd/simd_boolean.wast:952: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:968: assert_invalid passed:
   error: type mismatch in i8x16.any_true, expected [v128] but got [i32]
   000001c: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:953: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:969: assert_invalid passed:
   error: type mismatch in i8x16.all_true, expected [v128] but got [i32]
   000001c: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:954: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:970: assert_invalid passed:
   error: type mismatch in i16x8.any_true, expected [v128] but got [i32]
   000001d: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:955: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:971: assert_invalid passed:
   error: type mismatch in i16x8.all_true, expected [v128] but got [i32]
   000001d: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:956: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:972: assert_invalid passed:
   error: type mismatch in i32x4.any_true, expected [v128] but got [i32]
   000001d: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:957: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:973: assert_invalid passed:
   error: type mismatch in i32x4.all_true, expected [v128] but got [i32]
   000001d: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:961: assert_malformed passed:
+out/test/spec/simd/simd_boolean.wast:977: assert_malformed passed:
   out/test/spec/simd/simd_boolean/simd_boolean.8.wat:1:32: error: unexpected token "f32x4.any_true", expected an instr.
   (memory 1) (func (result i32) (f32x4.any_true (v128.const i32x4 0 0 0 0)))
                                  ^^^^^^^^^^^^^^
-out/test/spec/simd/simd_boolean.wast:962: assert_malformed passed:
+out/test/spec/simd/simd_boolean.wast:978: assert_malformed passed:
   out/test/spec/simd/simd_boolean/simd_boolean.9.wat:1:32: error: unexpected token "f32x4.all_true", expected an instr.
   (memory 1) (func (result i32) (f32x4.all_true (v128.const i32x4 0 0 0 0)))
                                  ^^^^^^^^^^^^^^
-out/test/spec/simd/simd_boolean.wast:963: assert_malformed passed:
+out/test/spec/simd/simd_boolean.wast:979: assert_malformed passed:
   out/test/spec/simd/simd_boolean/simd_boolean.10.wat:1:32: error: unexpected token "f64x2.any_true", expected an instr.
   (memory 1) (func (result i32) (f64x2.any_true (v128.const i32x4 0 0 0 0)))
                                  ^^^^^^^^^^^^^^
-out/test/spec/simd/simd_boolean.wast:964: assert_malformed passed:
+out/test/spec/simd/simd_boolean.wast:980: assert_malformed passed:
   out/test/spec/simd/simd_boolean/simd_boolean.11.wat:1:32: error: unexpected token "f64x2.all_true", expected an instr.
   (memory 1) (func (result i32) (f64x2.all_true (v128.const i32x4 0 0 0 0)))
                                  ^^^^^^^^^^^^^^
-out/test/spec/simd/simd_boolean.wast:969: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:985: assert_invalid passed:
   error: type mismatch in i8x16.any_true, expected [v128] but got []
   000001a: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:977: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:993: assert_invalid passed:
   error: type mismatch in i8x16.all_true, expected [v128] but got []
   000001a: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:985: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:1001: assert_invalid passed:
   error: type mismatch in i16x8.any_true, expected [v128] but got []
   000001b: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:993: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:1009: assert_invalid passed:
   error: type mismatch in i16x8.all_true, expected [v128] but got []
   000001b: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:1001: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:1017: assert_invalid passed:
   error: type mismatch in i32x4.any_true, expected [v128] but got []
   000001b: error: OnUnaryExpr callback failed
-out/test/spec/simd/simd_boolean.wast:1009: assert_invalid passed:
+out/test/spec/simd/simd_boolean.wast:1025: assert_invalid passed:
   error: type mismatch in i32x4.all_true, expected [v128] but got []
   000001b: error: OnUnaryExpr callback failed
-258/258 tests passed.
+264/264 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_f32x4_pmin_pmax.txt b/test/spec/simd/simd_f32x4_pmin_pmax.txt
new file mode 100644
index 00000000..c7c8788c
--- /dev/null
+++ b/test/spec/simd/simd_f32x4_pmin_pmax.txt
@@ -0,0 +1,56 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f32x4_pmin_pmax.wast
+;;; ARGS*: --enable-simd
+(;; STDOUT ;;;
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11629: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.1.wat:1:33: error: unexpected token "i8x16.pmin", expected an instr.
+  (memory 1) (func (result v128) (i8x16.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11630: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.2.wat:1:33: error: unexpected token "i8x16.pmax", expected an instr.
+  (memory 1) (func (result v128) (i8x16.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11631: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.3.wat:1:33: error: unexpected token "i16x8.pmin", expected an instr.
+  (memory 1) (func (result v128) (i16x8.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11632: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.4.wat:1:33: error: unexpected token "i16x8.pmax", expected an instr.
+  (memory 1) (func (result v128) (i16x8.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11633: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.5.wat:1:33: error: unexpected token "i32x4.pmin", expected an instr.
+  (memory 1) (func (result v128) (i32x4.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11634: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.6.wat:1:33: error: unexpected token "i32x4.pmax", expected an instr.
+  (memory 1) (func (result v128) (i32x4.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11635: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.7.wat:1:33: error: unexpected token "i64x2.pmin", expected an instr.
+  (memory 1) (func (result v128) (i64x2.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11636: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.8.wat:1:33: error: unexpected token "i64x2.pmax", expected an instr.
+  (memory 1) (func (result v128) (i64x2.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11639: assert_invalid passed:
+  error: type mismatch in f32x4.pmin, expected [v128, v128] but got [i32, f32]
+  0000022: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11640: assert_invalid passed:
+  error: type mismatch in f32x4.pmax, expected [v128, v128] but got [i32, f32]
+  0000022: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11645: assert_invalid passed:
+  error: type mismatch in f32x4.pmin, expected [v128, v128] but got [v128]
+  000002d: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11653: assert_invalid passed:
+  error: type mismatch in f32x4.pmin, expected [v128, v128] but got []
+  000001b: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11661: assert_invalid passed:
+  error: type mismatch in f32x4.pmax, expected [v128, v128] but got [v128]
+  000002d: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11669: assert_invalid passed:
+  error: type mismatch in f32x4.pmax, expected [v128, v128] but got []
+  000001b: error: OnBinaryExpr callback failed
+3886/3886 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_f32x4_rounding.txt b/test/spec/simd/simd_f32x4_rounding.txt
new file mode 100644
index 00000000..d5a93f09
--- /dev/null
+++ b/test/spec/simd/simd_f32x4_rounding.txt
@@ -0,0 +1,94 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f32x4_rounding.wast
+;;; ARGS*: --enable-simd
+(;; STDOUT ;;;
+out/test/spec/simd/simd_f32x4_rounding.wast:367: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.1.wat:1:33: error: unexpected token "i8x16.ceil", expected an instr.
+  (memory 1) (func (result v128) (i8x16.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:368: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.2.wat:1:33: error: unexpected token "i8x16.floor", expected an instr.
+  (memory 1) (func (result v128) (i8x16.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:369: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.3.wat:1:33: error: unexpected token "i8x16.trunc", expected an instr.
+  (memory 1) (func (result v128) (i8x16.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:370: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.4.wat:1:33: error: unexpected token "i8x16.nearest", expected an instr.
+  (memory 1) (func (result v128) (i8x16.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:371: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.5.wat:1:33: error: unexpected token "i16x8.ceil", expected an instr.
+  (memory 1) (func (result v128) (i16x8.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:372: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.6.wat:1:33: error: unexpected token "i16x8.floor", expected an instr.
+  (memory 1) (func (result v128) (i16x8.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:373: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.7.wat:1:33: error: unexpected token "i16x8.trunc", expected an instr.
+  (memory 1) (func (result v128) (i16x8.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:374: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.8.wat:1:33: error: unexpected token "i16x8.nearest", expected an instr.
+  (memory 1) (func (result v128) (i16x8.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:375: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.9.wat:1:33: error: unexpected token "i32x4.ceil", expected an instr.
+  (memory 1) (func (result v128) (i32x4.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:376: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.10.wat:1:33: error: unexpected token "i32x4.floor", expected an instr.
+  (memory 1) (func (result v128) (i32x4.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:377: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.11.wat:1:33: error: unexpected token "i32x4.trunc", expected an instr.
+  (memory 1) (func (result v128) (i32x4.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:378: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.12.wat:1:33: error: unexpected token "i32x4.nearest", expected an instr.
+  (memory 1) (func (result v128) (i32x4.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:379: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.13.wat:1:33: error: unexpected token "i64x2.ceil", expected an instr.
+  (memory 1) (func (result v128) (i64x2.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:380: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.14.wat:1:33: error: unexpected token "i64x2.floor", expected an instr.
+  (memory 1) (func (result v128) (i64x2.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:381: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.15.wat:1:33: error: unexpected token "i64x2.trunc", expected an instr.
+  (memory 1) (func (result v128) (i64x2.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:382: assert_malformed passed:
+  out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.16.wat:1:33: error: unexpected token "i64x2.nearest", expected an instr.
+  (memory 1) (func (result v128) (i64x2.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f32x4_rounding.wast:385: assert_invalid passed:
+  error: type mismatch in f32x4.ceil, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f32x4_rounding.wast:386: assert_invalid passed:
+  error: type mismatch in f32x4.floor, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f32x4_rounding.wast:387: assert_invalid passed:
+  error: type mismatch in f32x4.trunc, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f32x4_rounding.wast:388: assert_invalid passed:
+  error: type mismatch in f32x4.nearest, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f32x4_rounding.wast:393: assert_invalid passed:
+  error: type mismatch in f32x4.ceil, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f32x4_rounding.wast:401: assert_invalid passed:
+  error: type mismatch in f32x4.floor, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f32x4_rounding.wast:409: assert_invalid passed:
+  error: type mismatch in f32x4.trunc, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f32x4_rounding.wast:417: assert_invalid passed:
+  error: type mismatch in f32x4.nearest, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+200/200 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_f64x2_pmin_pmax.txt b/test/spec/simd/simd_f64x2_pmin_pmax.txt
new file mode 100644
index 00000000..6ba7b8d6
--- /dev/null
+++ b/test/spec/simd/simd_f64x2_pmin_pmax.txt
@@ -0,0 +1,56 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f64x2_pmin_pmax.wast
+;;; ARGS*: --enable-simd
+(;; STDOUT ;;;
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11629: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.1.wat:1:33: error: unexpected token "i8x16.pmin", expected an instr.
+  (memory 1) (func (result v128) (i8x16.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11630: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.2.wat:1:33: error: unexpected token "i8x16.pmax", expected an instr.
+  (memory 1) (func (result v128) (i8x16.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11631: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.3.wat:1:33: error: unexpected token "i16x8.pmin", expected an instr.
+  (memory 1) (func (result v128) (i16x8.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11632: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.4.wat:1:33: error: unexpected token "i16x8.pmax", expected an instr.
+  (memory 1) (func (result v128) (i16x8.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11633: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.5.wat:1:33: error: unexpected token "i32x4.pmin", expected an instr.
+  (memory 1) (func (result v128) (i32x4.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11634: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.6.wat:1:33: error: unexpected token "i32x4.pmax", expected an instr.
+  (memory 1) (func (result v128) (i32x4.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11635: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.7.wat:1:33: error: unexpected token "i64x2.pmin", expected an instr.
+  (memory 1) (func (result v128) (i64x2.pmin (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11636: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.8.wat:1:33: error: unexpected token "i64x2.pmax", expected an instr.
+  (memory 1) (func (result v128) (i64x2.pmax (v128.const i32x4 0 0 0 0) (v128.c...
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11639: assert_invalid passed:
+  error: type mismatch in f64x2.pmin, expected [v128, v128] but got [i32, f32]
+  0000022: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11640: assert_invalid passed:
+  error: type mismatch in f64x2.pmax, expected [v128, v128] but got [i32, f32]
+  0000022: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11645: assert_invalid passed:
+  error: type mismatch in f64x2.pmin, expected [v128, v128] but got [v128]
+  000002d: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11653: assert_invalid passed:
+  error: type mismatch in f64x2.pmin, expected [v128, v128] but got []
+  000001b: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11661: assert_invalid passed:
+  error: type mismatch in f64x2.pmax, expected [v128, v128] but got [v128]
+  000002d: error: OnBinaryExpr callback failed
+out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11669: assert_invalid passed:
+  error: type mismatch in f64x2.pmax, expected [v128, v128] but got []
+  000001b: error: OnBinaryExpr callback failed
+3886/3886 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_f64x2_rounding.txt b/test/spec/simd/simd_f64x2_rounding.txt
new file mode 100644
index 00000000..700905c4
--- /dev/null
+++ b/test/spec/simd/simd_f64x2_rounding.txt
@@ -0,0 +1,94 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f64x2_rounding.wast
+;;; ARGS*: --enable-simd
+(;; STDOUT ;;;
+out/test/spec/simd/simd_f64x2_rounding.wast:367: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.1.wat:1:33: error: unexpected token "i8x16.ceil", expected an instr.
+  (memory 1) (func (result v128) (i8x16.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:368: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.2.wat:1:33: error: unexpected token "i8x16.floor", expected an instr.
+  (memory 1) (func (result v128) (i8x16.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:369: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.3.wat:1:33: error: unexpected token "i8x16.trunc", expected an instr.
+  (memory 1) (func (result v128) (i8x16.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:370: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.4.wat:1:33: error: unexpected token "i8x16.nearest", expected an instr.
+  (memory 1) (func (result v128) (i8x16.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:371: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.5.wat:1:33: error: unexpected token "i16x8.ceil", expected an instr.
+  (memory 1) (func (result v128) (i16x8.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:372: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.6.wat:1:33: error: unexpected token "i16x8.floor", expected an instr.
+  (memory 1) (func (result v128) (i16x8.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:373: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.7.wat:1:33: error: unexpected token "i16x8.trunc", expected an instr.
+  (memory 1) (func (result v128) (i16x8.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:374: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.8.wat:1:33: error: unexpected token "i16x8.nearest", expected an instr.
+  (memory 1) (func (result v128) (i16x8.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:375: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.9.wat:1:33: error: unexpected token "i32x4.ceil", expected an instr.
+  (memory 1) (func (result v128) (i32x4.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:376: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.10.wat:1:33: error: unexpected token "i32x4.floor", expected an instr.
+  (memory 1) (func (result v128) (i32x4.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:377: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.11.wat:1:33: error: unexpected token "i32x4.trunc", expected an instr.
+  (memory 1) (func (result v128) (i32x4.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:378: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.12.wat:1:33: error: unexpected token "i32x4.nearest", expected an instr.
+  (memory 1) (func (result v128) (i32x4.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:379: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.13.wat:1:33: error: unexpected token "i64x2.ceil", expected an instr.
+  (memory 1) (func (result v128) (i64x2.ceil (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:380: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.14.wat:1:33: error: unexpected token "i64x2.floor", expected an instr.
+  (memory 1) (func (result v128) (i64x2.floor (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:381: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.15.wat:1:33: error: unexpected token "i64x2.trunc", expected an instr.
+  (memory 1) (func (result v128) (i64x2.trunc (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:382: assert_malformed passed:
+  out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.16.wat:1:33: error: unexpected token "i64x2.nearest", expected an instr.
+  (memory 1) (func (result v128) (i64x2.nearest (v128.const i32x4 0 0 0 0)))
+                                  ^^^^^^^^^^^^^
+out/test/spec/simd/simd_f64x2_rounding.wast:385: assert_invalid passed:
+  error: type mismatch in f64x2.ceil, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f64x2_rounding.wast:386: assert_invalid passed:
+  error: type mismatch in f64x2.floor, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f64x2_rounding.wast:387: assert_invalid passed:
+  error: type mismatch in f64x2.trunc, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f64x2_rounding.wast:388: assert_invalid passed:
+  error: type mismatch in f64x2.nearest, expected [v128] but got [i32]
+  000001d: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f64x2_rounding.wast:393: assert_invalid passed:
+  error: type mismatch in f64x2.ceil, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f64x2_rounding.wast:401: assert_invalid passed:
+  error: type mismatch in f64x2.floor, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f64x2_rounding.wast:409: assert_invalid passed:
+  error: type mismatch in f64x2.trunc, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+out/test/spec/simd/simd_f64x2_rounding.wast:417: assert_invalid passed:
+  error: type mismatch in f64x2.nearest, expected [v128] but got []
+  000001b: error: OnUnaryExpr callback failed
+200/200 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_i16x8_sat_arith.txt b/test/spec/simd/simd_i16x8_sat_arith.txt
index 955243f9..ea126872 100644
--- a/test/spec/simd/simd_i16x8_sat_arith.txt
+++ b/test/spec/simd/simd_i16x8_sat_arith.txt
@@ -3,56 +3,56 @@
 ;;; ARGS*: --enable-simd
 (;; STDOUT ;;;
 out/test/spec/simd/simd_i16x8_sat_arith.wast:609: assert_malformed passed:
-  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.1.wat:1:22: error: unexpected token "i16x8.add_saturate", expected an instr.
-  (func (result v128) (i16x8.add_saturate (v128.const i16x8 1 1 1 1 1 1 1 1) (v...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.1.wat:1:22: error: unexpected token "i16x8.add_sat", expected an instr.
+  (func (result v128) (i16x8.add_sat (v128.const i16x8 1 1 1 1 1 1 1 1) (v128.c...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i16x8_sat_arith.wast:612: assert_malformed passed:
-  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.2.wat:1:22: error: unexpected token "i16x8.sub_saturate", expected an instr.
-  (func (result v128) (i16x8.sub_saturate (v128.const i16x8 1 1 1 1 1 1 1 1) (v...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.2.wat:1:22: error: unexpected token "i16x8.sub_sat", expected an instr.
+  (func (result v128) (i16x8.sub_sat (v128.const i16x8 1 1 1 1 1 1 1 1) (v128.c...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i16x8_sat_arith.wast:615: assert_malformed passed:
-  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.3.wat:1:22: error: unexpected token "i16x8.mul_saturate", expected an instr.
-  (func (result v128) (i16x8.mul_saturate (v128.const i16x8 1 1 1 1 1 1 1 1) (v...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.3.wat:1:22: error: unexpected token "i16x8.mul_sat", expected an instr.
+  (func (result v128) (i16x8.mul_sat (v128.const i16x8 1 1 1 1 1 1 1 1) (v128.c...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i16x8_sat_arith.wast:618: assert_malformed passed:
-  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.4.wat:1:22: error: unexpected token "i16x8.div_saturate", expected an instr.
-  (func (result v128) (i16x8.div_saturate (v128.const i16x8 1 1 1 1 1 1 1 1) (v...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.4.wat:1:22: error: unexpected token "i16x8.div_sat", expected an instr.
+  (func (result v128) (i16x8.div_sat (v128.const i16x8 1 1 1 1 1 1 1 1) (v128.c...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i16x8_sat_arith.wast:623: assert_invalid passed:
-  error: type mismatch in i16x8.add_saturate_s, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i16x8.add_sat_s, expected [v128, v128] but got [i32, f32]
   0000022: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:624: assert_invalid passed:
-  error: type mismatch in i16x8.add_saturate_u, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i16x8.add_sat_u, expected [v128, v128] but got [i32, f32]
   0000022: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:625: assert_invalid passed:
-  error: type mismatch in i16x8.sub_saturate_s, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i16x8.sub_sat_s, expected [v128, v128] but got [i32, f32]
   0000022: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:626: assert_invalid passed:
-  error: type mismatch in i16x8.sub_saturate_u, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i16x8.sub_sat_u, expected [v128, v128] but got [i32, f32]
   0000022: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:631: assert_invalid passed:
-  error: type mismatch in i16x8.add_saturate_s, expected [v128, v128] but got [v128]
+  error: type mismatch in i16x8.add_sat_s, expected [v128, v128] but got [v128]
   000002d: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:639: assert_invalid passed:
-  error: type mismatch in i16x8.add_saturate_s, expected [v128, v128] but got []
+  error: type mismatch in i16x8.add_sat_s, expected [v128, v128] but got []
   000001b: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:647: assert_invalid passed:
-  error: type mismatch in i16x8.add_saturate_u, expected [v128, v128] but got [v128]
+  error: type mismatch in i16x8.add_sat_u, expected [v128, v128] but got [v128]
   000002d: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:655: assert_invalid passed:
-  error: type mismatch in i16x8.add_saturate_u, expected [v128, v128] but got []
+  error: type mismatch in i16x8.add_sat_u, expected [v128, v128] but got []
   000001b: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:663: assert_invalid passed:
-  error: type mismatch in i16x8.sub_saturate_s, expected [v128, v128] but got [v128]
+  error: type mismatch in i16x8.sub_sat_s, expected [v128, v128] but got [v128]
   000002d: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:671: assert_invalid passed:
-  error: type mismatch in i16x8.sub_saturate_s, expected [v128, v128] but got []
+  error: type mismatch in i16x8.sub_sat_s, expected [v128, v128] but got []
   000001b: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:679: assert_invalid passed:
-  error: type mismatch in i16x8.sub_saturate_u, expected [v128, v128] but got [v128]
+  error: type mismatch in i16x8.sub_sat_u, expected [v128, v128] but got [v128]
   000002d: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i16x8_sat_arith.wast:687: assert_invalid passed:
-  error: type mismatch in i16x8.sub_saturate_u, expected [v128, v128] but got []
+  error: type mismatch in i16x8.sub_sat_u, expected [v128, v128] but got []
   000001b: error: OnBinaryExpr callback failed
 220/220 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_i8x16_sat_arith.txt b/test/spec/simd/simd_i8x16_sat_arith.txt
index 5e84bb20..297cec8a 100644
--- a/test/spec/simd/simd_i8x16_sat_arith.txt
+++ b/test/spec/simd/simd_i8x16_sat_arith.txt
@@ -3,88 +3,88 @@
 ;;; ARGS*: --enable-simd
 (;; STDOUT ;;;
 out/test/spec/simd/simd_i8x16_sat_arith.wast:561: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.1.wat:1:22: error: unexpected token "i8x16.add_saturate", expected an instr.
-  (func (result v128) (i8x16.add_saturate (v128.const i8x16 1 1 1 1 1 1 1 1 1 1...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.1.wat:1:22: error: unexpected token "i8x16.add_sat", expected an instr.
+  (func (result v128) (i8x16.add_sat (v128.const i8x16 1 1 1 1 1 1 1 1 1 1 1 1 ...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:564: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.2.wat:1:22: error: unexpected token "i8x16.sub_saturate", expected an instr.
-  (func (result v128) (i8x16.sub_saturate (v128.const i8x16 1 1 1 1 1 1 1 1 1 1...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.2.wat:1:22: error: unexpected token "i8x16.sub_sat", expected an instr.
+  (func (result v128) (i8x16.sub_sat (v128.const i8x16 1 1 1 1 1 1 1 1 1 1 1 1 ...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:567: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.3.wat:1:22: error: unexpected token "i8x16.mul_saturate", expected an instr.
-  (func (result v128) (i8x16.mul_saturate (v128.const i8x16 1 1 1 1 1 1 1 1 1 1...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.3.wat:1:22: error: unexpected token "i8x16.mul_sat", expected an instr.
+  (func (result v128) (i8x16.mul_sat (v128.const i8x16 1 1 1 1 1 1 1 1 1 1 1 1 ...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:570: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.4.wat:1:22: error: unexpected token "i8x16.div_saturate", expected an instr.
-  (func (result v128) (i8x16.div_saturate (v128.const i8x16 1 1 1 1 1 1 1 1 1 1...
-                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.4.wat:1:22: error: unexpected token "i8x16.div_sat", expected an instr.
+  (func (result v128) (i8x16.div_sat (v128.const i8x16 1 1 1 1 1 1 1 1 1 1 1 1 ...
+                       ^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:573: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.5.wat:1:22: error: unexpected token "i32x4.add_saturate_s", expected an instr.
-  (func (result v128) (i32x4.add_saturate_s (v128.const i32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.5.wat:1:22: error: unexpected token "i32x4.add_sat_s", expected an instr.
+  (func (result v128) (i32x4.add_sat_s (v128.const i32x4 0 0 0 0) (v128.const i...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:576: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.6.wat:1:22: error: unexpected token "i32x4.add_saturate_u", expected an instr.
-  (func (result v128) (i32x4.add_saturate_u (v128.const i32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.6.wat:1:22: error: unexpected token "i32x4.add_sat_u", expected an instr.
+  (func (result v128) (i32x4.add_sat_u (v128.const i32x4 0 0 0 0) (v128.const i...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:579: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.7.wat:1:22: error: unexpected token "i32x4.sub_saturate_s", expected an instr.
-  (func (result v128) (i32x4.sub_saturate_s (v128.const i32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.7.wat:1:22: error: unexpected token "i32x4.sub_sat_s", expected an instr.
+  (func (result v128) (i32x4.sub_sat_s (v128.const i32x4 0 0 0 0) (v128.const i...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:582: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.8.wat:1:22: error: unexpected token "i32x4.sub_saturate_u", expected an instr.
-  (func (result v128) (i32x4.sub_saturate_u (v128.const i32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.8.wat:1:22: error: unexpected token "i32x4.sub_sat_u", expected an instr.
+  (func (result v128) (i32x4.sub_sat_u (v128.const i32x4 0 0 0 0) (v128.const i...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:585: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.9.wat:1:22: error: unexpected token "f32x4.add_saturate_s", expected an instr.
-  (func (result v128) (f32x4.add_saturate_s (v128.const f32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.9.wat:1:22: error: unexpected token "f32x4.add_sat_s", expected an instr.
+  (func (result v128) (f32x4.add_sat_s (v128.const f32x4 0 0 0 0) (v128.const f...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:588: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.10.wat:1:22: error: unexpected token "f32x4.add_saturate_u", expected an instr.
-  (func (result v128) (f32x4.add_saturate_u (v128.const f32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.10.wat:1:22: error: unexpected token "f32x4.add_sat_u", expected an instr.
+  (func (result v128) (f32x4.add_sat_u (v128.const f32x4 0 0 0 0) (v128.const f...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:591: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.11.wat:1:22: error: unexpected token "f32x4.sub_saturate_s", expected an instr.
-  (func (result v128) (f32x4.sub_saturate_s (v128.const f32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.11.wat:1:22: error: unexpected token "f32x4.sub_sat_s", expected an instr.
+  (func (result v128) (f32x4.sub_sat_s (v128.const f32x4 0 0 0 0) (v128.const f...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:594: assert_malformed passed:
-  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.12.wat:1:22: error: unexpected token "f32x4.sub_saturate_u", expected an instr.
-  (func (result v128) (f32x4.sub_saturate_u (v128.const f32x4 0 0 0 0) (v128.co...
-                       ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.12.wat:1:22: error: unexpected token "f32x4.sub_sat_u", expected an instr.
+  (func (result v128) (f32x4.sub_sat_u (v128.const f32x4 0 0 0 0) (v128.const f...
+                       ^^^^^^^^^^^^^^^
 out/test/spec/simd/simd_i8x16_sat_arith.wast:599: assert_invalid passed:
-  error: type mismatch in i8x16.add_saturate_s, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i8x16.add_sat_s, expected [v128, v128] but got [i32, f32]
   0000021: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:600: assert_invalid passed:
-  error: type mismatch in i8x16.add_saturate_u, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i8x16.add_sat_u, expected [v128, v128] but got [i32, f32]
   0000021: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:601: assert_invalid passed:
-  error: type mismatch in i8x16.sub_saturate_s, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i8x16.sub_sat_s, expected [v128, v128] but got [i32, f32]
   0000021: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:602: assert_invalid passed:
-  error: type mismatch in i8x16.sub_saturate_u, expected [v128, v128] but got [i32, f32]
+  error: type mismatch in i8x16.sub_sat_u, expected [v128, v128] but got [i32, f32]
   0000021: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:607: assert_invalid passed:
-  error: type mismatch in i8x16.add_saturate_s, expected [v128, v128] but got [v128]
+  error: type mismatch in i8x16.add_sat_s, expected [v128, v128] but got [v128]
   000002c: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:615: assert_invalid passed:
-  error: type mismatch in i8x16.add_saturate_s, expected [v128, v128] but got []
+  error: type mismatch in i8x16.add_sat_s, expected [v128, v128] but got []
   000001a: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:623: assert_invalid passed:
-  error: type mismatch in i8x16.add_saturate_u, expected [v128, v128] but got [v128]
+  error: type mismatch in i8x16.add_sat_u, expected [v128, v128] but got [v128]
   000002c: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:631: assert_invalid passed:
-  error: type mismatch in i8x16.add_saturate_u, expected [v128, v128] but got []
+  error: type mismatch in i8x16.add_sat_u, expected [v128, v128] but got []
   000001a: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:639: assert_invalid passed:
-  error: type mismatch in i8x16.sub_saturate_s, expected [v128, v128] but got [v128]
+  error: type mismatch in i8x16.sub_sat_s, expected [v128, v128] but got [v128]
   000002c: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:647: assert_invalid passed:
-  error: type mismatch in i8x16.sub_saturate_s, expected [v128, v128] but got []
+  error: type mismatch in i8x16.sub_sat_s, expected [v128, v128] but got []
   000001a: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:655: assert_invalid passed:
-  error: type mismatch in i8x16.sub_saturate_u, expected [v128, v128] but got [v128]
+  error: type mismatch in i8x16.sub_sat_u, expected [v128, v128] but got [v128]
   000002c: error: OnBinaryExpr callback failed
 out/test/spec/simd/simd_i8x16_sat_arith.wast:663: assert_invalid passed:
-  error: type mismatch in i8x16.sub_saturate_u, expected [v128, v128] but got []
+  error: type mismatch in i8x16.sub_sat_u, expected [v128, v128] but got []
   000001a: error: OnBinaryExpr callback failed
 212/212 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_lane.txt b/test/spec/simd/simd_lane.txt
index 3f54f91c..d8db834f 100644
--- a/test/spec/simd/simd_lane.txt
+++ b/test/spec/simd/simd_lane.txt
@@ -3,528 +3,528 @@
 ;;; ARGS*: --enable-simd
 (;; STDOUT ;;;
 out/test/spec/simd/simd_lane.wast:398: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.1.wat:1:21: error: lane index "-1" out-of-range [0, 32)
+  out/test/spec/simd/simd_lane/simd_lane.1.wat:1:21: error: invalid literal "-1"
   (func (result i32) (i8x16.extract_lane_s  -1 (v128.const i8x16 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
   out/test/spec/simd/simd_lane/simd_lane.1.wat:1:97: error: unexpected token ), expected EOF.
   ...i8x16.extract_lane_s  -1 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                  ^
 out/test/spec/simd/simd_lane.wast:399: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.2.wat:1:21: error: lane index "256" out-of-range [0, 32)
-  (func (result i32) (i8x16.extract_lane_s 256 (v128.const i8x16 0 0 0 0 0 0 0 ...
+  out/test/spec/simd/simd_lane/simd_lane.2.wat:1:21: error: invalid literal "-1"
+  (func (result i32) (i8x16.extract_lane_u  -1 (v128.const i8x16 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
   out/test/spec/simd/simd_lane/simd_lane.2.wat:1:97: error: unexpected token ), expected EOF.
-  ...i8x16.extract_lane_s 256 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
+  ...i8x16.extract_lane_u  -1 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                  ^
 out/test/spec/simd/simd_lane.wast:400: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.3.wat:1:21: error: lane index "-1" out-of-range [0, 32)
-  (func (result i32) (i8x16.extract_lane_u  -1 (v128.const i8x16 0 0 0 0 0 0 0 ...
+  out/test/spec/simd/simd_lane/simd_lane.3.wat:1:21: error: invalid literal "-1"
+  (func (result i32) (i16x8.extract_lane_s  -1 (v128.const i16x8 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.3.wat:1:97: error: unexpected token ), expected EOF.
-  ...i8x16.extract_lane_u  -1 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
+  out/test/spec/simd/simd_lane/simd_lane.3.wat:1:81: error: unexpected token ), expected EOF.
+  ...c (result i32) (i16x8.extract_lane_s  -1 (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                                                                  ^
 out/test/spec/simd/simd_lane.wast:401: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.4.wat:1:21: error: lane index "256" out-of-range [0, 32)
-  (func (result i32) (i8x16.extract_lane_u 256 (v128.const i8x16 0 0 0 0 0 0 0 ...
+  out/test/spec/simd/simd_lane/simd_lane.4.wat:1:21: error: invalid literal "-1"
+  (func (result i32) (i16x8.extract_lane_u  -1 (v128.const i16x8 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.4.wat:1:97: error: unexpected token ), expected EOF.
-  ...i8x16.extract_lane_u 256 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
+  out/test/spec/simd/simd_lane/simd_lane.4.wat:1:81: error: unexpected token ), expected EOF.
+  ...c (result i32) (i16x8.extract_lane_u  -1 (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                                                                  ^
 out/test/spec/simd/simd_lane.wast:402: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.5.wat:1:21: error: lane index "-1" out-of-range [0, 32)
-  (func (result i32) (i16x8.extract_lane_s  -1 (v128.const i16x8 0 0 0 0 0 0 0 ...
+  out/test/spec/simd/simd_lane/simd_lane.5.wat:1:21: error: invalid literal "-1"
+  (func (result i32) (i32x4.extract_lane  -1 (v128.const i32x4 0 0 0 0)))
+                      ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.5.wat:1:71: error: unexpected token ), expected EOF.
+  (func (result i32) (i32x4.extract_lane  -1 (v128.const i32x4 0 0 0 0)))
+                                                                        ^
+out/test/spec/simd/simd_lane.wast:403: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.6.wat:1:21: error: invalid literal "-1"
+  (func (result f32) (f32x4.extract_lane  -1 (v128.const f32x4 0 0 0 0)))
+                      ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.6.wat:1:71: error: unexpected token ), expected EOF.
+  (func (result f32) (f32x4.extract_lane  -1 (v128.const f32x4 0 0 0 0)))
+                                                                        ^
+out/test/spec/simd/simd_lane.wast:404: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.7.wat:1:22: error: invalid literal "-1"
+  (func (result v128) (i8x16.replace_lane  -1 (v128.const i8x16 0 0 0 0 0 0 0 0...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.7.wat:1:110: error: unexpected token ), expected EOF.
+  ...e_lane  -1 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) (i32.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:405: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.8.wat:1:22: error: invalid literal "-1"
+  (func (result v128) (i16x8.replace_lane  -1 (v128.const i16x8 0 0 0 0 0 0 0 0...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.8.wat:1:94: error: unexpected token ), expected EOF.
+  ...8) (i16x8.replace_lane  -1 (v128.const i16x8 0 0 0 0 0 0 0 0) (i32.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:406: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.9.wat:1:22: error: invalid literal "-1"
+  (func (result v128) (i32x4.replace_lane  -1 (v128.const i32x4 0 0 0 0) (i32.c...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.9.wat:1:86: error: unexpected token ), expected EOF.
+  ...sult v128) (i32x4.replace_lane  -1 (v128.const i32x4 0 0 0 0) (i32.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:407: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.10.wat:1:22: error: invalid literal "-1"
+  (func (result v128) (f32x4.replace_lane  -1 (v128.const f32x4 0 0 0 0) (i32.c...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.10.wat:1:86: error: unexpected token ), expected EOF.
+  ...sult v128) (f32x4.replace_lane  -1 (v128.const f32x4 0 0 0 0) (i32.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:408: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.11.wat:1:21: error: invalid literal "-1"
+  (func (result i64) (i64x2.extract_lane  -1 (v128.const i64x2 0 0)))
+                      ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.11.wat:1:67: error: unexpected token ), expected EOF.
+  (func (result i64) (i64x2.extract_lane  -1 (v128.const i64x2 0 0)))
+                                                                    ^
+out/test/spec/simd/simd_lane.wast:409: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.12.wat:1:21: error: invalid literal "-1"
+  (func (result f64) (f64x2.extract_lane  -1 (v128.const f64x2 0 0)))
+                      ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.12.wat:1:67: error: unexpected token ), expected EOF.
+  (func (result f64) (f64x2.extract_lane  -1 (v128.const f64x2 0 0)))
+                                                                    ^
+out/test/spec/simd/simd_lane.wast:410: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.13.wat:1:22: error: invalid literal "-1"
+  (func (result v128) (i64x2.replace_lane  -1 (v128.const i64x2 0 0) (i64.const...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.13.wat:1:82: error: unexpected token ), expected EOF.
+  ... (result v128) (i64x2.replace_lane  -1 (v128.const i64x2 0 0) (i64.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:411: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.14.wat:1:22: error: invalid literal "-1"
+  (func (result v128) (f64x2.replace_lane  -1 (v128.const f64x2 0 0) (f64.const...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.14.wat:1:82: error: unexpected token ), expected EOF.
+  ... (result v128) (f64x2.replace_lane  -1 (v128.const f64x2 0 0) (f64.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:415: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.15.wat:1:21: error: lane index "256" out-of-range [0, 32)
+  (func (result i32) (i8x16.extract_lane_s 256 (v128.const i8x16 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.5.wat:1:81: error: unexpected token ), expected EOF.
-  ...c (result i32) (i16x8.extract_lane_s  -1 (v128.const i16x8 0 0 0 0 0 0 0 0)))
+  out/test/spec/simd/simd_lane/simd_lane.15.wat:1:97: error: unexpected token ), expected EOF.
+  ...i8x16.extract_lane_s 256 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:403: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.6.wat:1:21: error: lane index "256" out-of-range [0, 32)
-  (func (result i32) (i16x8.extract_lane_s 256 (v128.const i16x8 0 0 0 0 0 0 0 ...
+out/test/spec/simd/simd_lane.wast:416: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.16.wat:1:21: error: lane index "256" out-of-range [0, 32)
+  (func (result i32) (i8x16.extract_lane_u 256 (v128.const i8x16 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.6.wat:1:81: error: unexpected token ), expected EOF.
-  ...c (result i32) (i16x8.extract_lane_s 256 (v128.const i16x8 0 0 0 0 0 0 0 0)))
+  out/test/spec/simd/simd_lane/simd_lane.16.wat:1:97: error: unexpected token ), expected EOF.
+  ...i8x16.extract_lane_u 256 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:404: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.7.wat:1:21: error: lane index "-1" out-of-range [0, 32)
-  (func (result i32) (i16x8.extract_lane_u  -1 (v128.const i16x8 0 0 0 0 0 0 0 ...
+out/test/spec/simd/simd_lane.wast:417: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.17.wat:1:21: error: lane index "256" out-of-range [0, 32)
+  (func (result i32) (i16x8.extract_lane_s 256 (v128.const i16x8 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.7.wat:1:81: error: unexpected token ), expected EOF.
-  ...c (result i32) (i16x8.extract_lane_u  -1 (v128.const i16x8 0 0 0 0 0 0 0 0)))
+  out/test/spec/simd/simd_lane/simd_lane.17.wat:1:81: error: unexpected token ), expected EOF.
+  ...c (result i32) (i16x8.extract_lane_s 256 (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:405: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.8.wat:1:21: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:418: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.18.wat:1:21: error: lane index "256" out-of-range [0, 32)
   (func (result i32) (i16x8.extract_lane_u 256 (v128.const i16x8 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.8.wat:1:81: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.18.wat:1:81: error: unexpected token ), expected EOF.
   ...c (result i32) (i16x8.extract_lane_u 256 (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:406: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.9.wat:1:21: error: lane index "-1" out-of-range [0, 32)
-  (func (result i32) (i32x4.extract_lane  -1 (v128.const i32x4 0 0 0 0)))
-                      ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.9.wat:1:71: error: unexpected token ), expected EOF.
-  (func (result i32) (i32x4.extract_lane  -1 (v128.const i32x4 0 0 0 0)))
-                                                                        ^
-out/test/spec/simd/simd_lane.wast:407: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.10.wat:1:21: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:419: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.19.wat:1:21: error: lane index "256" out-of-range [0, 32)
   (func (result i32) (i32x4.extract_lane 256 (v128.const i32x4 0 0 0 0)))
                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.10.wat:1:71: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.19.wat:1:71: error: unexpected token ), expected EOF.
   (func (result i32) (i32x4.extract_lane 256 (v128.const i32x4 0 0 0 0)))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:408: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.11.wat:1:21: error: lane index "-1" out-of-range [0, 32)
-  (func (result f32) (f32x4.extract_lane  -1 (v128.const f32x4 0 0 0 0)))
-                      ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.11.wat:1:71: error: unexpected token ), expected EOF.
-  (func (result f32) (f32x4.extract_lane  -1 (v128.const f32x4 0 0 0 0)))
-                                                                        ^
-out/test/spec/simd/simd_lane.wast:409: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.12.wat:1:21: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:420: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.20.wat:1:21: error: lane index "256" out-of-range [0, 32)
   (func (result f32) (f32x4.extract_lane 256 (v128.const f32x4 0 0 0 0)))
                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.12.wat:1:71: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.20.wat:1:71: error: unexpected token ), expected EOF.
   (func (result f32) (f32x4.extract_lane 256 (v128.const f32x4 0 0 0 0)))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:410: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.13.wat:1:22: error: lane index "-1" out-of-range [0, 32)
-  (func (result v128) (i8x16.replace_lane  -1 (v128.const i8x16 0 0 0 0 0 0 0 0...
-                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.13.wat:1:110: error: unexpected token ), expected EOF.
-  ...e_lane  -1 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) (i32.const 1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:411: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.14.wat:1:22: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:421: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.21.wat:1:22: error: lane index "256" out-of-range [0, 32)
   (func (result v128) (i8x16.replace_lane 256 (v128.const i8x16 0 0 0 0 0 0 0 0...
                        ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.14.wat:1:110: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.21.wat:1:110: error: unexpected token ), expected EOF.
   ...e_lane 256 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) (i32.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:412: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.15.wat:1:22: error: lane index "-1" out-of-range [0, 32)
-  (func (result v128) (i16x8.replace_lane  -1 (v128.const i16x8 0 0 0 0 0 0 0 0...
-                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.15.wat:1:94: error: unexpected token ), expected EOF.
-  ...8) (i16x8.replace_lane  -1 (v128.const i16x8 0 0 0 0 0 0 0 0) (i32.const 1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:413: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.16.wat:1:22: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:422: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.22.wat:1:22: error: lane index "256" out-of-range [0, 32)
   (func (result v128) (i16x8.replace_lane 256 (v128.const i16x8 0 0 0 0 0 0 0 0...
                        ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.16.wat:1:94: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.22.wat:1:94: error: unexpected token ), expected EOF.
   ...8) (i16x8.replace_lane 256 (v128.const i16x8 0 0 0 0 0 0 0 0) (i32.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:414: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.17.wat:1:22: error: lane index "-1" out-of-range [0, 32)
-  (func (result v128) (i32x4.replace_lane  -1 (v128.const i32x4 0 0 0 0) (i32.c...
-                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.17.wat:1:86: error: unexpected token ), expected EOF.
-  ...sult v128) (i32x4.replace_lane  -1 (v128.const i32x4 0 0 0 0) (i32.const 1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:415: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.18.wat:1:22: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:423: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.23.wat:1:22: error: lane index "256" out-of-range [0, 32)
   (func (result v128) (i32x4.replace_lane 256 (v128.const i32x4 0 0 0 0) (i32.c...
                        ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.18.wat:1:86: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.23.wat:1:86: error: unexpected token ), expected EOF.
   ...sult v128) (i32x4.replace_lane 256 (v128.const i32x4 0 0 0 0) (i32.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:416: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.19.wat:1:22: error: lane index "-1" out-of-range [0, 32)
-  (func (result v128) (f32x4.replace_lane  -1 (v128.const f32x4 0 0 0 0) (i32.c...
-                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.19.wat:1:86: error: unexpected token ), expected EOF.
-  ...sult v128) (f32x4.replace_lane  -1 (v128.const f32x4 0 0 0 0) (i32.const 1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:417: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.20.wat:1:22: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:424: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.24.wat:1:22: error: lane index "256" out-of-range [0, 32)
   (func (result v128) (f32x4.replace_lane 256 (v128.const f32x4 0 0 0 0) (i32.c...
                        ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.20.wat:1:86: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.24.wat:1:86: error: unexpected token ), expected EOF.
   ...sult v128) (f32x4.replace_lane 256 (v128.const f32x4 0 0 0 0) (i32.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:418: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.21.wat:1:21: error: lane index "-1" out-of-range [0, 32)
-  (func (result i64) (i64x2.extract_lane  -1 (v128.const i64x2 0 0)))
-                      ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.21.wat:1:67: error: unexpected token ), expected EOF.
-  (func (result i64) (i64x2.extract_lane  -1 (v128.const i64x2 0 0)))
-                                                                    ^
-out/test/spec/simd/simd_lane.wast:419: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.22.wat:1:21: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:425: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.25.wat:1:21: error: lane index "256" out-of-range [0, 32)
   (func (result i64) (i64x2.extract_lane 256 (v128.const i64x2 0 0)))
                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.22.wat:1:67: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.25.wat:1:67: error: unexpected token ), expected EOF.
   (func (result i64) (i64x2.extract_lane 256 (v128.const i64x2 0 0)))
                                                                     ^
-out/test/spec/simd/simd_lane.wast:420: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.23.wat:1:21: error: lane index "-1" out-of-range [0, 32)
-  (func (result f64) (f64x2.extract_lane  -1 (v128.const f64x2 0 0)))
-                      ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.23.wat:1:67: error: unexpected token ), expected EOF.
-  (func (result f64) (f64x2.extract_lane  -1 (v128.const f64x2 0 0)))
-                                                                    ^
-out/test/spec/simd/simd_lane.wast:421: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.24.wat:1:21: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:426: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.26.wat:1:21: error: lane index "256" out-of-range [0, 32)
   (func (result f64) (f64x2.extract_lane 256 (v128.const f64x2 0 0)))
                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.24.wat:1:67: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.26.wat:1:67: error: unexpected token ), expected EOF.
   (func (result f64) (f64x2.extract_lane 256 (v128.const f64x2 0 0)))
                                                                     ^
-out/test/spec/simd/simd_lane.wast:422: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.25.wat:1:22: error: lane index "-1" out-of-range [0, 32)
-  (func (result v128) (i64x2.replace_lane  -1 (v128.const i64x2 0 0) (i64.const...
-                       ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.25.wat:1:82: error: unexpected token ), expected EOF.
-  ... (result v128) (i64x2.replace_lane  -1 (v128.const i64x2 0 0) (i64.const 1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:423: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.26.wat:1:22: error: lane index "256" out-of-range [0, 32)
+out/test/spec/simd/simd_lane.wast:427: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.27.wat:1:22: error: lane index "256" out-of-range [0, 32)
   (func (result v128) (i64x2.replace_lane 256 (v128.const i64x2 0 0) (i64.const...
                        ^^^^^^^^^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.26.wat:1:82: error: unexpected token ), expected EOF.
-  ... (result v128) (i64x2.replace_lane 256 (v128.const i64x2 0 0) (i64.const 1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:424: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.27.wat:1:22: error: lane index "-1" out-of-range [0, 32)
-  (func (result v128) (f64x2.replace_lane  -1 (v128.const f64x2 0 0) (f64.const...
-                       ^^^^^^^^^^^^^^^^^^
   out/test/spec/simd/simd_lane/simd_lane.27.wat:1:82: error: unexpected token ), expected EOF.
-  ... (result v128) (f64x2.replace_lane  -1 (v128.const f64x2 0 0) (f64.const 1)))
+  ... (result v128) (i64x2.replace_lane 256 (v128.const i64x2 0 0) (i64.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:425: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:428: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.28.wat:1:22: error: lane index "256" out-of-range [0, 32)
   (func (result v128) (f64x2.replace_lane 256 (v128.const f64x2 0 0) (f64.const...
                        ^^^^^^^^^^^^^^^^^^
   out/test/spec/simd/simd_lane/simd_lane.28.wat:1:82: error: unexpected token ), expected EOF.
   ... (result v128) (f64x2.replace_lane 256 (v128.const f64x2 0 0) (f64.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:429: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:432: assert_invalid passed:
   error: lane index must be less than 16 (got 16)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:430: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:433: assert_invalid passed:
   error: lane index must be less than 16 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:431: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:434: assert_invalid passed:
   error: lane index must be less than 16 (got 16)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:432: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:435: assert_invalid passed:
   error: lane index must be less than 16 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:433: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:436: assert_invalid passed:
   error: lane index must be less than 8 (got 8)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:434: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:437: assert_invalid passed:
   error: lane index must be less than 8 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:435: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:438: assert_invalid passed:
   error: lane index must be less than 8 (got 8)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:436: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:439: assert_invalid passed:
   error: lane index must be less than 8 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:437: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:440: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:438: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:441: assert_invalid passed:
   error: lane index must be less than 4 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:439: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:442: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:440: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:443: assert_invalid passed:
   error: lane index must be less than 4 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:441: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:444: assert_invalid passed:
   error: lane index must be less than 16 (got 16)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:442: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:445: assert_invalid passed:
   error: lane index must be less than 16 (got 255)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:443: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:446: assert_invalid passed:
   error: lane index must be less than 8 (got 16)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:444: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:447: assert_invalid passed:
   error: lane index must be less than 8 (got 255)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:445: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:448: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:446: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:449: assert_invalid passed:
   error: lane index must be less than 4 (got 255)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:447: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:450: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [v128, i32]
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:448: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:451: assert_invalid passed:
   error: lane index must be less than 4 (got 255)
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [v128, i32]
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:449: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:452: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:450: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:453: assert_invalid passed:
   error: lane index must be less than 2 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:451: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:454: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:452: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:455: assert_invalid passed:
   error: lane index must be less than 2 (got 255)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:453: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:456: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:454: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:457: assert_invalid passed:
   error: lane index must be less than 2 (got 255)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:455: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:458: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   0000036: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:456: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:459: assert_invalid passed:
   error: lane index must be less than 2 (got 255)
   0000036: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:460: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:463: assert_invalid passed:
   error: lane index must be less than 8 (got 8)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:461: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:464: assert_invalid passed:
   error: lane index must be less than 8 (got 8)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:462: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:465: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:463: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:466: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:464: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:467: assert_invalid passed:
   error: lane index must be less than 8 (got 8)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:465: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:468: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:466: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:469: assert_invalid passed:
   error: lane index must be less than 4 (got 4)
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [v128, i32]
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:467: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:470: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:468: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:471: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:469: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:472: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:470: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:473: assert_invalid passed:
   error: lane index must be less than 2 (got 2)
   0000036: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:474: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:477: assert_invalid passed:
   error: type mismatch in i8x16.extract_lane_s, expected [v128] but got [i32]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:475: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:478: assert_invalid passed:
   error: type mismatch in i8x16.extract_lane_u, expected [v128] but got [i64]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:476: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:479: assert_invalid passed:
   error: type mismatch in i8x16.extract_lane_s, expected [v128] but got [f32]
   0000020: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:477: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:480: assert_invalid passed:
   error: type mismatch in i8x16.extract_lane_u, expected [v128] but got [f64]
   0000024: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:478: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:481: assert_invalid passed:
   error: type mismatch in i32x4.extract_lane, expected [v128] but got [i32]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:479: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:482: assert_invalid passed:
   error: type mismatch in f32x4.extract_lane, expected [v128] but got [f32]
   0000020: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:480: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:483: assert_invalid passed:
   error: type mismatch in i8x16.replace_lane, expected [v128, i32] but got [i32, i32]
   000001f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:481: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:484: assert_invalid passed:
   error: type mismatch in i16x8.replace_lane, expected [v128, i32] but got [i64, i32]
   000001f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:482: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:485: assert_invalid passed:
   error: type mismatch in i32x4.replace_lane, expected [v128, i32] but got [i32, i32]
   000001f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:483: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:486: assert_invalid passed:
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [f32, i32]
   0000022: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:484: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:487: assert_invalid passed:
   error: type mismatch in i64x2.extract_lane, expected [v128] but got [i64]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:485: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:488: assert_invalid passed:
   error: type mismatch in f64x2.extract_lane, expected [v128] but got [f64]
   0000024: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:486: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:489: assert_invalid passed:
   error: type mismatch in i32x4.replace_lane, expected [v128, i32] but got [i32, i32]
   000001f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:487: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:490: assert_invalid passed:
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [f32, i32]
   0000022: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:491: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:494: assert_invalid passed:
   error: type mismatch in i8x16.replace_lane, expected [v128, i32] but got [v128, f32]
   0000032: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:492: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:495: assert_invalid passed:
   error: type mismatch in i16x8.replace_lane, expected [v128, i32] but got [v128, f64]
   0000036: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:493: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:496: assert_invalid passed:
   error: type mismatch in i32x4.replace_lane, expected [v128, i32] but got [v128, f32]
   0000032: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:494: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:497: assert_invalid passed:
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [v128, i32]
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:496: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:499: assert_invalid passed:
   error: type mismatch in i64x2.replace_lane, expected [v128, i64] but got [v128, f64]
   0000036: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:497: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:500: assert_invalid passed:
   error: type mismatch in f64x2.replace_lane, expected [v128, f64] but got [v128, i64]
   000002f: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:500: assert_invalid passed:
-  error: type mismatch in v8x16.swizzle, expected [v128, v128] but got [i32, v128]
+out/test/spec/simd/simd_lane.wast:503: assert_invalid passed:
+  error: type mismatch in i8x16.swizzle, expected [v128, v128] but got [i32, v128]
   000002e: error: OnBinaryExpr callback failed
-out/test/spec/simd/simd_lane.wast:502: assert_invalid passed:
-  error: type mismatch in v8x16.swizzle, expected [v128, v128] but got [v128, i32]
+out/test/spec/simd/simd_lane.wast:505: assert_invalid passed:
+  error: type mismatch in i8x16.swizzle, expected [v128, v128] but got [v128, i32]
   000002e: error: OnBinaryExpr callback failed
-out/test/spec/simd/simd_lane.wast:504: assert_invalid passed:
-  error: type mismatch in v8x16.shuffle, expected [v128, v128] but got [f32, v128]
-  0000041: error: OnSimdShuffleOpExpr callback failed
 out/test/spec/simd/simd_lane.wast:507: assert_invalid passed:
-  error: type mismatch in v8x16.shuffle, expected [v128, v128] but got [v128, f32]
+  error: type mismatch in i8x16.shuffle, expected [v128, v128] but got [f32, v128]
+  0000041: error: OnSimdShuffleOpExpr callback failed
+out/test/spec/simd/simd_lane.wast:510: assert_invalid passed:
+  error: type mismatch in i8x16.shuffle, expected [v128, v128] but got [v128, f32]
   0000041: error: OnSimdShuffleOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:512: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.92.wat:1:43: error: unexpected token "0local.get", expected a numeric index or a name (e.g. 12 or $foo).
-  ...am v128) (result v128)local.get 0local.get 0v8x16.shuffle 0 1 2 3 4 5 6 7 ...
-                                     ^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.92.wat:1:54: error: unexpected token 0v8x16.shuffle.
-  ...ult v128)local.get 0local.get 0v8x16.shuffle 0 1 2 3 4 5 6 7 8 9 10 11 12 ...
-                                   ^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:517: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.93.wat:1:43: error: unexpected token "0local.get", expected a numeric index or a name (e.g. 12 or $foo).
-  ...am v128) (result v128)local.get 0local.get 0v8x16.shuffle 0 1 2 3 4 5 6 7 ...
-                                     ^^^^^^^^^^
-  out/test/spec/simd/simd_lane/simd_lane.93.wat:1:54: error: unexpected token 0v8x16.shuffle.
-  ...ult v128)local.get 0local.get 0v8x16.shuffle 0 1 2 3 4 5 6 7 8 9 10 11 12 ...
-                                   ^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:522: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:515: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.92.wat:1:83: error: unexpected token "(", expected a natural number in range [0, 32).
+  ...8x16.shuffle 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 (local.get 0) (local.get 0)))
+                                                     ^
+  out/test/spec/simd/simd_lane/simd_lane.92.wat:1:97: error: unexpected token (, expected EOF.
+  ...8x16.shuffle 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 (local.get 0) (local.get 0)))
+                                                                   ^
+out/test/spec/simd/simd_lane.wast:518: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.93.wat:1:86: error: unexpected token 16, expected ).
+  ...huffle 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 (local.get 0) (local.get 0)))
+                                                  ^^
+  out/test/spec/simd/simd_lane/simd_lane.93.wat:1:117: error: unexpected token ), expected EOF.
+  ...huffle 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 (local.get 0) (local.get 0)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:521: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.94.wat:1:70: error: unexpected token "-1", expected a natural number in range [0, 32).
   ... 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 -1(v128.const i8x16 15 14 13 12 11 10 ...
                                          ^^
   out/test/spec/simd/simd_lane/simd_lane.94.wat:1:185: error: unexpected token ), expected EOF.
   ... 8 7 6 5 4 3 2 1 0)(v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:526: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:525: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.95.wat:1:70: error: shuffle index "256" out-of-range [0, 32)
   ... 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 256(v128.const i8x16 15 14 13 12 11 10...
                                          ^^^
   out/test/spec/simd/simd_lane/simd_lane.95.wat:1:186: error: unexpected token ), expected EOF.
   ... 8 7 6 5 4 3 2 1 0)(v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:530: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:529: assert_invalid passed:
   error: lane index must be less than 32 (got 255)
   000004e: error: OnSimdShuffleOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:537: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:536: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.97.wat:1:21: error: unexpected token "i8x16.extract_lane", expected an instr.
   (func (result i32) (i8x16.extract_lane 0 (v128.const i8x16 0 0 0 0 0 0 0 0 0 ...
                       ^^^^^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:538: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:537: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.98.wat:1:21: error: unexpected token "i16x8.extract_lane", expected an instr.
   (func (result i32) (i16x8.extract_lane 0 (v128.const i16x8 0 0 0 0 0 0 0 0)))
                       ^^^^^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:539: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:538: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.99.wat:1:21: error: unexpected token "i32x4.extract_lane_s", expected an instr.
   (func (result i32) (i32x4.extract_lane_s 0 (v128.const i32x4 0 0 0 0)))
                       ^^^^^^^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:540: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:539: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.100.wat:1:21: error: unexpected token "i32x4.extract_lane_u", expected an instr.
   (func (result i32) (i32x4.extract_lane_u 0 (v128.const i32x4 0 0 0 0)))
                       ^^^^^^^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:541: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:540: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.101.wat:1:21: error: unexpected token "i64x2.extract_lane_s", expected an instr.
   (func (result i32) (i64x2.extract_lane_s 0 (v128.const i64x2 0 0)))
                       ^^^^^^^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:542: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:541: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.102.wat:1:21: error: unexpected token "i64x2.extract_lane_u", expected an instr.
   (func (result i32) (i64x2.extract_lane_u 0 (v128.const i64x2 0 0)))
                       ^^^^^^^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:546: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.103.wat:1:22: error: unexpected token "v8x16.shuffle1", expected an instr.
-  (func (result v128) (v8x16.shuffle1 (v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 ...
+out/test/spec/simd/simd_lane.wast:545: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.103.wat:1:22: error: unexpected token "i8x16.shuffle1", expected an instr.
+  (func (result v128) (i8x16.shuffle1 (v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 ...
                        ^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:550: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.104.wat:1:22: error: unexpected token "v8x16.shuffle2_imm", expected an instr.
-  (func (result v128) (v8x16.shuffle2_imm  0  1  2  3  4  5  6  7  8  9 10 11 1...
+out/test/spec/simd/simd_lane.wast:549: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.104.wat:1:22: error: unexpected token "i8x16.shuffle2_imm", expected an instr.
+  (func (result v128) (i8x16.shuffle2_imm  0  1  2  3  4  5  6  7  8  9 10 11 1...
                        ^^^^^^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:556: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.105.wat:1:22: error: unexpected token "i8x16.swizzle", expected an instr.
-  (func (result v128) (i8x16.swizzle (v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 1...
+out/test/spec/simd/simd_lane.wast:555: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.105.wat:1:22: error: unexpected token "v8x16.swizzle", expected an instr.
+  (func (result v128) (v8x16.swizzle (v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 1...
                        ^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:560: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.106.wat:1:22: error: unexpected token "i8x16.shuffle", expected an instr.
-  (func (result v128) (i8x16.shuffle  0  1  2  3  4  5  6  7  8  9 10 11 12 13 ...
+out/test/spec/simd/simd_lane.wast:559: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.106.wat:1:22: error: unexpected token "v8x16.shuffle", expected an instr.
+  (func (result v128) (v8x16.shuffle  0  1  2  3  4  5  6  7  8  9 10 11 12 13 ...
                        ^^^^^^^^^^^^^
-out/test/spec/simd/simd_lane.wast:571: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:570: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.107.wat:1:54: error: unexpected token "(", expected a natural number (e.g. 123).
   ...) (result i32) (i8x16.extract_lane_s (local.get 0) (v128.const i8x16 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.107.wat:1:68: error: unexpected token (, expected EOF.
   ... (i8x16.extract_lane_s (local.get 0) (v128.const i8x16 0 0 0 0 0 0 0 0 0 0...
                                           ^
-out/test/spec/simd/simd_lane.wast:572: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:571: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.108.wat:1:54: error: unexpected token "(", expected a natural number (e.g. 123).
   ...) (result i32) (i8x16.extract_lane_u (local.get 0) (v128.const i8x16 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.108.wat:1:68: error: unexpected token (, expected EOF.
   ... (i8x16.extract_lane_u (local.get 0) (v128.const i8x16 0 0 0 0 0 0 0 0 0 0...
                                           ^
-out/test/spec/simd/simd_lane.wast:573: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:572: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.109.wat:1:54: error: unexpected token "(", expected a natural number (e.g. 123).
   ...) (result i32) (i16x8.extract_lane_s (local.get 0) (v128.const i16x8 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.109.wat:1:68: error: unexpected token (, expected EOF.
   ...i32) (i16x8.extract_lane_s (local.get 0) (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                               ^
-out/test/spec/simd/simd_lane.wast:574: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:573: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.110.wat:1:54: error: unexpected token "(", expected a natural number (e.g. 123).
   ...) (result i32) (i16x8.extract_lane_u (local.get 0) (v128.const i16x8 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.110.wat:1:68: error: unexpected token (, expected EOF.
   ...i32) (i16x8.extract_lane_u (local.get 0) (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                               ^
-out/test/spec/simd/simd_lane.wast:575: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:574: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.111.wat:1:52: error: unexpected token "(", expected a natural number (e.g. 123).
   ...32) (result i32) (i32x4.extract_lane (local.get 0) (v128.const i32x4 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.111.wat:1:66: error: unexpected token (, expected EOF.
   ...) (result i32) (i32x4.extract_lane (local.get 0) (v128.const i32x4 0 0 0 0)))
                                                       ^
-out/test/spec/simd/simd_lane.wast:576: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:575: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.112.wat:1:52: error: unexpected token "(", expected a natural number (e.g. 123).
   ...32) (result f32) (f32x4.extract_lane (local.get 0) (v128.const f32x4 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.112.wat:1:66: error: unexpected token (, expected EOF.
   ...) (result f32) (f32x4.extract_lane (local.get 0) (v128.const f32x4 0 0 0 0)))
                                                       ^
-out/test/spec/simd/simd_lane.wast:577: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:576: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.113.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
   ...2) (result v128) (i8x16.replace_lane (local.get 0) (v128.const i8x16 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.113.wat:1:67: error: unexpected token (, expected EOF.
   ...8) (i8x16.replace_lane (local.get 0) (v128.const i8x16 0 0 0 0 0 0 0 0 0 0...
                                           ^
-out/test/spec/simd/simd_lane.wast:578: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:577: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.114.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
   ...2) (result v128) (i16x8.replace_lane (local.get 0) (v128.const i16x8 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.114.wat:1:67: error: unexpected token (, expected EOF.
   ...8) (i16x8.replace_lane (local.get 0) (v128.const i16x8 0 0 0 0 0 0 0 0) (i...
                                           ^
-out/test/spec/simd/simd_lane.wast:579: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:578: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.115.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
   ...2) (result v128) (i32x4.replace_lane (local.get 0) (v128.const i32x4 0 0 0...
                                           ^
   out/test/spec/simd/simd_lane/simd_lane.115.wat:1:67: error: unexpected token (, expected EOF.
   ...8) (i32x4.replace_lane (local.get 0) (v128.const i32x4 0 0 0 0) (i32.const...
                                           ^
-out/test/spec/simd/simd_lane.wast:580: assert_malformed passed:
+out/test/spec/simd/simd_lane.wast:579: assert_malformed passed:
   out/test/spec/simd/simd_lane/simd_lane.116.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
   ...2) (result v128) (f32x4.replace_lane (local.get 0) (v128.const f32x4 0 0 0...
                                           ^
@@ -532,377 +532,391 @@ out/test/spec/simd/simd_lane.wast:580: assert_malformed passed:
   ...8) (f32x4.replace_lane (local.get 0) (v128.const f32x4 0 0 0 0) (f32.const...
                                           ^
 out/test/spec/simd/simd_lane.wast:581: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.117.wat:1:49: error: unexpected token "(", expected a natural number in range [0, 32).
-  ...m v128) (result v128) (v8x16.shuffle (local.get 0) (v128.const i8x16 15 14...
-                                          ^
-  out/test/spec/simd/simd_lane/simd_lane.117.wat:1:63: error: unexpected token (, expected EOF.
-  ...t v128) (v8x16.shuffle (local.get 0) (v128.const i8x16 15 14 13 12 11 10 9...
-                                          ^
-out/test/spec/simd/simd_lane.wast:586: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.118.wat:1:52: error: unexpected token "(", expected a natural number (e.g. 123).
+  out/test/spec/simd/simd_lane/simd_lane.117.wat:1:52: error: unexpected token "(", expected a natural number (e.g. 123).
   ... i32) (result i64) (i64x2.extract_lane (local.get 0) (v128.const i64x2 0 0)))
                                             ^
-  out/test/spec/simd/simd_lane/simd_lane.118.wat:1:66: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.117.wat:1:66: error: unexpected token (, expected EOF.
   ... i32) (result i64) (i64x2.extract_lane (local.get 0) (v128.const i64x2 0 0)))
                                                           ^
-out/test/spec/simd/simd_lane.wast:587: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.119.wat:1:52: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:582: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.118.wat:1:52: error: unexpected token "(", expected a natural number (e.g. 123).
   ... i32) (result f64) (f64x2.extract_lane (local.get 0) (v128.const f64x2 0 0)))
                                             ^
-  out/test/spec/simd/simd_lane/simd_lane.119.wat:1:66: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.118.wat:1:66: error: unexpected token (, expected EOF.
   ... i32) (result f64) (f64x2.extract_lane (local.get 0) (v128.const f64x2 0 0)))
                                                           ^
-out/test/spec/simd/simd_lane.wast:588: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.120.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:583: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.119.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
   ...2) (result v128) (i64x2.replace_lane (local.get 0) (v128.const i64x2 0 0) ...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.120.wat:1:67: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.119.wat:1:67: error: unexpected token (, expected EOF.
   ...128) (i64x2.replace_lane (local.get 0) (v128.const i64x2 0 0) (i64.const 1)))
                                             ^
-out/test/spec/simd/simd_lane.wast:589: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.121.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:584: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.120.wat:1:53: error: unexpected token "(", expected a natural number (e.g. 123).
   ...2) (result v128) (f64x2.replace_lane (local.get 0) (v128.const f64x2 0 0) ...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.121.wat:1:67: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.120.wat:1:67: error: unexpected token (, expected EOF.
   ...8) (f64x2.replace_lane (local.get 0) (v128.const f64x2 0 0) (f64.const 1.0)))
                                           ^
-out/test/spec/simd/simd_lane.wast:593: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.122.wat:1:42: error: unexpected token "1.5", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:588: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.121.wat:1:42: error: unexpected token "1.5", expected a natural number (e.g. 123).
   ... (result i32) (i8x16.extract_lane_s 1.5 (v128.const i8x16 0 0 0 0 0 0 0 0 ...
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.122.wat:1:97: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.121.wat:1:97: error: unexpected token ), expected EOF.
   ...i8x16.extract_lane_s 1.5 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:594: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.123.wat:1:42: error: unexpected token "nan", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:589: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.122.wat:1:42: error: unexpected token "nan", expected a natural number (e.g. 123).
   ... (result i32) (i8x16.extract_lane_u nan (v128.const i8x16 0 0 0 0 0 0 0 0 ...
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.123.wat:1:97: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.122.wat:1:97: error: unexpected token ), expected EOF.
   ...i8x16.extract_lane_u nan (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:595: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.124.wat:1:42: error: unexpected token "inf", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:590: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.123.wat:1:42: error: unexpected token "inf", expected a natural number (e.g. 123).
   ...c (result i32) (i16x8.extract_lane_s inf (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                           ^^^
-  out/test/spec/simd/simd_lane/simd_lane.124.wat:1:81: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.123.wat:1:81: error: unexpected token ), expected EOF.
   ...c (result i32) (i16x8.extract_lane_s inf (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:596: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.125.wat:1:42: error: unexpected token "-inf", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:591: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.124.wat:1:42: error: unexpected token "-inf", expected a natural number (e.g. 123).
   ... (result i32) (i16x8.extract_lane_u -inf (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                          ^^^^
-  out/test/spec/simd/simd_lane/simd_lane.125.wat:1:82: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.124.wat:1:82: error: unexpected token ), expected EOF.
   ... (result i32) (i16x8.extract_lane_u -inf (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:597: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.126.wat:1:40: error: unexpected token "nan", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:592: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.125.wat:1:40: error: unexpected token "nan", expected a natural number (e.g. 123).
   (func (result i32) (i32x4.extract_lane nan (v128.const i32x4 0 0 0 0)))
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.126.wat:1:71: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.125.wat:1:71: error: unexpected token ), expected EOF.
   (func (result i32) (i32x4.extract_lane nan (v128.const i32x4 0 0 0 0)))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:598: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.127.wat:1:40: error: unexpected token "nan", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:593: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.126.wat:1:40: error: unexpected token "nan", expected a natural number (e.g. 123).
   (func (result f32) (f32x4.extract_lane nan (v128.const f32x4 0 0 0 0)))
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.127.wat:1:71: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.126.wat:1:71: error: unexpected token ), expected EOF.
   (func (result f32) (f32x4.extract_lane nan (v128.const f32x4 0 0 0 0)))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:599: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.128.wat:1:41: error: unexpected token "-2.5", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:594: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.127.wat:1:41: error: unexpected token "-2.5", expected a natural number (e.g. 123).
   ... (result v128) (i8x16.replace_lane -2.5 (v128.const i8x16 0 0 0 0 0 0 0 0 ...
                                         ^^^^
-  out/test/spec/simd/simd_lane/simd_lane.128.wat:1:111: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.127.wat:1:111: error: unexpected token ), expected EOF.
   ..._lane -2.5 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) (i32.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:600: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.129.wat:1:41: error: unexpected token "nan", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:595: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.128.wat:1:41: error: unexpected token "nan", expected a natural number (e.g. 123).
   ...c (result v128) (i16x8.replace_lane nan (v128.const i16x8 0 0 0 0 0 0 0 0)...
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.129.wat:1:94: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.128.wat:1:94: error: unexpected token ), expected EOF.
   ...8) (i16x8.replace_lane nan (v128.const i16x8 0 0 0 0 0 0 0 0) (i32.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:601: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.130.wat:1:41: error: unexpected token "inf", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:596: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.129.wat:1:41: error: unexpected token "inf", expected a natural number (e.g. 123).
   ...c (result v128) (i32x4.replace_lane inf (v128.const i32x4 0 0 0 0) (i32.co...
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.130.wat:1:86: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.129.wat:1:86: error: unexpected token ), expected EOF.
   ...sult v128) (i32x4.replace_lane inf (v128.const i32x4 0 0 0 0) (i32.const 1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:602: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.131.wat:1:41: error: unexpected token "-inf", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:597: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.130.wat:1:41: error: unexpected token "-inf", expected a natural number (e.g. 123).
   ... (result v128) (f32x4.replace_lane -inf (v128.const f32x4 0 0 0 0) (f32.co...
                                         ^^^^
-  out/test/spec/simd/simd_lane/simd_lane.131.wat:1:89: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.130.wat:1:89: error: unexpected token ), expected EOF.
   ...t v128) (f32x4.replace_lane -inf (v128.const f32x4 0 0 0 0) (f32.const 1.1)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:604: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.132.wat:1:40: error: unexpected token "nan", expected a natural number (e.g. 123).
-  (func (result i64) (i64x2.extract_lane nan (v128.const i64x2 0 0)))
-                                         ^^^
-  out/test/spec/simd/simd_lane/simd_lane.132.wat:1:67: error: unexpected token ), expected EOF.
-  (func (result i64) (i64x2.extract_lane nan (v128.const i64x2 0 0)))
-                                                                    ^
-out/test/spec/simd/simd_lane.wast:605: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.133.wat:1:40: error: unexpected token "nan", expected a natural number (e.g. 123).
-  (func (result f64) (f64x2.extract_lane nan (v128.const f64x2 0 0)))
-                                         ^^^
-  out/test/spec/simd/simd_lane/simd_lane.133.wat:1:67: error: unexpected token ), expected EOF.
-  (func (result f64) (f64x2.extract_lane nan (v128.const f64x2 0 0)))
-                                                                    ^
-out/test/spec/simd/simd_lane.wast:606: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.134.wat:1:41: error: unexpected token "inf", expected a natural number (e.g. 123).
-  ...c (result v128) (i64x2.replace_lane inf (v128.const i64x2 0 0) (i64.const ...
-                                         ^^^
-  out/test/spec/simd/simd_lane/simd_lane.134.wat:1:82: error: unexpected token ), expected EOF.
-  ... (result v128) (i64x2.replace_lane inf (v128.const i64x2 0 0) (i64.const 1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:607: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.135.wat:1:41: error: unexpected token "-inf", expected a natural number (e.g. 123).
-  ... (result v128) (f64x2.replace_lane -inf (v128.const f64x2 0 0) (f64.const ...
-                                        ^^^^
-  out/test/spec/simd/simd_lane/simd_lane.135.wat:1:85: error: unexpected token ), expected EOF.
-  ...esult v128) (f64x2.replace_lane -inf (v128.const f64x2 0 0) (f64.const 1.1)))
-                                                                                 ^
-out/test/spec/simd/simd_lane.wast:610: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.136.wat:1:36: error: unexpected token "(", expected a natural number in range [0, 32).
-  (func (result v128) (v8x16.shuffle (v128.const i8x16 16 17 18 19 20 21 22 23 ...
+out/test/spec/simd/simd_lane.wast:600: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.131.wat:1:36: error: unexpected token "(", expected a natural number in range [0, 32).
+  (func (result v128) (i8x16.shuffle (v128.const i8x16 16 17 18 19 20 21 22 23 ...
                                      ^
-  out/test/spec/simd/simd_lane/simd_lane.136.wat:1:103: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.131.wat:1:103: error: unexpected token (, expected EOF.
   ...20 21 22 23 24 25 26 27 28 29 30 31) (v128.const i8x16 15 14 13 12 11 10 9...
                                           ^
-out/test/spec/simd/simd_lane.wast:614: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.137.wat:1:71: error: unexpected token "15.0", expected a natural number in range [0, 32).
+out/test/spec/simd/simd_lane.wast:604: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.132.wat:1:71: error: unexpected token "15.0", expected a natural number in range [0, 32).
   ...0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15.0) (v128.const i8x16 15 14 13 12 11 ...
                                         ^^^^
-  out/test/spec/simd/simd_lane/simd_lane.137.wat:1:191: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.132.wat:1:191: error: unexpected token ), expected EOF.
   ...8 7 6 5 4 3 2 1 0) (v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:618: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.138.wat:1:36: error: unexpected token "0.5", expected a natural number in range [0, 32).
-  (func (result v128) (v8x16.shuffle 0.5 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (...
+out/test/spec/simd/simd_lane.wast:608: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.133.wat:1:36: error: unexpected token "0.5", expected a natural number in range [0, 32).
+  (func (result v128) (i8x16.shuffle 0.5 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (...
                                      ^^^
-out/test/spec/simd/simd_lane.wast:622: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.139.wat:1:36: error: unexpected token "-inf", expected a natural number in range [0, 32).
-  (func (result v128) (v8x16.shuffle -inf 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) ...
+out/test/spec/simd/simd_lane.wast:612: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.134.wat:1:36: error: unexpected token "-inf", expected a natural number in range [0, 32).
+  (func (result v128) (i8x16.shuffle -inf 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) ...
                                      ^^^^
-out/test/spec/simd/simd_lane.wast:626: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.140.wat:1:71: error: unexpected token "inf", expected a natural number in range [0, 32).
+out/test/spec/simd/simd_lane.wast:616: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.135.wat:1:71: error: unexpected token "inf", expected a natural number in range [0, 32).
   ... 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 inf) (v128.const i8x16 15 14 13 12 11 ...
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.140.wat:1:190: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.135.wat:1:190: error: unexpected token ), expected EOF.
   ...8 7 6 5 4 3 2 1 0) (v128.const i8x16 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:630: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.141.wat:1:36: error: unexpected token "nan", expected a natural number in range [0, 32).
-  (func (result v128) (v8x16.shuffle nan 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (...
+out/test/spec/simd/simd_lane.wast:620: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.136.wat:1:36: error: unexpected token "nan", expected a natural number in range [0, 32).
+  (func (result v128) (i8x16.shuffle nan 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (...
                                      ^^^
-out/test/spec/simd/simd_lane.wast:907: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.161.wat:1:42: error: unexpected token "1.0", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:877: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.141.wat:1:21: error: invalid literal "+0x0f"
+  (func (result i32) (i8x16.extract_lane_u +0x0f (v128.const i8x16 0 0 0 0 0 0 ...
+                      ^^^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.141.wat:1:99: error: unexpected token ), expected EOF.
+  ...x16.extract_lane_u +0x0f (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:878: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.142.wat:1:21: error: invalid literal "+03"
+  (func (result f32) (f32x4.extract_lane +03 (v128.const f32x4 0 0 0 0)))
+                      ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.142.wat:1:71: error: unexpected token ), expected EOF.
+  (func (result f32) (f32x4.extract_lane +03 (v128.const f32x4 0 0 0 0)))
+                                                                        ^
+out/test/spec/simd/simd_lane.wast:879: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.143.wat:1:21: error: invalid literal "+1"
+  (func (result i64) (i64x2.extract_lane +1 (v128.const i64x2 0 0)))
+                      ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.143.wat:1:66: error: unexpected token ), expected EOF.
+  (func (result i64) (i64x2.extract_lane +1 (v128.const i64x2 0 0)))
+                                                                   ^
+out/test/spec/simd/simd_lane.wast:880: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.144.wat:1:22: error: invalid literal "+015"
+  (func (result v128) (i8x16.replace_lane +015 (v128.const i8x16 0 0 0 0 0 0 0 ...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.144.wat:1:111: error: unexpected token ), expected EOF.
+  ..._lane +015 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) (i32.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:881: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.145.wat:1:22: error: invalid literal "+0x7"
+  (func (result v128) (i16x8.replace_lane +0x7 (v128.const i16x8 0 0 0 0 0 0 0 ...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.145.wat:1:95: error: unexpected token ), expected EOF.
+  ...) (i16x8.replace_lane +0x7 (v128.const i16x8 0 0 0 0 0 0 0 0) (i32.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:882: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.146.wat:1:22: error: invalid literal "+3"
+  (func (result v128) (i32x4.replace_lane +3 (v128.const i32x4 0 0 0 0) (i32.co...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.146.wat:1:85: error: unexpected token ), expected EOF.
+  ...esult v128) (i32x4.replace_lane +3 (v128.const i32x4 0 0 0 0) (i32.const 1)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:883: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.147.wat:1:22: error: invalid literal "+0x01"
+  (func (result v128) (f64x2.replace_lane +0x01 (v128.const f64x2 0 0) (f64.con...
+                       ^^^^^^^^^^^^^^^^^^
+  out/test/spec/simd/simd_lane/simd_lane.147.wat:1:86: error: unexpected token ), expected EOF.
+  ...sult v128) (f64x2.replace_lane +0x01 (v128.const f64x2 0 0) (f64.const 1.0)))
+                                                                                 ^
+out/test/spec/simd/simd_lane.wast:897: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.155.wat:1:42: error: unexpected token "1.0", expected a natural number (e.g. 123).
   ... (result i32) (i8x16.extract_lane_s 1.0 (v128.const i8x16 0 0 0 0 0 0 0 0 ...
                                          ^^^
-  out/test/spec/simd/simd_lane/simd_lane.161.wat:1:97: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.155.wat:1:97: error: unexpected token ), expected EOF.
   ...i8x16.extract_lane_s 1.0 (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                  ^
-out/test/spec/simd/simd_lane.wast:912: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.162.wat:1:79: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:902: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.156.wat:1:79: error: unexpected token "(", expected a natural number (e.g. 123).
   ... (result i32)  (i8x16.extract_lane_s (v128.const i8x16 0 0 0 0 0 0 0 0 0 0...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.162.wat:1:129: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.156.wat:1:129: error: unexpected token ), expected EOF.
   ...)  (i8x16.extract_lane_s (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)))
                                                                                 ^
-out/test/spec/simd/simd_lane.wast:920: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:910: assert_invalid passed:
   error: type mismatch in i8x16.extract_lane_s, expected [v128] but got []
   000001b: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:928: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.164.wat:1:74: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:918: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.158.wat:1:74: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i8x16.extract_lane_s-arg-empty (result i32)  (i8x16.extract_lane_s))
                                                                            ^
-out/test/spec/simd/simd_lane.wast:936: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.165.wat:1:79: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:926: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.159.wat:1:79: error: unexpected token "(", expected a natural number (e.g. 123).
   ...mpty (result i32)  (i16x8.extract_lane_u (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                               ^
-  out/test/spec/simd/simd_lane/simd_lane.165.wat:1:113: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.159.wat:1:113: error: unexpected token ), expected EOF.
   ...mpty (result i32)  (i16x8.extract_lane_u (v128.const i16x8 0 0 0 0 0 0 0 0)))
                                                                                 ^
-out/test/spec/simd/simd_lane.wast:944: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:934: assert_invalid passed:
   error: type mismatch in i16x8.extract_lane_u, expected [v128] but got []
   000001b: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:952: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.167.wat:1:74: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:942: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.161.wat:1:74: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i16x8.extract_lane_u-arg-empty (result i32)  (i16x8.extract_lane_u))
                                                                            ^
-out/test/spec/simd/simd_lane.wast:960: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.168.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:950: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.162.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
   ...-1st-arg-empty (result i32)  (i32x4.extract_lane (v128.const i32x4 0 0 0 0)))
                                                       ^
-  out/test/spec/simd/simd_lane/simd_lane.168.wat:1:101: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.162.wat:1:101: error: unexpected token ), expected EOF.
   ...-1st-arg-empty (result i32)  (i32x4.extract_lane (v128.const i32x4 0 0 0 0)))
                                                                                 ^
-out/test/spec/simd/simd_lane.wast:968: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:958: assert_invalid passed:
   error: type mismatch in i32x4.extract_lane, expected [v128] but got []
   000001b: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:976: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.170.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:966: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.164.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i32x4.extract_lane-arg-empty (result i32)  (i32x4.extract_lane))
                                                                        ^
-out/test/spec/simd/simd_lane.wast:984: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.171.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:974: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.165.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
   ...lane-1st-arg-empty (result i64)  (i64x2.extract_lane (v128.const i64x2 0 0)))
                                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.171.wat:1:97: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.165.wat:1:97: error: unexpected token ), expected EOF.
   ...lane-1st-arg-empty (result i64)  (i64x2.extract_lane (v128.const i64x2 0 0)))
                                                                                 ^
-out/test/spec/simd/simd_lane.wast:992: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:982: assert_invalid passed:
   error: type mismatch in i64x2.extract_lane, expected [v128] but got []
   000001b: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1000: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.173.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:990: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.167.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i64x2.extract_lane-arg-empty (result i64)  (i64x2.extract_lane))
                                                                        ^
-out/test/spec/simd/simd_lane.wast:1008: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.174.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:998: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.168.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
   ...-1st-arg-empty (result f32)  (f32x4.extract_lane (v128.const f32x4 0 0 0 0)))
                                                       ^
-  out/test/spec/simd/simd_lane/simd_lane.174.wat:1:101: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.168.wat:1:101: error: unexpected token ), expected EOF.
   ...-1st-arg-empty (result f32)  (f32x4.extract_lane (v128.const f32x4 0 0 0 0)))
                                                                                 ^
-out/test/spec/simd/simd_lane.wast:1016: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1006: assert_invalid passed:
   error: type mismatch in f32x4.extract_lane, expected [v128] but got []
   000001b: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1024: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.176.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1014: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.170.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $f32x4.extract_lane-arg-empty (result f32)  (f32x4.extract_lane))
                                                                        ^
-out/test/spec/simd/simd_lane.wast:1032: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.177.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1022: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.171.wat:1:75: error: unexpected token "(", expected a natural number (e.g. 123).
   ...lane-1st-arg-empty (result f64)  (f64x2.extract_lane (v128.const f64x2 0 0)))
                                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.177.wat:1:97: error: unexpected token ), expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.171.wat:1:97: error: unexpected token ), expected EOF.
   ...lane-1st-arg-empty (result f64)  (f64x2.extract_lane (v128.const f64x2 0 0)))
                                                                                 ^
-out/test/spec/simd/simd_lane.wast:1040: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1030: assert_invalid passed:
   error: type mismatch in f64x2.extract_lane, expected [v128] but got []
   000001b: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1048: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.179.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1038: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.173.wat:1:70: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $f64x2.extract_lane-arg-empty (result f64)  (f64x2.extract_lane))
                                                                        ^
-out/test/spec/simd/simd_lane.wast:1056: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.180.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1046: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.174.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
   ...y (result v128)  (i8x16.replace_lane (v128.const i8x16 0 0 0 0 0 0 0 0 0 0...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.180.wat:1:127: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.174.wat:1:127: error: unexpected token (, expected EOF.
   ...place_lane (v128.const i8x16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) (i32.const 1)))
                                                                    ^
-out/test/spec/simd/simd_lane.wast:1064: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1054: assert_invalid passed:
   error: type mismatch in i8x16.replace_lane, expected [v128, i32] but got [i32]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1072: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1062: assert_invalid passed:
   error: type mismatch in i8x16.replace_lane, expected [v128, i32] but got [v128]
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1080: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.183.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1070: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.177.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i8x16.replace_lane-arg-empty (result v128)  (i8x16.replace_lane))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:1088: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.184.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1078: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.178.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
   ...y (result v128)  (i16x8.replace_lane (v128.const i16x8 0 0 0 0 0 0 0 0) (i...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.184.wat:1:111: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.178.wat:1:111: error: unexpected token (, expected EOF.
   ...v128)  (i16x8.replace_lane (v128.const i16x8 0 0 0 0 0 0 0 0) (i32.const 1)))
                                                                    ^
-out/test/spec/simd/simd_lane.wast:1096: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1086: assert_invalid passed:
   error: type mismatch in i16x8.replace_lane, expected [v128, i32] but got [i32]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1104: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1094: assert_invalid passed:
   error: type mismatch in i16x8.replace_lane, expected [v128, i32] but got [v128]
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1112: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.187.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1102: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.181.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i16x8.replace_lane-arg-empty (result v128)  (i16x8.replace_lane))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:1120: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.188.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1110: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.182.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
   ...y (result v128)  (i32x4.replace_lane (v128.const i32x4 0 0 0 0) (i32.const...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.188.wat:1:103: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.182.wat:1:103: error: unexpected token (, expected EOF.
   ...(result v128)  (i32x4.replace_lane (v128.const i32x4 0 0 0 0) (i32.const 1)))
                                                                    ^
-out/test/spec/simd/simd_lane.wast:1128: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1118: assert_invalid passed:
   error: type mismatch in i32x4.replace_lane, expected [v128, i32] but got [i32]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1136: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1126: assert_invalid passed:
   error: type mismatch in i32x4.replace_lane, expected [v128, i32] but got [v128]
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1144: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.191.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1134: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.185.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i32x4.replace_lane-arg-empty (result v128)  (i32x4.replace_lane))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:1152: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.192.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1142: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.186.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
   ...y (result v128)  (f32x4.replace_lane (v128.const f32x4 0 0 0 0) (f32.const...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.192.wat:1:103: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.186.wat:1:103: error: unexpected token (, expected EOF.
   ...esult v128)  (f32x4.replace_lane (v128.const f32x4 0 0 0 0) (f32.const 1.0)))
                                                                  ^
-out/test/spec/simd/simd_lane.wast:1160: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1150: assert_invalid passed:
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [f32]
   0000020: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1168: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1158: assert_invalid passed:
   error: type mismatch in f32x4.replace_lane, expected [v128, f32] but got [v128]
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1176: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.195.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1166: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.189.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $f32x4.replace_lane-arg-empty (result v128)  (f32x4.replace_lane))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:1184: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.196.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1174: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.190.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
   ...pty (result v128)  (i64x2.replace_lane (v128.const i64x2 0 0) (i64.const 1)))
                                             ^
-  out/test/spec/simd/simd_lane/simd_lane.196.wat:1:99: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.190.wat:1:99: error: unexpected token (, expected EOF.
   ...pty (result v128)  (i64x2.replace_lane (v128.const i64x2 0 0) (i64.const 1)))
                                                                    ^
-out/test/spec/simd/simd_lane.wast:1192: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1182: assert_invalid passed:
   error: type mismatch in i64x2.replace_lane, expected [v128, i64] but got [i64]
   000001d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1200: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1190: assert_invalid passed:
   error: type mismatch in i64x2.replace_lane, expected [v128, i64] but got [v128]
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1208: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.199.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1198: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.193.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $i64x2.replace_lane-arg-empty (result v128)  (i64x2.replace_lane))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:1216: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.200.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1206: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.194.wat:1:76: error: unexpected token "(", expected a natural number (e.g. 123).
   ...y (result v128)  (f64x2.replace_lane (v128.const f64x2 0 0) (f64.const 1.0)))
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.200.wat:1:99: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.194.wat:1:99: error: unexpected token (, expected EOF.
   ...y (result v128)  (f64x2.replace_lane (v128.const f64x2 0 0) (f64.const 1.0)))
                                                                  ^
-out/test/spec/simd/simd_lane.wast:1224: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1214: assert_invalid passed:
   error: type mismatch in f64x2.replace_lane, expected [v128, f64] but got [f64]
   0000024: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1232: assert_invalid passed:
+out/test/spec/simd/simd_lane.wast:1222: assert_invalid passed:
   error: type mismatch in f64x2.replace_lane, expected [v128, f64] but got [v128]
   000002d: error: OnSimdLaneOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1240: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.203.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
+out/test/spec/simd/simd_lane.wast:1230: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.197.wat:1:71: error: unexpected token ")", expected a natural number (e.g. 123).
   (func $f64x2.replace_lane-arg-empty (result v128)  (f64x2.replace_lane))
                                                                         ^
-out/test/spec/simd/simd_lane.wast:1248: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.204.wat:1:69: error: unexpected token "(", expected a natural number in range [0, 32).
-  ...pty (result v128)  (v8x16.shuffle    (v128.const i8x16 0 1 2 3 5 6 6 7 8 9...
+out/test/spec/simd/simd_lane.wast:1238: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.198.wat:1:69: error: unexpected token "(", expected a natural number in range [0, 32).
+  ...pty (result v128)  (i8x16.shuffle    (v128.const i8x16 0 1 2 3 5 6 6 7 8 9...
                                           ^
-  out/test/spec/simd/simd_lane/simd_lane.204.wat:1:129: error: unexpected token (, expected EOF.
+  out/test/spec/simd/simd_lane/simd_lane.198.wat:1:129: error: unexpected token (, expected EOF.
   ... 3 5 6 6 7 8 9 10 11 12 13 14 15)    (v128.const i8x16 1 2 3 5 6 6 7 8 9 1...
                                           ^
-out/test/spec/simd/simd_lane.wast:1259: assert_invalid passed:
-  error: type mismatch in v8x16.shuffle, expected [v128, v128] but got [v128]
+out/test/spec/simd/simd_lane.wast:1249: assert_invalid passed:
+  error: type mismatch in i8x16.shuffle, expected [v128, v128] but got [v128]
   000003c: error: OnSimdShuffleOpExpr callback failed
-out/test/spec/simd/simd_lane.wast:1269: assert_malformed passed:
-  out/test/spec/simd/simd_lane/simd_lane.206.wat:1:61: error: unexpected token ")", expected a natural number in range [0, 32).
-  (func $v8x16.shuffle-arg-empty (result v128)  (v8x16.shuffle))
+out/test/spec/simd/simd_lane.wast:1259: assert_malformed passed:
+  out/test/spec/simd/simd_lane/simd_lane.200.wat:1:61: error: unexpected token ")", expected a natural number in range [0, 32).
+  (func $i8x16.shuffle-arg-empty (result v128)  (i8x16.shuffle))
                                                               ^
-461/461 tests passed.
+463/463 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/simd/simd_load_extend.txt b/test/spec/simd/simd_load_extend.txt
index cbe53c3d..9c97f642 100644
--- a/test/spec/simd/simd_load_extend.txt
+++ b/test/spec/simd/simd_load_extend.txt
@@ -15,40 +15,40 @@ out/test/spec/simd/simd_load_extend.wast:236: assert_trap passed: out of bounds
 out/test/spec/simd/simd_load_extend.wast:237: assert_trap passed: out of bounds memory access: access at 4294967296+8 >= max value 65536
 out/test/spec/simd/simd_load_extend.wast:238: assert_trap passed: out of bounds memory access: access at 4294967296+8 >= max value 65536
 out/test/spec/simd/simd_load_extend.wast:241: assert_invalid passed:
-  error: type mismatch in i16x8.load8x8_s, expected [i32] but got [f32]
+  error: type mismatch in v128.load8x8_s, expected [i32] but got [f32]
   0000026: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:242: assert_invalid passed:
-  error: type mismatch in i16x8.load8x8_u, expected [i32] but got [f32]
+  error: type mismatch in v128.load8x8_u, expected [i32] but got [f32]
   0000026: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:243: assert_invalid passed:
-  error: type mismatch in i32x4.load16x4_s, expected [i32] but got [f64]
+  error: type mismatch in v128.load16x4_s, expected [i32] but got [f64]
   000002a: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:244: assert_invalid passed:
-  error: type mismatch in i32x4.load16x4_u, expected [i32] but got [f64]
+  error: type mismatch in v128.load16x4_u, expected [i32] but got [f64]
   000002a: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:245: assert_invalid passed:
-  error: type mismatch in i64x2.load32x2_s, expected [i32] but got [v128]
+  error: type mismatch in v128.load32x2_s, expected [i32] but got [v128]
   0000033: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:246: assert_invalid passed:
-  error: type mismatch in i64x2.load32x2_u, expected [i32] but got [v128]
+  error: type mismatch in v128.load32x2_u, expected [i32] but got [v128]
   0000033: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:251: assert_invalid passed:
-  error: type mismatch in i16x8.load8x8_s, expected [i32] but got []
+  error: type mismatch in v128.load8x8_s, expected [i32] but got []
   0000021: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:259: assert_invalid passed:
-  error: type mismatch in i16x8.load8x8_u, expected [i32] but got []
+  error: type mismatch in v128.load8x8_u, expected [i32] but got []
   0000021: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:267: assert_invalid passed:
-  error: type mismatch in i32x4.load16x4_s, expected [i32] but got []
+  error: type mismatch in v128.load16x4_s, expected [i32] but got []
   0000021: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:275: assert_invalid passed:
-  error: type mismatch in i32x4.load16x4_u, expected [i32] but got []
+  error: type mismatch in v128.load16x4_u, expected [i32] but got []
   0000021: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:283: assert_invalid passed:
-  error: type mismatch in i64x2.load32x2_s, expected [i32] but got []
+  error: type mismatch in v128.load32x2_s, expected [i32] but got []
   0000021: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:291: assert_invalid passed:
-  error: type mismatch in i64x2.load32x2_u, expected [i32] but got []
+  error: type mismatch in v128.load32x2_u, expected [i32] but got []
   0000021: error: OnLoadExpr callback failed
 out/test/spec/simd/simd_load_extend.wast:301: assert_malformed passed:
   out/test/spec/simd/simd_load_extend/simd_load_extend.13.wat:1:25: error: unexpected token "i16x8.load16x4_s", expected an expr.
diff --git a/test/spec/simd/simd_load_splat.txt b/test/spec/simd/simd_load_splat.txt
index 056dd74d..08f58427 100644
--- a/test/spec/simd/simd_load_splat.txt
+++ b/test/spec/simd/simd_load_splat.txt
@@ -35,16 +35,16 @@ out/test/spec/simd/simd_load_splat.wast:151: assert_trap passed: out of bounds m
 out/test/spec/simd/simd_load_splat.wast:152: assert_trap passed: out of bounds memory access: access at 65534+4 >= max value 65536
 out/test/spec/simd/simd_load_splat.wast:153: assert_trap passed: out of bounds memory access: access at 65530+8 >= max value 65536
 out/test/spec/simd/simd_load_splat.wast:214: assert_invalid passed:
-  error: type mismatch in v8x16.load_splat, expected [i32] but got [v128]
+  error: type mismatch in v128.load8_splat, expected [i32] but got [v128]
   0000033: error: OnLoadSplatExpr callback failed
 out/test/spec/simd/simd_load_splat.wast:215: assert_invalid passed:
-  error: type mismatch in v16x8.load_splat, expected [i32] but got [v128]
+  error: type mismatch in v128.load16_splat, expected [i32] but got [v128]
   0000033: error: OnLoadSplatExpr callback failed
 out/test/spec/simd/simd_load_splat.wast:216: assert_invalid passed:
-  error: type mismatch in v32x4.load_splat, expected [i32] but got [v128]
+  error: type mismatch in v128.load32_splat, expected [i32] but got [v128]
   0000033: error: OnLoadSplatExpr callback failed
 out/test/spec/simd/simd_load_splat.wast:217: assert_invalid passed:
-  error: type mismatch in v64x2.load_splat, expected [i32] but got [v128]
+  error: type mismatch in v128.load64_splat, expected [i32] but got [v128]
   0000033: error: OnLoadSplatExpr callback failed
 out/test/spec/simd/simd_load_splat.wast:222: assert_malformed passed:
   out/test/spec/simd/simd_load_splat/simd_load_splat.6.wat:1:25: error: unexpected token "i8x16.load_splat", expected an expr.
@@ -75,16 +75,16 @@ out/test/spec/simd/simd_load_splat.wast:225: assert_malformed passed:
   (memory 1) (func (drop (i64x2.load_splat (i32.const 0))))
                                                          ^
 out/test/spec/simd/simd_load_splat.wast:231: assert_invalid passed:
-  error: type mismatch in v8x16.load_splat, expected [i32] but got []
+  error: type mismatch in v128.load8_splat, expected [i32] but got []
   0000021: error: OnLoadSplatExpr callback failed
 out/test/spec/simd/simd_load_splat.wast:239: assert_invalid passed:
-  error: type mismatch in v16x8.load_splat, expected [i32] but got []
+  error: type mismatch in v128.load16_splat, expected [i32] but got []
   0000021: error: OnLoadSplatExpr callback failed
 out/test/spec/simd/simd_load_splat.wast:247: assert_invalid passed:
-  error: type mismatch in v32x4.load_splat, expected [i32] but got []
+  error: type mismatch in v128.load32_splat, expected [i32] but got []
   0000021: error: OnLoadSplatExpr callback failed
 out/test/spec/simd/simd_load_splat.wast:255: assert_invalid passed:
-  error: type mismatch in v64x2.load_splat, expected [i32] but got []
+  error: type mismatch in v128.load64_splat, expected [i32] but got []
   0000021: error: OnLoadSplatExpr callback failed
 124/124 tests passed.
 ;;; STDOUT ;;)