diff options
231 files changed, 2065 insertions, 2278 deletions
diff --git a/docs/demo/wast-mode.js b/docs/demo/wast-mode.js index 9c882922..03ae630f 100644 --- a/docs/demo/wast-mode.js +++ b/docs/demo/wast-mode.js @@ -17,7 +17,7 @@ var mode = CodeMirror.defineSimpleMode('wast', { start: [ {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"}, - {regex: /anyfunc|mut|nop|block|if|then|else|loop|br|br_if|br_table|call|call_indirect|drop|end|return|get_local|set_local|tee_local|get_global|set_global|i32\.load|i64\.load|f32\.load|f64\.load|i32\.store|i64\.store|f32\.store|f64\.store|i32\.load8_s|i64\.load8_s|i32\.load8_u|i64\.load8_u|i32\.load16_s|i64\.load16_s|i32\.load16_u|i64\.load16_u|i64\.load32_s|i64\.load32_u|i32\.store8|i64\.store8|i32\.store16|i64\.store16|i32\.const|i64\.const|f32\.const|f64\.const|i32\.eqz|i64\.eqz|i32\.clz|i64\.clz|i32\.ctz|i64\.ctz|i32\.popcnt|i64\.popcnt|f32\.neg|f64\.neg|f32\.abs|f64\.abs|f32\.sqrt|f64\.sqrt|f32\.ceil|f64\.ceil|f32\.floor|f64\.floor|f32\.trunc|f64\.trunc|f32\.nearest|f64\.nearest|i32\.add|i64\.add|i32\.sub|i64\.sub|i32\.mul|i64\.mul|i32\.div_s|i64\.div_s|i32\.div_u|i64\.div_u|i32\.rem_s|i64\.rem_s|i32\.rem_u|i64\.rem_u|i32\.and|i64\.and|i32\.or|i64\.or|i32\.xor|i64\.xor|i32\.shl|i64\.shl|i32\.shr_s|i64\.shr_s|i32\.shr_u|i64\.shr_u|i32\.rotl|i64\.rotl|i32\.rotr|i64\.rotr|f32\.add|f64\.add|f32\.sub|f64\.sub|f32\.mul|f64\.mul|f32\.div|f64\.div|f32\.min|f64\.min|f32\.max|f64\.max|f32\.copysign|f64\.copysign|i32\.eq|i64\.eq|i32\.ne|i64\.ne|i32\.lt_s|i64\.lt_s|i32\.lt_u|i64\.lt_u|i32\.le_s|i64\.le_s|i32\.le_u|i64\.le_u|i32\.gt_s|i64\.gt_s|i32\.gt_u|i64\.gt_u|i32\.ge_s|i64\.ge_s|i32\.ge_u|i64\.ge_u|f32\.eq|f64\.eq|f32\.ne|f64\.ne|f32\.lt|f64\.lt|f32\.le|f64\.le|f32\.gt|f64\.gt|f32\.ge|f64\.ge|i64\.extend_s\/i32|i64\.extend_u\/i32|i32\.wrap\/i64|i32\.trunc_s\/f32|i64\.trunc_s\/f32|i32\.trunc_s\/f64|i64\.trunc_s\/f64|i32\.trunc_u\/f32|i64\.trunc_u\/f32|i32\.trunc_u\/f64|i64\.trunc_u\/f64|f32\.convert_s\/i32|f64\.convert_s\/i32|f32\.convert_s\/i64|f64\.convert_s\/i64|f32\.convert_u\/i32|f64\.convert_u\/i32|f32\.convert_u\/i64|f64\.convert_u\/i64|f64\.promote\/f32|f32\.demote\/f64|f32\.reinterpret\/i32|i32\.reinterpret\/f32|f64\.reinterpret\/i64|i64\.reinterpret\/f64|select|unreachable|current_memory|memory.size|grow_memory|memory.grow|type|func|param|result|local|global|module|table|memory|start|elem|data|offset|import|export|i32|i64|f32|f64/, token: "keyword"}, + {regex: /funcref|mut|nop|block|if|then|else|loop|br|br_if|br_table|call|call_indirect|drop|end|return|local\.get|local\.set|local\.tee|global\.get|global\.set|i32\.load|i64\.load|f32\.load|f64\.load|i32\.store|i64\.store|f32\.store|f64\.store|i32\.load8_s|i64\.load8_s|i32\.load8_u|i64\.load8_u|i32\.load16_s|i64\.load16_s|i32\.load16_u|i64\.load16_u|i64\.load32_s|i64\.load32_u|i32\.store8|i64\.store8|i32\.store16|i64\.store16|i32\.const|i64\.const|f32\.const|f64\.const|i32\.eqz|i64\.eqz|i32\.clz|i64\.clz|i32\.ctz|i64\.ctz|i32\.popcnt|i64\.popcnt|f32\.neg|f64\.neg|f32\.abs|f64\.abs|f32\.sqrt|f64\.sqrt|f32\.ceil|f64\.ceil|f32\.floor|f64\.floor|f32\.trunc|f64\.trunc|f32\.nearest|f64\.nearest|i32\.add|i64\.add|i32\.sub|i64\.sub|i32\.mul|i64\.mul|i32\.div_s|i64\.div_s|i32\.div_u|i64\.div_u|i32\.rem_s|i64\.rem_s|i32\.rem_u|i64\.rem_u|i32\.and|i64\.and|i32\.or|i64\.or|i32\.xor|i64\.xor|i32\.shl|i64\.shl|i32\.shr_s|i64\.shr_s|i32\.shr_u|i64\.shr_u|i32\.rotl|i64\.rotl|i32\.rotr|i64\.rotr|f32\.add|f64\.add|f32\.sub|f64\.sub|f32\.mul|f64\.mul|f32\.div|f64\.div|f32\.min|f64\.min|f32\.max|f64\.max|f32\.copysign|f64\.copysign|i32\.eq|i64\.eq|i32\.ne|i64\.ne|i32\.lt_s|i64\.lt_s|i32\.lt_u|i64\.lt_u|i32\.le_s|i64\.le_s|i32\.le_u|i64\.le_u|i32\.gt_s|i64\.gt_s|i32\.gt_u|i64\.gt_u|i32\.ge_s|i64\.ge_s|i32\.ge_u|i64\.ge_u|f32\.eq|f64\.eq|f32\.ne|f64\.ne|f32\.lt|f64\.lt|f32\.le|f64\.le|f32\.gt|f64\.gt|f32\.ge|f64\.ge|i64\.extend_i32_s|i64\.extend_i32_u|i32\.wrap_i64|i32\.trunc_f32_s|i64\.trunc_f32_s|i32\.trunc_f64_s|i64\.trunc_f64_s|i32\.trunc_f32_u|i64\.trunc_f32_u|i32\.trunc_f64_u|i64\.trunc_f64_u|f32\.convert_i32_s|f64\.convert_i32_s|f32\.convert_i64_s|f64\.convert_i64_s|f32\.convert_i32_u|f64\.convert_i32_u|f32\.convert_i64_u|f64\.convert_i64_u|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|memory\.size|memory\.grow|type|func|param|result|local|global|module|table|memory|start|elem|data|offset|import|export|i32|i64|f32|f64/, token: "keyword"}, {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"}, {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"}, {regex: /\(;.*?/, token: "comment", next: "comment"}, diff --git a/docs/demo/wat2wasm/examples.js b/docs/demo/wat2wasm/examples.js index 02fe3116..efdbfc09 100644 --- a/docs/demo/wat2wasm/examples.js +++ b/docs/demo/wat2wasm/examples.js @@ -76,7 +76,7 @@ for (let i = 1; i <= 15; i++) { (memory (data "hi")) (type (func (param i32) (result i32))) (start 1) - (table 0 1 anyfunc) + (table 0 1 funcref) (func) (func (type 1) i32.const 42 diff --git a/fuzz-in/wast.dict b/fuzz-in/wast.dict index d9ac252f..28612562 100644 --- a/fuzz-in/wast.dict +++ b/fuzz-in/wast.dict @@ -45,11 +45,11 @@ op_call_indirect="call_indirect" op_drop="drop" op_end="end" op_return="return" -op_get_local="get_local" -op_set_local="set_local" -op_tee_local="tee_local" -op_get_global="get_global" -op_set_global="set_global" +op_local_get="local.get" +op_local_set="local.set" +op_local_tee="local.tee" +op_global_get="global.get" +op_global_set="global.set" op_i32_load="i32.load" op_i64_load="i64.load" op_f32_load="f32.load" @@ -173,31 +173,31 @@ op_f32_gt="f32.gt" op_f64_gt="f64.gt" op_f32_ge="f32.ge" op_f64_ge="f64.ge" -op_i64_extend_s_i32="i64.extend_s/i32" -op_i64_extend_u_i32="i64.extend_u/i32" -op_i32_wrap_i64="i32.wrap/i64" -op_i32_trunc_s_f32="i32.trunc_s/f32" -op_i64_trunc_s_f32="i64.trunc_s/f32" -op_i32_trunc_s_f64="i32.trunc_s/f64" -op_i64_trunc_s_f64="i64.trunc_s/f64" -op_i32_trunc_u_f32="i32.trunc_u/f32" -op_i64_trunc_u_f32="i64.trunc_u/f32" -op_i32_trunc_u_f64="i32.trunc_u/f64" -op_i64_trunc_u_f64="i64.trunc_u/f64" -op_f32_convert_s_i32="f32.convert_s/i32" -op_f64_convert_s_i32="f64.convert_s/i32" -op_f32_convert_s_i64="f32.convert_s/i64" -op_f64_convert_s_i64="f64.convert_s/i64" -op_f32_convert_u_i32="f32.convert_u/i32" -op_f64_convert_u_i32="f64.convert_u/i32" -op_f32_convert_u_i64="f32.convert_u/i64" -op_f64_convert_u_i64="f64.convert_u/i64" -op_f64_promote_f32="f64.promote/f32" -op_f32_demote_f64="f32.demote/f64" -op_f32_reinterpret_i32="f32.reinterpret/i32" -op_i32_reinterpret_f32="i32.reinterpret/f32" -op_f64_reinterpret_i64="f64.reinterpret/i64" -op_i64_reinterpret_f64="i64.reinterpret/f64" +op_i64_extend_i32_s="i64.extend_i32_s" +op_i64_extend_i32_u="i64.extend_i32_u" +op_i32_wrap_i64="i32.wrap_i64" +op_i32_trunc_f32_s="i32.trunc_f32_s" +op_i64_trunc_f32_s="i64.trunc_f32_s" +op_i32_trunc_f64_s="i32.trunc_f64_s" +op_i64_trunc_f64_s="i64.trunc_f64_s" +op_i32_trunc_f32_u="i32.trunc_f32_u" +op_i64_trunc_f32_u="i64.trunc_f32_u" +op_i32_trunc_f64_u="i32.trunc_f64_u" +op_i64_trunc_f64_u="i64.trunc_f64_u" +op_f32_convert_i32_s="f32.convert_i32_s" +op_f64_convert_i32_s="f64.convert_i32_s" +op_f32_convert_i64_s="f32.convert_i64_s" +op_f64_convert_i64_s="f64.convert_i64_s" +op_f32_convert_i32_u="f32.convert_i32_u" +op_f64_convert_i32_u="f64.convert_i32_u" +op_f32_convert_i64_u="f32.convert_i64_u" +op_f64_convert_i64_u="f64.convert_i64_u" +op_f64_promote_f32="f64.promote_f32" +op_f32_demote_f64="f32.demote_f64" +op_f32_reinterpret_i32="f32.reinterpret_i32" +op_i32_reinterpret_f32="i32.reinterpret_f32" +op_f64_reinterpret_i64="f64.reinterpret_i64" +op_i64_reinterpret_f64="i64.reinterpret_f64" op_select="select" op_unreachable="unreachable" op_memory_size="memory.size" diff --git a/src/c-writer.cc b/src/c-writer.cc index d143eeb3..473f0199 100644 --- a/src/c-writer.cc +++ b/src/c-writer.cc @@ -1120,7 +1120,7 @@ void CWriter::WriteElemInitializers() { Write(ExternalRef(table->name), ".data[offset + ", i, "] = (wasm_rt_elem_t){func_types[", func_type_index, - "], (wasm_rt_anyfunc_t)", ExternalPtr(func->name), "};", Newline()); + "], (wasm_rt_funcref_t)", ExternalPtr(func->name), "};", Newline()); ++i; } ++elem_segment_index; diff --git a/src/common.h b/src/common.h index 72fab59d..505ec950 100644 --- a/src/common.h +++ b/src/common.h @@ -268,7 +268,7 @@ enum class RelocType { MemoryAddressSLEB = 4, // e.g. Memory address in i32.const MemoryAddressI32 = 5, // e.g. Memory address in DATA TypeIndexLEB = 6, // e.g. Immediate type in call_indirect - GlobalIndexLEB = 7, // e.g. Immediate of get_global inst + GlobalIndexLEB = 7, // e.g. Immediate of global.get inst FunctionOffsetI32 = 8, // e.g. Code offset in DWARF metadata SectionOffsetI32 = 9, // e.g. Section offset in DWARF metadata TagIndexLEB = 10, // Used in throw instructions diff --git a/src/decompiler-ast.h b/src/decompiler-ast.h index b02bc76b..584a8373 100644 --- a/src/decompiler-ast.h +++ b/src/decompiler-ast.h @@ -329,8 +329,8 @@ struct AST { // Special optimisation: for constant instructions, we can mark these // as if they were variables, so they can be re-ordered for free with // the above code, without needing new variables! - // TODO: this would be nice to also do for get_local and maybe others, - // though that needs a way to ensure there's no set_local in between + // TODO: this would be nice to also do for local.get and maybe others, + // though that needs a way to ensure there's no local.set in between // when they get lifted, so complicates matters a bit. if (e.type() == ExprType::Const && value_stack_in_variables == value_stack_depth - 1) { diff --git a/src/lexer-keywords.txt b/src/lexer-keywords.txt index 5862ab6f..4927304b 100644 --- a/src/lexer-keywords.txt +++ b/src/lexer-keywords.txt @@ -36,7 +36,6 @@ call_ref, TokenType::CallRef, Opcode::CallRef call, TokenType::Call, Opcode::Call catch, TokenType::Catch, Opcode::Catch catch_all, TokenType::CatchAll, Opcode::CatchAll -current_memory, TokenType::MemorySize, Opcode::MemorySize data.drop, TokenType::DataDrop, Opcode::DataDrop data, TokenType::Data declare, TokenType::Declare @@ -174,7 +173,6 @@ get, TokenType::Get global.get, TokenType::GlobalGet, Opcode::GlobalGet global.set, TokenType::GlobalSet, Opcode::GlobalSet global, TokenType::Global -grow_memory, TokenType::MemoryGrow, Opcode::MemoryGrow i16x8.abs, TokenType::Unary, Opcode::I16X8Abs i16x8.add_sat_s, TokenType::Binary, Opcode::I16X8AddSatS i16x8.add_sat_u, TokenType::Binary, Opcode::I16X8AddSatU @@ -588,46 +586,3 @@ v128.store32_lane, TokenType::SimdStoreLane, Opcode::V128Store32Lane v128.store64_lane, TokenType::SimdStoreLane, Opcode::V128Store64Lane i8x16.shuffle, TokenType::SimdShuffleOp, Opcode::I8X16Shuffle i8x16.swizzle, TokenType::Binary, Opcode::I8X16Swizzle -# Deprecated names. -atomic.notify, TokenType::AtomicNotify, Opcode::MemoryAtomicNotify -i32.atomic.wait, TokenType::AtomicWait, Opcode::MemoryAtomicWait32 -i64.atomic.wait, TokenType::AtomicWait, Opcode::MemoryAtomicWait64 -anyfunc, Type::FuncRef -f32.convert_s/i32, TokenType::Convert, Opcode::F32ConvertI32S -f32.convert_s/i64, TokenType::Convert, Opcode::F32ConvertI64S -f32.convert_u/i32, TokenType::Convert, Opcode::F32ConvertI32U -f32.convert_u/i64, TokenType::Convert, Opcode::F32ConvertI64U -f32.demote/f64, TokenType::Convert, Opcode::F32DemoteF64 -f32.reinterpret/i32, TokenType::Convert, Opcode::F32ReinterpretI32 -f64.convert_s/i32, TokenType::Convert, Opcode::F64ConvertI32S -f64.convert_s/i64, TokenType::Convert, Opcode::F64ConvertI64S -f64.convert_u/i32, TokenType::Convert, Opcode::F64ConvertI32U -f64.convert_u/i64, TokenType::Convert, Opcode::F64ConvertI64U -f64.promote/f32, TokenType::Convert, Opcode::F64PromoteF32 -f64.reinterpret/i64, TokenType::Convert, Opcode::F64ReinterpretI64 -get_global, TokenType::GlobalGet, Opcode::GlobalGet -get_local, TokenType::LocalGet, Opcode::LocalGet -i32.reinterpret/f32, TokenType::Convert, Opcode::I32ReinterpretF32 -i32.trunc_s/f32, TokenType::Convert, Opcode::I32TruncF32S -i32.trunc_s/f64, TokenType::Convert, Opcode::I32TruncF64S -i32.trunc_s:sat/f32, TokenType::Convert, Opcode::I32TruncSatF32S -i32.trunc_s:sat/f64, TokenType::Convert, Opcode::I32TruncSatF64S -i32.trunc_u/f32, TokenType::Convert, Opcode::I32TruncF32U -i32.trunc_u/f64, TokenType::Convert, Opcode::I32TruncF64U -i32.trunc_u:sat/f32, TokenType::Convert, Opcode::I32TruncSatF32U -i32.trunc_u:sat/f64, TokenType::Convert, Opcode::I32TruncSatF64U -i32.wrap/i64, TokenType::Convert, Opcode::I32WrapI64 -i64.extend_s/i32, TokenType::Convert, Opcode::I64ExtendI32S -i64.extend_u/i32, TokenType::Convert, Opcode::I64ExtendI32U -i64.reinterpret/f64, TokenType::Convert, Opcode::I64ReinterpretF64 -i64.trunc_s/f32, TokenType::Convert, Opcode::I64TruncF32S -i64.trunc_s/f64, TokenType::Convert, Opcode::I64TruncF64S -i64.trunc_s:sat/f32, TokenType::Convert, Opcode::I64TruncSatF32S -i64.trunc_s:sat/f64, TokenType::Convert, Opcode::I64TruncSatF64S -i64.trunc_u/f32, TokenType::Convert, Opcode::I64TruncF32U -i64.trunc_u/f64, TokenType::Convert, Opcode::I64TruncF64U -i64.trunc_u:sat/f32, TokenType::Convert, Opcode::I64TruncSatF32U -i64.trunc_u:sat/f64, TokenType::Convert, Opcode::I64TruncSatF64U -set_global, TokenType::GlobalSet, Opcode::GlobalSet -set_local, TokenType::LocalSet, Opcode::LocalSet -tee_local, TokenType::LocalTee, Opcode::LocalTee diff --git a/src/prebuilt/lexer-keywords.cc b/src/prebuilt/lexer-keywords.cc index 9f48235b..2d8ec4e1 100644 --- a/src/prebuilt/lexer-keywords.cc +++ b/src/prebuilt/lexer-keywords.cc @@ -1,6 +1,6 @@ /* C++ code produced by gperf version 3.1 */ /* Command-line: gperf -m 50 -L C++ -N InWordSet -E -t -c --output-file=src/prebuilt/lexer-keywords.cc src/lexer-keywords.txt */ -/* Computed positions: -k'1,3,5-9,11-14,16-19,23,$' */ +/* Computed positions: -k'1,3,5-8,10,12,15,17-19,23,$' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -48,7 +48,7 @@ struct TokenInfo { Opcode opcode; }; }; -/* maximum key range = 2766, duplicates = 0 */ +/* maximum key range = 2358, duplicates = 0 */ class Perfect_Hash { @@ -63,32 +63,32 @@ Perfect_Hash::hash (const char *str, size_t len) { static unsigned short asso_values[] = { - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 19, 16, 2793, 305, - 12, 114, 11, 253, 141, 593, 392, 531, 13, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 11, 55, 57, 13, 97, - 20, 17, 11, 554, 871, 14, 37, 52, 28, 12, - 49, 66, 529, 42, 115, 11, 11, 13, 191, 133, - 336, 72, 56, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, 2793, - 2793, 2793, 2793, 2793, 2793, 2793, 2793 + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 13, 2380, 2380, 540, + 325, 4, 181, 3, 173, 368, 142, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 34, 4, 6, 776, 40, + 31, 9, 621, 3, 399, 214, 5, 8, 5, 126, + 25, 75, 471, 396, 20, 5, 17, 3, 626, 356, + 58, 515, 271, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, 2380, + 2380, 2380, 2380, 2380, 2380, 2380, 2380 }; unsigned int hval = len; @@ -107,28 +107,22 @@ Perfect_Hash::hash (const char *str, size_t len) hval += asso_values[static_cast<unsigned char>(str[17])]; /*FALLTHROUGH*/ case 17: - hval += asso_values[static_cast<unsigned char>(str[16]+1)]; + hval += asso_values[static_cast<unsigned char>(str[16])]; /*FALLTHROUGH*/ case 16: - hval += asso_values[static_cast<unsigned char>(str[15])]; - /*FALLTHROUGH*/ case 15: - case 14: - hval += asso_values[static_cast<unsigned char>(str[13])]; + hval += asso_values[static_cast<unsigned char>(str[14])]; /*FALLTHROUGH*/ + case 14: case 13: - hval += asso_values[static_cast<unsigned char>(str[12])]; - /*FALLTHROUGH*/ case 12: hval += asso_values[static_cast<unsigned char>(str[11])]; /*FALLTHROUGH*/ case 11: - hval += asso_values[static_cast<unsigned char>(str[10])]; - /*FALLTHROUGH*/ case 10: - case 9: - hval += asso_values[static_cast<unsigned char>(str[8])]; + hval += asso_values[static_cast<unsigned char>(str[9])]; /*FALLTHROUGH*/ + case 9: case 8: hval += asso_values[static_cast<unsigned char>(str[7])]; /*FALLTHROUGH*/ @@ -139,15 +133,15 @@ Perfect_Hash::hash (const char *str, size_t len) hval += asso_values[static_cast<unsigned char>(str[5])]; /*FALLTHROUGH*/ case 5: - hval += asso_values[static_cast<unsigned char>(str[4]+1)]; + hval += asso_values[static_cast<unsigned char>(str[4])]; /*FALLTHROUGH*/ case 4: case 3: - hval += asso_values[static_cast<unsigned char>(str[2])]; + hval += asso_values[static_cast<unsigned char>(str[2]+1)]; /*FALLTHROUGH*/ case 2: case 1: - hval += asso_values[static_cast<unsigned char>(str[0])]; + hval += asso_values[static_cast<unsigned char>(str[0]+1)]; break; } return hval + asso_values[static_cast<unsigned char>(str[len - 1])]; @@ -158,1659 +152,1510 @@ Perfect_Hash::InWordSet (const char *str, size_t len) { enum { - TOTAL_KEYWORDS = 613, + TOTAL_KEYWORDS = 569, MIN_WORD_LENGTH = 2, MAX_WORD_LENGTH = 29, - MIN_HASH_VALUE = 27, - MAX_HASH_VALUE = 2792 + MIN_HASH_VALUE = 22, + MAX_HASH_VALUE = 2379 }; static struct TokenInfo wordlist[] = { {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, +#line 40 "src/lexer-keywords.txt" + {"data", TokenType::Data}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 508 "src/lexer-keywords.txt" - {"if", TokenType::If, Opcode::If}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 141 "src/lexer-keywords.txt" - {"f64", Type::F64}, -#line 528 "src/lexer-keywords.txt" - {"mut", TokenType::Mut}, -#line 83 "src/lexer-keywords.txt" - {"f32", Type::F32}, -#line 440 "src/lexer-keywords.txt" - {"i64", Type::I64}, - {""}, -#line 302 "src/lexer-keywords.txt" - {"i32", Type::I32}, - {""}, {""}, {""}, {""}, {""}, -#line 512 "src/lexer-keywords.txt" - {"item", TokenType::Item}, {""}, -#line 48 "src/lexer-keywords.txt" - {"else", TokenType::Else, Opcode::Else}, -#line 47 "src/lexer-keywords.txt" - {"elem", TokenType::Elem}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 558 "src/lexer-keywords.txt" - {"table", TokenType::Table}, +#line 123 "src/lexer-keywords.txt" + {"f64.ge", TokenType::Compare, Opcode::F64Ge}, +#line 66 "src/lexer-keywords.txt" + {"f32.ge", TokenType::Compare, Opcode::F32Ge}, +#line 125 "src/lexer-keywords.txt" + {"f64.le", TokenType::Compare, Opcode::F64Le}, +#line 68 "src/lexer-keywords.txt" + {"f32.le", TokenType::Compare, Opcode::F32Le}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 49 "src/lexer-keywords.txt" - {"end", TokenType::End, Opcode::End}, - {""}, -#line 128 "src/lexer-keywords.txt" +#line 526 "src/lexer-keywords.txt" + {"mut", TokenType::Mut}, +#line 124 "src/lexer-keywords.txt" + {"f64.gt", TokenType::Compare, Opcode::F64Gt}, +#line 67 "src/lexer-keywords.txt" + {"f32.gt", TokenType::Compare, Opcode::F32Gt}, +#line 127 "src/lexer-keywords.txt" {"f64.lt", TokenType::Compare, Opcode::F64Lt}, -#line 71 "src/lexer-keywords.txt" +#line 70 "src/lexer-keywords.txt" {"f32.lt", TokenType::Compare, Opcode::F32Lt}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 170 "src/lexer-keywords.txt" - {"field", TokenType::Field}, - {""}, {""}, {""}, -#line 126 "src/lexer-keywords.txt" - {"f64.le", TokenType::Compare, Opcode::F64Le}, -#line 69 "src/lexer-keywords.txt" - {"f32.le", TokenType::Compare, Opcode::F32Le}, - {""}, -#line 112 "src/lexer-keywords.txt" - {"f64.abs", TokenType::Unary, Opcode::F64Abs}, -#line 54 "src/lexer-keywords.txt" - {"f32.abs", TokenType::Unary, Opcode::F32Abs}, -#line 139 "src/lexer-keywords.txt" - {"f64.sub", TokenType::Binary, Opcode::F64Sub}, -#line 81 "src/lexer-keywords.txt" - {"f32.sub", TokenType::Binary, Opcode::F32Sub}, -#line 559 "src/lexer-keywords.txt" - {"then", TokenType::Then}, -#line 431 "src/lexer-keywords.txt" - {"i64.sub", TokenType::Binary, Opcode::I64Sub}, -#line 293 "src/lexer-keywords.txt" - {"i32.sub", TokenType::Binary, Opcode::I32Sub}, -#line 527 "src/lexer-keywords.txt" +#line 132 "src/lexer-keywords.txt" + {"f64.neg", TokenType::Unary, Opcode::F64Neg}, +#line 75 "src/lexer-keywords.txt" + {"f32.neg", TokenType::Unary, Opcode::F32Neg}, +#line 133 "src/lexer-keywords.txt" + {"f64.ne", TokenType::Compare, Opcode::F64Ne}, +#line 76 "src/lexer-keywords.txt" + {"f32.ne", TokenType::Compare, Opcode::F32Ne}, +#line 414 "src/lexer-keywords.txt" + {"i64.ne", TokenType::Compare, Opcode::I64Ne}, +#line 277 "src/lexer-keywords.txt" + {"i32.ne", TokenType::Compare, Opcode::I32Ne}, +#line 538 "src/lexer-keywords.txt" + {"ref.null", TokenType::RefNull, Opcode::RefNull}, + {""}, {""}, +#line 33 "src/lexer-keywords.txt" + {"br", TokenType::Br, Opcode::Br}, +#line 525 "src/lexer-keywords.txt" {"module", TokenType::Module}, {""}, {""}, -#line 547 "src/lexer-keywords.txt" - {"select", TokenType::Select, Opcode::Select}, -#line 44 "src/lexer-keywords.txt" - {"do", TokenType::Do}, -#line 413 "src/lexer-keywords.txt" +#line 556 "src/lexer-keywords.txt" + {"table", TokenType::Table}, +#line 540 "src/lexer-keywords.txt" + {"result", TokenType::Result}, +#line 399 "src/lexer-keywords.txt" + {"i64.ge_u", TokenType::Compare, Opcode::I64GeU}, +#line 264 "src/lexer-keywords.txt" + {"i32.ge_u", TokenType::Compare, Opcode::I32GeU}, +#line 403 "src/lexer-keywords.txt" + {"i64.le_u", TokenType::Compare, Opcode::I64LeU}, +#line 268 "src/lexer-keywords.txt" + {"i32.le_u", TokenType::Compare, Opcode::I32LeU}, +#line 398 "src/lexer-keywords.txt" + {"i64.ge_s", TokenType::Compare, Opcode::I64GeS}, +#line 263 "src/lexer-keywords.txt" + {"i32.ge_s", TokenType::Compare, Opcode::I32GeS}, +#line 402 "src/lexer-keywords.txt" + {"i64.le_s", TokenType::Compare, Opcode::I64LeS}, +#line 267 "src/lexer-keywords.txt" + {"i32.le_s", TokenType::Compare, Opcode::I32LeS}, +#line 401 "src/lexer-keywords.txt" + {"i64.gt_u", TokenType::Compare, Opcode::I64GtU}, +#line 266 "src/lexer-keywords.txt" + {"i32.gt_u", TokenType::Compare, Opcode::I32GtU}, +#line 412 "src/lexer-keywords.txt" + {"i64.lt_u", TokenType::Compare, Opcode::I64LtU}, +#line 275 "src/lexer-keywords.txt" + {"i32.lt_u", TokenType::Compare, Opcode::I32LtU}, +#line 400 "src/lexer-keywords.txt" + {"i64.gt_s", TokenType::Compare, Opcode::I64GtS}, +#line 265 "src/lexer-keywords.txt" + {"i32.gt_s", TokenType::Compare, Opcode::I32GtS}, +#line 411 "src/lexer-keywords.txt" {"i64.lt_s", TokenType::Compare, Opcode::I64LtS}, -#line 276 "src/lexer-keywords.txt" +#line 274 "src/lexer-keywords.txt" {"i32.lt_s", TokenType::Compare, Opcode::I32LtS}, +#line 544 "src/lexer-keywords.txt" + {"return", TokenType::Return, Opcode::Return}, {""}, +#line 43 "src/lexer-keywords.txt" + {"do", TokenType::Do}, + {""}, {""}, {""}, {""}, #line 41 "src/lexer-keywords.txt" - {"data", TokenType::Data}, -#line 414 "src/lexer-keywords.txt" - {"i64.lt_u", TokenType::Compare, Opcode::I64LtU}, -#line 277 "src/lexer-keywords.txt" - {"i32.lt_u", TokenType::Compare, Opcode::I32LtU}, -#line 404 "src/lexer-keywords.txt" - {"i64.le_s", TokenType::Compare, Opcode::I64LeS}, -#line 269 "src/lexer-keywords.txt" - {"i32.le_s", TokenType::Compare, Opcode::I32LeS}, -#line 549 "src/lexer-keywords.txt" - {"start", TokenType::Start}, + {"declare", TokenType::Declare}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 131 "src/lexer-keywords.txt" + {"f64.nearest", TokenType::Unary, Opcode::F64Nearest}, +#line 74 "src/lexer-keywords.txt" + {"f32.nearest", TokenType::Unary, Opcode::F32Nearest}, {""}, -#line 405 "src/lexer-keywords.txt" - {"i64.le_u", TokenType::Compare, Opcode::I64LeU}, -#line 270 "src/lexer-keywords.txt" - {"i32.le_u", TokenType::Compare, Opcode::I32LeU}, +#line 548 "src/lexer-keywords.txt" + {"struct", Type::Struct, TokenType::Struct}, +#line 551 "src/lexer-keywords.txt" + {"table.get", TokenType::TableGet, Opcode::TableGet}, {""}, -#line 113 "src/lexer-keywords.txt" +#line 554 "src/lexer-keywords.txt" + {"table.set", TokenType::TableSet, Opcode::TableSet}, + {""}, {""}, +#line 349 "src/lexer-keywords.txt" + {"i64.and", TokenType::Binary, Opcode::I64And}, +#line 226 "src/lexer-keywords.txt" + {"i32.and", TokenType::Binary, Opcode::I32And}, + {""}, {""}, +#line 112 "src/lexer-keywords.txt" {"f64.add", TokenType::Binary, Opcode::F64Add}, -#line 55 "src/lexer-keywords.txt" +#line 54 "src/lexer-keywords.txt" {"f32.add", TokenType::Binary, Opcode::F32Add}, - {""}, -#line 350 "src/lexer-keywords.txt" +#line 348 "src/lexer-keywords.txt" {"i64.add", TokenType::Binary, Opcode::I64Add}, -#line 227 "src/lexer-keywords.txt" +#line 225 "src/lexer-keywords.txt" {"i32.add", TokenType::Binary, Opcode::I32Add}, -#line 420 "src/lexer-keywords.txt" - {"i64.rem_s", TokenType::Binary, Opcode::I64RemS}, -#line 283 "src/lexer-keywords.txt" - {"i32.rem_s", TokenType::Binary, Opcode::I32RemS}, - {""}, {""}, -#line 421 "src/lexer-keywords.txt" - {"i64.rem_u", TokenType::Binary, Opcode::I64RemU}, -#line 284 "src/lexer-keywords.txt" - {"i32.rem_u", TokenType::Binary, Opcode::I32RemU}, -#line 556 "src/lexer-keywords.txt" - {"table.set", TokenType::TableSet, Opcode::TableSet}, - {""}, {""}, -#line 532 "src/lexer-keywords.txt" - {"offset", TokenType::Offset}, + {""}, {""}, {""}, {""}, +#line 139 "src/lexer-keywords.txt" + {"f64.trunc", TokenType::Unary, Opcode::F64Trunc}, +#line 81 "src/lexer-keywords.txt" + {"f32.trunc", TokenType::Unary, Opcode::F32Trunc}, #line 171 "src/lexer-keywords.txt" - {"funcref", Type::FuncRef}, - {""}, {""}, -#line 32 "src/lexer-keywords.txt" - {"br_table", TokenType::BrTable, Opcode::BrTable}, - {""}, {""}, -#line 122 "src/lexer-keywords.txt" - {"f64.eq", TokenType::Compare, Opcode::F64Eq}, -#line 65 "src/lexer-keywords.txt" - {"f32.eq", TokenType::Compare, Opcode::F32Eq}, -#line 548 "src/lexer-keywords.txt" - {"shared", TokenType::Shared}, -#line 393 "src/lexer-keywords.txt" - {"i64.eq", TokenType::Compare, Opcode::I64Eq}, -#line 261 "src/lexer-keywords.txt" - {"i32.eq", TokenType::Compare, Opcode::I32Eq}, -#line 134 "src/lexer-keywords.txt" - {"f64.ne", TokenType::Compare, Opcode::F64Ne}, -#line 77 "src/lexer-keywords.txt" - {"f32.ne", TokenType::Compare, Opcode::F32Ne}, -#line 33 "src/lexer-keywords.txt" - {"br", TokenType::Br, Opcode::Br}, -#line 416 "src/lexer-keywords.txt" - {"i64.ne", TokenType::Compare, Opcode::I64Ne}, -#line 279 "src/lexer-keywords.txt" - {"i32.ne", TokenType::Compare, Opcode::I32Ne}, - {""}, -#line 351 "src/lexer-keywords.txt" - {"i64.and", TokenType::Binary, Opcode::I64And}, -#line 228 "src/lexer-keywords.txt" - {"i32.and", TokenType::Binary, Opcode::I32And}, - {""}, -#line 114 "src/lexer-keywords.txt" - {"f64.ceil", TokenType::Unary, Opcode::F64Ceil}, -#line 56 "src/lexer-keywords.txt" - {"f32.ceil", TokenType::Unary, Opcode::F32Ceil}, - {""}, -#line 535 "src/lexer-keywords.txt" - {"ref", TokenType::Ref}, -#line 536 "src/lexer-keywords.txt" - {"quote", TokenType::Quote}, - {""}, -#line 51 "src/lexer-keywords.txt" - {"extern", Type::ExternRef, TokenType::Extern}, + {"func", Type::FuncRef, TokenType::Func}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 415 "src/lexer-keywords.txt" + {"i64.or", TokenType::Binary, Opcode::I64Or}, +#line 278 "src/lexer-keywords.txt" + {"i32.or", TokenType::Binary, Opcode::I32Or}, {""}, -#line 552 "src/lexer-keywords.txt" - {"table.fill", TokenType::TableFill, Opcode::TableFill}, +#line 431 "src/lexer-keywords.txt" + {"i64.trunc_f32_u", TokenType::Convert, Opcode::I64TruncF32U}, +#line 293 "src/lexer-keywords.txt" + {"i32.trunc_f32_u", TokenType::Convert, Opcode::I32TruncF32U}, + {""}, {""}, +#line 430 "src/lexer-keywords.txt" + {"i64.trunc_f32_s", TokenType::Convert, Opcode::I64TruncF32S}, +#line 292 "src/lexer-keywords.txt" + {"i32.trunc_f32_s", TokenType::Convert, Opcode::I32TruncF32S}, +#line 420 "src/lexer-keywords.txt" + {"i64.rotl", TokenType::Binary, Opcode::I64Rotl}, +#line 283 "src/lexer-keywords.txt" + {"i32.rotl", TokenType::Binary, Opcode::I32Rotl}, {""}, -#line 131 "src/lexer-keywords.txt" +#line 137 "src/lexer-keywords.txt" + {"f64.store", TokenType::Store, Opcode::F64Store}, +#line 79 "src/lexer-keywords.txt" + {"f32.store", TokenType::Store, Opcode::F32Store}, +#line 428 "src/lexer-keywords.txt" + {"i64.store", TokenType::Store, Opcode::I64Store}, +#line 290 "src/lexer-keywords.txt" + {"i32.store", TokenType::Store, Opcode::I32Store}, + {""}, {""}, {""}, +#line 543 "src/lexer-keywords.txt" + {"return_call", TokenType::ReturnCall, Opcode::ReturnCall}, + {""}, {""}, {""}, +#line 130 "src/lexer-keywords.txt" {"f64.mul", TokenType::Binary, Opcode::F64Mul}, -#line 74 "src/lexer-keywords.txt" +#line 73 "src/lexer-keywords.txt" {"f32.mul", TokenType::Binary, Opcode::F32Mul}, - {""}, -#line 415 "src/lexer-keywords.txt" +#line 413 "src/lexer-keywords.txt" {"i64.mul", TokenType::Binary, Opcode::I64Mul}, -#line 278 "src/lexer-keywords.txt" +#line 276 "src/lexer-keywords.txt" {"i32.mul", TokenType::Binary, Opcode::I32Mul}, -#line 555 "src/lexer-keywords.txt" - {"table.init", TokenType::TableInit, Opcode::TableInit}, -#line 169 "src/lexer-keywords.txt" - {"f64x2", TokenType::F64X2}, - {""}, {""}, -#line 470 "src/lexer-keywords.txt" - {"i64x2", TokenType::I64X2}, + {""}, {""}, {""}, {""}, {""}, +#line 535 "src/lexer-keywords.txt" + {"ref.extern", TokenType::RefExtern}, +#line 126 "src/lexer-keywords.txt" + {"f64.load", TokenType::Load, Opcode::F64Load}, +#line 69 "src/lexer-keywords.txt" + {"f32.load", TokenType::Load, Opcode::F32Load}, +#line 410 "src/lexer-keywords.txt" + {"i64.load", TokenType::Load, Opcode::I64Load}, +#line 273 "src/lexer-keywords.txt" + {"i32.load", TokenType::Load, Opcode::I32Load}, #line 36 "src/lexer-keywords.txt" {"call", TokenType::Call, Opcode::Call}, -#line 561 "src/lexer-keywords.txt" - {"try", TokenType::Try, Opcode::Try}, - {""}, {""}, -#line 172 "src/lexer-keywords.txt" - {"func", Type::FuncRef, TokenType::Func}, -#line 557 "src/lexer-keywords.txt" - {"table.size", TokenType::TableSize, Opcode::TableSize}, - {""}, -#line 30 "src/lexer-keywords.txt" - {"block", TokenType::Block, Opcode::Block}, {""}, -#line 542 "src/lexer-keywords.txt" - {"result", TokenType::Result}, - {""}, {""}, {""}, -#line 516 "src/lexer-keywords.txt" - {"local", TokenType::Local}, - {""}, {""}, {""}, -#line 550 "src/lexer-keywords.txt" - {"struct", Type::Struct, TokenType::Struct}, -#line 390 "src/lexer-keywords.txt" - {"i64.ctz", TokenType::Unary, Opcode::I64Ctz}, -#line 258 "src/lexer-keywords.txt" - {"i32.ctz", TokenType::Unary, Opcode::I32Ctz}, -#line 422 "src/lexer-keywords.txt" - {"i64.rotl", TokenType::Binary, Opcode::I64Rotl}, -#line 285 "src/lexer-keywords.txt" - {"i32.rotl", TokenType::Binary, Opcode::I32Rotl}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 526 "src/lexer-keywords.txt" - {"memory", TokenType::Memory}, - {""}, {""}, {""}, {""}, -#line 130 "src/lexer-keywords.txt" - {"f64.min", TokenType::Binary, Opcode::F64Min}, -#line 73 "src/lexer-keywords.txt" - {"f32.min", TokenType::Binary, Opcode::F32Min}, -#line 388 "src/lexer-keywords.txt" - {"i64.clz", TokenType::Unary, Opcode::I64Clz}, -#line 256 "src/lexer-keywords.txt" - {"i32.clz", TokenType::Unary, Opcode::I32Clz}, +#line 421 "src/lexer-keywords.txt" + {"i64.rotr", TokenType::Binary, Opcode::I64Rotr}, +#line 284 "src/lexer-keywords.txt" + {"i32.rotr", TokenType::Binary, Opcode::I32Rotr}, {""}, {""}, -#line 525 "src/lexer-keywords.txt" - {"memory.size", TokenType::MemorySize, Opcode::MemorySize}, -#line 394 "src/lexer-keywords.txt" - {"i64.eqz", TokenType::Convert, Opcode::I64Eqz}, -#line 262 "src/lexer-keywords.txt" - {"i32.eqz", TokenType::Convert, Opcode::I32Eqz}, -#line 115 "src/lexer-keywords.txt" +#line 514 "src/lexer-keywords.txt" + {"local", TokenType::Local}, +#line 409 "src/lexer-keywords.txt" + {"i64.load8_u", TokenType::Load, Opcode::I64Load8U}, +#line 272 "src/lexer-keywords.txt" + {"i32.load8_u", TokenType::Load, Opcode::I32Load8U}, +#line 408 "src/lexer-keywords.txt" + {"i64.load8_s", TokenType::Load, Opcode::I64Load8S}, +#line 271 "src/lexer-keywords.txt" + {"i32.load8_s", TokenType::Load, Opcode::I32Load8S}, +#line 114 "src/lexer-keywords.txt" {"f64.const", TokenType::Const, Opcode::F64Const}, -#line 57 "src/lexer-keywords.txt" +#line 56 "src/lexer-keywords.txt" {"f32.const", TokenType::Const, Opcode::F32Const}, - {""}, -#line 389 "src/lexer-keywords.txt" +#line 387 "src/lexer-keywords.txt" {"i64.const", TokenType::Const, Opcode::I64Const}, -#line 257 "src/lexer-keywords.txt" +#line 255 "src/lexer-keywords.txt" {"i32.const", TokenType::Const, Opcode::I32Const}, - {""}, -#line 127 "src/lexer-keywords.txt" - {"f64.load", TokenType::Load, Opcode::F64Load}, -#line 70 "src/lexer-keywords.txt" - {"f32.load", TokenType::Load, Opcode::F32Load}, - {""}, -#line 412 "src/lexer-keywords.txt" - {"i64.load", TokenType::Load, Opcode::I64Load}, -#line 275 "src/lexer-keywords.txt" - {"i32.load", TokenType::Load, Opcode::I32Load}, {""}, {""}, {""}, -#line 152 "src/lexer-keywords.txt" - {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt}, -#line 164 "src/lexer-keywords.txt" - {"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub}, -#line 514 "src/lexer-keywords.txt" - {"local.set", TokenType::LocalSet, Opcode::LocalSet}, - {""}, -#line 465 "src/lexer-keywords.txt" - {"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub}, -#line 522 "src/lexer-keywords.txt" - {"memory.fill", TokenType::MemoryFill, Opcode::MemoryFill}, +#line 395 "src/lexer-keywords.txt" + {"i64.extend8_s", TokenType::Unary, Opcode::I64Extend8S}, +#line 262 "src/lexer-keywords.txt" + {"i32.extend8_s", TokenType::Unary, Opcode::I32Extend8S}, {""}, -#line 137 "src/lexer-keywords.txt" - {"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt}, -#line 79 "src/lexer-keywords.txt" - {"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt}, -#line 524 "src/lexer-keywords.txt" - {"memory.init", TokenType::MemoryInit, Opcode::MemoryInit}, -#line 29 "src/lexer-keywords.txt" - {"binary", TokenType::Bin}, +#line 42 "src/lexer-keywords.txt" + {"delegate", TokenType::Delegate}, +#line 469 "src/lexer-keywords.txt" + {"i64.xor", TokenType::Binary, Opcode::I64Xor}, +#line 347 "src/lexer-keywords.txt" + {"i32.xor", TokenType::Binary, Opcode::I32Xor}, +#line 140 "src/lexer-keywords.txt" + {"f64", Type::F64}, {""}, -#line 151 "src/lexer-keywords.txt" - {"f64x2.le", TokenType::Compare, Opcode::F64X2Le}, +#line 438 "src/lexer-keywords.txt" + {"i64", Type::I64}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 419 "src/lexer-keywords.txt" + {"i64.rem_u", TokenType::Binary, Opcode::I64RemU}, +#line 282 "src/lexer-keywords.txt" + {"i32.rem_u", TokenType::Binary, Opcode::I32RemU}, +#line 418 "src/lexer-keywords.txt" + {"i64.rem_s", TokenType::Binary, Opcode::I64RemS}, +#line 281 "src/lexer-keywords.txt" + {"i32.rem_s", TokenType::Binary, Opcode::I32RemS}, +#line 511 "src/lexer-keywords.txt" + {"local.get", TokenType::LocalGet, Opcode::LocalGet}, {""}, -#line 515 "src/lexer-keywords.txt" +#line 512 "src/lexer-keywords.txt" + {"local.set", TokenType::LocalSet, Opcode::LocalSet}, + {""}, {""}, {""}, +#line 513 "src/lexer-keywords.txt" {"local.tee", TokenType::LocalTee, Opcode::LocalTee}, - {""}, -#line 448 "src/lexer-keywords.txt" - {"i64x2.lt_s", TokenType::Binary, Opcode::I64X2LtS}, - {""}, {""}, {""}, {""}, {""}, -#line 450 "src/lexer-keywords.txt" - {"i64x2.le_s", TokenType::Binary, Opcode::I64X2LeS}, - {""}, {""}, {""}, {""}, {""}, -#line 546 "src/lexer-keywords.txt" - {"return", TokenType::Return, Opcode::Return}, {""}, {""}, {""}, -#line 155 "src/lexer-keywords.txt" - {"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul}, -#line 158 "src/lexer-keywords.txt" - {"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne}, - {""}, -#line 445 "src/lexer-keywords.txt" - {"i64x2.mul", TokenType::Binary, Opcode::I64X2Mul}, -#line 447 "src/lexer-keywords.txt" - {"i64x2.ne", TokenType::Binary, Opcode::I64X2Ne}, - {""}, -#line 52 "src/lexer-keywords.txt" - {"externref", Type::ExternRef}, - {""}, {""}, {""}, {""}, -#line 142 "src/lexer-keywords.txt" - {"f64x2.abs", TokenType::Unary, Opcode::F64X2Abs}, - {""}, {""}, -#line 452 "src/lexer-keywords.txt" - {"i64x2.abs", TokenType::Unary, Opcode::I64X2Abs}, - {""}, {""}, {""}, {""}, -#line 146 "src/lexer-keywords.txt" - {"f64x2.eq", TokenType::Compare, Opcode::F64X2Eq}, - {""}, {""}, -#line 446 "src/lexer-keywords.txt" - {"i64x2.eq", TokenType::Binary, Opcode::I64X2Eq}, -#line 138 "src/lexer-keywords.txt" - {"f64.store", TokenType::Store, Opcode::F64Store}, -#line 80 "src/lexer-keywords.txt" - {"f32.store", TokenType::Store, Opcode::F32Store}, - {""}, -#line 430 "src/lexer-keywords.txt" - {"i64.store", TokenType::Store, Opcode::I64Store}, -#line 292 "src/lexer-keywords.txt" - {"i32.store", TokenType::Store, Opcode::I32Store}, -#line 511 "src/lexer-keywords.txt" - {"invoke", TokenType::Invoke}, +#line 545 "src/lexer-keywords.txt" + {"select", TokenType::Select, Opcode::Select}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 428 "src/lexer-keywords.txt" - {"i64.store32", TokenType::Store, Opcode::I64Store32}, -#line 143 "src/lexer-keywords.txt" - {"f64x2.add", TokenType::Binary, Opcode::F64X2Add}, - {""}, -#line 38 "src/lexer-keywords.txt" - {"catch_all", TokenType::CatchAll, Opcode::CatchAll}, -#line 441 "src/lexer-keywords.txt" - {"i64x2.add", TokenType::Binary, Opcode::I64X2Add}, - {""}, -#line 42 "src/lexer-keywords.txt" - {"declare", TokenType::Declare}, +#line 92 "src/lexer-keywords.txt" + {"f32x4.ge", TokenType::Compare, Opcode::F32X4Ge}, +#line 309 "src/lexer-keywords.txt" + {"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU}, +#line 94 "src/lexer-keywords.txt" + {"f32x4.le", TokenType::Compare, Opcode::F32X4Le}, +#line 313 "src/lexer-keywords.txt" + {"i32x4.le_u", TokenType::Compare, Opcode::I32X4LeU}, {""}, -#line 154 "src/lexer-keywords.txt" - {"f64x2.min", TokenType::Binary, Opcode::F64X2Min}, -#line 391 "src/lexer-keywords.txt" - {"i64.div_s", TokenType::Binary, Opcode::I64DivS}, -#line 259 "src/lexer-keywords.txt" - {"i32.div_s", TokenType::Binary, Opcode::I32DivS}, +#line 308 "src/lexer-keywords.txt" + {"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS}, {""}, -#line 111 "src/lexer-keywords.txt" - {"f32x4", TokenType::F32X4}, -#line 392 "src/lexer-keywords.txt" - {"i64.div_u", TokenType::Binary, Opcode::I64DivU}, -#line 260 "src/lexer-keywords.txt" - {"i32.div_u", TokenType::Binary, Opcode::I32DivU}, -#line 340 "src/lexer-keywords.txt" - {"i32x4", TokenType::I32X4}, -#line 533 "src/lexer-keywords.txt" - {"output", TokenType::Output}, -#line 540 "src/lexer-keywords.txt" - {"ref.null", TokenType::RefNull, Opcode::RefNull}, -#line 387 "src/lexer-keywords.txt" - {"i64.atomic.store", TokenType::AtomicStore, Opcode::I64AtomicStore}, -#line 255 "src/lexer-keywords.txt" - {"i32.atomic.store", TokenType::AtomicStore, Opcode::I32AtomicStore}, - {""}, {""}, {""}, {""}, {""}, -#line 20 "src/lexer-keywords.txt" - {"array", Type::Array, TokenType::Array}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 539 "src/lexer-keywords.txt" - {"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull}, - {""}, {""}, -#line 23 "src/lexer-keywords.txt" - {"assert_invalid", TokenType::AssertInvalid}, -#line 385 "src/lexer-keywords.txt" - {"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32}, -#line 632 "src/lexer-keywords.txt" - {"set_local", TokenType::LocalSet, Opcode::LocalSet}, +#line 312 "src/lexer-keywords.txt" + {"i32x4.le_s", TokenType::Compare, Opcode::I32X4LeS}, {""}, -#line 144 "src/lexer-keywords.txt" - {"f64x2.ceil", TokenType::Unary, Opcode::F64X2Ceil}, - {""}, {""}, {""}, -#line 633 "src/lexer-keywords.txt" - {"tee_local", TokenType::LocalTee, Opcode::LocalTee}, +#line 311 "src/lexer-keywords.txt" + {"i32x4.gt_u", TokenType::Compare, Opcode::I32X4GtU}, {""}, -#line 132 "src/lexer-keywords.txt" - {"f64.nearest", TokenType::Unary, Opcode::F64Nearest}, -#line 75 "src/lexer-keywords.txt" - {"f32.nearest", TokenType::Unary, Opcode::F32Nearest}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 317 "src/lexer-keywords.txt" + {"i32x4.lt_u", TokenType::Compare, Opcode::I32X4LtU}, {""}, -#line 408 "src/lexer-keywords.txt" - {"i64.load32_s", TokenType::Load, Opcode::I64Load32S}, +#line 310 "src/lexer-keywords.txt" + {"i32x4.gt_s", TokenType::Compare, Opcode::I32X4GtS}, {""}, -#line 156 "src/lexer-keywords.txt" - {"f64x2.nearest", TokenType::Unary, Opcode::F64X2Nearest}, -#line 35 "src/lexer-keywords.txt" - {"call_ref", TokenType::CallRef, Opcode::CallRef}, -#line 409 "src/lexer-keywords.txt" - {"i64.load32_u", TokenType::Load, Opcode::I64Load32U}, -#line 163 "src/lexer-keywords.txt" - {"f64x2.sqrt", TokenType::Unary, Opcode::F64X2Sqrt}, -#line 63 "src/lexer-keywords.txt" - {"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64}, -#line 355 "src/lexer-keywords.txt" - {"i64.atomic.load", TokenType::AtomicLoad, Opcode::I64AtomicLoad}, -#line 231 "src/lexer-keywords.txt" - {"i32.atomic.load", TokenType::AtomicLoad, Opcode::I32AtomicLoad}, - {""}, {""}, -#line 600 "src/lexer-keywords.txt" - {"f32.demote/f64", TokenType::Convert, Opcode::F32DemoteF64}, -#line 423 "src/lexer-keywords.txt" - {"i64.rotr", TokenType::Binary, Opcode::I64Rotr}, -#line 286 "src/lexer-keywords.txt" - {"i32.rotr", TokenType::Binary, Opcode::I32Rotr}, -#line 96 "src/lexer-keywords.txt" +#line 316 "src/lexer-keywords.txt" + {"i32x4.lt_s", TokenType::Compare, Opcode::I32X4LtS}, +#line 93 "src/lexer-keywords.txt" + {"f32x4.gt", TokenType::Compare, Opcode::F32X4Gt}, +#line 100 "src/lexer-keywords.txt" + {"f32x4.neg", TokenType::Unary, Opcode::F32X4Neg}, +#line 95 "src/lexer-keywords.txt" {"f32x4.lt", TokenType::Compare, Opcode::F32X4Lt}, -#line 108 "src/lexer-keywords.txt" - {"f32x4.sub", TokenType::Binary, Opcode::F32X4Sub}, +#line 324 "src/lexer-keywords.txt" + {"i32x4.neg", TokenType::Unary, Opcode::I32X4Neg}, {""}, {""}, -#line 333 "src/lexer-keywords.txt" - {"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 569 "src/lexer-keywords.txt" - {"v128.not", TokenType::Unary, Opcode::V128Not}, -#line 95 "src/lexer-keywords.txt" - {"f32x4.le", TokenType::Compare, Opcode::F32X4Le}, - {""}, {""}, {""}, -#line 318 "src/lexer-keywords.txt" - {"i32x4.lt_s", TokenType::Compare, Opcode::I32X4LtS}, - {""}, -#line 319 "src/lexer-keywords.txt" - {"i32x4.lt_u", TokenType::Compare, Opcode::I32X4LtU}, - {""}, -#line 565 "src/lexer-keywords.txt" - {"v128.and", TokenType::Binary, Opcode::V128And}, - {""}, -#line 314 "src/lexer-keywords.txt" - {"i32x4.le_s", TokenType::Compare, Opcode::I32X4LeS}, - {""}, -#line 315 "src/lexer-keywords.txt" - {"i32x4.le_u", TokenType::Compare, Opcode::I32X4LeU}, - {""}, {""}, {""}, -#line 455 "src/lexer-keywords.txt" - {"i64x2.bitmask", TokenType::Unary, Opcode::I64X2Bitmask}, - {""}, {""}, {""}, -#line 99 "src/lexer-keywords.txt" - {"f32x4.mul", TokenType::Binary, Opcode::F32X4Mul}, -#line 102 "src/lexer-keywords.txt" +#line 101 "src/lexer-keywords.txt" {"f32x4.ne", TokenType::Compare, Opcode::F32X4Ne}, {""}, #line 325 "src/lexer-keywords.txt" - {"i32x4.mul", TokenType::Binary, Opcode::I32X4Mul}, -#line 327 "src/lexer-keywords.txt" {"i32x4.ne", TokenType::Compare, Opcode::I32X4Ne}, -#line 594 "src/lexer-keywords.txt" - {"i64.atomic.wait", TokenType::AtomicWait, Opcode::MemoryAtomicWait64}, -#line 593 "src/lexer-keywords.txt" - {"i32.atomic.wait", TokenType::AtomicWait, Opcode::MemoryAtomicWait32}, - {""}, {""}, {""}, {""}, -#line 84 "src/lexer-keywords.txt" - {"f32x4.abs", TokenType::Unary, Opcode::F32X4Abs}, - {""}, {""}, -#line 304 "src/lexer-keywords.txt" - {"i32x4.abs", TokenType::Unary, Opcode::I32X4Abs}, -#line 471 "src/lexer-keywords.txt" - {"i64.xor", TokenType::Binary, Opcode::I64Xor}, -#line 349 "src/lexer-keywords.txt" - {"i32.xor", TokenType::Binary, Opcode::I32Xor}, - {""}, {""}, -#line 90 "src/lexer-keywords.txt" - {"f32x4.eq", TokenType::Compare, Opcode::F32X4Eq}, - {""}, -#line 322 "src/lexer-keywords.txt" - {"i32x4.min_s", TokenType::Binary, Opcode::I32X4MinS}, -#line 308 "src/lexer-keywords.txt" - {"i32x4.eq", TokenType::Compare, Opcode::I32X4Eq}, -#line 27 "src/lexer-keywords.txt" - {"assert_unlinkable", TokenType::AssertUnlinkable}, - {""}, -#line 323 "src/lexer-keywords.txt" - {"i32x4.min_u", TokenType::Binary, Opcode::I32X4MinU}, - {""}, {""}, {""}, {""}, -#line 140 "src/lexer-keywords.txt" - {"f64.trunc", TokenType::Unary, Opcode::F64Trunc}, -#line 82 "src/lexer-keywords.txt" - {"f32.trunc", TokenType::Unary, Opcode::F32Trunc}, - {""}, -#line 545 "src/lexer-keywords.txt" - {"return_call", TokenType::ReturnCall, Opcode::ReturnCall}, -#line 568 "src/lexer-keywords.txt" - {"v128.load", TokenType::Load, Opcode::V128Load}, - {""}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 128 "src/lexer-keywords.txt" + {"f64.max", TokenType::Binary, Opcode::F64Max}, +#line 71 "src/lexer-keywords.txt" + {"f32.max", TokenType::Binary, Opcode::F32Max}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, #line 85 "src/lexer-keywords.txt" + {"f32x4.ceil", TokenType::Unary, Opcode::F32X4Ceil}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 84 "src/lexer-keywords.txt" {"f32x4.add", TokenType::Binary, Opcode::F32X4Add}, - {""}, {""}, -#line 305 "src/lexer-keywords.txt" - {"i32x4.add", TokenType::Binary, Opcode::I32X4Add}, - {""}, -#line 34 "src/lexer-keywords.txt" - {"call_indirect", TokenType::CallIndirect, Opcode::CallIndirect}, -#line 564 "src/lexer-keywords.txt" - {"v128.andnot", TokenType::Binary, Opcode::V128Andnot}, -#line 98 "src/lexer-keywords.txt" - {"f32x4.min", TokenType::Binary, Opcode::F32X4Min}, - {""}, -#line 24 "src/lexer-keywords.txt" - {"assert_malformed", TokenType::AssertMalformed}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, -#line 121 "src/lexer-keywords.txt" - {"f64.div", TokenType::Binary, Opcode::F64Div}, -#line 64 "src/lexer-keywords.txt" - {"f32.div", TokenType::Binary, Opcode::F32Div}, -#line 521 "src/lexer-keywords.txt" - {"memory.copy", TokenType::MemoryCopy, Opcode::MemoryCopy}, - {""}, -#line 566 "src/lexer-keywords.txt" - {"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect}, -#line 28 "src/lexer-keywords.txt" - {"atomic.fence", TokenType::AtomicFence, Opcode::AtomicFence}, {""}, -#line 574 "src/lexer-keywords.txt" - {"v128.store", TokenType::Store, Opcode::V128Store}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 454 "src/lexer-keywords.txt" - {"i64x2.all_true", TokenType::Unary, Opcode::I64X2AllTrue}, - {""}, {""}, -#line 86 "src/lexer-keywords.txt" - {"f32x4.ceil", TokenType::Unary, Opcode::F32X4Ceil}, +#line 303 "src/lexer-keywords.txt" + {"i32x4.add", TokenType::Binary, Opcode::I32X4Add}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 113 "src/lexer-keywords.txt" + {"f64.ceil", TokenType::Unary, Opcode::F64Ceil}, +#line 55 "src/lexer-keywords.txt" + {"f32.ceil", TokenType::Unary, Opcode::F32Ceil}, {""}, -#line 567 "src/lexer-keywords.txt" - {"v128.const", TokenType::Const, Opcode::V128Const}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 25 "src/lexer-keywords.txt" - {"assert_return", TokenType::AssertReturn}, - {""}, {""}, {""}, -#line 543 "src/lexer-keywords.txt" - {"rethrow", TokenType::Rethrow, Opcode::Rethrow}, - {""}, {""}, {""}, {""}, -#line 100 "src/lexer-keywords.txt" +#line 99 "src/lexer-keywords.txt" {"f32x4.nearest", TokenType::Unary, Opcode::F32X4Nearest}, - {""}, {""}, -#line 107 "src/lexer-keywords.txt" - {"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt}, - {""}, -#line 432 "src/lexer-keywords.txt" - {"i64.trunc_f32_s", TokenType::Convert, Opcode::I64TruncF32S}, -#line 294 "src/lexer-keywords.txt" - {"i32.trunc_f32_s", TokenType::Convert, Opcode::I32TruncF32S}, +#line 304 "src/lexer-keywords.txt" + {"i32x4.all_true", TokenType::Unary, Opcode::I32X4AllTrue}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, #line 433 "src/lexer-keywords.txt" - {"i64.trunc_f32_u", TokenType::Convert, Opcode::I64TruncF32U}, + {"i64.trunc_f64_u", TokenType::Convert, Opcode::I64TruncF64U}, #line 295 "src/lexer-keywords.txt" - {"i32.trunc_f32_u", TokenType::Convert, Opcode::I32TruncF32U}, - {""}, -#line 623 "src/lexer-keywords.txt" - {"i64.trunc_s/f32", TokenType::Convert, Opcode::I64TruncF32S}, -#line 611 "src/lexer-keywords.txt" - {"i32.trunc_s/f32", TokenType::Convert, Opcode::I32TruncF32S}, -#line 627 "src/lexer-keywords.txt" - {"i64.trunc_u/f32", TokenType::Convert, Opcode::I64TruncF32U}, -#line 615 "src/lexer-keywords.txt" - {"i32.trunc_u/f32", TokenType::Convert, Opcode::I32TruncF32U}, - {""}, {""}, {""}, {""}, -#line 165 "src/lexer-keywords.txt" - {"f64x2.trunc", TokenType::Unary, Opcode::F64X2Trunc}, - {""}, -#line 148 "src/lexer-keywords.txt" - {"f64x2.floor", TokenType::Unary, Opcode::F64X2Floor}, - {""}, -#line 135 "src/lexer-keywords.txt" - {"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32}, - {""}, {""}, {""}, -#line 367 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU}, -#line 606 "src/lexer-keywords.txt" - {"f64.promote/f32", TokenType::Convert, Opcode::F64PromoteF32}, + {"i32.trunc_f64_u", TokenType::Convert, Opcode::I32TruncF64U}, +#line 542 "src/lexer-keywords.txt" + {"return_call_indirect", TokenType::ReturnCallIndirect, Opcode::ReturnCallIndirect}, {""}, -#line 374 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8SubU}, -#line 243 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8SubU}, -#line 434 "src/lexer-keywords.txt" +#line 432 "src/lexer-keywords.txt" {"i64.trunc_f64_s", TokenType::Convert, Opcode::I64TruncF64S}, -#line 296 "src/lexer-keywords.txt" +#line 294 "src/lexer-keywords.txt" {"i32.trunc_f64_s", TokenType::Convert, Opcode::I32TruncF64S}, -#line 435 "src/lexer-keywords.txt" - {"i64.trunc_f64_u", TokenType::Convert, Opcode::I64TruncF64U}, -#line 297 "src/lexer-keywords.txt" - {"i32.trunc_f64_u", TokenType::Convert, Opcode::I32TruncF64U}, +#line 537 "src/lexer-keywords.txt" + {"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull}, + {""}, {""}, {""}, {""}, +#line 555 "src/lexer-keywords.txt" + {"table.size", TokenType::TableSize, Opcode::TableSize}, {""}, -#line 624 "src/lexer-keywords.txt" - {"i64.trunc_s/f64", TokenType::Convert, Opcode::I64TruncF64S}, -#line 612 "src/lexer-keywords.txt" - {"i32.trunc_s/f64", TokenType::Convert, Opcode::I32TruncF64S}, -#line 628 "src/lexer-keywords.txt" - {"i64.trunc_u/f64", TokenType::Convert, Opcode::I64TruncF64U}, -#line 616 "src/lexer-keywords.txt" - {"i32.trunc_u/f64", TokenType::Convert, Opcode::I32TruncF64U}, -#line 307 "src/lexer-keywords.txt" - {"i32x4.bitmask", TokenType::Unary, Opcode::I32X4Bitmask}, -#line 570 "src/lexer-keywords.txt" - {"v128.or", TokenType::Binary, Opcode::V128Or}, - {""}, {""}, {""}, -#line 370 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AddU}, -#line 239 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AddU}, - {""}, {""}, -#line 406 "src/lexer-keywords.txt" - {"i64.load16_s", TokenType::Load, Opcode::I64Load16S}, -#line 271 "src/lexer-keywords.txt" - {"i32.load16_s", TokenType::Load, Opcode::I32Load16S}, -#line 518 "src/lexer-keywords.txt" - {"memory.atomic.notify", TokenType::AtomicNotify, Opcode::MemoryAtomicNotify}, +#line 108 "src/lexer-keywords.txt" + {"f32x4.trunc", TokenType::Unary, Opcode::F32X4Trunc}, {""}, -#line 407 "src/lexer-keywords.txt" +#line 405 "src/lexer-keywords.txt" {"i64.load16_u", TokenType::Load, Opcode::I64Load16U}, -#line 272 "src/lexer-keywords.txt" +#line 270 "src/lexer-keywords.txt" {"i32.load16_u", TokenType::Load, Opcode::I32Load16U}, {""}, {""}, -#line 427 "src/lexer-keywords.txt" - {"i64.store16", TokenType::Store, Opcode::I64Store16}, -#line 290 "src/lexer-keywords.txt" - {"i32.store16", TokenType::Store, Opcode::I32Store16}, - {""}, -#line 620 "src/lexer-keywords.txt" - {"i64.extend_s/i32", TokenType::Convert, Opcode::I64ExtendI32S}, +#line 404 "src/lexer-keywords.txt" + {"i64.load16_s", TokenType::Load, Opcode::I64Load16S}, +#line 269 "src/lexer-keywords.txt" + {"i32.load16_s", TokenType::Load, Opcode::I32Load16S}, +#line 385 "src/lexer-keywords.txt" + {"i64.atomic.store", TokenType::AtomicStore, Opcode::I64AtomicStore}, +#line 253 "src/lexer-keywords.txt" + {"i32.atomic.store", TokenType::AtomicStore, Opcode::I32AtomicStore}, +#line 393 "src/lexer-keywords.txt" + {"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S}, +#line 261 "src/lexer-keywords.txt" + {"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 82 "src/lexer-keywords.txt" + {"f32", Type::F32}, {""}, -#line 621 "src/lexer-keywords.txt" - {"i64.extend_u/i32", TokenType::Convert, Opcode::I64ExtendI32U}, - {""}, {""}, {""}, -#line 584 "src/lexer-keywords.txt" - {"v128.load64_lane", TokenType::SimdLoadLane, Opcode::V128Load64Lane}, -#line 583 "src/lexer-keywords.txt" - {"v128.load32_lane", TokenType::SimdLoadLane, Opcode::V128Load32Lane}, +#line 300 "src/lexer-keywords.txt" + {"i32", Type::I32}, {""}, {""}, {""}, -#line 377 "src/lexer-keywords.txt" - {"i64.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I64AtomicRmwAdd}, -#line 246 "src/lexer-keywords.txt" - {"i32.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I32AtomicRmwAdd}, +#line 104 "src/lexer-keywords.txt" + {"f32x4.replace_lane", TokenType::SimdLaneOp, Opcode::F32X4ReplaceLane}, +#line 365 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU}, +#line 326 "src/lexer-keywords.txt" + {"i32x4.replace_lane", TokenType::SimdLaneOp, Opcode::I32X4ReplaceLane}, +#line 98 "src/lexer-keywords.txt" + {"f32x4.mul", TokenType::Binary, Opcode::F32X4Mul}, {""}, -#line 371 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AndU}, -#line 240 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AndU}, +#line 323 "src/lexer-keywords.txt" + {"i32x4.mul", TokenType::Binary, Opcode::I32X4Mul}, + {""}, +#line 553 "src/lexer-keywords.txt" + {"table.init", TokenType::TableInit, Opcode::TableInit}, + {""}, {""}, {""}, {""}, {""}, +#line 353 "src/lexer-keywords.txt" + {"i64.atomic.load", TokenType::AtomicLoad, Opcode::I64AtomicLoad}, +#line 229 "src/lexer-keywords.txt" + {"i32.atomic.load", TokenType::AtomicLoad, Opcode::I32AtomicLoad}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 378 "src/lexer-keywords.txt" + {"i64.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I64AtomicRmwOr}, +#line 247 "src/lexer-keywords.txt" + {"i32.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I32AtomicRmwOr}, + {""}, +#line 362 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AndU}, +#line 352 "src/lexer-keywords.txt" + {"i64.atomic.load8_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad8U}, +#line 228 "src/lexer-keywords.txt" + {"i32.atomic.load8_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad8U}, {""}, {""}, {""}, -#line 363 "src/lexer-keywords.txt" +#line 361 "src/lexer-keywords.txt" {"i64.atomic.rmw32.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AddU}, -#line 562 "src/lexer-keywords.txt" - {"type", TokenType::Type}, -#line 530 "src/lexer-keywords.txt" - {"nan:canonical", TokenType::NanCanonical}, - {""}, {""}, -#line 116 "src/lexer-keywords.txt" - {"f64.convert_i32_s", TokenType::Convert, Opcode::F64ConvertI32S}, -#line 58 "src/lexer-keywords.txt" - {"f32.convert_i32_s", TokenType::Convert, Opcode::F32ConvertI32S}, -#line 581 "src/lexer-keywords.txt" - {"v128.load8_lane", TokenType::SimdLoadLane, Opcode::V128Load8Lane}, + {""}, +#line 148 "src/lexer-keywords.txt" + {"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge}, +#line 110 "src/lexer-keywords.txt" + {"f32x4", TokenType::F32X4}, +#line 150 "src/lexer-keywords.txt" + {"f64x2.le", TokenType::Compare, Opcode::F64X2Le}, +#line 338 "src/lexer-keywords.txt" + {"i32x4", TokenType::I32X4}, + {""}, +#line 449 "src/lexer-keywords.txt" + {"i64x2.ge_s", TokenType::Binary, Opcode::I64X2GeS}, + {""}, +#line 448 "src/lexer-keywords.txt" + {"i64x2.le_s", TokenType::Binary, Opcode::I64X2LeS}, {""}, {""}, -#line 595 "src/lexer-keywords.txt" - {"anyfunc", Type::FuncRef}, +#line 319 "src/lexer-keywords.txt" + {"i32x4.max_u", TokenType::Binary, Opcode::I32X4MaxU}, {""}, -#line 510 "src/lexer-keywords.txt" - {"input", TokenType::Input}, -#line 592 "src/lexer-keywords.txt" - {"atomic.notify", TokenType::AtomicNotify, Opcode::MemoryAtomicNotify}, - {""}, {""}, {""}, -#line 384 "src/lexer-keywords.txt" - {"i64.atomic.store16", TokenType::AtomicStore, Opcode::I64AtomicStore16}, -#line 253 "src/lexer-keywords.txt" - {"i32.atomic.store16", TokenType::AtomicStore, Opcode::I32AtomicStore16}, -#line 173 "src/lexer-keywords.txt" - {"get", TokenType::Get}, -#line 145 "src/lexer-keywords.txt" - {"f64x2.div", TokenType::Binary, Opcode::F64X2Div}, +#line 318 "src/lexer-keywords.txt" + {"i32x4.max_s", TokenType::Binary, Opcode::I32X4MaxS}, +#line 447 "src/lexer-keywords.txt" + {"i64x2.gt_s", TokenType::Binary, Opcode::I64X2GtS}, {""}, +#line 446 "src/lexer-keywords.txt" + {"i64x2.lt_s", TokenType::Binary, Opcode::I64X2LtS}, +#line 149 "src/lexer-keywords.txt" + {"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt}, +#line 156 "src/lexer-keywords.txt" + {"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg}, +#line 151 "src/lexer-keywords.txt" + {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt}, +#line 451 "src/lexer-keywords.txt" + {"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg}, #line 509 "src/lexer-keywords.txt" - {"import", TokenType::Import}, -#line 571 "src/lexer-keywords.txt" - {"v128.any_true", TokenType::Unary, Opcode::V128AnyTrue}, + {"invoke", TokenType::Invoke}, +#line 90 "src/lexer-keywords.txt" + {"f32x4.extract_lane", TokenType::SimdLaneOp, Opcode::F32X4ExtractLane}, +#line 157 "src/lexer-keywords.txt" + {"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne}, +#line 307 "src/lexer-keywords.txt" + {"i32x4.extract_lane", TokenType::SimdLaneOp, Opcode::I32X4ExtractLane}, +#line 445 "src/lexer-keywords.txt" + {"i64x2.ne", TokenType::Binary, Opcode::I64X2Ne}, {""}, -#line 53 "src/lexer-keywords.txt" - {"export", TokenType::Export}, +#line 397 "src/lexer-keywords.txt" + {"i64.extend_i32_u", TokenType::Convert, Opcode::I64ExtendI32U}, +#line 96 "src/lexer-keywords.txt" + {"f32x4.max", TokenType::Binary, Opcode::F32X4Max}, +#line 396 "src/lexer-keywords.txt" + {"i64.extend_i32_s", TokenType::Convert, Opcode::I64ExtendI32S}, {""}, -#line 519 "src/lexer-keywords.txt" - {"memory.atomic.wait32", TokenType::AtomicWait, Opcode::MemoryAtomicWait32}, +#line 129 "src/lexer-keywords.txt" + {"f64.min", TokenType::Binary, Opcode::F64Min}, +#line 72 "src/lexer-keywords.txt" + {"f32.min", TokenType::Binary, Opcode::F32Min}, + {""}, {""}, {""}, +#line 49 "src/lexer-keywords.txt" + {"tag", TokenType::Tag}, {""}, -#line 364 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AndU}, - {""}, {""}, -#line 118 "src/lexer-keywords.txt" - {"f64.convert_i64_s", TokenType::Convert, Opcode::F64ConvertI64S}, -#line 60 "src/lexer-keywords.txt" - {"f32.convert_i64_s", TokenType::Convert, Opcode::F32ConvertI64S}, -#line 31 "src/lexer-keywords.txt" - {"br_if", TokenType::BrIf, Opcode::BrIf}, -#line 353 "src/lexer-keywords.txt" - {"i64.atomic.load32_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad32U}, - {""}, {""}, -#line 306 "src/lexer-keywords.txt" - {"i32x4.all_true", TokenType::Unary, Opcode::I32X4AllTrue}, -#line 575 "src/lexer-keywords.txt" - {"v128", Type::V128}, -#line 560 "src/lexer-keywords.txt" - {"throw", TokenType::Throw, Opcode::Throw}, -#line 378 "src/lexer-keywords.txt" +#line 376 "src/lexer-keywords.txt" {"i64.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I64AtomicRmwAnd}, -#line 247 "src/lexer-keywords.txt" +#line 245 "src/lexer-keywords.txt" {"i32.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I32AtomicRmwAnd}, +#line 560 "src/lexer-keywords.txt" + {"type", TokenType::Type}, +#line 143 "src/lexer-keywords.txt" + {"f64x2.ceil", TokenType::Unary, Opcode::F64X2Ceil}, {""}, {""}, -#line 410 "src/lexer-keywords.txt" - {"i64.load8_s", TokenType::Load, Opcode::I64Load8S}, -#line 273 "src/lexer-keywords.txt" - {"i32.load8_s", TokenType::Load, Opcode::I32Load8S}, - {""}, {""}, -#line 411 "src/lexer-keywords.txt" - {"i64.load8_u", TokenType::Load, Opcode::I64Load8U}, -#line 274 "src/lexer-keywords.txt" - {"i32.load8_u", TokenType::Load, Opcode::I32Load8U}, - {""}, {""}, -#line 520 "src/lexer-keywords.txt" - {"memory.atomic.wait64", TokenType::AtomicWait, Opcode::MemoryAtomicWait64}, - {""}, {""}, {""}, {""}, {""}, -#line 45 "src/lexer-keywords.txt" - {"drop", TokenType::Drop, Opcode::Drop}, - {""}, {""}, -#line 396 "src/lexer-keywords.txt" - {"i64.extend32_s", TokenType::Unary, Opcode::I64Extend32S}, -#line 544 "src/lexer-keywords.txt" - {"return_call_indirect", TokenType::ReturnCallIndirect, Opcode::ReturnCallIndirect}, - {""}, {""}, {""}, -#line 517 "src/lexer-keywords.txt" - {"loop", TokenType::Loop, Opcode::Loop}, - {""}, -#line 380 "src/lexer-keywords.txt" - {"i64.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I64AtomicRmwOr}, -#line 249 "src/lexer-keywords.txt" - {"i32.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I32AtomicRmwOr}, - {""}, {""}, -#line 573 "src/lexer-keywords.txt" - {"v128.load64_zero", TokenType::Load, Opcode::V128Load64Zero}, -#line 572 "src/lexer-keywords.txt" - {"v128.load32_zero", TokenType::Load, Opcode::V128Load32Zero}, - {""}, -#line 360 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16SubU}, -#line 236 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16SubU}, -#line 398 "src/lexer-keywords.txt" - {"i64.extend_i32_s", TokenType::Convert, Opcode::I64ExtendI32S}, -#line 109 "src/lexer-keywords.txt" - {"f32x4.trunc", TokenType::Unary, Opcode::F32X4Trunc}, +#line 375 "src/lexer-keywords.txt" + {"i64.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I64AtomicRmwAdd}, +#line 244 "src/lexer-keywords.txt" + {"i32.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I32AtomicRmwAdd}, {""}, -#line 92 "src/lexer-keywords.txt" - {"f32x4.floor", TokenType::Unary, Opcode::F32X4Floor}, -#line 399 "src/lexer-keywords.txt" - {"i64.extend_i32_u", TokenType::Convert, Opcode::I64ExtendI32U}, - {""}, {""}, {""}, {""}, -#line 429 "src/lexer-keywords.txt" +#line 427 "src/lexer-keywords.txt" {"i64.store8", TokenType::Store, Opcode::I64Store8}, -#line 291 "src/lexer-keywords.txt" +#line 289 "src/lexer-keywords.txt" {"i32.store8", TokenType::Store, Opcode::I32Store8}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 110 "src/lexer-keywords.txt" - {"f32x4.demote_f64x2_zero", TokenType::Unary, Opcode::F32X4DemoteF64X2Zero}, -#line 553 "src/lexer-keywords.txt" - {"table.get", TokenType::TableGet, Opcode::TableGet}, -#line 39 "src/lexer-keywords.txt" - {"current_memory", TokenType::MemorySize, Opcode::MemorySize}, - {""}, {""}, {""}, {""}, {""}, -#line 366 "src/lexer-keywords.txt" +#line 142 "src/lexer-keywords.txt" + {"f64x2.add", TokenType::Binary, Opcode::F64X2Add}, +#line 172 "src/lexer-keywords.txt" + {"get", TokenType::Get}, +#line 439 "src/lexer-keywords.txt" + {"i64x2.add", TokenType::Binary, Opcode::I64X2Add}, + {""}, {""}, {""}, {""}, +#line 364 "src/lexer-keywords.txt" {"i64.atomic.rmw32.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32OrU}, +#line 422 "src/lexer-keywords.txt" + {"i64.shl", TokenType::Binary, Opcode::I64Shl}, +#line 285 "src/lexer-keywords.txt" + {"i32.shl", TokenType::Binary, Opcode::I32Shl}, {""}, {""}, -#line 381 "src/lexer-keywords.txt" - {"i64.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I64AtomicRmwSub}, -#line 250 "src/lexer-keywords.txt" - {"i32.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I32AtomicRmwSub}, - {""}, {""}, {""}, -#line 602 "src/lexer-keywords.txt" - {"f64.convert_s/i32", TokenType::Convert, Opcode::F64ConvertI32S}, -#line 596 "src/lexer-keywords.txt" - {"f32.convert_s/i32", TokenType::Convert, Opcode::F32ConvertI32S}, -#line 604 "src/lexer-keywords.txt" - {"f64.convert_u/i32", TokenType::Convert, Opcode::F64ConvertI32U}, -#line 598 "src/lexer-keywords.txt" - {"f32.convert_u/i32", TokenType::Convert, Opcode::F32ConvertI32U}, -#line 537 "src/lexer-keywords.txt" - {"ref.extern", TokenType::RefExtern}, +#line 155 "src/lexer-keywords.txt" + {"f64x2.nearest", TokenType::Unary, Opcode::F64X2Nearest}, +#line 452 "src/lexer-keywords.txt" + {"i64x2.all_true", TokenType::Unary, Opcode::I64X2AllTrue}, {""}, -#line 582 "src/lexer-keywords.txt" - {"v128.load16_lane", TokenType::SimdLoadLane, Opcode::V128Load16Lane}, - {""}, {""}, {""}, -#line 587 "src/lexer-keywords.txt" - {"v128.store32_lane", TokenType::SimdStoreLane, Opcode::V128Store32Lane}, -#line 436 "src/lexer-keywords.txt" - {"i64.trunc_sat_f32_s", TokenType::Convert, Opcode::I64TruncSatF32S}, -#line 298 "src/lexer-keywords.txt" - {"i32.trunc_sat_f32_s", TokenType::Convert, Opcode::I32TruncSatF32S}, - {""}, {""}, -#line 437 "src/lexer-keywords.txt" - {"i64.trunc_sat_f32_u", TokenType::Convert, Opcode::I64TruncSatF32U}, -#line 299 "src/lexer-keywords.txt" - {"i32.trunc_sat_f32_u", TokenType::Convert, Opcode::I32TruncSatF32U}, +#line 366 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XchgU}, {""}, -#line 356 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AddU}, -#line 232 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AddU}, - {""}, {""}, {""}, {""}, -#line 176 "src/lexer-keywords.txt" - {"global", TokenType::Global}, +#line 381 "src/lexer-keywords.txt" + {"i64.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I64AtomicRmwXor}, +#line 250 "src/lexer-keywords.txt" + {"i32.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I32AtomicRmwXor}, +#line 508 "src/lexer-keywords.txt" + {"input", TokenType::Input}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, -#line 588 "src/lexer-keywords.txt" - {"v128.store64_lane", TokenType::SimdStoreLane, Opcode::V128Store64Lane}, - {""}, {""}, -#line 534 "src/lexer-keywords.txt" - {"param", TokenType::Param}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 357 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AndU}, -#line 233 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AndU}, -#line 89 "src/lexer-keywords.txt" - {"f32x4.div", TokenType::Binary, Opcode::F32X4Div}, - {""}, {""}, {""}, {""}, {""}, -#line 376 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU}, -#line 245 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XorU}, - {""}, -#line 175 "src/lexer-keywords.txt" - {"global.set", TokenType::GlobalSet, Opcode::GlobalSet}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 320 "src/lexer-keywords.txt" - {"i32x4.max_s", TokenType::Binary, Opcode::I32X4MaxS}, - {""}, {""}, -#line 150 "src/lexer-keywords.txt" - {"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt}, -#line 321 "src/lexer-keywords.txt" - {"i32x4.max_u", TokenType::Binary, Opcode::I32X4MaxU}, +#line 164 "src/lexer-keywords.txt" + {"f64x2.trunc", TokenType::Unary, Opcode::F64X2Trunc}, {""}, {""}, {""}, -#line 22 "src/lexer-keywords.txt" - {"assert_exhaustion", TokenType::AssertExhaustion}, - {""}, {""}, -#line 117 "src/lexer-keywords.txt" - {"f64.convert_i32_u", TokenType::Convert, Opcode::F64ConvertI32U}, -#line 59 "src/lexer-keywords.txt" - {"f32.convert_i32_u", TokenType::Convert, Opcode::F32ConvertI32U}, - {""}, {""}, -#line 149 "src/lexer-keywords.txt" - {"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge}, +#line 507 "src/lexer-keywords.txt" + {"import", TokenType::Import}, {""}, {""}, {""}, -#line 449 "src/lexer-keywords.txt" - {"i64x2.gt_s", TokenType::Binary, Opcode::I64X2GtS}, -#line 162 "src/lexer-keywords.txt" - {"f64x2.splat", TokenType::Unary, Opcode::F64X2Splat}, +#line 426 "src/lexer-keywords.txt" + {"i64.store32", TokenType::Store, Opcode::I64Store32}, {""}, -#line 513 "src/lexer-keywords.txt" - {"local.get", TokenType::LocalGet, Opcode::LocalGet}, -#line 464 "src/lexer-keywords.txt" - {"i64x2.splat", TokenType::Unary, Opcode::I64X2Splat}, +#line 367 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XorU}, +#line 407 "src/lexer-keywords.txt" + {"i64.load32_u", TokenType::Load, Opcode::I64Load32U}, +#line 136 "src/lexer-keywords.txt" + {"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt}, +#line 78 "src/lexer-keywords.txt" + {"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt}, {""}, -#line 451 "src/lexer-keywords.txt" - {"i64x2.ge_s", TokenType::Binary, Opcode::I64X2GeS}, - {""}, {""}, -#line 215 "src/lexer-keywords.txt" - {"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub}, - {""}, {""}, {""}, {""}, -#line 160 "src/lexer-keywords.txt" - {"f64x2.pmin", TokenType::Binary, Opcode::F64X2PMin}, - {""}, {""}, {""}, {""}, -#line 119 "src/lexer-keywords.txt" - {"f64.convert_i64_u", TokenType::Convert, Opcode::F64ConvertI64U}, -#line 61 "src/lexer-keywords.txt" - {"f32.convert_i64_u", TokenType::Convert, Opcode::F32ConvertI64U}, -#line 196 "src/lexer-keywords.txt" - {"i16x8.lt_s", TokenType::Compare, Opcode::I16X8LtS}, +#line 406 "src/lexer-keywords.txt" + {"i64.load32_s", TokenType::Load, Opcode::I64Load32S}, {""}, -#line 197 "src/lexer-keywords.txt" - {"i16x8.lt_u", TokenType::Compare, Opcode::I16X8LtU}, - {""}, {""}, {""}, -#line 192 "src/lexer-keywords.txt" - {"i16x8.le_s", TokenType::Compare, Opcode::I16X8LeS}, +#line 563 "src/lexer-keywords.txt" + {"v128.and", TokenType::Binary, Opcode::V128And}, {""}, -#line 193 "src/lexer-keywords.txt" - {"i16x8.le_u", TokenType::Compare, Opcode::I16X8LeU}, - {""}, {""}, -#line 443 "src/lexer-keywords.txt" - {"v128.load32x2_s", TokenType::Load, Opcode::V128Load32X2S}, +#line 394 "src/lexer-keywords.txt" + {"i64.extend32_s", TokenType::Unary, Opcode::I64Extend32S}, {""}, -#line 444 "src/lexer-keywords.txt" - {"v128.load32x2_u", TokenType::Load, Opcode::V128Load32X2U}, -#line 417 "src/lexer-keywords.txt" - {"i64.or", TokenType::Binary, Opcode::I64Or}, -#line 280 "src/lexer-keywords.txt" - {"i32.or", TokenType::Binary, Opcode::I32Or}, -#line 359 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU}, -#line 235 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16OrU}, +#line 424 "src/lexer-keywords.txt" + {"i64.shr_u", TokenType::Binary, Opcode::I64ShrU}, +#line 287 "src/lexer-keywords.txt" + {"i32.shr_u", TokenType::Binary, Opcode::I32ShrU}, +#line 423 "src/lexer-keywords.txt" + {"i64.shr_s", TokenType::Binary, Opcode::I64ShrS}, +#line 286 "src/lexer-keywords.txt" + {"i32.shr_s", TokenType::Binary, Opcode::I32ShrS}, {""}, -#line 202 "src/lexer-keywords.txt" - {"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul}, -#line 207 "src/lexer-keywords.txt" - {"i16x8.ne", TokenType::Compare, Opcode::I16X8Ne}, - {""}, {""}, {""}, {""}, {""}, -#line 354 "src/lexer-keywords.txt" - {"i64.atomic.load8_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad8U}, -#line 230 "src/lexer-keywords.txt" - {"i32.atomic.load8_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad8U}, +#line 539 "src/lexer-keywords.txt" + {"register", TokenType::Register}, +#line 160 "src/lexer-keywords.txt" + {"f64x2.replace_lane", TokenType::SimdLaneOp, Opcode::F64X2ReplaceLane}, + {""}, +#line 458 "src/lexer-keywords.txt" + {"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane}, +#line 154 "src/lexer-keywords.txt" + {"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul}, + {""}, +#line 443 "src/lexer-keywords.txt" + {"i64x2.mul", TokenType::Binary, Opcode::I64X2Mul}, {""}, {""}, -#line 178 "src/lexer-keywords.txt" - {"i16x8.abs", TokenType::Unary, Opcode::I16X8Abs}, -#line 129 "src/lexer-keywords.txt" - {"f64.max", TokenType::Binary, Opcode::F64Max}, -#line 72 "src/lexer-keywords.txt" - {"f32.max", TokenType::Binary, Opcode::F32Max}, - {""}, {""}, {""}, {""}, -#line 200 "src/lexer-keywords.txt" - {"i16x8.min_s", TokenType::Binary, Opcode::I16X8MinS}, -#line 185 "src/lexer-keywords.txt" - {"i16x8.eq", TokenType::Compare, Opcode::I16X8Eq}, +#line 38 "src/lexer-keywords.txt" + {"catch_all", TokenType::CatchAll, Opcode::CatchAll}, {""}, {""}, -#line 201 "src/lexer-keywords.txt" - {"i16x8.min_u", TokenType::Binary, Opcode::I16X8MinU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 568 "src/lexer-keywords.txt" + {"v128.or", TokenType::Binary, Opcode::V128Or}, + {""}, {""}, +#line 572 "src/lexer-keywords.txt" + {"v128.store", TokenType::Store, Opcode::V128Store}, +#line 566 "src/lexer-keywords.txt" + {"v128.load", TokenType::Load, Opcode::V128Load}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 573 "src/lexer-keywords.txt" + {"v128", Type::V128}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 534 "src/lexer-keywords.txt" + {"quote", TokenType::Quote}, +#line 567 "src/lexer-keywords.txt" + {"v128.not", TokenType::Unary, Opcode::V128Not}, {""}, -#line 551 "src/lexer-keywords.txt" - {"table.copy", TokenType::TableCopy, Opcode::TableCopy}, -#line 418 "src/lexer-keywords.txt" - {"i64.popcnt", TokenType::Unary, Opcode::I64Popcnt}, -#line 281 "src/lexer-keywords.txt" - {"i32.popcnt", TokenType::Unary, Opcode::I32Popcnt}, -#line 181 "src/lexer-keywords.txt" - {"i16x8.add", TokenType::Binary, Opcode::I16X8Add}, - {""}, {""}, {""}, {""}, -#line 603 "src/lexer-keywords.txt" - {"f64.convert_s/i64", TokenType::Convert, Opcode::F64ConvertI64S}, -#line 597 "src/lexer-keywords.txt" - {"f32.convert_s/i64", TokenType::Convert, Opcode::F32ConvertI64S}, -#line 605 "src/lexer-keywords.txt" - {"f64.convert_u/i64", TokenType::Convert, Opcode::F64ConvertI64U}, -#line 599 "src/lexer-keywords.txt" - {"f32.convert_u/i64", TokenType::Convert, Opcode::F32ConvertI64U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 438 "src/lexer-keywords.txt" - {"i64.trunc_sat_f64_s", TokenType::Convert, Opcode::I64TruncSatF64S}, -#line 300 "src/lexer-keywords.txt" - {"i32.trunc_sat_f64_s", TokenType::Convert, Opcode::I32TruncSatF64S}, +#line 531 "src/lexer-keywords.txt" + {"output", TokenType::Output}, {""}, {""}, -#line 439 "src/lexer-keywords.txt" - {"i64.trunc_sat_f64_u", TokenType::Convert, Opcode::I64TruncSatF64U}, -#line 301 "src/lexer-keywords.txt" - {"i32.trunc_sat_f64_u", TokenType::Convert, Opcode::I32TruncSatF64U}, +#line 369 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AndU}, +#line 238 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AndU}, + {""}, +#line 530 "src/lexer-keywords.txt" + {"offset", TokenType::Offset}, + {""}, {""}, +#line 368 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AddU}, +#line 237 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AddU}, {""}, {""}, {""}, {""}, -#line 213 "src/lexer-keywords.txt" - {"i16x8.sub_sat_s", TokenType::Binary, Opcode::I16X8SubSatS}, -#line 576 "src/lexer-keywords.txt" - {"v128.xor", TokenType::Binary, Opcode::V128Xor}, -#line 214 "src/lexer-keywords.txt" - {"i16x8.sub_sat_u", TokenType::Binary, Opcode::I16X8SubSatU}, +#line 30 "src/lexer-keywords.txt" + {"block", TokenType::Block, Opcode::Block}, {""}, -#line 609 "src/lexer-keywords.txt" - {"get_local", TokenType::LocalGet, Opcode::LocalGet}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 147 "src/lexer-keywords.txt" - {"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane}, +#line 528 "src/lexer-keywords.txt" + {"nan:canonical", TokenType::NanCanonical}, {""}, {""}, -#line 442 "src/lexer-keywords.txt" +#line 146 "src/lexer-keywords.txt" + {"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane}, +#line 562 "src/lexer-keywords.txt" + {"v128.andnot", TokenType::Binary, Opcode::V128Andnot}, +#line 440 "src/lexer-keywords.txt" {"i64x2.extract_lane", TokenType::SimdLaneOp, Opcode::I64X2ExtractLane}, - {""}, {""}, {""}, {""}, {""}, -#line 94 "src/lexer-keywords.txt" - {"f32x4.gt", TokenType::Compare, Opcode::F32X4Gt}, - {""}, {""}, {""}, {""}, {""}, -#line 369 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XorU}, - {""}, -#line 397 "src/lexer-keywords.txt" - {"i64.extend8_s", TokenType::Unary, Opcode::I64Extend8S}, -#line 264 "src/lexer-keywords.txt" - {"i32.extend8_s", TokenType::Unary, Opcode::I32Extend8S}, +#line 350 "src/lexer-keywords.txt" + {"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U}, +#line 227 "src/lexer-keywords.txt" + {"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U}, +#line 442 "src/lexer-keywords.txt" + {"v128.load32x2_u", TokenType::Load, Opcode::V128Load32X2U}, +#line 152 "src/lexer-keywords.txt" + {"f64x2.max", TokenType::Binary, Opcode::F64X2Max}, {""}, {""}, -#line 93 "src/lexer-keywords.txt" - {"f32x4.ge", TokenType::Compare, Opcode::F32X4Ge}, +#line 441 "src/lexer-keywords.txt" + {"v128.load32x2_s", TokenType::Load, Opcode::V128Load32X2S}, +#line 581 "src/lexer-keywords.txt" + {"v128.load32_lane", TokenType::SimdLoadLane, Opcode::V128Load32Lane}, {""}, {""}, {""}, -#line 312 "src/lexer-keywords.txt" - {"i32x4.gt_s", TokenType::Compare, Opcode::I32X4GtS}, -#line 106 "src/lexer-keywords.txt" - {"f32x4.splat", TokenType::Unary, Opcode::F32X4Splat}, -#line 313 "src/lexer-keywords.txt" - {"i32x4.gt_u", TokenType::Compare, Opcode::I32X4GtU}, +#line 34 "src/lexer-keywords.txt" + {"call_indirect", TokenType::CallIndirect, Opcode::CallIndirect}, {""}, -#line 332 "src/lexer-keywords.txt" - {"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat}, +#line 576 "src/lexer-keywords.txt" + {"v128.load32_splat", TokenType::Load, Opcode::V128Load32Splat}, +#line 574 "src/lexer-keywords.txt" + {"v128.xor", TokenType::Binary, Opcode::V128Xor}, {""}, -#line 310 "src/lexer-keywords.txt" - {"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS}, +#line 187 "src/lexer-keywords.txt" + {"i16x8.ge_u", TokenType::Compare, Opcode::I16X8GeU}, +#line 565 "src/lexer-keywords.txt" + {"v128.const", TokenType::Const, Opcode::V128Const}, +#line 191 "src/lexer-keywords.txt" + {"i16x8.le_u", TokenType::Compare, Opcode::I16X8LeU}, {""}, -#line 311 "src/lexer-keywords.txt" - {"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU}, +#line 186 "src/lexer-keywords.txt" + {"i16x8.ge_s", TokenType::Compare, Opcode::I16X8GeS}, {""}, -#line 153 "src/lexer-keywords.txt" - {"f64x2.max", TokenType::Binary, Opcode::F64X2Max}, +#line 190 "src/lexer-keywords.txt" + {"i16x8.le_s", TokenType::Compare, Opcode::I16X8LeS}, +#line 583 "src/lexer-keywords.txt" + {"v128.store8_lane", TokenType::SimdStoreLane, Opcode::V128Store8Lane}, +#line 189 "src/lexer-keywords.txt" + {"i16x8.gt_u", TokenType::Compare, Opcode::I16X8GtU}, + {""}, +#line 195 "src/lexer-keywords.txt" + {"i16x8.lt_u", TokenType::Compare, Opcode::I16X8LtU}, + {""}, +#line 188 "src/lexer-keywords.txt" + {"i16x8.gt_s", TokenType::Compare, Opcode::I16X8GtS}, + {""}, +#line 194 "src/lexer-keywords.txt" + {"i16x8.lt_s", TokenType::Compare, Opcode::I16X8LtS}, {""}, {""}, {""}, -#line 104 "src/lexer-keywords.txt" - {"f32x4.pmin", TokenType::Binary, Opcode::F32X4PMin}, - {""}, {""}, {""}, {""}, {""}, -#line 316 "src/lexer-keywords.txt" - {"v128.load16x4_s", TokenType::Load, Opcode::V128Load16X4S}, +#line 203 "src/lexer-keywords.txt" + {"i16x8.neg", TokenType::Unary, Opcode::I16X8Neg}, +#line 97 "src/lexer-keywords.txt" + {"f32x4.min", TokenType::Binary, Opcode::F32X4Min}, + {""}, {""}, {""}, +#line 205 "src/lexer-keywords.txt" + {"i16x8.ne", TokenType::Compare, Opcode::I16X8Ne}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 371 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU}, +#line 240 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8OrU}, + {""}, {""}, {""}, +#line 321 "src/lexer-keywords.txt" + {"i32x4.min_u", TokenType::Binary, Opcode::I32X4MinU}, {""}, -#line 317 "src/lexer-keywords.txt" - {"v128.load16x4_u", TokenType::Load, Opcode::V128Load16X4U}, +#line 320 "src/lexer-keywords.txt" + {"i32x4.min_s", TokenType::Binary, Opcode::I32X4MinS}, + {""}, {""}, {""}, +#line 212 "src/lexer-keywords.txt" + {"i16x8.sub_sat_u", TokenType::Binary, Opcode::I16X8SubSatU}, +#line 384 "src/lexer-keywords.txt" + {"i64.atomic.store8", TokenType::AtomicStore, Opcode::I64AtomicStore8}, +#line 252 "src/lexer-keywords.txt" + {"i32.atomic.store8", TokenType::AtomicStore, Opcode::I32AtomicStore8}, + {""}, +#line 211 "src/lexer-keywords.txt" + {"i16x8.sub_sat_s", TokenType::Binary, Opcode::I16X8SubSatS}, +#line 386 "src/lexer-keywords.txt" + {"i64.clz", TokenType::Unary, Opcode::I64Clz}, +#line 254 "src/lexer-keywords.txt" + {"i32.clz", TokenType::Unary, Opcode::I32Clz}, +#line 527 "src/lexer-keywords.txt" + {"nan:arithmetic", TokenType::NanArithmetic}, #line 179 "src/lexer-keywords.txt" - {"i16x8.add_sat_s", TokenType::Binary, Opcode::I16X8AddSatS}, + {"i16x8.add", TokenType::Binary, Opcode::I16X8Add}, + {""}, {""}, +#line 570 "src/lexer-keywords.txt" + {"v128.load32_zero", TokenType::Load, Opcode::V128Load32Zero}, + {""}, {""}, +#line 374 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU}, +#line 243 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XorU}, {""}, +#line 388 "src/lexer-keywords.txt" + {"i64.ctz", TokenType::Unary, Opcode::I64Ctz}, +#line 256 "src/lexer-keywords.txt" + {"i32.ctz", TokenType::Unary, Opcode::I32Ctz}, #line 180 "src/lexer-keywords.txt" + {"i16x8.all_true", TokenType::Unary, Opcode::I16X8AllTrue}, + {""}, {""}, {""}, {""}, +#line 327 "src/lexer-keywords.txt" + {"i32x4.shl", TokenType::Binary, Opcode::I32X4Shl}, + {""}, {""}, {""}, {""}, +#line 178 "src/lexer-keywords.txt" {"i16x8.add_sat_u", TokenType::Binary, Opcode::I16X8AddSatU}, -#line 125 "src/lexer-keywords.txt" - {"f64.gt", TokenType::Compare, Opcode::F64Gt}, -#line 68 "src/lexer-keywords.txt" - {"f32.gt", TokenType::Compare, Opcode::F32Gt}, - {""}, {""}, {""}, {""}, {""}, -#line 184 "src/lexer-keywords.txt" - {"i16x8.bitmask", TokenType::Unary, Opcode::I16X8Bitmask}, {""}, -#line 368 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XchgU}, +#line 506 "src/lexer-keywords.txt" + {"if", TokenType::If, Opcode::If}, {""}, -#line 554 "src/lexer-keywords.txt" - {"table.grow", TokenType::TableGrow, Opcode::TableGrow}, -#line 124 "src/lexer-keywords.txt" - {"f64.ge", TokenType::Compare, Opcode::F64Ge}, -#line 67 "src/lexer-keywords.txt" - {"f32.ge", TokenType::Compare, Opcode::F32Ge}, - {""}, {""}, #line 177 "src/lexer-keywords.txt" - {"grow_memory", TokenType::MemoryGrow, Opcode::MemoryGrow}, + {"i16x8.add_sat_s", TokenType::Binary, Opcode::I16X8AddSatS}, +#line 39 "src/lexer-keywords.txt" + {"data.drop", TokenType::DataDrop, Opcode::DataDrop}, +#line 533 "src/lexer-keywords.txt" + {"ref", TokenType::Ref}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 579 "src/lexer-keywords.txt" + {"v128.load8_lane", TokenType::SimdLoadLane, Opcode::V128Load8Lane}, + {""}, {""}, {""}, {""}, {""}, +#line 578 "src/lexer-keywords.txt" + {"v128.load8_splat", TokenType::Load, Opcode::V128Load8Splat}, +#line 106 "src/lexer-keywords.txt" + {"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt}, {""}, {""}, {""}, {""}, -#line 395 "src/lexer-keywords.txt" - {"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S}, -#line 263 "src/lexer-keywords.txt" - {"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S}, -#line 538 "src/lexer-keywords.txt" - {"ref.func", TokenType::RefFunc, Opcode::RefFunc}, +#line 47 "src/lexer-keywords.txt" + {"else", TokenType::Else, Opcode::Else}, {""}, -#line 541 "src/lexer-keywords.txt" - {"register", TokenType::Register}, +#line 557 "src/lexer-keywords.txt" + {"then", TokenType::Then}, {""}, -#line 402 "src/lexer-keywords.txt" - {"i64.gt_s", TokenType::Compare, Opcode::I64GtS}, -#line 267 "src/lexer-keywords.txt" - {"i32.gt_s", TokenType::Compare, Opcode::I32GtS}, - {""}, {""}, -#line 403 "src/lexer-keywords.txt" - {"i64.gt_u", TokenType::Compare, Opcode::I64GtU}, -#line 268 "src/lexer-keywords.txt" - {"i32.gt_u", TokenType::Compare, Opcode::I32GtU}, -#line 400 "src/lexer-keywords.txt" - {"i64.ge_s", TokenType::Compare, Opcode::I64GeS}, -#line 265 "src/lexer-keywords.txt" - {"i32.ge_s", TokenType::Compare, Opcode::I32GeS}, - {""}, {""}, -#line 401 "src/lexer-keywords.txt" - {"i64.ge_u", TokenType::Compare, Opcode::I64GeU}, -#line 266 "src/lexer-keywords.txt" - {"i32.ge_u", TokenType::Compare, Opcode::I32GeU}, -#line 585 "src/lexer-keywords.txt" - {"v128.store8_lane", TokenType::SimdStoreLane, Opcode::V128Store8Lane}, - {""}, {""}, {""}, -#line 466 "src/lexer-keywords.txt" - {"i64x2.extmul_low_i32x4_s", TokenType::Binary, Opcode::I64X2ExtmulLowI32X4S}, +#line 329 "src/lexer-keywords.txt" + {"i32x4.shr_u", TokenType::Binary, Opcode::I32X4ShrU}, {""}, +#line 328 "src/lexer-keywords.txt" + {"i32x4.shr_s", TokenType::Binary, Opcode::I32X4ShrS}, +#line 532 "src/lexer-keywords.txt" + {"param", TokenType::Param}, + {""}, {""}, +#line 168 "src/lexer-keywords.txt" + {"f64x2", TokenType::F64X2}, +#line 220 "src/lexer-keywords.txt" + {"i16x8", TokenType::I16X8}, #line 468 "src/lexer-keywords.txt" - {"i64x2.extmul_low_i32x4_u", TokenType::Binary, Opcode::I64X2ExtmulLowI32X4U}, - {""}, {""}, {""}, -#line 424 "src/lexer-keywords.txt" - {"i64.shl", TokenType::Binary, Opcode::I64Shl}, -#line 287 "src/lexer-keywords.txt" - {"i32.shl", TokenType::Binary, Opcode::I32Shl}, + {"i64x2", TokenType::I64X2}, +#line 48 "src/lexer-keywords.txt" + {"end", TokenType::End, Opcode::End}, {""}, {""}, {""}, -#line 123 "src/lexer-keywords.txt" - {"f64.floor", TokenType::Unary, Opcode::F64Floor}, -#line 66 "src/lexer-keywords.txt" - {"f32.floor", TokenType::Unary, Opcode::F32Floor}, +#line 206 "src/lexer-keywords.txt" + {"i16x8.replace_lane", TokenType::SimdLaneOp, Opcode::I16X8ReplaceLane}, + {""}, {""}, +#line 200 "src/lexer-keywords.txt" + {"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, +#line 169 "src/lexer-keywords.txt" + {"field", TokenType::Field}, +#line 351 "src/lexer-keywords.txt" + {"i64.atomic.load32_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad32U}, +#line 584 "src/lexer-keywords.txt" + {"v128.store16_lane", TokenType::SimdStoreLane, Opcode::V128Store16Lane}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 456 "src/lexer-keywords.txt" - {"i64x2.extend_low_i32x4_s", TokenType::Unary, Opcode::I64X2ExtendLowI32X4S}, +#line 50 "src/lexer-keywords.txt" + {"extern", Type::ExternRef, TokenType::Extern}, +#line 586 "src/lexer-keywords.txt" + {"v128.store64_lane", TokenType::SimdStoreLane, Opcode::V128Store64Lane}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 197 "src/lexer-keywords.txt" + {"i16x8.max_u", TokenType::Binary, Opcode::I16X8MaxU}, {""}, -#line 458 "src/lexer-keywords.txt" - {"i64x2.extend_low_i32x4_u", TokenType::Unary, Opcode::I64X2ExtendLowI32X4U}, -#line 166 "src/lexer-keywords.txt" - {"f64x2.convert_low_i32x4_s", TokenType::Unary, Opcode::F64X2ConvertLowI32X4S}, +#line 196 "src/lexer-keywords.txt" + {"i16x8.max_s", TokenType::Binary, Opcode::I16X8MaxS}, +#line 105 "src/lexer-keywords.txt" + {"f32x4.splat", TokenType::Unary, Opcode::F32X4Splat}, {""}, -#line 167 "src/lexer-keywords.txt" - {"f64x2.convert_low_i32x4_u", TokenType::Unary, Opcode::F64X2ConvertLowI32X4U}, -#line 37 "src/lexer-keywords.txt" - {"catch", TokenType::Catch, Opcode::Catch}, +#line 330 "src/lexer-keywords.txt" + {"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat}, {""}, {""}, -#line 586 "src/lexer-keywords.txt" - {"v128.store16_lane", TokenType::SimdStoreLane, Opcode::V128Store16Lane}, - {""}, {""}, {""}, -#line 182 "src/lexer-keywords.txt" - {"i16x8.all_true", TokenType::Unary, Opcode::I16X8AllTrue}, +#line 582 "src/lexer-keywords.txt" + {"v128.load64_lane", TokenType::SimdLoadLane, Opcode::V128Load64Lane}, {""}, -#line 580 "src/lexer-keywords.txt" - {"v128.load8_splat", TokenType::Load, Opcode::V128Load8Splat}, - {""}, {""}, -#line 91 "src/lexer-keywords.txt" - {"f32x4.extract_lane", TokenType::SimdLaneOp, Opcode::F32X4ExtractLane}, - {""}, {""}, -#line 309 "src/lexer-keywords.txt" - {"i32x4.extract_lane", TokenType::SimdLaneOp, Opcode::I32X4ExtractLane}, -#line 362 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XorU}, -#line 238 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XorU}, - {""}, {""}, {""}, {""}, {""}, -#line 506 "src/lexer-keywords.txt" - {"i8x16.sub", TokenType::Binary, Opcode::I8X16Sub}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 43 "src/lexer-keywords.txt" - {"delegate", TokenType::Delegate}, +#line 153 "src/lexer-keywords.txt" + {"f64x2.min", TokenType::Binary, Opcode::F64X2Min}, {""}, {""}, {""}, -#line 488 "src/lexer-keywords.txt" - {"i8x16.lt_s", TokenType::Compare, Opcode::I8X16LtS}, +#line 577 "src/lexer-keywords.txt" + {"v128.load64_splat", TokenType::Load, Opcode::V128Load64Splat}, + {""}, {""}, +#line 558 "src/lexer-keywords.txt" + {"throw", TokenType::Throw, Opcode::Throw}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 481 "src/lexer-keywords.txt" + {"i8x16.ge_u", TokenType::Compare, Opcode::I8X16GeU}, {""}, -#line 489 "src/lexer-keywords.txt" - {"i8x16.lt_u", TokenType::Compare, Opcode::I8X16LtU}, - {""}, {""}, {""}, -#line 486 "src/lexer-keywords.txt" +#line 485 "src/lexer-keywords.txt" + {"i8x16.le_u", TokenType::Compare, Opcode::I8X16LeU}, + {""}, +#line 480 "src/lexer-keywords.txt" + {"i8x16.ge_s", TokenType::Compare, Opcode::I8X16GeS}, + {""}, +#line 484 "src/lexer-keywords.txt" {"i8x16.le_s", TokenType::Compare, Opcode::I8X16LeS}, {""}, +#line 483 "src/lexer-keywords.txt" + {"i8x16.gt_u", TokenType::Compare, Opcode::I8X16GtU}, + {""}, #line 487 "src/lexer-keywords.txt" - {"i8x16.le_u", TokenType::Compare, Opcode::I8X16LeU}, - {""}, {""}, {""}, -#line 97 "src/lexer-keywords.txt" - {"f32x4.max", TokenType::Binary, Opcode::F32X4Max}, - {""}, {""}, {""}, {""}, -#line 579 "src/lexer-keywords.txt" - {"v128.load64_splat", TokenType::Load, Opcode::V128Load64Splat}, -#line 578 "src/lexer-keywords.txt" - {"v128.load32_splat", TokenType::Load, Opcode::V128Load32Splat}, + {"i8x16.lt_u", TokenType::Compare, Opcode::I8X16LtU}, +#line 536 "src/lexer-keywords.txt" + {"ref.func", TokenType::RefFunc, Opcode::RefFunc}, +#line 482 "src/lexer-keywords.txt" + {"i8x16.gt_s", TokenType::Compare, Opcode::I8X16GtS}, {""}, -#line 498 "src/lexer-keywords.txt" - {"i8x16.ne", TokenType::Compare, Opcode::I8X16Ne}, - {""}, {""}, {""}, {""}, {""}, -#line 361 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XchgU}, -#line 237 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XchgU}, +#line 486 "src/lexer-keywords.txt" + {"i8x16.lt_s", TokenType::Compare, Opcode::I8X16LtS}, {""}, {""}, -#line 472 "src/lexer-keywords.txt" - {"i8x16.abs", TokenType::Unary, Opcode::I8X16Abs}, -#line 425 "src/lexer-keywords.txt" - {"i64.shr_s", TokenType::Binary, Opcode::I64ShrS}, -#line 288 "src/lexer-keywords.txt" - {"i32.shr_s", TokenType::Binary, Opcode::I32ShrS}, +#line 185 "src/lexer-keywords.txt" + {"i16x8.extract_lane_u", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU}, +#line 494 "src/lexer-keywords.txt" + {"i8x16.neg", TokenType::Unary, Opcode::I8X16Neg}, +#line 184 "src/lexer-keywords.txt" + {"i16x8.extract_lane_s", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneS}, {""}, {""}, -#line 426 "src/lexer-keywords.txt" - {"i64.shr_u", TokenType::Binary, Opcode::I64ShrU}, -#line 289 "src/lexer-keywords.txt" - {"i32.shr_u", TokenType::Binary, Opcode::I32ShrU}, -#line 492 "src/lexer-keywords.txt" - {"i8x16.min_s", TokenType::Binary, Opcode::I8X16MinS}, -#line 479 "src/lexer-keywords.txt" - {"i8x16.eq", TokenType::Compare, Opcode::I8X16Eq}, -#line 523 "src/lexer-keywords.txt" - {"memory.grow", TokenType::MemoryGrow, Opcode::MemoryGrow}, +#line 510 "src/lexer-keywords.txt" + {"item", TokenType::Item}, +#line 496 "src/lexer-keywords.txt" + {"i8x16.ne", TokenType::Compare, Opcode::I8X16Ne}, + {""}, {""}, +#line 193 "src/lexer-keywords.txt" + {"v128.load8x8_u", TokenType::Load, Opcode::V128Load8X8U}, {""}, -#line 493 "src/lexer-keywords.txt" - {"i8x16.min_u", TokenType::Binary, Opcode::I8X16MinU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 222 "src/lexer-keywords.txt" - {"i16x8", TokenType::I16X8}, +#line 192 "src/lexer-keywords.txt" + {"v128.load8x8_s", TokenType::Load, Opcode::V128Load8X8S}, + {""}, +#line 459 "src/lexer-keywords.txt" + {"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl}, {""}, {""}, {""}, {""}, -#line 475 "src/lexer-keywords.txt" +#line 380 "src/lexer-keywords.txt" + {"i64.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I64AtomicRmwXchg}, +#line 249 "src/lexer-keywords.txt" + {"i32.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I32AtomicRmwXchg}, + {""}, {""}, {""}, {""}, +#line 503 "src/lexer-keywords.txt" + {"i8x16.sub_sat_u", TokenType::Binary, Opcode::I8X16SubSatU}, + {""}, +#line 571 "src/lexer-keywords.txt" + {"v128.load64_zero", TokenType::Load, Opcode::V128Load64Zero}, + {""}, +#line 502 "src/lexer-keywords.txt" + {"i8x16.sub_sat_s", TokenType::Binary, Opcode::I8X16SubSatS}, + {""}, {""}, {""}, +#line 473 "src/lexer-keywords.txt" {"i8x16.add", TokenType::Binary, Opcode::I8X16Add}, -#line 507 "src/lexer-keywords.txt" - {"i8x16", TokenType::I8X16}, {""}, {""}, {""}, {""}, {""}, -#line 631 "src/lexer-keywords.txt" - {"set_global", TokenType::GlobalSet, Opcode::GlobalSet}, +#line 162 "src/lexer-keywords.txt" + {"f64x2.sqrt", TokenType::Unary, Opcode::F64X2Sqrt}, + {""}, {""}, +#line 559 "src/lexer-keywords.txt" + {"try", TokenType::Try, Opcode::Try}, + {""}, +#line 474 "src/lexer-keywords.txt" + {"i8x16.all_true", TokenType::Unary, Opcode::I8X16AllTrue}, {""}, {""}, {""}, -#line 159 "src/lexer-keywords.txt" - {"f64x2.pmax", TokenType::Binary, Opcode::F64X2PMax}, - {""}, {""}, {""}, {""}, {""}, #line 461 "src/lexer-keywords.txt" - {"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl}, -#line 78 "src/lexer-keywords.txt" - {"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32}, - {""}, {""}, {""}, -#line 531 "src/lexer-keywords.txt" - {"nop", TokenType::Nop, Opcode::Nop}, -#line 601 "src/lexer-keywords.txt" - {"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32}, + {"i64x2.shr_u", TokenType::Binary, Opcode::I64X2ShrU}, + {""}, +#line 460 "src/lexer-keywords.txt" + {"i64x2.shr_s", TokenType::Binary, Opcode::I64X2ShrS}, {""}, {""}, {""}, -#line 504 "src/lexer-keywords.txt" - {"i8x16.sub_sat_s", TokenType::Binary, Opcode::I8X16SubSatS}, +#line 472 "src/lexer-keywords.txt" + {"i8x16.add_sat_u", TokenType::Binary, Opcode::I8X16AddSatU}, +#line 111 "src/lexer-keywords.txt" + {"f64.abs", TokenType::Unary, Opcode::F64Abs}, +#line 53 "src/lexer-keywords.txt" + {"f32.abs", TokenType::Unary, Opcode::F32Abs}, {""}, -#line 505 "src/lexer-keywords.txt" - {"i8x16.sub_sat_u", TokenType::Binary, Opcode::I8X16SubSatU}, - {""}, {""}, {""}, {""}, -#line 50 "src/lexer-keywords.txt" - {"tag", TokenType::Tag}, - {""}, {""}, {""}, {""}, -#line 373 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU}, -#line 242 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8OrU}, +#line 471 "src/lexer-keywords.txt" + {"i8x16.add_sat_s", TokenType::Binary, Opcode::I8X16AddSatS}, {""}, -#line 136 "src/lexer-keywords.txt" - {"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64}, -#line 625 "src/lexer-keywords.txt" - {"i64.trunc_s:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32S}, -#line 613 "src/lexer-keywords.txt" - {"i32.trunc_s:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32S}, -#line 629 "src/lexer-keywords.txt" - {"i64.trunc_u:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32U}, -#line 617 "src/lexer-keywords.txt" - {"i32.trunc_u:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32U}, -#line 607 "src/lexer-keywords.txt" - {"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64}, - {""}, {""}, {""}, -#line 21 "src/lexer-keywords.txt" - {"assert_exception", TokenType::AssertException}, - {""}, {""}, {""}, -#line 198 "src/lexer-keywords.txt" - {"i16x8.max_s", TokenType::Binary, Opcode::I16X8MaxS}, - {""}, {""}, {""}, -#line 199 "src/lexer-keywords.txt" - {"i16x8.max_u", TokenType::Binary, Opcode::I16X8MaxU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 626 "src/lexer-keywords.txt" - {"i64.trunc_s:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64S}, -#line 614 "src/lexer-keywords.txt" - {"i32.trunc_s:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64S}, -#line 630 "src/lexer-keywords.txt" - {"i64.trunc_u:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64U}, -#line 618 "src/lexer-keywords.txt" - {"i32.trunc_u:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64U}, +#line 552 "src/lexer-keywords.txt" + {"table.grow", TokenType::TableGrow, Opcode::TableGrow}, +#line 122 "src/lexer-keywords.txt" + {"f64.floor", TokenType::Unary, Opcode::F64Floor}, +#line 65 "src/lexer-keywords.txt" + {"f32.floor", TokenType::Unary, Opcode::F32Floor}, +#line 121 "src/lexer-keywords.txt" + {"f64.eq", TokenType::Compare, Opcode::F64Eq}, +#line 64 "src/lexer-keywords.txt" + {"f32.eq", TokenType::Compare, Opcode::F32Eq}, +#line 391 "src/lexer-keywords.txt" + {"i64.eq", TokenType::Compare, Opcode::I64Eq}, +#line 259 "src/lexer-keywords.txt" + {"i32.eq", TokenType::Compare, Opcode::I32Eq}, {""}, {""}, {""}, {""}, {""}, -#line 194 "src/lexer-keywords.txt" - {"v128.load8x8_s", TokenType::Load, Opcode::V128Load8X8S}, +#line 541 "src/lexer-keywords.txt" + {"rethrow", TokenType::Rethrow, Opcode::Rethrow}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 547 "src/lexer-keywords.txt" + {"start", TokenType::Start}, + {""}, {""}, {""}, {""}, +#line 37 "src/lexer-keywords.txt" + {"catch", TokenType::Catch, Opcode::Catch}, {""}, {""}, {""}, -#line 195 "src/lexer-keywords.txt" - {"v128.load8x8_u", TokenType::Load, Opcode::V128Load8X8U}, +#line 456 "src/lexer-keywords.txt" + {"i64x2.extend_low_i32x4_u", TokenType::Unary, Opcode::I64X2ExtendLowI32X4U}, + {""}, +#line 454 "src/lexer-keywords.txt" + {"i64x2.extend_low_i32x4_s", TokenType::Unary, Opcode::I64X2ExtendLowI32X4S}, + {""}, +#line 585 "src/lexer-keywords.txt" + {"v128.store32_lane", TokenType::SimdStoreLane, Opcode::V128Store32Lane}, +#line 497 "src/lexer-keywords.txt" + {"i8x16.replace_lane", TokenType::SimdLaneOp, Opcode::I8X16ReplaceLane}, + {""}, {""}, +#line 425 "src/lexer-keywords.txt" + {"i64.store16", TokenType::Store, Opcode::I64Store16}, +#line 288 "src/lexer-keywords.txt" + {"i32.store16", TokenType::Store, Opcode::I32Store16}, {""}, {""}, {""}, #line 161 "src/lexer-keywords.txt" - {"f64x2.replace_lane", TokenType::SimdLaneOp, Opcode::F64X2ReplaceLane}, + {"f64x2.splat", TokenType::Unary, Opcode::F64X2Splat}, {""}, -#line 473 "src/lexer-keywords.txt" - {"i8x16.add_sat_s", TokenType::Binary, Opcode::I8X16AddSatS}, -#line 460 "src/lexer-keywords.txt" - {"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane}, -#line 474 "src/lexer-keywords.txt" - {"i8x16.add_sat_u", TokenType::Binary, Opcode::I8X16AddSatU}, - {""}, {""}, -#line 577 "src/lexer-keywords.txt" - {"v128.load16_splat", TokenType::Load, Opcode::V128Load16Splat}, - {""}, {""}, {""}, {""}, -#line 478 "src/lexer-keywords.txt" - {"i8x16.bitmask", TokenType::Unary, Opcode::I8X16Bitmask}, - {""}, {""}, #line 462 "src/lexer-keywords.txt" - {"i64x2.shr_s", TokenType::Binary, Opcode::I64X2ShrS}, - {""}, {""}, {""}, -#line 463 "src/lexer-keywords.txt" - {"i64x2.shr_u", TokenType::Binary, Opcode::I64X2ShrU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, -#line 386 "src/lexer-keywords.txt" - {"i64.atomic.store8", TokenType::AtomicStore, Opcode::I64AtomicStore8}, -#line 254 "src/lexer-keywords.txt" - {"i32.atomic.store8", TokenType::AtomicStore, Opcode::I32AtomicStore8}, + {"i64x2.splat", TokenType::Unary, Opcode::I64X2Splat}, +#line 32 "src/lexer-keywords.txt" + {"br_table", TokenType::BrTable, Opcode::BrTable}, +#line 103 "src/lexer-keywords.txt" + {"f32x4.pmin", TokenType::Binary, Opcode::F32X4PMin}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, -#line 133 "src/lexer-keywords.txt" - {"f64.neg", TokenType::Unary, Opcode::F64Neg}, -#line 76 "src/lexer-keywords.txt" - {"f32.neg", TokenType::Unary, Opcode::F32Neg}, {""}, {""}, -#line 563 "src/lexer-keywords.txt" - {"unreachable", TokenType::Unreachable, Opcode::Unreachable}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 103 "src/lexer-keywords.txt" - {"f32x4.pmax", TokenType::Binary, Opcode::F32X4PMax}, +#line 546 "src/lexer-keywords.txt" + {"shared", TokenType::Shared}, +#line 505 "src/lexer-keywords.txt" + {"i8x16", TokenType::I8X16}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 358 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16SubU}, +#line 234 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16SubU}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 489 "src/lexer-keywords.txt" + {"i8x16.max_u", TokenType::Binary, Opcode::I8X16MaxU}, {""}, -#line 324 "src/lexer-keywords.txt" - {"i32x4.dot_i16x8_s", TokenType::Binary, Opcode::I32X4DotI16X8S}, - {""}, {""}, {""}, -#line 329 "src/lexer-keywords.txt" - {"i32x4.shl", TokenType::Binary, Opcode::I32X4Shl}, +#line 488 "src/lexer-keywords.txt" + {"i8x16.max_s", TokenType::Binary, Opcode::I8X16MaxS}, {""}, {""}, {""}, -#line 303 "src/lexer-keywords.txt" - {"i32.wrap_i64", TokenType::Convert, Opcode::I32WrapI64}, +#line 175 "src/lexer-keywords.txt" + {"global", TokenType::Global}, {""}, -#line 590 "src/lexer-keywords.txt" - {"i8x16.swizzle", TokenType::Binary, Opcode::I8X16Swizzle}, - {""}, {""}, -#line 619 "src/lexer-keywords.txt" - {"i32.wrap/i64", TokenType::Convert, Opcode::I32WrapI64}, +#line 523 "src/lexer-keywords.txt" + {"memory.size", TokenType::MemorySize, Opcode::MemorySize}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 355 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AndU}, +#line 231 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AndU}, +#line 363 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw32CmpxchgU}, + {""}, {""}, {""}, +#line 354 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AddU}, +#line 230 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AddU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 476 "src/lexer-keywords.txt" - {"i8x16.all_true", TokenType::Unary, Opcode::I8X16AllTrue}, - {""}, {""}, -#line 352 "src/lexer-keywords.txt" - {"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U}, -#line 229 "src/lexer-keywords.txt" - {"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U}, +#line 199 "src/lexer-keywords.txt" + {"i16x8.min_u", TokenType::Binary, Opcode::I16X8MinU}, {""}, -#line 87 "src/lexer-keywords.txt" - {"f32x4.convert_i32x4_s", TokenType::Unary, Opcode::F32X4ConvertI32X4S}, +#line 198 "src/lexer-keywords.txt" + {"i16x8.min_s", TokenType::Binary, Opcode::I16X8MinS}, {""}, -#line 88 "src/lexer-keywords.txt" - {"f32x4.convert_i32x4_u", TokenType::Unary, Opcode::F32X4ConvertI32X4U}, +#line 550 "src/lexer-keywords.txt" + {"table.fill", TokenType::TableFill, Opcode::TableFill}, + {""}, {""}, {""}, +#line 102 "src/lexer-keywords.txt" + {"f32x4.pmax", TokenType::Binary, Opcode::F32X4PMax}, +#line 390 "src/lexer-keywords.txt" + {"i64.div_u", TokenType::Binary, Opcode::I64DivU}, +#line 258 "src/lexer-keywords.txt" + {"i32.div_u", TokenType::Binary, Opcode::I32DivU}, +#line 389 "src/lexer-keywords.txt" + {"i64.div_s", TokenType::Binary, Opcode::I64DivS}, +#line 257 "src/lexer-keywords.txt" + {"i32.div_s", TokenType::Binary, Opcode::I32DivS}, +#line 479 "src/lexer-keywords.txt" + {"i8x16.extract_lane_u", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneU}, {""}, -#line 174 "src/lexer-keywords.txt" +#line 478 "src/lexer-keywords.txt" + {"i8x16.extract_lane_s", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneS}, +#line 466 "src/lexer-keywords.txt" + {"i64x2.extmul_low_i32x4_u", TokenType::Binary, Opcode::I64X2ExtmulLowI32X4U}, +#line 91 "src/lexer-keywords.txt" + {"f32x4.floor", TokenType::Unary, Opcode::F32X4Floor}, +#line 464 "src/lexer-keywords.txt" + {"i64x2.extmul_low_i32x4_s", TokenType::Binary, Opcode::I64X2ExtmulLowI32X4S}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 173 "src/lexer-keywords.txt" {"global.get", TokenType::GlobalGet, Opcode::GlobalGet}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 203 "src/lexer-keywords.txt" - {"i16x8.narrow_i32x4_s", TokenType::Binary, Opcode::I16X8NarrowI32X4S}, {""}, -#line 204 "src/lexer-keywords.txt" - {"i16x8.narrow_i32x4_u", TokenType::Binary, Opcode::I16X8NarrowI32X4U}, - {""}, {""}, {""}, {""}, {""}, -#line 336 "src/lexer-keywords.txt" - {"i32x4.extmul_low_i16x8_s", TokenType::Binary, Opcode::I32X4ExtmulLowI16X8S}, -#line 26 "src/lexer-keywords.txt" - {"assert_trap", TokenType::AssertTrap}, -#line 338 "src/lexer-keywords.txt" - {"i32x4.extmul_low_i16x8_u", TokenType::Binary, Opcode::I32X4ExtmulLowI16X8U}, - {""}, {""}, {""}, {""}, -#line 190 "src/lexer-keywords.txt" - {"i16x8.gt_s", TokenType::Compare, Opcode::I16X8GtS}, +#line 174 "src/lexer-keywords.txt" + {"global.set", TokenType::GlobalSet, Opcode::GlobalSet}, {""}, -#line 191 "src/lexer-keywords.txt" - {"i16x8.gt_u", TokenType::Compare, Opcode::I16X8GtU}, +#line 529 "src/lexer-keywords.txt" + {"nop", TokenType::Nop, Opcode::Nop}, +#line 207 "src/lexer-keywords.txt" + {"i16x8.shl", TokenType::Binary, Opcode::I16X8Shl}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 44 "src/lexer-keywords.txt" + {"drop", TokenType::Drop, Opcode::Drop}, +#line 373 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XchgU}, +#line 242 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XchgU}, {""}, -#line 212 "src/lexer-keywords.txt" - {"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat}, +#line 25 "src/lexer-keywords.txt" + {"assert_return", TokenType::AssertReturn}, {""}, -#line 188 "src/lexer-keywords.txt" - {"i16x8.ge_s", TokenType::Compare, Opcode::I16X8GeS}, +#line 569 "src/lexer-keywords.txt" + {"v128.any_true", TokenType::Unary, Opcode::V128AnyTrue}, +#line 392 "src/lexer-keywords.txt" + {"i64.eqz", TokenType::Convert, Opcode::I64Eqz}, +#line 260 "src/lexer-keywords.txt" + {"i32.eqz", TokenType::Convert, Opcode::I32Eqz}, +#line 357 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU}, +#line 233 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16OrU}, + {""}, {""}, {""}, +#line 383 "src/lexer-keywords.txt" + {"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32}, + {""}, {""}, +#line 359 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XchgU}, +#line 235 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XchgU}, +#line 437 "src/lexer-keywords.txt" + {"i64.trunc_sat_f64_u", TokenType::Convert, Opcode::I64TruncSatF64U}, +#line 299 "src/lexer-keywords.txt" + {"i32.trunc_sat_f64_u", TokenType::Convert, Opcode::I32TruncSatF64U}, + {""}, {""}, +#line 436 "src/lexer-keywords.txt" + {"i64.trunc_sat_f64_s", TokenType::Convert, Opcode::I64TruncSatF64S}, +#line 298 "src/lexer-keywords.txt" + {"i32.trunc_sat_f64_s", TokenType::Convert, Opcode::I32TruncSatF64S}, +#line 209 "src/lexer-keywords.txt" + {"i16x8.shr_u", TokenType::Binary, Opcode::I16X8ShrU}, {""}, -#line 189 "src/lexer-keywords.txt" - {"i16x8.ge_u", TokenType::Compare, Opcode::I16X8GeU}, +#line 208 "src/lexer-keywords.txt" + {"i16x8.shr_s", TokenType::Binary, Opcode::I16X8ShrS}, {""}, {""}, -#line 105 "src/lexer-keywords.txt" - {"f32x4.replace_lane", TokenType::SimdLaneOp, Opcode::F32X4ReplaceLane}, +#line 377 "src/lexer-keywords.txt" + {"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg}, +#line 246 "src/lexer-keywords.txt" + {"i32.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmwCmpxchg}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 107 "src/lexer-keywords.txt" + {"f32x4.sub", TokenType::Binary, Opcode::F32X4Sub}, {""}, -#line 40 "src/lexer-keywords.txt" - {"data.drop", TokenType::DataDrop, Opcode::DataDrop}, -#line 328 "src/lexer-keywords.txt" - {"i32x4.replace_lane", TokenType::SimdLaneOp, Opcode::I32X4ReplaceLane}, +#line 331 "src/lexer-keywords.txt" + {"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub}, +#line 83 "src/lexer-keywords.txt" + {"f32x4.abs", TokenType::Unary, Opcode::F32X4Abs}, {""}, -#line 46 "src/lexer-keywords.txt" - {"elem.drop", TokenType::ElemDrop, Opcode::ElemDrop}, - {""}, {""}, {""}, {""}, -#line 345 "src/lexer-keywords.txt" - {"i32x4.extend_low_i16x8_s", TokenType::Unary, Opcode::I32X4ExtendLowI16X8S}, +#line 302 "src/lexer-keywords.txt" + {"i32x4.abs", TokenType::Unary, Opcode::I32X4Abs}, {""}, -#line 346 "src/lexer-keywords.txt" - {"i32x4.extend_low_i16x8_u", TokenType::Unary, Opcode::I32X4ExtendLowI16X8U}, - {""}, {""}, -#line 330 "src/lexer-keywords.txt" - {"i32x4.shr_s", TokenType::Binary, Opcode::I32X4ShrS}, - {""}, {""}, {""}, -#line 331 "src/lexer-keywords.txt" - {"i32x4.shr_u", TokenType::Binary, Opcode::I32X4ShrU}, +#line 159 "src/lexer-keywords.txt" + {"f64x2.pmin", TokenType::Binary, Opcode::F64X2PMin}, + {""}, +#line 360 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XorU}, +#line 236 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XorU}, {""}, {""}, {""}, {""}, {""}, -#line 157 "src/lexer-keywords.txt" - {"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg}, - {""}, {""}, -#line 453 "src/lexer-keywords.txt" - {"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 341 "src/lexer-keywords.txt" - {"i32x4.trunc_sat_f32x4_s", TokenType::Unary, Opcode::I32X4TruncSatF32X4S}, - {""}, {""}, {""}, -#line 342 "src/lexer-keywords.txt" - {"i32x4.trunc_sat_f32x4_u", TokenType::Unary, Opcode::I32X4TruncSatF32X4U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 529 "src/lexer-keywords.txt" - {"nan:arithmetic", TokenType::NanArithmetic}, +#line 89 "src/lexer-keywords.txt" + {"f32x4.eq", TokenType::Compare, Opcode::F32X4Eq}, + {""}, +#line 306 "src/lexer-keywords.txt" + {"i32x4.eq", TokenType::Compare, Opcode::I32X4Eq}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 118 "src/lexer-keywords.txt" + {"f64.convert_i64_u", TokenType::Convert, Opcode::F64ConvertI64U}, +#line 60 "src/lexer-keywords.txt" + {"f32.convert_i64_u", TokenType::Convert, Opcode::F32ConvertI64U}, {""}, {""}, -#line 120 "src/lexer-keywords.txt" - {"f64.copysign", TokenType::Binary, Opcode::F64Copysign}, -#line 62 "src/lexer-keywords.txt" - {"f32.copysign", TokenType::Binary, Opcode::F32Copysign}, +#line 117 "src/lexer-keywords.txt" + {"f64.convert_i64_s", TokenType::Convert, Opcode::F64ConvertI64S}, +#line 59 "src/lexer-keywords.txt" + {"f32.convert_i64_s", TokenType::Convert, Opcode::F32ConvertI64S}, + {""}, {""}, +#line 210 "src/lexer-keywords.txt" + {"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat}, + {""}, {""}, {""}, {""}, +#line 521 "src/lexer-keywords.txt" + {"memory.grow", TokenType::MemoryGrow, Opcode::MemoryGrow}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 322 "src/lexer-keywords.txt" + {"i32x4.dot_i16x8_s", TokenType::Binary, Opcode::I32X4DotI16X8S}, + {""}, +#line 522 "src/lexer-keywords.txt" + {"memory.init", TokenType::MemoryInit, Opcode::MemoryInit}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 490 "src/lexer-keywords.txt" - {"i8x16.max_s", TokenType::Binary, Opcode::I8X16MaxS}, {""}, {""}, {""}, -#line 491 "src/lexer-keywords.txt" - {"i8x16.max_u", TokenType::Binary, Opcode::I8X16MaxU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 158 "src/lexer-keywords.txt" + {"f64x2.pmax", TokenType::Binary, Opcode::F64X2PMax}, {""}, {""}, {""}, {""}, -#line 186 "src/lexer-keywords.txt" - {"i16x8.extract_lane_s", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneS}, +#line 515 "src/lexer-keywords.txt" + {"loop", TokenType::Loop, Opcode::Loop}, +#line 62 "src/lexer-keywords.txt" + {"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64}, + {""}, {""}, +#line 147 "src/lexer-keywords.txt" + {"f64x2.floor", TokenType::Unary, Opcode::F64X2Floor}, +#line 52 "src/lexer-keywords.txt" + {"export", TokenType::Export}, +#line 315 "src/lexer-keywords.txt" + {"v128.load16x4_u", TokenType::Load, Opcode::V128Load16X4U}, + {""}, {""}, +#line 88 "src/lexer-keywords.txt" + {"f32x4.div", TokenType::Binary, Opcode::F32X4Div}, +#line 314 "src/lexer-keywords.txt" + {"v128.load16x4_s", TokenType::Load, Opcode::V128Load16X4S}, +#line 580 "src/lexer-keywords.txt" + {"v128.load16_lane", TokenType::SimdLoadLane, Opcode::V128Load16Lane}, + {""}, {""}, {""}, {""}, +#line 109 "src/lexer-keywords.txt" + {"f32x4.demote_f64x2_zero", TokenType::Unary, Opcode::F32X4DemoteF64X2Zero}, +#line 575 "src/lexer-keywords.txt" + {"v128.load16_splat", TokenType::Load, Opcode::V128Load16Splat}, + {""}, {""}, {""}, {""}, +#line 491 "src/lexer-keywords.txt" + {"i8x16.min_u", TokenType::Binary, Opcode::I8X16MinU}, {""}, -#line 187 "src/lexer-keywords.txt" - {"i16x8.extract_lane_u", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU}, +#line 490 "src/lexer-keywords.txt" + {"i8x16.min_s", TokenType::Binary, Opcode::I8X16MinS}, {""}, {""}, {""}, {""}, {""}, -#line 347 "src/lexer-keywords.txt" - {"i32x4.trunc_sat_f64x2_s_zero", TokenType::Unary, Opcode::I32X4TruncSatF64X2SZero}, - {""}, -#line 348 "src/lexer-keywords.txt" - {"i32x4.trunc_sat_f64x2_u_zero", TokenType::Unary, Opcode::I32X4TruncSatF64X2UZero}, - {""}, -#line 168 "src/lexer-keywords.txt" - {"f64x2.promote_low_f32x4", TokenType::Unary, Opcode::F64X2PromoteLowF32X4}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 365 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw32CmpxchgU}, -#line 334 "src/lexer-keywords.txt" - {"i32x4.extadd_pairwise_i16x8_s", TokenType::Unary, Opcode::I32X4ExtaddPairwiseI16X8S}, +#line 370 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw8CmpxchgU}, +#line 239 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw8CmpxchgU}, + {""}, {""}, +#line 524 "src/lexer-keywords.txt" + {"memory", TokenType::Memory}, +#line 561 "src/lexer-keywords.txt" + {"unreachable", TokenType::Unreachable, Opcode::Unreachable}, {""}, -#line 335 "src/lexer-keywords.txt" - {"i32x4.extadd_pairwise_i16x8_u", TokenType::Unary, Opcode::I32X4ExtaddPairwiseI16X8U}, +#line 416 "src/lexer-keywords.txt" + {"i64.popcnt", TokenType::Unary, Opcode::I64Popcnt}, +#line 279 "src/lexer-keywords.txt" + {"i32.popcnt", TokenType::Unary, Opcode::I32Popcnt}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 101 "src/lexer-keywords.txt" - {"f32x4.neg", TokenType::Unary, Opcode::F32X4Neg}, - {""}, {""}, -#line 326 "src/lexer-keywords.txt" - {"i32x4.neg", TokenType::Unary, Opcode::I32X4Neg}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 375 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XchgU}, -#line 244 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XchgU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 383 "src/lexer-keywords.txt" - {"i64.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I64AtomicRmwXor}, -#line 252 "src/lexer-keywords.txt" - {"i32.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I32AtomicRmwXor}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, -#line 183 "src/lexer-keywords.txt" - {"i16x8.avgr_u", TokenType::Binary, Opcode::I16X8AvgrU}, +#line 435 "src/lexer-keywords.txt" + {"i64.trunc_sat_f32_u", TokenType::Convert, Opcode::I64TruncSatF32U}, +#line 297 "src/lexer-keywords.txt" + {"i32.trunc_sat_f32_u", TokenType::Convert, Opcode::I32TruncSatF32U}, {""}, {""}, -#line 484 "src/lexer-keywords.txt" - {"i8x16.gt_s", TokenType::Compare, Opcode::I8X16GtS}, +#line 434 "src/lexer-keywords.txt" + {"i64.trunc_sat_f32_s", TokenType::Convert, Opcode::I64TruncSatF32S}, +#line 296 "src/lexer-keywords.txt" + {"i32.trunc_sat_f32_s", TokenType::Convert, Opcode::I32TruncSatF32S}, +#line 498 "src/lexer-keywords.txt" + {"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl}, {""}, -#line 485 "src/lexer-keywords.txt" - {"i8x16.gt_u", TokenType::Compare, Opcode::I8X16GtU}, +#line 24 "src/lexer-keywords.txt" + {"assert_malformed", TokenType::AssertMalformed}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 503 "src/lexer-keywords.txt" - {"i8x16.splat", TokenType::Unary, Opcode::I8X16Splat}, +#line 163 "src/lexer-keywords.txt" + {"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub}, {""}, -#line 482 "src/lexer-keywords.txt" - {"i8x16.ge_s", TokenType::Compare, Opcode::I8X16GeS}, +#line 463 "src/lexer-keywords.txt" + {"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub}, +#line 141 "src/lexer-keywords.txt" + {"f64x2.abs", TokenType::Unary, Opcode::F64X2Abs}, {""}, -#line 483 "src/lexer-keywords.txt" - {"i8x16.ge_u", TokenType::Compare, Opcode::I8X16GeU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 450 "src/lexer-keywords.txt" + {"i64x2.abs", TokenType::Unary, Opcode::I64X2Abs}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 372 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw8CmpxchgU}, -#line 241 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw8CmpxchgU}, -#line 206 "src/lexer-keywords.txt" - {"i16x8.q15mulr_sat_s", TokenType::Binary, Opcode::I16X8Q15mulrSatS}, +#line 333 "src/lexer-keywords.txt" + {"i32x4.extadd_pairwise_i16x8_u", TokenType::Unary, Opcode::I32X4ExtaddPairwiseI16X8U}, {""}, -#line 358 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw16CmpxchgU}, -#line 234 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw16CmpxchgU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 332 "src/lexer-keywords.txt" + {"i32x4.extadd_pairwise_i16x8_s", TokenType::Unary, Opcode::I32X4ExtaddPairwiseI16X8S}, {""}, -#line 282 "src/lexer-keywords.txt" - {"i32.reinterpret_f32", TokenType::Convert, Opcode::I32ReinterpretF32}, - {""}, {""}, {""}, {""}, -#line 610 "src/lexer-keywords.txt" - {"i32.reinterpret/f32", TokenType::Convert, Opcode::I32ReinterpretF32}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 608 "src/lexer-keywords.txt" - {"get_global", TokenType::GlobalGet, Opcode::GlobalGet}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 145 "src/lexer-keywords.txt" + {"f64x2.eq", TokenType::Compare, Opcode::F64X2Eq}, + {""}, +#line 444 "src/lexer-keywords.txt" + {"i64x2.eq", TokenType::Binary, Opcode::I64X2Eq}, {""}, {""}, -#line 419 "src/lexer-keywords.txt" - {"i64.reinterpret_f64", TokenType::Convert, Opcode::I64ReinterpretF64}, +#line 500 "src/lexer-keywords.txt" + {"i8x16.shr_u", TokenType::Binary, Opcode::I8X16ShrU}, {""}, -#line 209 "src/lexer-keywords.txt" - {"i16x8.shl", TokenType::Binary, Opcode::I16X8Shl}, +#line 499 "src/lexer-keywords.txt" + {"i8x16.shr_s", TokenType::Binary, Opcode::I8X16ShrS}, +#line 224 "src/lexer-keywords.txt" + {"i16x8.extend_low_i8x16_u", TokenType::Unary, Opcode::I16X8ExtendLowI8X16U}, + {""}, +#line 223 "src/lexer-keywords.txt" + {"i16x8.extend_low_i8x16_s", TokenType::Unary, Opcode::I16X8ExtendLowI8X16S}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 29 "src/lexer-keywords.txt" + {"binary", TokenType::Bin}, + {""}, {""}, +#line 116 "src/lexer-keywords.txt" + {"f64.convert_i32_u", TokenType::Convert, Opcode::F64ConvertI32U}, +#line 58 "src/lexer-keywords.txt" + {"f32.convert_i32_u", TokenType::Convert, Opcode::F32ConvertI32U}, {""}, {""}, -#line 622 "src/lexer-keywords.txt" - {"i64.reinterpret/f64", TokenType::Convert, Opcode::I64ReinterpretF64}, +#line 115 "src/lexer-keywords.txt" + {"f64.convert_i32_s", TokenType::Convert, Opcode::F64ConvertI32S}, +#line 57 "src/lexer-keywords.txt" + {"f32.convert_i32_s", TokenType::Convert, Opcode::F32ConvertI32S}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 181 "src/lexer-keywords.txt" + {"i16x8.avgr_u", TokenType::Binary, Opcode::I16X8AvgrU}, + {""}, {""}, +#line 382 "src/lexer-keywords.txt" + {"i64.atomic.store16", TokenType::AtomicStore, Opcode::I64AtomicStore16}, +#line 251 "src/lexer-keywords.txt" + {"i32.atomic.store16", TokenType::AtomicStore, Opcode::I32AtomicStore16}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, +#line 501 "src/lexer-keywords.txt" + {"i8x16.splat", TokenType::Unary, Opcode::I8X16Splat}, + {""}, {""}, {""}, +#line 549 "src/lexer-keywords.txt" + {"table.copy", TokenType::TableCopy, Opcode::TableCopy}, + {""}, {""}, {""}, +#line 144 "src/lexer-keywords.txt" + {"f64x2.div", TokenType::Binary, Opcode::F64X2Div}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 344 "src/lexer-keywords.txt" + {"i32x4.extend_low_i16x8_u", TokenType::Unary, Opcode::I32X4ExtendLowI16X8U}, +#line 202 "src/lexer-keywords.txt" + {"i16x8.narrow_i32x4_u", TokenType::Binary, Opcode::I16X8NarrowI32X4U}, +#line 343 "src/lexer-keywords.txt" + {"i32x4.extend_low_i16x8_s", TokenType::Unary, Opcode::I32X4ExtendLowI16X8S}, +#line 201 "src/lexer-keywords.txt" + {"i16x8.narrow_i32x4_s", TokenType::Binary, Opcode::I16X8NarrowI32X4S}, + {""}, {""}, +#line 520 "src/lexer-keywords.txt" + {"memory.fill", TokenType::MemoryFill, Opcode::MemoryFill}, {""}, -#line 480 "src/lexer-keywords.txt" - {"i8x16.extract_lane_s", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneS}, +#line 372 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8SubU}, +#line 241 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8SubU}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 218 "src/lexer-keywords.txt" + {"i16x8.extmul_low_i8x16_u", TokenType::Binary, Opcode::I16X8ExtmulLowI8X16U}, {""}, -#line 481 "src/lexer-keywords.txt" - {"i8x16.extract_lane_u", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 216 "src/lexer-keywords.txt" + {"i16x8.extmul_low_i8x16_s", TokenType::Binary, Opcode::I16X8ExtmulLowI8X16S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 208 "src/lexer-keywords.txt" - {"i16x8.replace_lane", TokenType::SimdLaneOp, Opcode::I16X8ReplaceLane}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, -#line 210 "src/lexer-keywords.txt" - {"i16x8.shr_s", TokenType::Binary, Opcode::I16X8ShrS}, +#line 31 "src/lexer-keywords.txt" + {"br_if", TokenType::BrIf, Opcode::BrIf}, {""}, {""}, {""}, -#line 211 "src/lexer-keywords.txt" - {"i16x8.shr_u", TokenType::Binary, Opcode::I16X8ShrU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 340 "src/lexer-keywords.txt" + {"i32x4.trunc_sat_f32x4_u", TokenType::Unary, Opcode::I32X4TruncSatF32X4U}, + {""}, {""}, {""}, +#line 339 "src/lexer-keywords.txt" + {"i32x4.trunc_sat_f32x4_s", TokenType::Unary, Opcode::I32X4TruncSatF32X4S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, -#line 218 "src/lexer-keywords.txt" - {"i16x8.extmul_low_i8x16_s", TokenType::Binary, Opcode::I16X8ExtmulLowI8X16S}, + {""}, {""}, {""}, +#line 213 "src/lexer-keywords.txt" + {"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub}, + {""}, {""}, +#line 176 "src/lexer-keywords.txt" + {"i16x8.abs", TokenType::Unary, Opcode::I16X8Abs}, +#line 336 "src/lexer-keywords.txt" + {"i32x4.extmul_low_i16x8_u", TokenType::Binary, Opcode::I32X4ExtmulLowI16X8U}, {""}, -#line 220 "src/lexer-keywords.txt" - {"i16x8.extmul_low_i8x16_u", TokenType::Binary, Opcode::I16X8ExtmulLowI8X16U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 334 "src/lexer-keywords.txt" + {"i32x4.extmul_low_i16x8_s", TokenType::Binary, Opcode::I32X4ExtmulLowI16X8S}, +#line 51 "src/lexer-keywords.txt" + {"externref", Type::ExternRef}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 183 "src/lexer-keywords.txt" + {"i16x8.eq", TokenType::Compare, Opcode::I16X8Eq}, +#line 495 "src/lexer-keywords.txt" + {"i8x16.popcnt", TokenType::Unary, Opcode::I8X16Popcnt}, + {""}, {""}, +#line 342 "src/lexer-keywords.txt" + {"i32x4.extend_high_i16x8_u", TokenType::Unary, Opcode::I32X4ExtendHighI16X8U}, + {""}, +#line 341 "src/lexer-keywords.txt" + {"i32x4.extend_high_i16x8_s", TokenType::Unary, Opcode::I32X4ExtendHighI16X8S}, + {""}, +#line 305 "src/lexer-keywords.txt" + {"i32x4.bitmask", TokenType::Unary, Opcode::I32X4Bitmask}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, +#line 170 "src/lexer-keywords.txt" + {"funcref", Type::FuncRef}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 588 "src/lexer-keywords.txt" + {"i8x16.swizzle", TokenType::Binary, Opcode::I8X16Swizzle}, {""}, {""}, {""}, -#line 477 "src/lexer-keywords.txt" +#line 26 "src/lexer-keywords.txt" + {"assert_trap", TokenType::AssertTrap}, + {""}, {""}, +#line 46 "src/lexer-keywords.txt" + {"elem", TokenType::Elem}, + {""}, {""}, {""}, +#line 475 "src/lexer-keywords.txt" {"i8x16.avgr_u", TokenType::Binary, Opcode::I8X16AvgrU}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 119 "src/lexer-keywords.txt" + {"f64.copysign", TokenType::Binary, Opcode::F64Copysign}, +#line 61 "src/lexer-keywords.txt" + {"f32.copysign", TokenType::Binary, Opcode::F32Copysign}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 225 "src/lexer-keywords.txt" - {"i16x8.extend_low_i8x16_s", TokenType::Unary, Opcode::I16X8ExtendLowI8X16S}, +#line 346 "src/lexer-keywords.txt" + {"i32x4.trunc_sat_f64x2_u_zero", TokenType::Unary, Opcode::I32X4TruncSatF64X2UZero}, {""}, -#line 226 "src/lexer-keywords.txt" - {"i16x8.extend_low_i8x16_u", TokenType::Unary, Opcode::I16X8ExtendLowI8X16U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 345 "src/lexer-keywords.txt" + {"i32x4.trunc_sat_f64x2_s_zero", TokenType::Unary, Opcode::I32X4TruncSatF64X2SZero}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, +#line 134 "src/lexer-keywords.txt" + {"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, +#line 564 "src/lexer-keywords.txt" + {"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect}, + {""}, {""}, +#line 337 "src/lexer-keywords.txt" + {"i32x4.extmul_high_i16x8_u", TokenType::Binary, Opcode::I32X4ExtmulHighI16X8U}, + {""}, +#line 335 "src/lexer-keywords.txt" + {"i32x4.extmul_high_i16x8_s", TokenType::Binary, Opcode::I32X4ExtmulHighI16X8S}, + {""}, {""}, {""}, {""}, +#line 356 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw16CmpxchgU}, +#line 232 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw16CmpxchgU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 301 "src/lexer-keywords.txt" + {"i32.wrap_i64", TokenType::Convert, Opcode::I32WrapI64}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 216 "src/lexer-keywords.txt" - {"i16x8.extadd_pairwise_i8x16_s", TokenType::Unary, Opcode::I16X8ExtaddPairwiseI8X16S}, - {""}, -#line 217 "src/lexer-keywords.txt" +#line 35 "src/lexer-keywords.txt" + {"call_ref", TokenType::CallRef, Opcode::CallRef}, + {""}, {""}, {""}, +#line 215 "src/lexer-keywords.txt" {"i16x8.extadd_pairwise_i8x16_u", TokenType::Unary, Opcode::I16X8ExtaddPairwiseI8X16U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 205 "src/lexer-keywords.txt" - {"i16x8.neg", TokenType::Unary, Opcode::I16X8Neg}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 214 "src/lexer-keywords.txt" + {"i16x8.extadd_pairwise_i8x16_s", TokenType::Unary, Opcode::I16X8ExtaddPairwiseI8X16S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 500 "src/lexer-keywords.txt" - {"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 589 "src/lexer-keywords.txt" - {"i8x16.shuffle", TokenType::SimdShuffleOp, Opcode::I8X16Shuffle}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 499 "src/lexer-keywords.txt" - {"i8x16.replace_lane", TokenType::SimdLaneOp, Opcode::I8X16ReplaceLane}, +#line 453 "src/lexer-keywords.txt" + {"i64x2.bitmask", TokenType::Unary, Opcode::I64X2Bitmask}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, -#line 501 "src/lexer-keywords.txt" - {"i8x16.shr_s", TokenType::Binary, Opcode::I8X16ShrS}, + {""}, +#line 504 "src/lexer-keywords.txt" + {"i8x16.sub", TokenType::Binary, Opcode::I8X16Sub}, +#line 21 "src/lexer-keywords.txt" + {"assert_exception", TokenType::AssertException}, + {""}, +#line 470 "src/lexer-keywords.txt" + {"i8x16.abs", TokenType::Unary, Opcode::I8X16Abs}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 120 "src/lexer-keywords.txt" + {"f64.div", TokenType::Binary, Opcode::F64Div}, +#line 63 "src/lexer-keywords.txt" + {"f32.div", TokenType::Binary, Opcode::F32Div}, {""}, {""}, {""}, -#line 502 "src/lexer-keywords.txt" - {"i8x16.shr_u", TokenType::Binary, Opcode::I8X16ShrU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 477 "src/lexer-keywords.txt" + {"i8x16.eq", TokenType::Compare, Opcode::I8X16Eq}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 457 "src/lexer-keywords.txt" + {"i64x2.extend_high_i32x4_u", TokenType::Unary, Opcode::I64X2ExtendHighI32X4U}, {""}, -#line 379 "src/lexer-keywords.txt" - {"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg}, -#line 248 "src/lexer-keywords.txt" - {"i32.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmwCmpxchg}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 455 "src/lexer-keywords.txt" + {"i64x2.extend_high_i32x4_s", TokenType::Unary, Opcode::I64X2ExtendHighI32X4S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, +#line 135 "src/lexer-keywords.txt" + {"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 22 "src/lexer-keywords.txt" + {"assert_exhaustion", TokenType::AssertExhaustion}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 138 "src/lexer-keywords.txt" + {"f64.sub", TokenType::Binary, Opcode::F64Sub}, +#line 80 "src/lexer-keywords.txt" + {"f32.sub", TokenType::Binary, Opcode::F32Sub}, +#line 429 "src/lexer-keywords.txt" + {"i64.sub", TokenType::Binary, Opcode::I64Sub}, +#line 291 "src/lexer-keywords.txt" + {"i32.sub", TokenType::Binary, Opcode::I32Sub}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 494 "src/lexer-keywords.txt" - {"i8x16.narrow_i16x8_s", TokenType::Binary, Opcode::I8X16NarrowI16X8S}, - {""}, -#line 495 "src/lexer-keywords.txt" - {"i8x16.narrow_i16x8_u", TokenType::Binary, Opcode::I8X16NarrowI16X8U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, #line 467 "src/lexer-keywords.txt" - {"i64x2.extmul_high_i32x4_s", TokenType::Binary, Opcode::I64X2ExtmulHighI32X4S}, - {""}, -#line 469 "src/lexer-keywords.txt" {"i64x2.extmul_high_i32x4_u", TokenType::Binary, Opcode::I64X2ExtmulHighI32X4U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 457 "src/lexer-keywords.txt" - {"i64x2.extend_high_i32x4_s", TokenType::Unary, Opcode::I64X2ExtendHighI32X4S}, {""}, -#line 459 "src/lexer-keywords.txt" - {"i64x2.extend_high_i32x4_u", TokenType::Unary, Opcode::I64X2ExtendHighI32X4U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 465 "src/lexer-keywords.txt" + {"i64x2.extmul_high_i32x4_s", TokenType::Binary, Opcode::I64X2ExtmulHighI32X4S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, -#line 496 "src/lexer-keywords.txt" - {"i8x16.neg", TokenType::Unary, Opcode::I8X16Neg}, +#line 519 "src/lexer-keywords.txt" + {"memory.copy", TokenType::MemoryCopy, Opcode::MemoryCopy}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 497 "src/lexer-keywords.txt" - {"i8x16.popcnt", TokenType::Unary, Opcode::I8X16Popcnt}, +#line 77 "src/lexer-keywords.txt" + {"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, +#line 182 "src/lexer-keywords.txt" + {"i16x8.bitmask", TokenType::Unary, Opcode::I16X8Bitmask}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 204 "src/lexer-keywords.txt" + {"i16x8.q15mulr_sat_s", TokenType::Binary, Opcode::I16X8Q15mulrSatS}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 222 "src/lexer-keywords.txt" + {"i16x8.extend_high_i8x16_u", TokenType::Unary, Opcode::I16X8ExtendHighI8X16U}, + {""}, +#line 221 "src/lexer-keywords.txt" + {"i16x8.extend_high_i8x16_s", TokenType::Unary, Opcode::I16X8ExtendHighI8X16S}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 27 "src/lexer-keywords.txt" + {"assert_unlinkable", TokenType::AssertUnlinkable}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 23 "src/lexer-keywords.txt" + {"assert_invalid", TokenType::AssertInvalid}, + {""}, {""}, {""}, +#line 587 "src/lexer-keywords.txt" + {"i8x16.shuffle", TokenType::SimdShuffleOp, Opcode::I8X16Shuffle}, + {""}, {""}, {""}, {""}, {""}, +#line 87 "src/lexer-keywords.txt" + {"f32x4.convert_i32x4_u", TokenType::Unary, Opcode::F32X4ConvertI32X4U}, + {""}, +#line 86 "src/lexer-keywords.txt" + {"f32x4.convert_i32x4_s", TokenType::Unary, Opcode::F32X4ConvertI32X4S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 219 "src/lexer-keywords.txt" + {"i16x8.extmul_high_i8x16_u", TokenType::Binary, Opcode::I16X8ExtmulHighI8X16U}, + {""}, +#line 217 "src/lexer-keywords.txt" + {"i16x8.extmul_high_i8x16_s", TokenType::Binary, Opcode::I16X8ExtmulHighI8X16S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 20 "src/lexer-keywords.txt" + {"array", Type::Array, TokenType::Array}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 517 "src/lexer-keywords.txt" + {"memory.atomic.wait32", TokenType::AtomicWait, Opcode::MemoryAtomicWait32}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 476 "src/lexer-keywords.txt" + {"i8x16.bitmask", TokenType::Unary, Opcode::I8X16Bitmask}, + {""}, {""}, {""}, {""}, {""}, +#line 518 "src/lexer-keywords.txt" + {"memory.atomic.wait64", TokenType::AtomicWait, Opcode::MemoryAtomicWait64}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 45 "src/lexer-keywords.txt" + {"elem.drop", TokenType::ElemDrop, Opcode::ElemDrop}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 379 "src/lexer-keywords.txt" + {"i64.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I64AtomicRmwSub}, +#line 248 "src/lexer-keywords.txt" + {"i32.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I32AtomicRmwSub}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 493 "src/lexer-keywords.txt" + {"i8x16.narrow_i16x8_u", TokenType::Binary, Opcode::I8X16NarrowI16X8U}, + {""}, +#line 492 "src/lexer-keywords.txt" + {"i8x16.narrow_i16x8_s", TokenType::Binary, Opcode::I8X16NarrowI16X8S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, +#line 166 "src/lexer-keywords.txt" + {"f64x2.convert_low_i32x4_u", TokenType::Unary, Opcode::F64X2ConvertLowI32X4U}, + {""}, +#line 165 "src/lexer-keywords.txt" + {"f64x2.convert_low_i32x4_s", TokenType::Unary, Opcode::F64X2ConvertLowI32X4S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, +#line 417 "src/lexer-keywords.txt" + {"i64.reinterpret_f64", TokenType::Convert, Opcode::I64ReinterpretF64}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1824,6 +1669,9 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 280 "src/lexer-keywords.txt" + {"i32.reinterpret_f32", TokenType::Convert, Opcode::I32ReinterpretF32}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1838,19 +1686,10 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 337 "src/lexer-keywords.txt" - {"i32x4.extmul_high_i16x8_s", TokenType::Binary, Opcode::I32X4ExtmulHighI16X8S}, - {""}, -#line 339 "src/lexer-keywords.txt" - {"i32x4.extmul_high_i16x8_u", TokenType::Binary, Opcode::I32X4ExtmulHighI16X8U}, +#line 28 "src/lexer-keywords.txt" + {"atomic.fence", TokenType::AtomicFence, Opcode::AtomicFence}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 343 "src/lexer-keywords.txt" - {"i32x4.extend_high_i16x8_s", TokenType::Unary, Opcode::I32X4ExtendHighI16X8S}, - {""}, -#line 344 "src/lexer-keywords.txt" - {"i32x4.extend_high_i16x8_u", TokenType::Unary, Opcode::I32X4ExtendHighI16X8U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1861,27 +1700,20 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 516 "src/lexer-keywords.txt" + {"memory.atomic.notify", TokenType::AtomicNotify, Opcode::MemoryAtomicNotify}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 219 "src/lexer-keywords.txt" - {"i16x8.extmul_high_i8x16_s", TokenType::Binary, Opcode::I16X8ExtmulHighI8X16S}, - {""}, -#line 221 "src/lexer-keywords.txt" - {"i16x8.extmul_high_i8x16_u", TokenType::Binary, Opcode::I16X8ExtmulHighI8X16U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 382 "src/lexer-keywords.txt" - {"i64.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I64AtomicRmwXchg}, -#line 251 "src/lexer-keywords.txt" - {"i32.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I32AtomicRmwXchg}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 223 "src/lexer-keywords.txt" - {"i16x8.extend_high_i8x16_s", TokenType::Unary, Opcode::I16X8ExtendHighI8X16S}, {""}, -#line 224 "src/lexer-keywords.txt" - {"i16x8.extend_high_i8x16_u", TokenType::Unary, Opcode::I16X8ExtendHighI8X16U} +#line 167 "src/lexer-keywords.txt" + {"f64x2.promote_low_f32x4", TokenType::Unary, Opcode::F64X2PromoteLowF32X4} }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) diff --git a/src/test-interp.cc b/src/test-interp.cc index 245bc884..d7461209 100644 --- a/src/test-interp.cc +++ b/src/test-interp.cc @@ -412,22 +412,22 @@ TEST_F(InterpTest, Rot13) { // (local $uc i32) // // ;; No change if < 'A'. - // (if (i32.lt_u (get_local $c) (i32.const 65)) - // (return (get_local $c))) + // (if (i32.lt_u (local.get $c) (i32.const 65)) + // (return (local.get $c))) // // ;; Clear 5th bit of c, to force uppercase. 0xdf = 0b11011111 - // (set_local $uc (i32.and (get_local $c) (i32.const 0xdf))) + // (local.set $uc (i32.and (local.get $c) (i32.const 0xdf))) // // ;; In range ['A', 'M'] return |c| + 13. - // (if (i32.le_u (get_local $uc) (i32.const 77)) - // (return (i32.add (get_local $c) (i32.const 13)))) + // (if (i32.le_u (local.get $uc) (i32.const 77)) + // (return (i32.add (local.get $c) (i32.const 13)))) // // ;; In range ['N', 'Z'] return |c| - 13. - // (if (i32.le_u (get_local $uc) (i32.const 90)) - // (return (i32.sub (get_local $c) (i32.const 13)))) + // (if (i32.le_u (local.get $uc) (i32.const 90)) + // (return (i32.sub (local.get $c) (i32.const 13)))) // // ;; No change for everything else. - // (return (get_local $c)) + // (return (local.get $c)) // ) // // (func (export "rot13") @@ -438,27 +438,27 @@ TEST_F(InterpTest, Rot13) { // (call $fill_buf (i32.const 0) (i32.const 1024)) // // ;; The host returns the size filled. - // (set_local $size) + // (local.set $size) // // ;; Loop over all bytes and rot13 them. // (block $exit // (loop $top // ;; if (i >= size) break - // (if (i32.ge_u (get_local $i) (get_local $size)) (br $exit)) + // (if (i32.ge_u (local.get $i) (local.get $size)) (br $exit)) // // ;; mem[i] = rot13c(mem[i]) // (i32.store8 - // (get_local $i) + // (local.get $i) // (call $rot13c - // (i32.load8_u (get_local $i)))) + // (i32.load8_u (local.get $i)))) // // ;; i++ - // (set_local $i (i32.add (get_local $i) (i32.const 1))) + // (local.set $i (i32.add (local.get $i) (i32.const 1))) // (br $top) // ) // ) // - // (call $buf_done (i32.const 0) (get_local $size)) + // (call $buf_done (i32.const 0) (local.get $size)) // ) ReadModule({ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x14, 0x04, 0x60, diff --git a/test/README.md b/test/README.md index 689e8c99..4a6c59e6 100644 --- a/test/README.md +++ b/test/README.md @@ -204,7 +204,7 @@ $ cat > test/my-awesome-test.txt << HERE (module (export "add2" 0) (func (param i32) (result i32) - (i32.add (get_local 0) (i32.const 2)))) + (i32.add (local.get 0) (i32.const 2)))) (assert_return (invoke "add2" (i32.const 4)) (i32.const 6)) (assert_return (invoke "add2" (i32.const -2)) (i32.const 0)) HERE diff --git a/test/binary/bad-call-indirect-reserved.txt b/test/binary/bad-call-indirect-reserved.txt index fdfe63f4..123149fd 100644 --- a/test/binary/bad-call-indirect-reserved.txt +++ b/test/binary/bad-call-indirect-reserved.txt @@ -5,7 +5,7 @@ magic version section(TYPE) { count[1] function params[0] results[0]} section(FUNCTION) { count[1] type[0] } -section(TABLE) { count[1] anyfunc flags[0] init[0] } +section(TABLE) { count[1] funcref flags[0] init[0] } section(CODE) { count[1] func { diff --git a/test/binary/bad-callindirect-invalid-sig.txt b/test/binary/bad-callindirect-invalid-sig.txt index 2dccf135..a4ef7081 100644 --- a/test/binary/bad-callindirect-invalid-sig.txt +++ b/test/binary/bad-callindirect-invalid-sig.txt @@ -3,7 +3,7 @@ magic version section(TYPE) { count[1] function params[0] results[0] } section(FUNCTION) { count[1] type[0] } -section(TABLE) { count[1] anyfunc flags[0] min[0] } +section(TABLE) { count[1] funcref flags[0] min[0] } section(CODE) { count[1] func { diff --git a/test/binary/bad-duplicate-subsection.txt b/test/binary/bad-duplicate-subsection.txt index 5af9c6de..145ba337 100644 --- a/test/binary/bad-duplicate-subsection.txt +++ b/test/binary/bad-duplicate-subsection.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/binary/bad-elem-flags.txt b/test/binary/bad-elem-flags.txt index ac39c7f7..7d463540 100644 --- a/test/binary/bad-elem-flags.txt +++ b/test/binary/bad-elem-flags.txt @@ -3,7 +3,7 @@ magic version section(TABLE) { count[1] - anyfunc + funcref has_max[0] initial[0] } diff --git a/test/binary/bad-name-section-invalid-index.txt b/test/binary/bad-name-section-invalid-index.txt index dc639cb7..43597ac3 100644 --- a/test/binary/bad-name-section-invalid-index.txt +++ b/test/binary/bad-name-section-invalid-index.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/binary/bad-names-duplicate-locals.txt b/test/binary/bad-names-duplicate-locals.txt index 8455c90b..84cc12ab 100644 --- a/test/binary/bad-names-duplicate-locals.txt +++ b/test/binary/bad-names-duplicate-locals.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[2] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/binary/bad-names-locals-out-of-order.txt b/test/binary/bad-names-locals-out-of-order.txt index 7cdfa0df..42d78882 100644 --- a/test/binary/bad-names-locals-out-of-order.txt +++ b/test/binary/bad-names-locals-out-of-order.txt @@ -6,7 +6,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[2] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/binary/bad-returncallindirect-invalid-sig.txt b/test/binary/bad-returncallindirect-invalid-sig.txt index 715324be..97714a16 100644 --- a/test/binary/bad-returncallindirect-invalid-sig.txt +++ b/test/binary/bad-returncallindirect-invalid-sig.txt @@ -5,7 +5,7 @@ magic version section(TYPE) { count[1] function params[0] results[0] } section(FUNCTION) { count[1] type[0] } -section(TABLE) { count[1] anyfunc flags[0] min[0] } +section(TABLE) { count[1] funcref flags[0] min[0] } section(CODE) { count[1] func { diff --git a/test/binary/bad-returncallindirect-reserved.txt b/test/binary/bad-returncallindirect-reserved.txt index 8a4175cc..508835a1 100644 --- a/test/binary/bad-returncallindirect-reserved.txt +++ b/test/binary/bad-returncallindirect-reserved.txt @@ -5,7 +5,7 @@ magic version section(TYPE) { count[1] function params[0] results[0]} section(FUNCTION) { count[1] type[0] } -section(TABLE) { count[1] anyfunc flags[0] init[0] } +section(TABLE) { count[1] funcref flags[0] init[0] } section(CODE) { count[1] func { diff --git a/test/binary/bad-subsection-out-of-order.txt b/test/binary/bad-subsection-out-of-order.txt index c57cc0eb..e0e73938 100644 --- a/test/binary/bad-subsection-out-of-order.txt +++ b/test/binary/bad-subsection-out-of-order.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/binary/bad-subsection-size.txt b/test/binary/bad-subsection-size.txt index 6ad1a25e..3308c6fd 100644 --- a/test/binary/bad-subsection-size.txt +++ b/test/binary/bad-subsection-size.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/binary/bad-subsection-unfinished.txt b/test/binary/bad-subsection-unfinished.txt index 75cf2498..bd54f84f 100644 --- a/test/binary/bad-subsection-unfinished.txt +++ b/test/binary/bad-subsection-unfinished.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/binary/bad-table-limits-flag-is64.txt b/test/binary/bad-table-limits-flag-is64.txt index 8c8b8d14..52e61d1d 100644 --- a/test/binary/bad-table-limits-flag-is64.txt +++ b/test/binary/bad-table-limits-flag-is64.txt @@ -3,7 +3,7 @@ magic version section(TABLE) { count[1] - anyfunc + funcref flags[4] } (;; STDERR ;;; diff --git a/test/binary/bad-table-limits-flag.txt b/test/binary/bad-table-limits-flag.txt index 28f6b438..3c4b4837 100644 --- a/test/binary/bad-table-limits-flag.txt +++ b/test/binary/bad-table-limits-flag.txt @@ -3,7 +3,7 @@ magic version section(TABLE) { count[1] - anyfunc + funcref flags[8] } (;; STDERR ;;; diff --git a/test/binary/names.txt b/test/binary/names.txt index d5561072..d9d4724e 100644 --- a/test/binary/names.txt +++ b/test/binary/names.txt @@ -40,7 +40,7 @@ section(CODE) { ;; Test name section. func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } ;; Test naming priorities ;; If there's a name section name, prefer that over sym/export. diff --git a/test/binary/no-names.txt b/test/binary/no-names.txt index 20ff9b12..3d33f45c 100644 --- a/test/binary/no-names.txt +++ b/test/binary/no-names.txt @@ -8,7 +8,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/decompile/basic.txt b/test/decompile/basic.txt index a5ae3a82..2b63e4a5 100644 --- a/test/decompile/basic.txt +++ b/test/decompile/basic.txt @@ -21,11 +21,11 @@ (func $f (param i32 i32) (result i32) (local i64 f32 f64) i64.const 8 - set_local 2 + local.set 2 f32.const 6.0 - set_local 3 + local.set 3 f64.const 7.0 - tee_local 4 + local.tee 4 f64.const 10.0 f64.lt if @@ -36,8 +36,8 @@ i32.add i32.store offset=4 end - get_local 0 - get_global $g1 + local.get 0 + global.get $g1 i32.add i32.const 9 call $f @@ -97,7 +97,7 @@ drop i32.const 3 end - set_local 0 + local.set 0 nop ref.null func ref.is_null @@ -111,10 +111,10 @@ ;; of first definition. loop i32.const 1 - tee_local 0 + local.tee 0 br_if 0 end - get_local 0 + local.get 0 drop ) ;; LLD outputs a name section with de-mangled C++ function signatures as names, diff --git a/test/decompile/loadstore.txt b/test/decompile/loadstore.txt index c02700a1..6b480286 100644 --- a/test/decompile/loadstore.txt +++ b/test/decompile/loadstore.txt @@ -7,91 +7,91 @@ (func $f (param i32 i32) (result) (local i32 i32 i32 i32 i32 i32) ;; Test regular accesses that become a struct. - get_local 0 + local.get 0 f32.load offset=0 - get_local 2 + local.get 2 f32.load offset=0 f32.add - get_local 0 + local.get 0 f32.load offset=4 - get_local 2 + local.get 2 f32.load offset=4 f32.add f32.add drop - get_local 1 + local.get 1 i64.load16_u offset=0 - get_local 3 + local.get 3 i64.load16_u offset=0 i64.add - get_local 1 + local.get 1 i64.load offset=8 - get_local 3 + local.get 3 i64.load offset=8 i64.add i64.add drop ;; Test things that do not become a struct for various reasons. ;; 1) Mixed type access. - get_local 4 + local.get 4 i32.load offset=0 drop - get_local 4 + local.get 4 f32.load offset=0 drop ;; 2) Mixed size access. - get_local 5 + local.get 5 i32.load offset=0 drop - get_local 5 + local.get 5 i32.load16_s offset=0 drop ;; 3) Mixed align requirement access. - get_local 6 + local.get 6 i32.load offset=0 drop - get_local 6 + local.get 6 i32.load offset=0 align=1 drop ;; 4) Unaligned access / access with unexpected gaps. - get_local 7 + local.get 7 f32.load offset=1 align=1 drop ;; Test index rewriting. ;; code that does (base + (index << 2))[0]:int is super common. - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.const 2 i32.shl i32.add - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.const 2 i32.shl i32.add i32.load offset=0 i32.store offset=0 ;; Same with non-zero offsets. - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.const 2 i32.shl i32.add - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.const 2 i32.shl i32.add i32.load offset=4 i32.store offset=4 ;; If the shift amount does not match, it doesn't work. - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.const 3 i32.shl i32.add - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.const 2 i32.shl i32.add diff --git a/test/decompile/names.txt b/test/decompile/names.txt index f390b891..3874b49c 100644 --- a/test/decompile/names.txt +++ b/test/decompile/names.txt @@ -39,7 +39,7 @@ section(CODE) { ;; Test name section. func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } ;; Test naming priorities ;; If there's a name section name, prefer that over sym/export. diff --git a/test/desugar/basic.txt b/test/desugar/basic.txt index e5fab866..30143e5b 100644 --- a/test/desugar/basic.txt +++ b/test/desugar/basic.txt @@ -4,7 +4,7 @@ (global i32 (i32.const 1)) - (table anyfunc (elem 0)) + (table funcref (elem 0)) (memory (data "hello")) diff --git a/test/dump/atomic.txt b/test/dump/atomic.txt index 211da4cd..4e463efd 100644 --- a/test/dump/atomic.txt +++ b/test/dump/atomic.txt @@ -4,9 +4,9 @@ (module (memory 1 1 shared) (func - i32.const 0 i32.const 0 atomic.notify drop - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop + i32.const 0 i32.const 0 memory.atomic.notify drop + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop i32.const 0 i32.atomic.load drop i32.const 0 i64.atomic.load drop diff --git a/test/dump/basic.txt b/test/dump/basic.txt index 3b7b8ba2..092a9c05 100644 --- a/test/dump/basic.txt +++ b/test/dump/basic.txt @@ -10,8 +10,8 @@ i32.const 1 i32.add i32.store - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.add) (export "f" (func $f))) (;; STDERR ;;; diff --git a/test/dump/basic_dump_only.txt b/test/dump/basic_dump_only.txt index dd15954e..1e20171c 100644 --- a/test/dump/basic_dump_only.txt +++ b/test/dump/basic_dump_only.txt @@ -8,8 +8,8 @@ i32.const 1 i32.add i32.store - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.add) (export "f" (func $f))) (;; STDOUT ;;; diff --git a/test/dump/bulk-memory.txt b/test/dump/bulk-memory.txt index 2b56eb49..3ae30e66 100644 --- a/test/dump/bulk-memory.txt +++ b/test/dump/bulk-memory.txt @@ -11,7 +11,7 @@ i32.const 0 i32.const 0 i32.const 0 memory.fill ) - (table 1 anyfunc) + (table 1 funcref) (elem func 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 diff --git a/test/dump/bulk-memory64.txt b/test/dump/bulk-memory64.txt index 8ac1c7f6..8c0326db 100644 --- a/test/dump/bulk-memory64.txt +++ b/test/dump/bulk-memory64.txt @@ -10,7 +10,7 @@ i64.const 0 i32.const 0 i64.const 0 memory.fill ) - (table 1 anyfunc) + (table 1 funcref) (elem func 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 diff --git a/test/dump/callindirect.txt b/test/dump/callindirect.txt index 442b6733..1660f746 100644 --- a/test/dump/callindirect.txt +++ b/test/dump/callindirect.txt @@ -6,7 +6,7 @@ i32.const 0 i32.const 0 call_indirect (type $t)) - (table anyfunc (elem $f))) + (table funcref (elem $f))) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION diff --git a/test/dump/cast.txt b/test/dump/cast.txt index 3145f322..21651f5d 100644 --- a/test/dump/cast.txt +++ b/test/dump/cast.txt @@ -3,16 +3,16 @@ (module (func i32.const 0 - f32.reinterpret/i32 + f32.reinterpret_i32 drop f32.const 0 - i32.reinterpret/f32 + i32.reinterpret_f32 drop i64.const 0 - f64.reinterpret/i64 + f64.reinterpret_i64 drop f64.const 0 - i64.reinterpret/f64 + i64.reinterpret_f64 drop)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC diff --git a/test/dump/convert-sat.txt b/test/dump/convert-sat.txt index 7542c11f..03122c26 100644 --- a/test/dump/convert-sat.txt +++ b/test/dump/convert-sat.txt @@ -3,35 +3,35 @@ (module (func f32.const 0 - i32.trunc_s:sat/f32 + i32.trunc_sat_f32_s drop f32.const 0 - i32.trunc_u:sat/f32 + i32.trunc_sat_f32_u drop f64.const 0 - i32.trunc_s:sat/f64 + i32.trunc_sat_f64_s drop f64.const 0 - i32.trunc_u:sat/f64 + i32.trunc_sat_f64_u drop f32.const 0 - i64.trunc_s:sat/f32 + i64.trunc_sat_f32_s drop f32.const 0 - i64.trunc_u:sat/f32 + i64.trunc_sat_f32_u drop f64.const 0 - i64.trunc_s:sat/f64 + i64.trunc_sat_f64_s drop f64.const 0 - i64.trunc_u:sat/f64 + i64.trunc_sat_f64_u drop)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC diff --git a/test/dump/convert.txt b/test/dump/convert.txt index 0da3f2b3..6934d024 100644 --- a/test/dump/convert.txt +++ b/test/dump/convert.txt @@ -3,33 +3,33 @@ (module (func i32.const 0 - f64.convert_u/i32 - i32.trunc_u/f64 - f64.convert_s/i32 - i32.trunc_s/f64 - f32.convert_u/i32 - i32.trunc_u/f32 - f32.convert_s/i32 - i32.trunc_s/f32 - i64.extend_u/i32 - i32.wrap/i64 + f64.convert_i32_u + i32.trunc_f64_u + f64.convert_i32_s + i32.trunc_f64_s + f32.convert_i32_u + i32.trunc_f32_u + f32.convert_i32_s + i32.trunc_f32_s + i64.extend_i32_u + i32.wrap_i64 drop i32.const 0 - i64.extend_s/i32 - f64.convert_u/i64 - i64.trunc_u/f64 - f64.convert_s/i64 - i64.trunc_s/f64 - f32.convert_u/i64 - i64.trunc_u/f32 - f32.convert_s/i64 - i64.trunc_s/f32 + i64.extend_i32_s + f64.convert_i64_u + i64.trunc_f64_u + f64.convert_i64_s + i64.trunc_f64_s + f32.convert_i64_u + i64.trunc_f32_u + f32.convert_i64_s + i64.trunc_f32_s drop f32.const 0 - f64.promote/f32 - f32.demote/f64 + f64.promote_f32 + f32.demote_f64 drop)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC diff --git a/test/dump/global.txt b/test/dump/global.txt index 369f45a5..9a270ff5 100644 --- a/test/dump/global.txt +++ b/test/dump/global.txt @@ -12,10 +12,10 @@ (global f32 (f32.const 3)) (global f64 (f64.const 4)) - (global i32 (get_global 0)) - (global i64 (get_global 1)) - (global f32 (get_global 2)) - (global f64 (get_global 3))) + (global i32 (global.get 0)) + (global i64 (global.get 1)) + (global f32 (global.get 2)) + (global f64 (global.get 3))) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION diff --git a/test/dump/getglobal.txt b/test/dump/globalget.txt index a4a70776..5a8fc45c 100644 --- a/test/dump/getglobal.txt +++ b/test/dump/globalget.txt @@ -3,7 +3,7 @@ (module (global i32 (i32.const 0)) (func (result i32) - get_global 0)) + global.get 0)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION @@ -48,7 +48,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -getglobal.wasm: file format wasm 0x1 +globalget.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/setglobal.txt b/test/dump/globalset.txt index 5e975c36..ad6a35b5 100644 --- a/test/dump/setglobal.txt +++ b/test/dump/globalset.txt @@ -4,7 +4,7 @@ (global (mut f32) (f32.const 1)) (func f32.const 2 - set_global 0)) + global.set 0)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION @@ -50,7 +50,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -setglobal.wasm: file format wasm 0x1 +globalset.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/import.txt b/test/dump/import.txt index 834acbb4..6f16b6dc 100644 --- a/test/dump/import.txt +++ b/test/dump/import.txt @@ -5,7 +5,7 @@ (import "ignored" "test" (func (param i32 i64 f32 f64))) (import "ignored" "test2" (func (param i32) (result i32))) (import "ignored" "testmem" (memory 0)) - (import "ignored" "testtable" (table 0 anyfunc)) + (import "ignored" "testtable" (table 0 funcref)) (import "ignored" "testtag" (tag (param i32))) ) (;; STDERR ;;; diff --git a/test/dump/invalid-elem-segment-offset.txt b/test/dump/invalid-elem-segment-offset.txt index 01d02024..3c70d430 100644 --- a/test/dump/invalid-elem-segment-offset.txt +++ b/test/dump/invalid-elem-segment-offset.txt @@ -1,7 +1,7 @@ ;;; TOOL: wat2wasm ;;; ARGS: -v --no-check (module - (table 1 anyfunc) + (table 1 funcref) (func) (elem (i32.eqz (i32.const 1)) 0)) (;; STDERR ;;; diff --git a/test/dump/tee_local.txt b/test/dump/local-tee.txt index 5b1acf8b..07eb9c3f 100644 --- a/test/dump/tee_local.txt +++ b/test/dump/local-tee.txt @@ -4,7 +4,7 @@ (func (local i32) i32.const 0 - tee_local 0 + local.tee 0 drop)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC @@ -44,7 +44,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -tee_local.wasm: file format wasm 0x1 +local-tee.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/getlocal-param.txt b/test/dump/localget-param.txt index e9f5664f..e3f7c415 100644 --- a/test/dump/getlocal-param.txt +++ b/test/dump/localget-param.txt @@ -3,17 +3,17 @@ (module (func (param i32 f32) (local i64 f32 i32 f32) - get_local 0 + local.get 0 drop - get_local 1 + local.get 1 drop - get_local 2 + local.get 2 drop - get_local 3 + local.get 3 drop - get_local 4 + local.get 4 drop - get_local 5 + local.get 5 drop )) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC @@ -74,7 +74,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -getlocal-param.wasm: file format wasm 0x1 +localget-param.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/getlocal.txt b/test/dump/localget.txt index f29d71ef..c0310cf0 100644 --- a/test/dump/getlocal.txt +++ b/test/dump/localget.txt @@ -3,21 +3,21 @@ (module (func (local f64 f32 i64 i32 i32 f32 f64 i64) - get_local 0 + local.get 0 drop - get_local 1 + local.get 1 drop - get_local 2 + local.get 2 drop - get_local 3 + local.get 3 drop - get_local 4 + local.get 4 drop - get_local 5 + local.get 5 drop - get_local 6 + local.get 6 drop - get_local 7 + local.get 7 drop)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC @@ -88,7 +88,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -getlocal.wasm: file format wasm 0x1 +localget.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/setlocal-param.txt b/test/dump/localset-param.txt index 6cd74b99..da5609a2 100644 --- a/test/dump/setlocal-param.txt +++ b/test/dump/localset-param.txt @@ -8,17 +8,17 @@ ;; f32 4 5 (local i64 f32 i32 f32) i32.const 0 - set_local 0 + local.set 0 f32.const 0 - set_local 1 + local.set 1 i64.const 0 - set_local 2 + local.set 2 f32.const 0 - set_local 3 + local.set 3 i32.const 0 - set_local 4 + local.set 4 f32.const 0 - set_local 5)) + local.set 5)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION @@ -84,7 +84,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -setlocal-param.wasm: file format wasm 0x1 +localset-param.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/setlocal.txt b/test/dump/localset.txt index 6604c410..644c9978 100644 --- a/test/dump/setlocal.txt +++ b/test/dump/localset.txt @@ -8,21 +8,21 @@ ;; f64 6 7 (local f64 f32 i64 i32 i32 f32 f64 i64) f64.const 0 - set_local 0 + local.set 0 f32.const 0 - set_local 1 + local.set 1 i64.const 0 - set_local 2 + local.set 2 i32.const 0 - set_local 3 + local.set 3 i32.const 0 - set_local 4 + local.set 4 f32.const 0 - set_local 5 + local.set 5 f64.const 0 - set_local 6 + local.set 6 i64.const 0 - set_local 7)) + local.set 7)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION @@ -100,7 +100,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -setlocal.wasm: file format wasm 0x1 +localset.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/grow-memory.txt b/test/dump/memory-grow.txt index 80de8a01..6a309641 100644 --- a/test/dump/grow-memory.txt +++ b/test/dump/memory-grow.txt @@ -3,8 +3,8 @@ (module (memory 1 2) (func (param i32) - get_local 0 - grow_memory + local.get 0 + memory.grow drop)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC @@ -52,7 +52,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -grow-memory.wasm: file format wasm 0x1 +memory-grow.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/current-memory.txt b/test/dump/memory-size.txt index 28059287..533d952a 100644 --- a/test/dump/current-memory.txt +++ b/test/dump/memory-size.txt @@ -3,7 +3,7 @@ (module (memory 1) (func (result i32) - current_memory)) + memory.size)) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION @@ -46,7 +46,7 @@ ;;; STDERR ;;) (;; STDOUT ;;; -current-memory.wasm: file format wasm 0x1 +memory-size.wasm: file format wasm 0x1 Code Disassembly: diff --git a/test/dump/no-canonicalize.txt b/test/dump/no-canonicalize.txt index 39dda617..de3196ec 100644 --- a/test/dump/no-canonicalize.txt +++ b/test/dump/no-canonicalize.txt @@ -4,20 +4,20 @@ (import "stdio" "print" (func (param i32))) (memory 100) (export "f1" (func $f1)) - (table anyfunc (elem $f2 $f3)) + (table funcref (elem $f2 $f3)) (type $t (func (param i32) (result i32))) (func $f1 (param i32 i32) - get_local 0 - get_local 1 + local.get 0 + local.get 1 call_indirect (type $t) drop) (func $f2 (param i32) - get_local 0 + local.get 0 i32.const 1 i32.add drop) (func $f3 (param i32) - get_local 0 + local.get 0 i32.const 2 i32.mul drop)) diff --git a/test/dump/reference-types.txt b/test/dump/reference-types.txt index 9ccba7e8..2fd082cc 100644 --- a/test/dump/reference-types.txt +++ b/test/dump/reference-types.txt @@ -19,12 +19,12 @@ (func (param externref) i32.const 0 - get_local 0 + local.get 0 table.set $foo ) (func (param externref) i32.const 0 - get_local 0 + local.get 0 table.set $bar ) diff --git a/test/dump/relocations-all-features.txt b/test/dump/relocations-all-features.txt index ee017fd2..e6a0f9b5 100644 --- a/test/dump/relocations-all-features.txt +++ b/test/dump/relocations-all-features.txt @@ -7,14 +7,14 @@ (import "__extern" "bar" (func (param i32) (param i32) (result i32))) (global $g i32 (i32.const 0)) (func $f (param i32) (result i32) - get_global 0 + global.get 0 call 2 call 0 i32.const 1234 i32.const 0 call_indirect (param i32) (param i32) (result i32)) (export "f" (func $f)) - (table anyfunc (elem 1))) + (table funcref (elem 1))) (;; STDOUT ;;; relocations-all-features.wasm: file format wasm 0x1 diff --git a/test/dump/relocations-long-func-bodies.txt b/test/dump/relocations-long-func-bodies.txt index caabf95f..84b82b86 100644 --- a/test/dump/relocations-long-func-bodies.txt +++ b/test/dump/relocations-long-func-bodies.txt @@ -4,9 +4,9 @@ (module (global $g i32 (i32.const 0)) (func $previous_func - (drop (get_global 0))) + (drop (global.get 0))) (func $long_func - (drop (get_global 0)) + (drop (global.get 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) (drop (i32.const 0)) diff --git a/test/dump/relocations.txt b/test/dump/relocations.txt index 97fe671f..58679803 100644 --- a/test/dump/relocations.txt +++ b/test/dump/relocations.txt @@ -7,14 +7,14 @@ (import "__extern" "bar" (func (param i32) (param i32) (result i32))) (global $g i32 (i32.const 0)) (func $f (param i32) (result i32) - get_global 0 + global.get 0 call 2 call 0 i32.const 1234 i32.const 0 call_indirect (param i32) (param i32) (result i32)) (export "f" (func $f)) - (table anyfunc (elem 1))) + (table funcref (elem 1))) (;; STDOUT ;;; relocations.wasm: file format wasm 0x1 diff --git a/test/dump/table-multi.txt b/test/dump/table-multi.txt index 0f9e7a03..fc4555e0 100644 --- a/test/dump/table-multi.txt +++ b/test/dump/table-multi.txt @@ -3,8 +3,8 @@ ;;; ARGS1: -x (module (func (param i32)) - (table anyfunc (elem 0)) - (table anyfunc (elem 0))) + (table funcref (elem 0)) + (table funcref (elem 0))) (;; STDERR ;;; 0000000: 0061 736d ; WASM_BINARY_MAGIC 0000004: 0100 0000 ; WASM_BINARY_VERSION diff --git a/test/dump/table.txt b/test/dump/table.txt index 8e004267..10aadb5e 100644 --- a/test/dump/table.txt +++ b/test/dump/table.txt @@ -7,7 +7,7 @@ (func (param i32 i64)) (func (result f64) f64.const 0) - (table 6 6 anyfunc) + (table 6 6 funcref) (elem (i32.const 0) 1 1) (elem (i32.const 2) 0 0 1 2)) (;; STDERR ;;; diff --git a/test/dump/tail-call.txt b/test/dump/tail-call.txt index 61c10f66..0c725584 100644 --- a/test/dump/tail-call.txt +++ b/test/dump/tail-call.txt @@ -1,7 +1,7 @@ ;;; TOOL: run-objdump ;;; ARGS0: --enable-tail-call (module - (table 1 anyfunc) + (table 1 funcref) (func return_call 0) (func i32.const 0 return_call_indirect) ) diff --git a/test/gen-spec-js.py b/test/gen-spec-js.py index 826e45a4..caba3568 100755 --- a/test/gen-spec-js.py +++ b/test/gen-spec-js.py @@ -286,7 +286,7 @@ class ModuleExtender(object): self._Constant(arg) self.lines.append('call %s' % export[1]) elif action['type'] == 'get': - self.lines.append('get_global %s' % export[1]) + self.lines.append('global.get %s' % export[1]) else: raise Error('Unexpected action: %s' % action['type']) @@ -294,8 +294,8 @@ class ModuleExtender(object): self.lines.extend({ 'i32': [], 'i64': [], - 'f32': ['i32.reinterpret/f32'], - 'f64': ['i64.reinterpret/f64'] + 'f32': ['i32.reinterpret_f32'], + 'f64': ['i64.reinterpret_f64'] }[type_]) def _Eq(self, type_): diff --git a/test/gen-spec-js/action.txt b/test/gen-spec-js/action.txt index 266e6095..47e365a6 100644 --- a/test/gen-spec-js/action.txt +++ b/test/gen-spec-js/action.txt @@ -2,7 +2,7 @@ ;;; ARGS: --prefix=%(test_dir)s/gen-spec-empty-prefix.js (module (import "spectest" "print" (func (param i32))) - (func (export "print_i32") (param i32) get_local 0 call 0) + (func (export "print_i32") (param i32) local.get 0 call 0) (global (export "global") i32 (i32.const 14))) diff --git a/test/gen-spec-js/assert_return.txt b/test/gen-spec-js/assert_return.txt index 7fa044d1..2f0cc288 100644 --- a/test/gen-spec-js/assert_return.txt +++ b/test/gen-spec-js/assert_return.txt @@ -4,20 +4,20 @@ (func (export "no_result")) (func (export "42") (result i32) i32.const 42) (func (export "i32.add") (param i32 i32) (result i32) - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.add) (func (export "i64.add") (param i64 i64) (result i64) - get_local 0 - get_local 1 + local.get 0 + local.get 1 i64.add) (func (export "f32.add") (param f32 f32) (result f32) - get_local 0 - get_local 1 + local.get 0 + local.get 1 f32.add) (func (export "f64.add") (param f64 f64) (result f64) - get_local 0 - get_local 1 + local.get 0 + local.get 1 f64.add) (func (export "nan") (result f32) f32.const nan:0x2)) diff --git a/test/gen-spec-js/assert_return_nan.txt b/test/gen-spec-js/assert_return_nan.txt index e3770cca..3ac3c0d7 100644 --- a/test/gen-spec-js/assert_return_nan.txt +++ b/test/gen-spec-js/assert_return_nan.txt @@ -3,11 +3,11 @@ (module (func (export "f32_nan") (result f32) f32.const nan) (func (export "f32_nan_with_tag") (result f32) f32.const nan:0x1234) - (func (export "f32_passthru") (param f32) (result f32) get_local 0) + (func (export "f32_passthru") (param f32) (result f32) local.get 0) (func (export "f64_nan") (result f64) f64.const nan) (func (export "f64_nan_with_tag") (result f64) f64.const nan:0x1234) - (func (export "f64_passthru") (param f64) (result f64) get_local 0)) + (func (export "f64_passthru") (param f64) (result f64) local.get 0)) (assert_return (invoke "f32_nan") (f32.const nan:canonical)) (assert_return (invoke "f32_nan_with_tag") (f32.const nan:arithmetic)) diff --git a/test/gen-spec-js/assert_trap.txt b/test/gen-spec-js/assert_trap.txt index 825003be..523092b2 100644 --- a/test/gen-spec-js/assert_trap.txt +++ b/test/gen-spec-js/assert_trap.txt @@ -3,8 +3,8 @@ (module (func (export "unreachable") unreachable) (func (export "i32.trunc_s") (param f32) (result i32) - get_local 0 - i32.trunc_s/f32)) + local.get 0 + i32.trunc_f32_s)) (assert_trap (invoke "unreachable") "unreachable") ;; Rewritten to avoid passing nan as a parameter. diff --git a/test/gen-spec-prefix.js b/test/gen-spec-prefix.js index 0ce7ce46..9d45d024 100644 --- a/test/gen-spec-prefix.js +++ b/test/gen-spec-prefix.js @@ -5,7 +5,7 @@ let spectest = { print: print || ((...xs) => console.log(...xs)), global: 666, - table: new WebAssembly.Table({initial: 10, maximum: 20, element: 'anyfunc'}), + table: new WebAssembly.Table({initial: 10, maximum: 20, element: 'funcref'}), memory: new WebAssembly.Memory({initial: 1, maximum: 2}),}; let registry = {spectest}; diff --git a/test/gen-wasm.py b/test/gen-wasm.py index 76764728..b437dfeb 100755 --- a/test/gen-wasm.py +++ b/test/gen-wasm.py @@ -42,7 +42,7 @@ NAMED_VALUES = { 'f32': 0x7d, # -3 'f64': 0x7c, # -4 'v128': 0x7b, # -5 - 'anyfunc': 0x70, # -0x10 + 'funcref': 0x70, # -0x10 'function': 0x60, # -0x20 'struct': 0x5f, # -0x21 'array': 0x5e, # -0x22 @@ -105,11 +105,11 @@ NAMED_VALUES = { "return_call_indirect": 0x13, "drop": 0x1a, "select": 0x1b, - "get_local": 0x20, - "set_local": 0x21, - "tee_local": 0x22, - "get_global": 0x23, - "set_global": 0x24, + "local.get": 0x20, + "local.set": 0x21, + "local.tee": 0x22, + "global.get": 0x23, + "global.set": 0x24, "i32.load": 0x28, "i64.load": 0x29, "f32.load": 0x2a, @@ -237,31 +237,31 @@ NAMED_VALUES = { "f64.div": 0xa4, "f64.min": 0xa5, "f64.max": 0xa6, - "i32.wrap/i64": 0xa7, - "i32.trunc_s/f32": 0xa8, - "i32.trunc_u/f32": 0xa9, - "i32.trunc_s/f64": 0xaa, - "i32.trunc_u/f64": 0xab, - "i64.extend_s/i32": 0xac, - "i64.extend_u/i32": 0xad, - "i64.trunc_s/f32": 0xae, - "i64.trunc_u/f32": 0xaf, - "i64.trunc_s/f64": 0xb0, - "i64.trunc_u/f64": 0xb1, - "f32.convert_s/i32": 0xb2, - "f32.convert_u/i32": 0xb3, - "f32.convert_s/i64": 0xb4, - "f32.convert_u/i64": 0xb5, - "f32.demote/f64": 0xb6, - "f64.convert_s/i32": 0xb7, - "f64.convert_u/i32": 0xb8, - "f64.convert_s/i64": 0xb9, - "f64.convert_u/i64": 0xba, - "f64.promote/f32": 0xbb, - "i32.reinterpret/f32": 0xbc, - "i64.reinterpret/f64": 0xbd, - "f32.reinterpret/i32": 0xbe, - "f64.reinterpret/i64": 0xbf, + "i32.wrap_i64": 0xa7, + "i32.trunc_f32_s": 0xa8, + "i32.trunc_f32_u": 0xa9, + "i32.trunc_f64_s": 0xaa, + "i32.trunc_f64_u": 0xab, + "i64.extend_i32_s": 0xac, + "i64.extend_i32_u": 0xad, + "i64.trunc_f32_s": 0xae, + "i64.trunc_f32_u": 0xaf, + "i64.trunc_f64_s": 0xb0, + "i64.trunc_f64_u": 0xb1, + "f32.convert_i32_s": 0xb2, + "f32.convert_i32_u": 0xb3, + "f32.convert_i64_s": 0xb4, + "f32.convert_i64_u": 0xb5, + "f32.demote_f64": 0xb6, + "f64.convert_i32_s": 0xb7, + "f64.convert_i32_u": 0xb8, + "f64.convert_i64_s": 0xb9, + "f64.convert_i64_u": 0xba, + "f64.promote_f32": 0xbb, + "i32.reinterpret_f32": 0xbc, + "i64.reinterpret_f64": 0xbd, + "f32.reinterpret_i32": 0xbe, + "f64.reinterpret_i64": 0xbf, # bulk memory "memory.init": (0xfc, 0x08), diff --git a/test/interp/basic-tracing.txt b/test/interp/basic-tracing.txt index 945fae0d..5a5e20fd 100644 --- a/test/interp/basic-tracing.txt +++ b/test/interp/basic-tracing.txt @@ -2,17 +2,17 @@ ;;; ARGS: --trace (module (func $fib (param $n i32) (result i32) - get_local $n + local.get $n i32.const 1 i32.le_s if (result i32) i32.const 1 else - get_local $n + local.get $n i32.const 1 i32.sub call $fib - get_local $n + local.get $n i32.mul end) diff --git a/test/interp/block-multi.txt b/test/interp/block-multi.txt index be71a75d..155b26f1 100644 --- a/test/interp/block-multi.txt +++ b/test/interp/block-multi.txt @@ -23,7 +23,7 @@ (func (export "block-param") (result f32) i32.const 2 block (param i32) (result f32) - f32.convert_s/i32 + f32.convert_i32_s end ) ) diff --git a/test/interp/br.txt b/test/interp/br.txt index 0731eb61..0a892b9f 100644 --- a/test/interp/br.txt +++ b/test/interp/br.txt @@ -9,14 +9,14 @@ br 1 ;; if branches introduce blocks end i32.const 1 - set_local 0 ;; not executed + local.set 0 ;; not executed end i32.const 1 - set_local 1 - get_local 0 + local.set 1 + local.get 0 i32.const 0 i32.eq - get_local 1 + local.get 1 i32.const 1 i32.eq i32.add @@ -32,21 +32,21 @@ br 2 end ;; if branches introduce blocks i32.const 1 - set_local 0 ;; not executed + local.set 0 ;; not executed end i32.const 1 - set_local 1 ;; not executed + local.set 1 ;; not executed end i32.const 1 - set_local 2 - get_local 0 + local.set 2 + local.get 0 i32.const 0 i32.eq - get_local 1 + local.get 1 i32.const 0 i32.eq i32.add - get_local 2 + local.get 2 i32.const 1 i32.eq i32.add @@ -72,28 +72,28 @@ (local i32 i32) block $exit loop $cont - get_local 0 + local.get 0 i32.const 1 i32.add - set_local 0 - get_local 0 + local.set 0 + local.get 0 i32.const 5 i32.ge_s if br $exit end - get_local 0 + local.get 0 i32.const 4 i32.eq if (br $cont) end - get_local 0 - set_local 1 + local.get 0 + local.set 1 br $cont end end - get_local 1 + local.get 1 return) ) (;; STDOUT ;;; diff --git a/test/interp/brif-loop.txt b/test/interp/brif-loop.txt index cfab76e5..ef311473 100644 --- a/test/interp/brif-loop.txt +++ b/test/interp/brif-loop.txt @@ -3,16 +3,16 @@ (func $f (param i32) (result i32) (local i32) loop $cont - get_local 1 + local.get 1 i32.const 1 i32.add - set_local 1 - get_local 1 - get_local 0 + local.set 1 + local.get 1 + local.get 0 i32.lt_s br_if $cont end - get_local 1 + local.get 1 return) (func (export "test1") (result i32) diff --git a/test/interp/brif.txt b/test/interp/brif.txt index efcc3404..67d2a584 100644 --- a/test/interp/brif.txt +++ b/test/interp/brif.txt @@ -2,7 +2,7 @@ (module (func $f (param i32) (result i32) block $exit - get_local 0 + local.get 0 br_if $exit i32.const 1 return diff --git a/test/interp/brtable.txt b/test/interp/brtable.txt index 2a3b137f..85d8c440 100644 --- a/test/interp/brtable.txt +++ b/test/interp/brtable.txt @@ -5,7 +5,7 @@ block $2 block $1 block $0 - get_local 0 + local.get 0 br_table $0 $1 $2 $default end ;; 0 diff --git a/test/interp/call-multi-result.txt b/test/interp/call-multi-result.txt index fd9de3b5..584bd9de 100644 --- a/test/interp/call-multi-result.txt +++ b/test/interp/call-multi-result.txt @@ -6,13 +6,13 @@ (func (export "call-multi-result") (result i32) call $i32_i64 - i32.wrap/i64 + i32.wrap_i64 i32.add) (func $rot_f32_3 (param f32 f32 f32) (result f32 f32 f32) - get_local 1 - get_local 2 - get_local 0) + local.get 1 + local.get 2 + local.get 0) (func (export "call-multi-param-result") (result i32) block $fail diff --git a/test/interp/call-zero-args.txt b/test/interp/call-zero-args.txt index b6ffd4a9..15ef0d8c 100644 --- a/test/interp/call-zero-args.txt +++ b/test/interp/call-zero-args.txt @@ -4,8 +4,8 @@ i32.const 42) (func $g (param i32 i32) (result i32) - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.add) (func (export "h") (result i32) diff --git a/test/interp/call.txt b/test/interp/call.txt index 7c0df054..04a3fa19 100644 --- a/test/interp/call.txt +++ b/test/interp/call.txt @@ -8,15 +8,15 @@ call $helper) (func $helper (param i32 i64 f32 f64) (result i32) - get_local 1 - i32.wrap/i64 - get_local 0 + local.get 1 + i32.wrap_i64 + local.get 0 i32.add - get_local 2 - i32.trunc_s/f32 + local.get 2 + i32.trunc_f32_s i32.add - get_local 3 - i32.trunc_s/f64 + local.get 3 + i32.trunc_f64_s i32.add return) @@ -26,12 +26,12 @@ (func $fac (param i32) (result i32) - get_local 0 + local.get 0 i32.const 0 i32.gt_s if (result i32) - get_local 0 - get_local 0 + local.get 0 + local.get 0 i32.const 1 i32.sub call $fac diff --git a/test/interp/callindirect.txt b/test/interp/callindirect.txt index b12e6d26..5a930bbc 100644 --- a/test/interp/callindirect.txt +++ b/test/interp/callindirect.txt @@ -7,26 +7,26 @@ i32.const 1) (func $nullary (param i32) (result i32) - get_local 0 + local.get 0 call_indirect (type $v_i)) (type $ii_i (func (param i32 i32) (result i32))) (func $add (type $ii_i) - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.add) (func $sub (type $ii_i) - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.sub) (func $binary (param i32 i32 i32) (result i32) - get_local 0 - get_local 1 - get_local 2 + local.get 0 + local.get 1 + local.get 2 call_indirect (type $ii_i)) - (table anyfunc (elem $zero $one $add $sub)) + (table funcref (elem $zero $one $add $sub)) (func (export "test_zero") (result i32) i32.const 0 diff --git a/test/interp/cast.txt b/test/interp/cast.txt index 423f09b9..ec9a17c7 100644 --- a/test/interp/cast.txt +++ b/test/interp/cast.txt @@ -2,19 +2,19 @@ (module (func (export "f32_reinterpret_i32") (result f32) i32.const 0x40900000 - f32.reinterpret/i32) + f32.reinterpret_i32) (func (export "i32_reinterpret_f32") (result i32) f32.const -3.5 - i32.reinterpret/f32) + i32.reinterpret_f32) (func (export "f64_reinterpret_i64") (result f64) i64.const 0x405f480000000000 - f64.reinterpret/i64) + f64.reinterpret_i64) (func (export "i64_reinterpret_f64") (result i64) f64.const 1.375e10 - i64.reinterpret/f64)) + i64.reinterpret_f64)) (;; STDOUT ;;; f32_reinterpret_i32() => f32:4.500000 i32_reinterpret_f32() => i32:3227516928 diff --git a/test/interp/convert-sat.txt b/test/interp/convert-sat.txt index 70119c07..b2127d48 100644 --- a/test/interp/convert-sat.txt +++ b/test/interp/convert-sat.txt @@ -1,43 +1,43 @@ ;;; TOOL: run-interp (module - (func (export "i32.trunc_s:sat/f32") (result i32) + (func (export "i32.trunc_sat_f32_s") (result i32) f32.const -100.12345 - i32.trunc_s:sat/f32) + i32.trunc_sat_f32_s) - (func (export "i32.trunc_u:sat/f32") (result i32) + (func (export "i32.trunc_sat_f32_u") (result i32) f32.const 3e9 - i32.trunc_u:sat/f32) + i32.trunc_sat_f32_u) - (func (export "i32.trunc_s:sat/f64") (result i32) + (func (export "i32.trunc_sat_f64_s") (result i32) f64.const -100.12345 - i32.trunc_s:sat/f64) + i32.trunc_sat_f64_s) - (func (export "i32.trunc_u:sat/f64") (result i32) + (func (export "i32.trunc_sat_f64_u") (result i32) f64.const 3e9 - i32.trunc_u:sat/f64) + i32.trunc_sat_f64_u) - (func (export "i64.trunc_s:sat/f32") (result i64) + (func (export "i64.trunc_sat_f32_s") (result i64) f32.const -100.12345 - i64.trunc_s:sat/f32) + i64.trunc_sat_f32_s) - (func (export "i64.trunc_u:sat/f32") (result i64) + (func (export "i64.trunc_sat_f32_u") (result i64) f32.const 3e9 - i64.trunc_u:sat/f32) + i64.trunc_sat_f32_u) - (func (export "i64.trunc_s:sat/f64") (result i64) + (func (export "i64.trunc_sat_f64_s") (result i64) f64.const -100.12345 - i64.trunc_s:sat/f64) + i64.trunc_sat_f64_s) - (func (export "i64.trunc_u:sat/f64") (result i64) + (func (export "i64.trunc_sat_f64_u") (result i64) f64.const 3e9 - i64.trunc_u:sat/f64)) + i64.trunc_sat_f64_u)) (;; STDOUT ;;; -i32.trunc_s:sat/f32() => i32:4294967196 -i32.trunc_u:sat/f32() => i32:3000000000 -i32.trunc_s:sat/f64() => i32:4294967196 -i32.trunc_u:sat/f64() => i32:3000000000 -i64.trunc_s:sat/f32() => i64:18446744073709551516 -i64.trunc_u:sat/f32() => i64:3000000000 -i64.trunc_s:sat/f64() => i64:18446744073709551516 -i64.trunc_u:sat/f64() => i64:3000000000 +i32.trunc_sat_f32_s() => i32:4294967196 +i32.trunc_sat_f32_u() => i32:3000000000 +i32.trunc_sat_f64_s() => i32:4294967196 +i32.trunc_sat_f64_u() => i32:3000000000 +i64.trunc_sat_f32_s() => i64:18446744073709551516 +i64.trunc_sat_f32_u() => i64:3000000000 +i64.trunc_sat_f64_s() => i64:18446744073709551516 +i64.trunc_sat_f64_u() => i64:3000000000 ;;; STDOUT ;;) diff --git a/test/interp/convert.txt b/test/interp/convert.txt index 49d59843..141a1ad4 100644 --- a/test/interp/convert.txt +++ b/test/interp/convert.txt @@ -3,83 +3,83 @@ ;; i32 (func (export "i32_wrap_i64") (result i32) i64.const -1 - i32.wrap/i64) + i32.wrap_i64) ;; TODO(binji): how best to distinguish _s from _u? (func (export "i32_trunc_s_f32") (result i32) f32.const -100.12345 - i32.trunc_s/f32) + i32.trunc_f32_s) (func (export "i32_trunc_u_f32") (result i32) f32.const 3e9 - i32.trunc_u/f32) + i32.trunc_f32_u) (func (export "i32_trunc_s_f64") (result i32) f64.const -100.12345 - i32.trunc_s/f64) + i32.trunc_f64_s) (func (export "i32_trunc_u_f64") (result i32) f64.const 3e9 - i32.trunc_u/f64) + i32.trunc_f64_u) ;; i64 (func (export "i64_extend_u_i32") (result i64) i32.const -1 - i64.extend_u/i32) + i64.extend_i32_u) (func (export "i64_extend_s_i32") (result i64) i32.const -1 - i64.extend_s/i32) + i64.extend_i32_s) (func (export "i64_trunc_s_f32") (result i32) f32.const -100.12345 - i64.trunc_s/f32 + i64.trunc_f32_s i64.const -100 i64.eq) (func (export "i64_trunc_u_f32") (result i32) f32.const 3e9 - i64.trunc_u/f32 + i64.trunc_f32_u i64.const 3000000000 i64.eq) (func (export "i64_trunc_s_f64") (result i32) f64.const -100.12345 - i64.trunc_s/f64 + i64.trunc_f64_s i64.const -100 i64.eq) (func (export "i64_trunc_u_f64") (result i32) f64.const 3e9 - i64.trunc_u/f64 + i64.trunc_f64_u i64.const 3000000000 i64.eq) ;; f32 (func (export "f32_convert_s_i32") (result f32) i32.const -1 - f32.convert_s/i32) + f32.convert_i32_s) (func (export "f32_convert_u_i32") (result f32) i32.const -1 - f32.convert_u/i32) + f32.convert_i32_u) (func (export "f32_demote_f64") (result f32) f64.const 12345678.9 - f32.demote/f64) + f32.demote_f64) (func (export "f32_convert_s_i64") (result f32) i64.const 0 - f32.convert_s/i64) + f32.convert_i64_s) (func (export "f32_convert_u_i64") (result f32) i64.const 0 - f32.convert_u/i64) + f32.convert_i64_u) ;; f64 (func (export "f64_convert_s_i32") (result f64) i32.const -1 - f64.convert_s/i32) + f64.convert_i32_s) (func (export "f64_convert_u_i32") (result f64) i32.const -1 - f64.convert_u/i32) + f64.convert_i32_u) (func (export "f64_demote_f32") (result f64) f32.const 12345678.9 - f64.promote/f32) + f64.promote_f32) (func (export "f64_convert_s_i64") (result f64) i64.const 0 - f64.convert_s/i64) + f64.convert_i64_s) (func (export "f64_convert_u_i64") (result f64) i64.const 0 - f64.convert_u/i64) + f64.convert_i64_u) ) (;; STDOUT ;;; i32_wrap_i64() => i32:4294967295 diff --git a/test/interp/expr-br.txt b/test/interp/expr-br.txt index f5d2d4bc..55f20e0e 100644 --- a/test/interp/expr-br.txt +++ b/test/interp/expr-br.txt @@ -2,7 +2,7 @@ (module (func $f (param i32) (result i32) block (result i32) - get_local 0 + local.get 0 i32.const 0 i32.eq if diff --git a/test/interp/expr-brif.txt b/test/interp/expr-brif.txt index 219d9a87..0207dffd 100644 --- a/test/interp/expr-brif.txt +++ b/test/interp/expr-brif.txt @@ -3,7 +3,7 @@ (func (param i32) (result i32) (block $exit (result i32) (i32.sub - (br_if $exit (i32.const 42) (get_local 0)) + (br_if $exit (i32.const 42) (local.get 0)) (i32.const 13)))) (func (export "test1") (result i32) diff --git a/test/interp/expr-if.txt b/test/interp/expr-if.txt index 98b0a95b..ae44efc9 100644 --- a/test/interp/expr-if.txt +++ b/test/interp/expr-if.txt @@ -1,7 +1,7 @@ ;;; TOOL: run-interp (module (func (param i32) (result i32) - get_local 0 + local.get 0 i32.const 0 i32.eq if (result i32) diff --git a/test/interp/if-multi.txt b/test/interp/if-multi.txt index d8e291c0..c53f6e3b 100644 --- a/test/interp/if-multi.txt +++ b/test/interp/if-multi.txt @@ -8,7 +8,7 @@ else unreachable end - i32.trunc_s/f32 + i32.trunc_f32_s i32.add) (func (export "if-param") (result f32) diff --git a/test/interp/if.txt b/test/interp/if.txt index 46a2c758..7e85424c 100644 --- a/test/interp/if.txt +++ b/test/interp/if.txt @@ -2,43 +2,43 @@ (module (func (export "if1") (result i32) (local i32) i32.const 0 - set_local 0 + local.set 0 i32.const 1 if - get_local 0 + local.get 0 i32.const 1 i32.add - set_local 0 + local.set 0 end i32.const 0 if - get_local 0 + local.get 0 i32.const 1 i32.add - set_local 0 + local.set 0 end - get_local 0 + local.get 0 return) (func (export "if2") (result i32) (local i32 i32) i32.const 1 if i32.const 1 - set_local 0 + local.set 0 else i32.const 2 - set_local 0 + local.set 0 end i32.const 0 if i32.const 4 - set_local 1 + local.set 1 else i32.const 8 - set_local 1 + local.set 1 end - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.add return) ) diff --git a/test/interp/loop-multi.txt b/test/interp/loop-multi.txt index 7b6aea56..1e118c15 100644 --- a/test/interp/loop-multi.txt +++ b/test/interp/loop-multi.txt @@ -14,8 +14,8 @@ i32.const 3 i32.add ;; +3 to TOS (loop param) - tee_local $l - get_local $l ;; dup TOS + local.tee $l + local.get $l ;; dup TOS i32.const 10 i32.lt_s diff --git a/test/interp/loop.txt b/test/interp/loop.txt index 446bc605..3a7c0e03 100644 --- a/test/interp/loop.txt +++ b/test/interp/loop.txt @@ -4,22 +4,22 @@ (local i32 i32) ;; loop statements now require an explicit branch to the top loop $cont - get_local 1 - get_local 0 + local.get 1 + local.get 0 i32.add - set_local 1 - get_local 0 + local.set 1 + local.get 0 i32.const 1 i32.add - set_local 0 - get_local 0 + local.set 0 + local.get 0 i32.const 5 i32.lt_s if br $cont end end - get_local 1)) + local.get 1)) (;; STDOUT ;;; loop() => i32:10 ;;; STDOUT ;;) diff --git a/test/interp/rethrow-and-br.txt b/test/interp/rethrow-and-br.txt index 3ed2f1eb..705351cd 100644 --- a/test/interp/rethrow-and-br.txt +++ b/test/interp/rethrow-and-br.txt @@ -4,7 +4,7 @@ (tag $e1) (tag $e2) (type $helper-type (func (result i32))) - (table anyfunc (elem $helper)) + (table funcref (elem $helper)) (func (export "rethrow-br") (result i32) (try (result i32) (do diff --git a/test/interp/return-call-indirect-import.txt b/test/interp/return-call-indirect-import.txt index 8913f0b2..6233ff78 100644 --- a/test/interp/return-call-indirect-import.txt +++ b/test/interp/return-call-indirect-import.txt @@ -4,7 +4,7 @@ (module (import "host" "print" (func $imported (param i32) (result i32))) (type $i_i (func (param i32)(result i32))) - (table anyfunc (elem $imported)) + (table funcref (elem $imported)) (func (export "f") (result i32) i32.const 42 diff --git a/test/interp/return-call-indirect.txt b/test/interp/return-call-indirect.txt index 1e386b0e..cca47171 100644 --- a/test/interp/return-call-indirect.txt +++ b/test/interp/return-call-indirect.txt @@ -2,7 +2,7 @@ ;;; ARGS*: --enable-tail-call (module (type $iii_i (func (param i32 i32 i32)(result i32))) - (table anyfunc (elem $facInd)) + (table funcref (elem $facInd)) (func (export "facInd10") (result i32) i32.const 10 @@ -14,22 +14,22 @@ (;; Tail call version of factorial, using indirect call ;;) (;; fac(Ix,So) => Ix==0?So:fac(Ix-1,So*Ix) ;;) (func $facInd (type $iii_i) - get_local 0 + local.get 0 i32.const 0 i32.gt_s if (result i32) - get_local 0 + local.get 0 i32.const 1 i32.sub - get_local 1 - get_local 0 + local.get 1 + local.get 0 i32.mul - get_local 2 - get_local 2 + local.get 2 + local.get 2 return_call_indirect (type $iii_i) unreachable else - get_local 1 + local.get 1 return end) ) diff --git a/test/interp/return-call-set-local.txt b/test/interp/return-call-local-set.txt index 5b566361..5b566361 100644 --- a/test/interp/return-call-set-local.txt +++ b/test/interp/return-call-local-set.txt diff --git a/test/interp/return-call.txt b/test/interp/return-call.txt index 54ed9286..ced413ff 100644 --- a/test/interp/return-call.txt +++ b/test/interp/return-call.txt @@ -10,19 +10,19 @@ (;; Tail call version of factorial ;;) (;; fac(Ix,So) => Ix==0?So:fac(Ix-1,So*Ix) ;;) (func $fac (param i32 i32) (result i32) - get_local 0 + local.get 0 i32.const 0 i32.gt_s if (result i32) - get_local 0 + local.get 0 i32.const 1 i32.sub - get_local 1 - get_local 0 + local.get 1 + local.get 0 i32.mul return_call $fac else - get_local 1 + local.get 1 return end) ) diff --git a/test/interp/return-void.txt b/test/interp/return-void.txt index 728600ef..704aedda 100644 --- a/test/interp/return-void.txt +++ b/test/interp/return-void.txt @@ -2,7 +2,7 @@ (module (memory 1) (func $store_unless (param i32) - get_local 0 + local.get 0 i32.const 0 i32.eq if diff --git a/test/interp/return.txt b/test/interp/return.txt index b3159250..dbdd1fd0 100644 --- a/test/interp/return.txt +++ b/test/interp/return.txt @@ -1,14 +1,14 @@ ;;; TOOL: run-interp (module (func $f (param i32) (result i32) - get_local 0 + local.get 0 i32.const 0 i32.eq if i32.const 1 return end - get_local 0 + local.get 0 i32.const 1 i32.eq if diff --git a/test/interp/select.txt b/test/interp/select.txt index 45dc4bd9..81e72172 100644 --- a/test/interp/select.txt +++ b/test/interp/select.txt @@ -3,22 +3,22 @@ (func $i32 (param i32) (result i32) i32.const 1 i32.const 2 - get_local 0 + local.get 0 select) (func $i64 (param i32) (result i64) i64.const 1 i64.const 2 - get_local 0 + local.get 0 select) (func $f32 (param i32) (result f32) f32.const 1 f32.const 2 - get_local 0 + local.get 0 select) (func $f64 (param i32) (result f64) f64.const 1 f64.const 2 - get_local 0 + local.get 0 select) (func (export "test_i32_l") (result i32) diff --git a/test/interp/unary.txt b/test/interp/unary.txt index d6300cf5..b0e94e8f 100644 --- a/test/interp/unary.txt +++ b/test/interp/unary.txt @@ -1,12 +1,12 @@ ;;; TOOL: run-interp (module (func $f32_is_nan (param f32) (result i32) - get_local 0 - get_local 0 + local.get 0 + local.get 0 f32.ne) (func $f64_is_nan (param f64) (result i32) - get_local 0 - get_local 0 + local.get 0 + local.get 0 f64.ne) ;; i32 diff --git a/test/opcodecnt/basic.txt b/test/opcodecnt/basic.txt index 79696d57..33cf7e2f 100644 --- a/test/opcodecnt/basic.txt +++ b/test/opcodecnt/basic.txt @@ -5,11 +5,11 @@ (local i32 i32) i32.const 1 i32.const 2 - get_local 0 - get_local 0 - get_local 0 - get_local 1 - get_local 1 + local.get 0 + local.get 0 + local.get 0 + local.get 1 + local.get 1 br 0) (func diff --git a/test/parse/all-features.txt b/test/parse/all-features.txt index 9ddf2c2c..cdb06660 100644 --- a/test/parse/all-features.txt +++ b/test/parse/all-features.txt @@ -21,7 +21,7 @@ ;; saturating float-to-int f32.const 0 - i32.trunc_s:sat/f32 + i32.trunc_sat_f32_s drop ;; sign extention diff --git a/test/parse/assert/assert-return-arithmetic-nan.txt b/test/parse/assert/assert-return-arithmetic-nan.txt index 74ba2795..00402d41 100644 --- a/test/parse/assert/assert-return-arithmetic-nan.txt +++ b/test/parse/assert/assert-return-arithmetic-nan.txt @@ -1,7 +1,7 @@ ;;; TOOL: wast2json (module (func $foo (param f32) (result f32) - get_local 0 + local.get 0 f32.const 0 f32.div) (export "foo" (func $foo))) diff --git a/test/parse/assert/assert-return-canonical-nan.txt b/test/parse/assert/assert-return-canonical-nan.txt index 69d08c42..d19520b5 100644 --- a/test/parse/assert/assert-return-canonical-nan.txt +++ b/test/parse/assert/assert-return-canonical-nan.txt @@ -1,7 +1,7 @@ ;;; TOOL: wast2json (module (func $foo (param f32) (result f32) - get_local 0 + local.get 0 f32.const 0 f32.div) (export "foo" (func $foo))) diff --git a/test/parse/assert/assertreturn.txt b/test/parse/assert/assertreturn.txt index 8339d773..aa38d7a6 100644 --- a/test/parse/assert/assertreturn.txt +++ b/test/parse/assert/assertreturn.txt @@ -3,7 +3,7 @@ (func $foo (result i32) i32.const 0) (export "foo" (func $foo)) (func $bar (param f32) (result f32) - get_local 0) + local.get 0) (export "bar" (func $bar))) (assert_return (invoke "foo") (i32.const 0)) diff --git a/test/parse/assert/bad-assertreturn-non-const.txt b/test/parse/assert/bad-assertreturn-non-const.txt index ee805c75..04e06be9 100644 --- a/test/parse/assert/bad-assertreturn-non-const.txt +++ b/test/parse/assert/bad-assertreturn-non-const.txt @@ -2,7 +2,7 @@ ;;; ERROR: 1 (module (func $bar (param f32) (result f32) - get_local 0) + local.get 0) (export "bar" (func $bar))) ;; NOT ok to use more complex exprs diff --git a/test/parse/assert/bad-assertreturn-too-few.txt b/test/parse/assert/bad-assertreturn-too-few.txt index e969883c..210d4714 100644 --- a/test/parse/assert/bad-assertreturn-too-few.txt +++ b/test/parse/assert/bad-assertreturn-too-few.txt @@ -2,7 +2,7 @@ ;;; ERROR: 1 (module (func $foo (param i32) (result i32) - get_local 0) + local.get 0) (export "foo" (func $foo))) (assert_return (invoke "foo") (i32.const 0)) (;; STDERR ;;; diff --git a/test/parse/assert/invoke.txt b/test/parse/assert/invoke.txt index fba32549..b932beab 100644 --- a/test/parse/assert/invoke.txt +++ b/test/parse/assert/invoke.txt @@ -2,7 +2,7 @@ (module (export "test" (func $test)) (func $test (param i32) (result i32) - get_local 0 + local.get 0 i32.const 100 i32.add)) diff --git a/test/parse/expr/atomic-align.txt b/test/parse/expr/atomic-align.txt index 6bfd40a5..432e40ee 100644 --- a/test/parse/expr/atomic-align.txt +++ b/test/parse/expr/atomic-align.txt @@ -3,9 +3,9 @@ (module (memory 1 1 shared) (func - i32.const 0 i32.const 0 atomic.notify align=4 drop - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait align=4 drop - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait align=8 drop + i32.const 0 i32.const 0 memory.atomic.notify align=4 drop + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 align=4 drop + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 align=8 drop i32.const 0 i32.atomic.load align=4 drop i32.const 0 i64.atomic.load align=8 drop diff --git a/test/parse/expr/atomic-disabled.txt b/test/parse/expr/atomic-disabled.txt index 7783228c..90ee13e6 100644 --- a/test/parse/expr/atomic-disabled.txt +++ b/test/parse/expr/atomic-disabled.txt @@ -4,9 +4,9 @@ (module (memory 1) (func - i32.const 0 i32.const 0 atomic.notify drop - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop + i32.const 0 i32.const 0 memory.atomic.notify drop + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop i32.const 0 i32.atomic.load drop i32.const 0 i64.atomic.load drop @@ -83,14 +83,14 @@ )) (;; STDERR ;;; out/test/parse/expr/atomic-disabled.txt:7:29: error: opcode not allowed: memory.atomic.notify - i32.const 0 i32.const 0 atomic.notify drop - ^^^^^^^^^^^^^ + i32.const 0 i32.const 0 memory.atomic.notify drop + ^^^^^^^^^^^^^^^^^^^^ out/test/parse/expr/atomic-disabled.txt:8:41: error: opcode not allowed: memory.atomic.wait32 - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop - ^^^^^^^^^^^^^^^ + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop + ^^^^^^^^^^^^^^^^^^^^ out/test/parse/expr/atomic-disabled.txt:9:41: error: opcode not allowed: memory.atomic.wait64 - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop - ^^^^^^^^^^^^^^^ + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop + ^^^^^^^^^^^^^^^^^^^^ out/test/parse/expr/atomic-disabled.txt:11:17: error: opcode not allowed: i32.atomic.load i32.const 0 i32.atomic.load drop ^^^^^^^^^^^^^^^ diff --git a/test/parse/expr/atomic.txt b/test/parse/expr/atomic.txt index 2c4aa1b9..3dfd22c6 100644 --- a/test/parse/expr/atomic.txt +++ b/test/parse/expr/atomic.txt @@ -3,9 +3,9 @@ (module (memory 1 1 shared) (func - i32.const 0 i32.const 0 atomic.notify drop - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop + i32.const 0 i32.const 0 memory.atomic.notify drop + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop i32.const 0 i32.atomic.load drop i32.const 0 i64.atomic.load drop diff --git a/test/parse/expr/atomic64.txt b/test/parse/expr/atomic64.txt index d907c13b..3a701155 100644 --- a/test/parse/expr/atomic64.txt +++ b/test/parse/expr/atomic64.txt @@ -3,9 +3,9 @@ (module (memory i64 1 1 shared) (func - i64.const 0 i32.const 0 atomic.notify drop - i64.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop - i64.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop + i64.const 0 i32.const 0 memory.atomic.notify drop + i64.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop + i64.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop i64.const 0 i32.atomic.load drop i64.const 0 i64.atomic.load drop diff --git a/test/parse/expr/bad-atomic-unnatural-align.txt b/test/parse/expr/bad-atomic-unnatural-align.txt index a2886cd8..a8e64bf0 100644 --- a/test/parse/expr/bad-atomic-unnatural-align.txt +++ b/test/parse/expr/bad-atomic-unnatural-align.txt @@ -4,9 +4,9 @@ (module (memory 1 1 shared) (func - i32.const 0 i32.const 0 atomic.notify align=8 drop - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait align=8 drop - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait align=16 drop + i32.const 0 i32.const 0 memory.atomic.notify align=8 drop + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 align=8 drop + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 align=16 drop i32.const 0 i32.atomic.load align=8 drop i32.const 0 i64.atomic.load align=16 drop @@ -84,14 +84,14 @@ (;; STDERR ;;; out/test/parse/expr/bad-atomic-unnatural-align.txt:7:29: error: alignment must be equal to natural alignment (4) - i32.const 0 i32.const 0 atomic.notify align=8 drop - ^^^^^^^^^^^^^ + i32.const 0 i32.const 0 memory.atomic.notify align=8 drop + ^^^^^^^^^^^^^^^^^^^^ out/test/parse/expr/bad-atomic-unnatural-align.txt:8:41: error: alignment must be equal to natural alignment (4) - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait align=8 drop - ^^^^^^^^^^^^^^^ + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 align=8 drop + ^^^^^^^^^^^^^^^^^^^^ out/test/parse/expr/bad-atomic-unnatural-align.txt:9:41: error: alignment must be equal to natural alignment (8) - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait align=16 drop - ^^^^^^^^^^^^^^^ + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 align=16 drop + ^^^^^^^^^^^^^^^^^^^^ out/test/parse/expr/bad-atomic-unnatural-align.txt:11:17: error: alignment must be equal to natural alignment (4) i32.const 0 i32.atomic.load align=8 drop ^^^^^^^^^^^^^^^ diff --git a/test/parse/expr/bad-getglobal-name-undefined.txt b/test/parse/expr/bad-getglobal-name-undefined.txt deleted file mode 100644 index 7ed6ac9c..00000000 --- a/test/parse/expr/bad-getglobal-name-undefined.txt +++ /dev/null @@ -1,8 +0,0 @@ -;;; TOOL: wat2wasm -;;; ERROR: 1 -(module (func get_global $n)) -(;; STDERR ;;; -out/test/parse/expr/bad-getglobal-name-undefined.txt:3:26: error: undefined global variable "$n" -(module (func get_global $n)) - ^^ -;;; STDERR ;;) diff --git a/test/parse/expr/bad-getlocal-name-undefined.txt b/test/parse/expr/bad-getlocal-name-undefined.txt deleted file mode 100644 index f8101f7b..00000000 --- a/test/parse/expr/bad-getlocal-name-undefined.txt +++ /dev/null @@ -1,8 +0,0 @@ -;;; TOOL: wat2wasm -;;; ERROR: 1 -(module (func get_local $n)) -(;; STDERR ;;; -out/test/parse/expr/bad-getlocal-name-undefined.txt:3:25: error: undefined local variable "$n" -(module (func get_local $n)) - ^^ -;;; STDERR ;;) diff --git a/test/parse/expr/bad-globalget-name-undefined.txt b/test/parse/expr/bad-globalget-name-undefined.txt new file mode 100644 index 00000000..abd83f52 --- /dev/null +++ b/test/parse/expr/bad-globalget-name-undefined.txt @@ -0,0 +1,8 @@ +;;; TOOL: wat2wasm +;;; ERROR: 1 +(module (func global.get $n)) +(;; STDERR ;;; +out/test/parse/expr/bad-globalget-name-undefined.txt:3:26: error: undefined global variable "$n" +(module (func global.get $n)) + ^^ +;;; STDERR ;;) diff --git a/test/parse/expr/bad-getglobal-undefined.txt b/test/parse/expr/bad-globalget-undefined.txt index 843425eb..d9ccd9b0 100644 --- a/test/parse/expr/bad-getglobal-undefined.txt +++ b/test/parse/expr/bad-globalget-undefined.txt @@ -2,10 +2,10 @@ ;;; ERROR: 1 (module (func - get_global 0 + global.get 0 drop)) (;; STDERR ;;; -out/test/parse/expr/bad-getglobal-undefined.txt:5:16: error: global variable out of range: 0 (max 0) - get_global 0 +out/test/parse/expr/bad-globalget-undefined.txt:5:16: error: global variable out of range: 0 (max 0) + global.get 0 ^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-setglobal-name-undefined.txt b/test/parse/expr/bad-globalset-name-undefined.txt index 4fa77899..12a7242c 100644 --- a/test/parse/expr/bad-setglobal-name-undefined.txt +++ b/test/parse/expr/bad-globalset-name-undefined.txt @@ -2,9 +2,9 @@ ;;; ERROR: 1 (module (func i32.const 1 - set_global $f)) + global.set $f)) (;; STDERR ;;; -out/test/parse/expr/bad-setglobal-name-undefined.txt:5:22: error: undefined global variable "$f" - set_global $f)) +out/test/parse/expr/bad-globalset-name-undefined.txt:5:22: error: undefined global variable "$f" + global.set $f)) ^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-setglobal-undefined.txt b/test/parse/expr/bad-globalset-undefined.txt index 462a559f..780326f1 100644 --- a/test/parse/expr/bad-setglobal-undefined.txt +++ b/test/parse/expr/bad-globalset-undefined.txt @@ -2,9 +2,9 @@ ;;; ERROR: 1 (module (func i32.const 1 - set_global 0)) + global.set 0)) (;; STDERR ;;; -out/test/parse/expr/bad-setglobal-undefined.txt:5:22: error: global variable out of range: 0 (max 0) - set_global 0)) +out/test/parse/expr/bad-globalset-undefined.txt:5:22: error: global variable out of range: 0 (max 0) + global.set 0)) ^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-localget-name-undefined.txt b/test/parse/expr/bad-localget-name-undefined.txt new file mode 100644 index 00000000..a9bddb75 --- /dev/null +++ b/test/parse/expr/bad-localget-name-undefined.txt @@ -0,0 +1,8 @@ +;;; TOOL: wat2wasm +;;; ERROR: 1 +(module (func local.get $n)) +(;; STDERR ;;; +out/test/parse/expr/bad-localget-name-undefined.txt:3:25: error: undefined local variable "$n" +(module (func local.get $n)) + ^^ +;;; STDERR ;;) diff --git a/test/parse/expr/bad-getlocal-name.txt b/test/parse/expr/bad-localget-name.txt index 3168aaec..1d2eebb3 100644 --- a/test/parse/expr/bad-getlocal-name.txt +++ b/test/parse/expr/bad-localget-name.txt @@ -1,8 +1,8 @@ ;;; TOOL: wat2wasm ;;; ERROR: 1 -(module (func (local $f f32) get_local f)) +(module (func (local $f f32) local.get f)) (;; STDERR ;;; -out/test/parse/expr/bad-getlocal-name.txt:3:40: error: unexpected token "f", expected a numeric index or a name (e.g. 12 or $foo). -(module (func (local $f f32) get_local f)) +out/test/parse/expr/bad-localget-name.txt:3:40: error: unexpected token "f", expected a numeric index or a name (e.g. 12 or $foo). +(module (func (local $f f32) local.get f)) ^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-getlocal-undefined.txt b/test/parse/expr/bad-localget-undefined.txt index d2a27d8d..9b58efd3 100644 --- a/test/parse/expr/bad-getlocal-undefined.txt +++ b/test/parse/expr/bad-localget-undefined.txt @@ -2,10 +2,10 @@ ;;; ERROR: 1 (module (func - get_local 0 + local.get 0 drop)) (;; STDERR ;;; -out/test/parse/expr/bad-getlocal-undefined.txt:5:15: error: local variable out of range (max 0) - get_local 0 +out/test/parse/expr/bad-localget-undefined.txt:5:15: error: local variable out of range (max 0) + local.get 0 ^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-setlocal-name-undefined.txt b/test/parse/expr/bad-localset-name-undefined.txt index b5d9f142..10c298df 100644 --- a/test/parse/expr/bad-setlocal-name-undefined.txt +++ b/test/parse/expr/bad-localset-name-undefined.txt @@ -2,9 +2,9 @@ ;;; ERROR: 1 (module (func i32.const 0 - set_local $n)) + local.set $n)) (;; STDERR ;;; -out/test/parse/expr/bad-setlocal-name-undefined.txt:5:21: error: undefined local variable "$n" - set_local $n)) +out/test/parse/expr/bad-localset-name-undefined.txt:5:21: error: undefined local variable "$n" + local.set $n)) ^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-setlocal-name.txt b/test/parse/expr/bad-localset-name.txt index 98768770..6ddeaf55 100644 --- a/test/parse/expr/bad-setlocal-name.txt +++ b/test/parse/expr/bad-localset-name.txt @@ -3,9 +3,9 @@ (module (func (local $n i32) i32.const 0 - set_local n)) + local.set n)) (;; STDERR ;;; -out/test/parse/expr/bad-setlocal-name.txt:6:13: error: unexpected token "n", expected a numeric index or a name (e.g. 12 or $foo). - set_local n)) +out/test/parse/expr/bad-localset-name.txt:6:13: error: unexpected token "n", expected a numeric index or a name (e.g. 12 or $foo). + local.set n)) ^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-setlocal-no-value.txt b/test/parse/expr/bad-localset-no-value.txt index b4e9099d..5134dad9 100644 --- a/test/parse/expr/bad-setlocal-no-value.txt +++ b/test/parse/expr/bad-localset-no-value.txt @@ -2,9 +2,9 @@ ;;; ERROR: 1 (module (func (local i32) - set_local 0)) + local.set 0)) (;; STDERR ;;; -out/test/parse/expr/bad-setlocal-no-value.txt:5:3: error: type mismatch in local.set, expected [i32] but got [] - set_local 0)) +out/test/parse/expr/bad-localset-no-value.txt:5:3: error: type mismatch in local.set, expected [i32] but got [] + local.set 0)) ^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/expr/bad-setlocal-undefined.txt b/test/parse/expr/bad-localset-undefined.txt index dd631284..031895a5 100644 --- a/test/parse/expr/bad-setlocal-undefined.txt +++ b/test/parse/expr/bad-localset-undefined.txt @@ -2,9 +2,9 @@ ;;; ERROR: 1 (module (func i32.const 0 - set_local 0)) + local.set 0)) (;; STDERR ;;; -out/test/parse/expr/bad-setlocal-undefined.txt:5:21: error: local variable out of range (max 0) - set_local 0)) +out/test/parse/expr/bad-localset-undefined.txt:5:21: error: local variable out of range (max 0) + local.set 0)) ^ ;;; STDERR ;;) diff --git a/test/parse/expr/bulk-memory-disabled.txt b/test/parse/expr/bulk-memory-disabled.txt index efbbbe74..fbd6fd86 100644 --- a/test/parse/expr/bulk-memory-disabled.txt +++ b/test/parse/expr/bulk-memory-disabled.txt @@ -12,7 +12,7 @@ i32.const 0 i32.const 0 i32.const 0 memory.fill ) - (table 1 anyfunc) + (table 1 funcref) (elem $elem funcref 0) (elem funcref (ref.null func)) (func diff --git a/test/parse/expr/bulk-memory-named.txt b/test/parse/expr/bulk-memory-named.txt index cef251bd..a4293206 100644 --- a/test/parse/expr/bulk-memory-named.txt +++ b/test/parse/expr/bulk-memory-named.txt @@ -8,7 +8,7 @@ data.drop $data ) - (table 1 anyfunc) + (table 1 funcref) (elem $elem funcref (ref.func 0) (ref.null func)) (elem $elem2 func 0) (func diff --git a/test/parse/expr/bulk-memory-named64.txt b/test/parse/expr/bulk-memory-named64.txt index 6b4a4abe..2ce14af7 100644 --- a/test/parse/expr/bulk-memory-named64.txt +++ b/test/parse/expr/bulk-memory-named64.txt @@ -10,7 +10,7 @@ data.drop $data ) - (table 1 anyfunc) + (table 1 funcref) (elem $elem funcref (ref.func 0) (ref.null func)) (elem $elem2 func 0) (func diff --git a/test/parse/expr/callindirect-named.txt b/test/parse/expr/callindirect-named.txt index 00eb58fc..d4ee88a1 100644 --- a/test/parse/expr/callindirect-named.txt +++ b/test/parse/expr/callindirect-named.txt @@ -1,6 +1,6 @@ ;;; TOOL: wat2wasm (module - (table anyfunc (elem 0)) + (table funcref (elem 0)) (type $t (func (param i32))) (func $g i32.const 0 diff --git a/test/parse/expr/callindirect.txt b/test/parse/expr/callindirect.txt index 6244ae90..3f538bb6 100644 --- a/test/parse/expr/callindirect.txt +++ b/test/parse/expr/callindirect.txt @@ -1,6 +1,6 @@ ;;; TOOL: wat2wasm (module - (table anyfunc (elem 0)) + (table funcref (elem 0)) (type (func (param i32))) (func i32.const 0 diff --git a/test/parse/expr/cast.txt b/test/parse/expr/cast.txt index 42c92cbb..66e55f54 100644 --- a/test/parse/expr/cast.txt +++ b/test/parse/expr/cast.txt @@ -2,14 +2,14 @@ (module (func i32.const 0 - f32.reinterpret/i32 + f32.reinterpret_i32 drop f32.const 0 - i32.reinterpret/f32 + i32.reinterpret_f32 drop i64.const 0 - f64.reinterpret/i64 + f64.reinterpret_i64 drop f64.const 0 - i64.reinterpret/f64 + i64.reinterpret_f64 drop)) diff --git a/test/parse/expr/convert-sat.txt b/test/parse/expr/convert-sat.txt index 2e134de2..ac81b72e 100644 --- a/test/parse/expr/convert-sat.txt +++ b/test/parse/expr/convert-sat.txt @@ -2,33 +2,33 @@ (module (func f32.const 0 - i32.trunc_s:sat/f32 + i32.trunc_sat_f32_s drop f32.const 0 - i32.trunc_u:sat/f32 + i32.trunc_sat_f32_u drop f64.const 0 - i32.trunc_s:sat/f64 + i32.trunc_sat_f64_s drop f64.const 0 - i32.trunc_u:sat/f64 + i32.trunc_sat_f64_u drop f32.const 0 - i64.trunc_s:sat/f32 + i64.trunc_sat_f32_s drop f32.const 0 - i64.trunc_u:sat/f32 + i64.trunc_sat_f32_u drop f64.const 0 - i64.trunc_s:sat/f64 + i64.trunc_sat_f64_s drop f64.const 0 - i64.trunc_u:sat/f64 + i64.trunc_sat_f64_u drop)) diff --git a/test/parse/expr/convert.txt b/test/parse/expr/convert.txt index a7c8b26e..0dbce526 100644 --- a/test/parse/expr/convert.txt +++ b/test/parse/expr/convert.txt @@ -2,66 +2,66 @@ (module (func i64.const 0 - i32.wrap/i64 + i32.wrap_i64 drop i32.const 0 - i64.extend_u/i32 + i64.extend_i32_u drop i32.const 0 - i64.extend_s/i32 + i64.extend_i32_s drop f32.const 0 - i32.trunc_s/f32 + i32.trunc_f32_s drop f32.const 0 - i32.trunc_u/f32 + i32.trunc_f32_u drop f64.const 0 - i32.trunc_s/f64 + i32.trunc_f64_s drop f64.const 0 - i32.trunc_u/f64 + i32.trunc_f64_u drop f32.const 0 - i64.trunc_s/f32 + i64.trunc_f32_s drop f32.const 0 - i64.trunc_u/f32 + i64.trunc_f32_u drop f64.const 0 - i64.trunc_s/f64 + i64.trunc_f64_s drop f64.const 0 - i64.trunc_u/f64 + i64.trunc_f64_u drop i32.const 0 - f32.convert_s/i32 + f32.convert_i32_s drop i32.const 0 - f32.convert_u/i32 + f32.convert_i32_u drop i64.const 0 - f32.convert_s/i64 + f32.convert_i64_s drop i64.const 0 - f32.convert_u/i64 + f32.convert_i64_u drop i32.const 0 - f64.convert_s/i32 + f64.convert_i32_s drop i32.const 0 - f64.convert_u/i32 + f64.convert_i32_u drop i64.const 0 - f64.convert_s/i64 + f64.convert_i64_s drop i64.const 0 - f64.convert_u/i64 + f64.convert_i64_u drop f64.const 0 - f32.demote/f64 + f32.demote_f64 drop f32.const 0 - f64.promote/f32 + f64.promote_f32 drop)) diff --git a/test/parse/expr/getglobal-named.txt b/test/parse/expr/globalget-named.txt index f6be8af1..cabbbf33 100644 --- a/test/parse/expr/getglobal-named.txt +++ b/test/parse/expr/globalget-named.txt @@ -2,4 +2,4 @@ (module (global $g i32 (i32.const 1)) (func (result i32) - get_global $g)) + global.get $g)) diff --git a/test/parse/expr/getglobal.txt b/test/parse/expr/globalget.txt index 0e45f6f5..9fa3e16a 100644 --- a/test/parse/expr/getglobal.txt +++ b/test/parse/expr/globalget.txt @@ -2,4 +2,4 @@ (module (global i32 (i32.const 1)) (func (result i32) - get_global 0)) + global.get 0)) diff --git a/test/parse/expr/setglobal-named.txt b/test/parse/expr/globalset-named.txt index c8e4bdf4..ee061d46 100644 --- a/test/parse/expr/setglobal-named.txt +++ b/test/parse/expr/globalset-named.txt @@ -3,4 +3,4 @@ (global $g (mut f32) (f32.const 1)) (func f32.const 2 - set_global $g)) + global.set $g)) diff --git a/test/parse/expr/setglobal.txt b/test/parse/expr/globalset.txt index c0548596..ded23c23 100644 --- a/test/parse/expr/setglobal.txt +++ b/test/parse/expr/globalset.txt @@ -3,4 +3,4 @@ (global (mut f32) (f32.const 1)) (func f32.const 2 - set_global 0)) + global.set 0)) diff --git a/test/parse/expr/if-multi.txt b/test/parse/expr/if-multi.txt index 458fedd9..979e3e2e 100644 --- a/test/parse/expr/if-multi.txt +++ b/test/parse/expr/if-multi.txt @@ -22,7 +22,7 @@ drop i64.const 1 else - i64.extend_u/i32 + i64.extend_i32_u end return) ) diff --git a/test/parse/expr/tee_local.txt b/test/parse/expr/local-tee.txt index 0a153e3b..995614ab 100644 --- a/test/parse/expr/tee_local.txt +++ b/test/parse/expr/local-tee.txt @@ -3,5 +3,5 @@ (func (local i32) i32.const 0 - tee_local 0 + local.tee 0 drop)) diff --git a/test/parse/expr/getlocal-index-after-param.txt b/test/parse/expr/localget-index-after-param.txt index 8798aa99..d9ea5384 100644 --- a/test/parse/expr/getlocal-index-after-param.txt +++ b/test/parse/expr/localget-index-after-param.txt @@ -1,5 +1,5 @@ ;;; TOOL: wat2wasm (module (func (param i32) (local i32) - get_local 1 + local.get 1 drop)) diff --git a/test/parse/expr/getlocal-index-mixed-named-unnamed.txt b/test/parse/expr/localget-index-mixed-named-unnamed.txt index 2ded272a..a5cc3c7d 100644 --- a/test/parse/expr/getlocal-index-mixed-named-unnamed.txt +++ b/test/parse/expr/localget-index-mixed-named-unnamed.txt @@ -3,17 +3,17 @@ (func (param i32) (param $n f32) (local i32 i64) (local $m f64) - get_local 0 + local.get 0 drop - get_local 1 + local.get 1 drop - get_local $n ;; 1 + local.get $n ;; 1 drop - get_local 2 + local.get 2 drop - get_local 3 + local.get 3 drop - get_local $m ;; 4 + local.get $m ;; 4 drop - get_local 4 + local.get 4 drop)) diff --git a/test/parse/expr/getlocal-named.txt b/test/parse/expr/localget-named.txt index 652178be..4ad46465 100644 --- a/test/parse/expr/getlocal-named.txt +++ b/test/parse/expr/localget-named.txt @@ -1,5 +1,5 @@ ;;; TOOL: wat2wasm (module (func (local $foo i32) - get_local $foo + local.get $foo drop)) diff --git a/test/parse/expr/getlocal-param-named.txt b/test/parse/expr/localget-param-named.txt index bb9c119a..6fe30aff 100644 --- a/test/parse/expr/getlocal-param-named.txt +++ b/test/parse/expr/localget-param-named.txt @@ -1,5 +1,5 @@ ;;; TOOL: wat2wasm (module (func (param $n i32) - get_local $n + local.get $n drop)) diff --git a/test/parse/expr/getlocal-param.txt b/test/parse/expr/localget-param.txt index 274fe737..b129bcb3 100644 --- a/test/parse/expr/getlocal-param.txt +++ b/test/parse/expr/localget-param.txt @@ -1,5 +1,5 @@ ;;; TOOL: wat2wasm (module (func (param i32) - get_local 0 + local.get 0 drop)) diff --git a/test/parse/expr/getlocal.txt b/test/parse/expr/localget.txt index 8a9d758d..f762b705 100644 --- a/test/parse/expr/getlocal.txt +++ b/test/parse/expr/localget.txt @@ -1,5 +1,5 @@ ;;; TOOL: wat2wasm (module (func (local i32) - get_local 0 + local.get 0 drop)) diff --git a/test/parse/expr/setlocal-index-after-param.txt b/test/parse/expr/localset-index-after-param.txt index 690130fe..1dd47440 100644 --- a/test/parse/expr/setlocal-index-after-param.txt +++ b/test/parse/expr/localset-index-after-param.txt @@ -3,4 +3,4 @@ (func (param i32) (local i32) i32.const 0 - set_local 1)) + local.set 1)) diff --git a/test/parse/expr/setlocal-index-mixed-named-unnamed.txt b/test/parse/expr/localset-index-mixed-named-unnamed.txt index 1b5a3801..1d876601 100644 --- a/test/parse/expr/setlocal-index-mixed-named-unnamed.txt +++ b/test/parse/expr/localset-index-mixed-named-unnamed.txt @@ -4,16 +4,16 @@ (local i32 i64) (local $m f64) i32.const 0 - set_local 0 + local.set 0 f32.const 0 - set_local 1 + local.set 1 f32.const 0 - set_local $n ;; 1 + local.set $n ;; 1 i32.const 0 - set_local 2 + local.set 2 i64.const 0 - set_local 3 + local.set 3 f64.const 0 - set_local $m ;; 4 + local.set $m ;; 4 f64.const 0 - set_local 4)) + local.set 4)) diff --git a/test/parse/expr/setlocal-named.txt b/test/parse/expr/localset-named.txt index 2f23aaad..4f1027af 100644 --- a/test/parse/expr/setlocal-named.txt +++ b/test/parse/expr/localset-named.txt @@ -2,4 +2,4 @@ (module (func (local $n i32) i32.const 12 - set_local $n)) + local.set $n)) diff --git a/test/parse/expr/setlocal-param-named.txt b/test/parse/expr/localset-param-named.txt index 76e1468d..365d7e17 100644 --- a/test/parse/expr/setlocal-param-named.txt +++ b/test/parse/expr/localset-param-named.txt @@ -2,4 +2,4 @@ (module (func (param $n i32) i32.const 0 - set_local $n)) + local.set $n)) diff --git a/test/parse/expr/setlocal-param.txt b/test/parse/expr/localset-param.txt index 1a455a66..5d7baf56 100644 --- a/test/parse/expr/setlocal-param.txt +++ b/test/parse/expr/localset-param.txt @@ -2,4 +2,4 @@ (module (func (param i32) i32.const 0 - set_local 0)) + local.set 0)) diff --git a/test/parse/expr/setlocal.txt b/test/parse/expr/localset.txt index b851ef50..e5dbc845 100644 --- a/test/parse/expr/setlocal.txt +++ b/test/parse/expr/localset.txt @@ -1,4 +1,4 @@ ;;; TOOL: wat2wasm (module (func (local i32) i32.const 0 - set_local 0)) + local.set 0)) diff --git a/test/parse/expr/grow-memory.txt b/test/parse/expr/memory-grow.txt index fd3d8aa7..02f67e9c 100644 --- a/test/parse/expr/grow-memory.txt +++ b/test/parse/expr/memory-grow.txt @@ -3,5 +3,5 @@ (memory 1) (func i32.const 100 - grow_memory + memory.grow drop)) diff --git a/test/parse/expr/grow-memory64.txt b/test/parse/expr/memory-grow64.txt index 17531b8d..d53fd120 100644 --- a/test/parse/expr/grow-memory64.txt +++ b/test/parse/expr/memory-grow64.txt @@ -4,5 +4,5 @@ (memory i64 1) (func i64.const 100 - grow_memory + memory.grow drop)) diff --git a/test/parse/expr/current-memory.txt b/test/parse/expr/memory-size.txt index d68eecce..796e91b5 100644 --- a/test/parse/expr/current-memory.txt +++ b/test/parse/expr/memory-size.txt @@ -2,5 +2,5 @@ (module (memory 1) (func - current_memory + memory.size drop)) diff --git a/test/parse/expr/reference-types-call-indirect.txt b/test/parse/expr/reference-types-call-indirect.txt index 93b3460e..1b6f02d9 100644 --- a/test/parse/expr/reference-types-call-indirect.txt +++ b/test/parse/expr/reference-types-call-indirect.txt @@ -1,8 +1,8 @@ ;;; TOOL: wat2wasm (module - (table $foo 1 anyfunc) - (table $bar 1 anyfunc) + (table $foo 1 funcref) + (table $bar 1 funcref) (func (result i32) i32.const 0) (func (result i32) i32.const 1) diff --git a/test/parse/expr/reference-types-named.txt b/test/parse/expr/reference-types-named.txt index ed11a6f7..d0131609 100644 --- a/test/parse/expr/reference-types-named.txt +++ b/test/parse/expr/reference-types-named.txt @@ -8,7 +8,7 @@ ) (func (param externref) i32.const 0 - get_local 0 + local.get 0 table.set $foo ) (func (result i32) diff --git a/test/parse/expr/reference-types.txt b/test/parse/expr/reference-types.txt index b5a8790a..c65e0c7e 100644 --- a/test/parse/expr/reference-types.txt +++ b/test/parse/expr/reference-types.txt @@ -17,12 +17,12 @@ (func (param externref) i32.const 0 - get_local 0 + local.get 0 table.set $foo ) (func (param externref) i32.const 0 - get_local 0 + local.get 0 table.set $bar ) diff --git a/test/parse/expr/table-copy.txt b/test/parse/expr/table-copy.txt index 52c54567..42335f18 100644 --- a/test/parse/expr/table-copy.txt +++ b/test/parse/expr/table-copy.txt @@ -8,4 +8,4 @@ i32.const 0 table.copy) - (table 0 anyfunc)) + (table 0 funcref)) diff --git a/test/parse/expr/table-set.txt b/test/parse/expr/table-set.txt index 21cdc7d9..c9203cbc 100644 --- a/test/parse/expr/table-set.txt +++ b/test/parse/expr/table-set.txt @@ -2,7 +2,7 @@ (module (func (param externref) i32.const 0 - get_local 0 + local.get 0 table.set 0) (table 1 externref)) diff --git a/test/parse/expr/tail-call-disabled.txt b/test/parse/expr/tail-call-disabled.txt index 5bb0d610..8e74fa8e 100644 --- a/test/parse/expr/tail-call-disabled.txt +++ b/test/parse/expr/tail-call-disabled.txt @@ -2,7 +2,7 @@ ;;; ERROR: 1 (module - (table 1 anyfunc) + (table 1 funcref) (func return_call 0) (func i32.const 0 return_call_indirect) ) diff --git a/test/parse/expr/tail-call-named.txt b/test/parse/expr/tail-call-named.txt index 63a2cdd8..2f3996bb 100644 --- a/test/parse/expr/tail-call-named.txt +++ b/test/parse/expr/tail-call-named.txt @@ -2,7 +2,7 @@ ;;; ARGS0: --enable-tail-call (module (type $t (func)) - (table 1 anyfunc) + (table 1 funcref) (elem (i32.const 0) 0) (func $f return_call $f) (func i32.const 0 return_call_indirect (type $t)) diff --git a/test/parse/expr/tail-call.txt b/test/parse/expr/tail-call.txt index 40aa18e5..6d471877 100644 --- a/test/parse/expr/tail-call.txt +++ b/test/parse/expr/tail-call.txt @@ -1,7 +1,7 @@ ;;; TOOL: wat2wasm ;;; ARGS0: --enable-tail-call (module - (table 1 anyfunc) + (table 1 funcref) (func return_call 0) (func i32.const 0 return_call_indirect) ) diff --git a/test/parse/module/bad-global-invalid-getglobal.txt b/test/parse/module/bad-global-invalid-globalget.txt index afc9284e..935d2b40 100644 --- a/test/parse/module/bad-global-invalid-getglobal.txt +++ b/test/parse/module/bad-global-invalid-globalget.txt @@ -1,9 +1,9 @@ ;;; TOOL: wat2wasm ;;; ERROR: 1 (module - (global i32 (get_global 1))) + (global i32 (global.get 1))) (;; STDERR ;;; -out/test/parse/module/bad-global-invalid-getglobal.txt:4:27: error: global variable out of range: 1 (max 1) - (global i32 (get_global 1))) +out/test/parse/module/bad-global-invalid-globalget.txt:4:27: error: global variable out of range: 1 (max 1) + (global i32 (global.get 1))) ^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-import-table-redefinition.txt b/test/parse/module/bad-import-table-redefinition.txt index 997f0c57..ced5fa8c 100644 --- a/test/parse/module/bad-import-table-redefinition.txt +++ b/test/parse/module/bad-import-table-redefinition.txt @@ -1,10 +1,10 @@ ;;; TOOL: wat2wasm ;;; ERROR: 1 (module - (import "foo" "bar" (table $baz 0 anyfunc)) - (import "foo" "blah" (table $baz 0 anyfunc))) + (import "foo" "bar" (table $baz 0 funcref)) + (import "foo" "blah" (table $baz 0 funcref))) (;; STDERR ;;; out/test/parse/module/bad-import-table-redefinition.txt:5:4: error: redefinition of table "$baz" - (import "foo" "blah" (table $baz 0 anyfunc))) + (import "foo" "blah" (table $baz 0 funcref))) ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-import-table-shared.txt b/test/parse/module/bad-import-table-shared.txt index d0a0f3d8..7a91f43f 100644 --- a/test/parse/module/bad-import-table-shared.txt +++ b/test/parse/module/bad-import-table-shared.txt @@ -1,10 +1,10 @@ ;;; TOOL: wat2wasm ;;; ERROR: 1 (module - (import "foo" "bar" (table 0 3 shared anyfunc)) + (import "foo" "bar" (table 0 3 shared funcref)) ) (;; STDERR ;;; out/test/parse/module/bad-import-table-shared.txt:4:4: error: tables may not be shared - (import "foo" "bar" (table 0 3 shared anyfunc)) + (import "foo" "bar" (table 0 3 shared funcref)) ^^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/bad-table-invalid-function.txt b/test/parse/module/bad-table-invalid-function.txt index 19480106..07383518 100644 --- a/test/parse/module/bad-table-invalid-function.txt +++ b/test/parse/module/bad-table-invalid-function.txt @@ -1,7 +1,7 @@ ;;; TOOL: wat2wasm ;;; ERROR: 1 (module - (table 1 anyfunc) + (table 1 funcref) (func $f) (elem (i32.const 0) $f 1)) (;; STDERR ;;; diff --git a/test/parse/module/bad-table-no-offset.txt b/test/parse/module/bad-table-no-offset.txt index 2f7e6340..93a6b76e 100644 --- a/test/parse/module/bad-table-no-offset.txt +++ b/test/parse/module/bad-table-no-offset.txt @@ -2,7 +2,7 @@ ;;; ARGS: --disable-reference-types --disable-bulk-memory ;;; ERROR: 1 (module - (table 1 anyfunc) + (table 1 funcref) (func) (elem 0)) (;; STDERR ;;; diff --git a/test/parse/module/bad-table-too-many.txt b/test/parse/module/bad-table-too-many.txt index b1ff2409..74836053 100644 --- a/test/parse/module/bad-table-too-many.txt +++ b/test/parse/module/bad-table-too-many.txt @@ -3,10 +3,10 @@ ;;; ERROR: 1 (module (func (param i32)) - (table anyfunc (elem 0)) - (table anyfunc (elem 0))) + (table funcref (elem 0)) + (table funcref (elem 0))) (;; STDERR ;;; out/test/parse/module/bad-table-too-many.txt:7:4: error: only one table allowed - (table anyfunc (elem 0))) + (table funcref (elem 0))) ^^^^^ ;;; STDERR ;;) diff --git a/test/parse/module/data-offset.txt b/test/parse/module/data-offset.txt index f30118b3..9b207e3e 100644 --- a/test/parse/module/data-offset.txt +++ b/test/parse/module/data-offset.txt @@ -3,4 +3,4 @@ (import "foo" "bar" (global i32)) (memory 1) (global i32 i32.const 1) - (data (get_global 0) "hi")) + (data (global.get 0) "hi")) diff --git a/test/parse/module/elem-offset.txt b/test/parse/module/elem-offset.txt index 9d9f68d0..10fba665 100644 --- a/test/parse/module/elem-offset.txt +++ b/test/parse/module/elem-offset.txt @@ -3,5 +3,5 @@ (import "foo" "bar" (global i32)) (global i32 i32.const 1) (func) - (table 2 anyfunc) - (elem (get_global 0) 0)) + (table 2 funcref) + (elem (global.get 0) 0)) diff --git a/test/parse/module/export-table.txt b/test/parse/module/export-table.txt index 62e85ff6..1755ccf1 100644 --- a/test/parse/module/export-table.txt +++ b/test/parse/module/export-table.txt @@ -1,4 +1,4 @@ ;;; TOOL: wat2wasm (module - (table 0 anyfunc) + (table 0 funcref) (export "my_table" (table 0))) diff --git a/test/parse/module/global.txt b/test/parse/module/global.txt index 021824eb..506ead31 100644 --- a/test/parse/module/global.txt +++ b/test/parse/module/global.txt @@ -12,10 +12,10 @@ (global f32 (f32.const 3)) (global f64 (f64.const 4)) - (global i32 (get_global 0)) - (global i64 (get_global 1)) - (global f32 (get_global 2)) - (global f64 (get_global 3)) + (global i32 (global.get 0)) + (global i64 (global.get 1)) + (global f32 (global.get 2)) + (global f64 (global.get 3)) (func $foo) (global externref (ref.null extern)) diff --git a/test/parse/module/import-global-getglobal.txt b/test/parse/module/import-global-globalget.txt index f2cc8bdf..37388840 100644 --- a/test/parse/module/import-global-getglobal.txt +++ b/test/parse/module/import-global-globalget.txt @@ -1,4 +1,4 @@ ;;; TOOL: wat2wasm (module (import "a" "global" (global i32)) - (global i32 (get_global 0))) + (global i32 (global.get 0))) diff --git a/test/parse/module/import-table.txt b/test/parse/module/import-table.txt index 5976dfef..b43b71e3 100644 --- a/test/parse/module/import-table.txt +++ b/test/parse/module/import-table.txt @@ -1,3 +1,3 @@ ;;; TOOL: wat2wasm (module - (import "foo" "2" (table 0 10 anyfunc))) + (import "foo" "2" (table 0 10 funcref))) diff --git a/test/parse/module/table-named.txt b/test/parse/module/table-named.txt index 381ef1c0..8cd56159 100644 --- a/test/parse/module/table-named.txt +++ b/test/parse/module/table-named.txt @@ -3,4 +3,4 @@ (func $f (param i32)) (func $g (param i32 i64)) (func $h (result i64) (i64.const 0)) - (table anyfunc (elem $f $f $g $h))) + (table funcref (elem $f $f $g $h))) diff --git a/test/parse/module/table.txt b/test/parse/module/table.txt index a9d029cd..a8ca62e7 100644 --- a/test/parse/module/table.txt +++ b/test/parse/module/table.txt @@ -3,4 +3,4 @@ (func (param i32)) (func (param i32 i64)) (func (result i64) i64.const 0) - (table anyfunc (elem 0 0 1 2))) + (table funcref (elem 0 0 1 2))) diff --git a/test/regress/regress-10.txt b/test/regress/regress-10.txt index 0df645a5..39b49614 100644 --- a/test/regress/regress-10.txt +++ b/test/regress/regress-10.txt @@ -5,7 +5,7 @@ (local i32) block unreachable - tee_local 0 + local.tee 0 end)) (;; STDERR ;;; out/test/regress/regress-10.txt:9:5: error: type mismatch at end of block, expected [] but got [i32] diff --git a/test/regress/regress-21.txt b/test/regress/regress-21.txt index 12d3916d..d05d26fd 100644 --- a/test/regress/regress-21.txt +++ b/test/regress/regress-21.txt @@ -4,12 +4,12 @@ (type $foo.ty (func)) (global $g i32 (i32.const -1)) (func $foo (type $foo.ty) - (set_global $g (i32.const 1)) + (global.set $g (i32.const 1)) ) (export "foo" (func $foo)) ) (;; STDERR ;;; out/test/regress/regress-21.txt:7:7: error: can't global.set on immutable global at index 0. - (set_global $g (i32.const 1)) + (global.set $g (i32.const 1)) ^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/regress/regress-22.txt b/test/regress/regress-22.txt index 70ae4d17..736d4a80 100644 --- a/test/regress/regress-22.txt +++ b/test/regress/regress-22.txt @@ -2,7 +2,7 @@ ;;; ERROR: 1 (module (type $sig (func (param i32) (result i32))) - (table 0 anyfunc) + (table 0 funcref) (func (result i32) (call_indirect (type $sig) (result i32) (i32.const 0)) ) diff --git a/test/regress/regress-26.txt b/test/regress/regress-26.txt index 220232f1..b618db62 100644 --- a/test/regress/regress-26.txt +++ b/test/regress/regress-26.txt @@ -4,7 +4,7 @@ magic version section(TABLE) { count[1] - anyfunc + funcref has_max[0] initial[0] } diff --git a/test/regress/regress-35.txt b/test/regress/regress-35.txt index 241c047e..7cb28c3f 100644 --- a/test/regress/regress-35.txt +++ b/test/regress/regress-35.txt @@ -3,12 +3,12 @@ (module (type (func (param i32)(param i32)(result i32))) (func $add (param i32)(param i32)(result i32) - get_local 0 - get_local 1 + local.get 0 + local.get 1 i32.add return ) - (table 1 anyfunc) + (table 1 funcref) (elem (i32.const 0) $add) (func $run i32.const 4444 diff --git a/test/regress/regress-4.txt b/test/regress/regress-4.txt index d5120ece..ab0d0bc3 100644 --- a/test/regress/regress-4.txt +++ b/test/regress/regress-4.txt @@ -4,9 +4,9 @@ ;; was any name at all. (module (func (param $p i32) - (get_local $n))) + (local.get $n))) (;; STDERR ;;; out/test/regress/regress-4.txt:7:16: error: undefined local variable "$n" - (get_local $n))) + (local.get $n))) ^^ ;;; STDERR ;;) diff --git a/test/roundtrip/apply-global-names.txt b/test/roundtrip/apply-global-names.txt index 2d9c1492..e5f49bec 100644 --- a/test/roundtrip/apply-global-names.txt +++ b/test/roundtrip/apply-global-names.txt @@ -3,12 +3,12 @@ (module (import "m" "g" (global $g i32)) (func) - (table 1 anyfunc) + (table 1 funcref) (memory 1) - (global i32 (get_global $g)) - (elem (get_global $g) 0) - (data (get_global $g) "hi") + (global i32 (global.get $g)) + (elem (global.get $g) 0) + (data (global.get $g) "hi") ) (;; STDOUT ;;; (module diff --git a/test/roundtrip/bulk-memory.txt b/test/roundtrip/bulk-memory.txt index c7c43ef9..3215736d 100644 --- a/test/roundtrip/bulk-memory.txt +++ b/test/roundtrip/bulk-memory.txt @@ -2,7 +2,7 @@ ;;; ARGS: --stdout (module (memory 0) - (table 0 anyfunc) + (table 0 funcref) (func i32.const 0 diff --git a/test/roundtrip/bulk-memory64.txt b/test/roundtrip/bulk-memory64.txt index 4b37e75b..9cadea70 100644 --- a/test/roundtrip/bulk-memory64.txt +++ b/test/roundtrip/bulk-memory64.txt @@ -2,7 +2,7 @@ ;;; ARGS: --stdout --enable-memory64 (module (memory i64 0) - (table 0 anyfunc) + (table 0 funcref) (func i64.const 0 diff --git a/test/roundtrip/fold-atomic.txt b/test/roundtrip/fold-atomic.txt index 390861f1..ac2343b6 100644 --- a/test/roundtrip/fold-atomic.txt +++ b/test/roundtrip/fold-atomic.txt @@ -4,9 +4,9 @@ (module (memory 1 1 shared) (func - i32.const 0 i32.const 0 atomic.notify drop - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop + i32.const 0 i32.const 0 memory.atomic.notify drop + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop i32.const 0 i32.atomic.load drop i32.const 0 i64.atomic.load drop diff --git a/test/roundtrip/fold-basic.txt b/test/roundtrip/fold-basic.txt index 3ec792d1..894521cb 100644 --- a/test/roundtrip/fold-basic.txt +++ b/test/roundtrip/fold-basic.txt @@ -25,9 +25,9 @@ (func $fold-convert (result i64) f64.const 0 - f32.demote/f64 - i32.trunc_s/f32 - i64.extend_s/i32) + f32.demote_f64 + i32.trunc_f32_s + i64.extend_i32_s) (func $fold-select (result f32) f32.const 1 diff --git a/test/roundtrip/fold-bulk-memory.txt b/test/roundtrip/fold-bulk-memory.txt index 9b568003..967210d5 100644 --- a/test/roundtrip/fold-bulk-memory.txt +++ b/test/roundtrip/fold-bulk-memory.txt @@ -11,7 +11,7 @@ i32.const 0 i32.const 0 i32.const 0 memory.fill ) - (table 1 anyfunc) + (table 1 funcref) (elem func 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 diff --git a/test/roundtrip/fold-call-import-gen-names.txt b/test/roundtrip/fold-call-import-gen-names.txt index 1001ee20..b2cc4a96 100644 --- a/test/roundtrip/fold-call-import-gen-names.txt +++ b/test/roundtrip/fold-call-import-gen-names.txt @@ -4,8 +4,8 @@ (import "a" "b" (func (param i32) (result i32))) (func (export "c") (param i64) (result i32) - get_local 0 - i32.wrap/i64) + local.get 0 + i32.wrap_i64) ;; Make sure that calls are folded properly when referencing generated names ;; (there was a bug here). diff --git a/test/roundtrip/fold-call.txt b/test/roundtrip/fold-call.txt index de05b4f0..40882599 100644 --- a/test/roundtrip/fold-call.txt +++ b/test/roundtrip/fold-call.txt @@ -27,7 +27,7 @@ call $if_f call $ffff_v) - (table anyfunc (elem $i_i $if_f)) + (table funcref (elem $i_i $if_f)) (func $fold-call-indirect (result i32) i32.const 1 i32.const 2 diff --git a/test/roundtrip/fold-fac.txt b/test/roundtrip/fold-fac.txt index d1ee1ff0..e74708c7 100644 --- a/test/roundtrip/fold-fac.txt +++ b/test/roundtrip/fold-fac.txt @@ -4,31 +4,31 @@ (func $fac-stack-raw (param $n i64) (result i64) (local $i i64) (local $res i64) - get_local $n - set_local $i + local.get $n + local.set $i i64.const 1 - set_local $res + local.set $res block $done loop $loop - get_local $i + local.get $i i64.const 0 i64.eq if $body br $done else $body - get_local $i - get_local $res + local.get $i + local.get $res i64.mul - set_local $res - get_local $i + local.set $res + local.get $i i64.const 1 i64.sub - set_local $i + local.set $i end $body br $loop end $loop end $done - get_local $res)) + local.get $res)) (;; STDOUT ;;; (module (type $t0 (func (param i64) (result i64))) diff --git a/test/roundtrip/fold-getset-global.txt b/test/roundtrip/fold-global-getset.txt index 38ca2472..0a95ece6 100644 --- a/test/roundtrip/fold-getset-global.txt +++ b/test/roundtrip/fold-global-getset.txt @@ -4,20 +4,20 @@ (global (mut i32) (i32.const 1)) (global (mut f32) (f32.const 1.5)) - (func $fold-get-global (result i32) - get_global 1 + (func $fold-global-get (result i32) + global.get 1 drop - get_global 0 - get_global 0 + global.get 0 + global.get 0 i32.mul) - (func $fold-set-global - get_global 0 + (func $fold-global-set + global.get 0 i32.const 1 i32.add - set_global 0 + global.set 0 f32.const 2 - set_global 1) + global.set 1) ) (;; STDOUT ;;; (module diff --git a/test/roundtrip/fold-load-store.txt b/test/roundtrip/fold-load-store.txt index 1a13d075..ed5c185e 100644 --- a/test/roundtrip/fold-load-store.txt +++ b/test/roundtrip/fold-load-store.txt @@ -16,17 +16,17 @@ f32.const 2 f32.store) - (func $fold-current-memory (result i32) - current_memory + (func $fold-memory-size (result i32) + memory.size i32.const 1 i32.add drop i32.const 2) - (func $fold-grow-memory (result i32) + (func $fold-memory-grow (result i32) i32.const 1 i32.const 2 - grow_memory + memory.grow i32.lt_s)) (;; STDOUT ;;; (module diff --git a/test/roundtrip/fold-load-store64.txt b/test/roundtrip/fold-load-store64.txt index 91e45a60..33b8e414 100644 --- a/test/roundtrip/fold-load-store64.txt +++ b/test/roundtrip/fold-load-store64.txt @@ -16,17 +16,17 @@ f32.const 2 f32.store) - (func $fold-current-memory (result i32) - current_memory + (func $fold-memory-size (result i32) + memory.size i64.const 1 i64.add drop i32.const 2) - (func $fold-grow-memory (result i32) + (func $fold-memory-grow (result i32) i64.const 1 i64.const 2 - grow_memory + memory.grow i64.lt_s)) (;; STDOUT ;;; (module diff --git a/test/roundtrip/fold-getset-local.txt b/test/roundtrip/fold-local-getset.txt index edb30289..bd8201da 100644 --- a/test/roundtrip/fold-getset-local.txt +++ b/test/roundtrip/fold-local-getset.txt @@ -1,34 +1,34 @@ ;;; TOOL: run-roundtrip ;;; ARGS: --stdout --fold-exprs (module - (func $fold-get-local (result f32) + (func $fold-local-get (result f32) (local f32 f32 f64 f64) - get_local 0 - get_local 1 + local.get 0 + local.get 1 f32.add - get_local 2 - get_local 3 + local.get 2 + local.get 3 f64.add - f32.demote/f64 + f32.demote_f64 f32.add) - (func $fold-set-local + (func $fold-local-set (local i64 i32) i64.const 1 i64.const 2 i64.const 3 i64.xor i64.xor - set_local 0 + local.set 0 i32.const 4 - set_local 1) + local.set 1) - (func $fold-tee-local (result i32) + (func $fold-local-tee (result i32) (local i32 i32) i32.const 1 - tee_local 0 + local.tee 0 i32.const 2 - tee_local 1 + local.tee 1 i32.add) ) (;; STDOUT ;;; diff --git a/test/roundtrip/fold-tail-call.txt b/test/roundtrip/fold-tail-call.txt index a85c182e..8f051254 100644 --- a/test/roundtrip/fold-tail-call.txt +++ b/test/roundtrip/fold-tail-call.txt @@ -3,7 +3,7 @@ (module (type $t (func)) (type $t2 (func (param f32 f32) (result f32))) - (table 1 anyfunc) + (table 1 funcref) (func $f return_call $f) diff --git a/test/roundtrip/generate-bulk-memory-names.txt b/test/roundtrip/generate-bulk-memory-names.txt index c8045bbd..9558a773 100644 --- a/test/roundtrip/generate-bulk-memory-names.txt +++ b/test/roundtrip/generate-bulk-memory-names.txt @@ -9,7 +9,7 @@ data.drop 0 ) - (table 1 anyfunc) + (table 1 funcref) (elem func 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 diff --git a/test/roundtrip/generate-from-export-name.txt b/test/roundtrip/generate-from-export-name.txt index 9d5d7262..f6635607 100644 --- a/test/roundtrip/generate-from-export-name.txt +++ b/test/roundtrip/generate-from-export-name.txt @@ -3,7 +3,7 @@ (module (func (export "my_func")) - (table (export "my_table") 1 anyfunc) + (table (export "my_table") 1 funcref) (memory (export "my_memory") 1) (global (export "my_global") i32 (i32.const 1)) diff --git a/test/roundtrip/generate-from-import-name.txt b/test/roundtrip/generate-from-import-name.txt index 43a5b555..c9aeb77e 100644 --- a/test/roundtrip/generate-from-import-name.txt +++ b/test/roundtrip/generate-from-import-name.txt @@ -3,7 +3,7 @@ (module (func (import "m1" "my_func")) - (table (import "m2" "my_table") 1 anyfunc) + (table (import "m2" "my_table") 1 funcref) (memory (import "m3" "my_memory") 1) (global (import "m4" "my_global") i32) diff --git a/test/roundtrip/generate-func-names.txt b/test/roundtrip/generate-func-names.txt index ef6d8a8e..c16044c2 100644 --- a/test/roundtrip/generate-func-names.txt +++ b/test/roundtrip/generate-func-names.txt @@ -5,7 +5,7 @@ (func call 0) (func (; not exported ;)) - (table anyfunc (elem 0 1 0)) + (table funcref (elem 0 1 0)) (export "zero" (func 0)) (export "one" (func 1))) (;; STDOUT ;;; diff --git a/test/roundtrip/generate-func-type-names.txt b/test/roundtrip/generate-func-type-names.txt index 998dd3cb..2eb4bfcd 100644 --- a/test/roundtrip/generate-func-type-names.txt +++ b/test/roundtrip/generate-func-type-names.txt @@ -2,7 +2,7 @@ ;;; ARGS: --stdout --generate-names (module (import "foo" "bar" (func (type 0))) - (table anyfunc (elem 0)) + (table funcref (elem 0)) (type (func)) (type (func (result i32))) (func (type 0)) diff --git a/test/roundtrip/generate-global-names.txt b/test/roundtrip/generate-global-names.txt index 022bafa1..2bfdaa39 100644 --- a/test/roundtrip/generate-global-names.txt +++ b/test/roundtrip/generate-global-names.txt @@ -5,8 +5,8 @@ (global (mut f32) (f32.const -1.5)) (func (result i32) f32.const 3.0 - set_global 1 - get_global 0)) + global.set 1 + global.get 0)) (;; STDOUT ;;; (module (type $t0 (func (result i32))) diff --git a/test/roundtrip/generate-local-names.txt b/test/roundtrip/generate-local-names.txt index 176c3db7..d1c2df2e 100644 --- a/test/roundtrip/generate-local-names.txt +++ b/test/roundtrip/generate-local-names.txt @@ -4,22 +4,22 @@ (func (param i32) (param f32) (local f64) (local i64) - get_local 0 + local.get 0 drop - get_local 1 + local.get 1 drop - get_local 2 + local.get 2 drop - get_local 3 + local.get 3 drop i32.const 1 - set_local 0 + local.set 0 f32.const 1 - set_local 1 + local.set 1 f64.const 1 - set_local 2 + local.set 2 i64.const 1 - set_local 3)) + local.set 3)) (;; STDOUT ;;; (module (type $t0 (func (param i32 f32))) diff --git a/test/roundtrip/generate-some-names.txt b/test/roundtrip/generate-some-names.txt index f62d45cb..4eeb496d 100644 --- a/test/roundtrip/generate-some-names.txt +++ b/test/roundtrip/generate-some-names.txt @@ -7,7 +7,7 @@ (module (type (func (param i32) (result f32))) (import "foo" "bar" (func $import (result i32))) - (table anyfunc (elem 0)) + (table funcref (elem 0)) (func $func0 (type 0) f32.const 1) (func (param i32) (param $param1 i64) (local f32) @@ -21,10 +21,10 @@ i32.const 1 call_indirect (type 0) drop - get_local 1 + local.get 1 drop f32.const 0 - set_local 2) + local.set 2) (export "baz" (func 0)) (export "quux" (func 1))) diff --git a/test/roundtrip/generate-tail-call.txt b/test/roundtrip/generate-tail-call.txt index f56e24af..31ab6a98 100644 --- a/test/roundtrip/generate-tail-call.txt +++ b/test/roundtrip/generate-tail-call.txt @@ -1,7 +1,7 @@ ;;; TOOL: run-roundtrip ;;; ARGS: --stdout --debug-names --generate-names --enable-tail-call (module - (table 1 anyfunc) + (table 1 funcref) (func return_call 0) (func i32.const 0 return_call_indirect) ) diff --git a/test/roundtrip/inline-export-multi.txt b/test/roundtrip/inline-export-multi.txt index 178ea12c..4a5c22ef 100644 --- a/test/roundtrip/inline-export-multi.txt +++ b/test/roundtrip/inline-export-multi.txt @@ -9,7 +9,7 @@ (export "global0" (global $global)) (export "global1" (global $global)) - (table $table 1 1 anyfunc) + (table $table 1 1 funcref) (export "table0" (table $table)) (export "table1" (table $table)) diff --git a/test/roundtrip/inline-export-table.txt b/test/roundtrip/inline-export-table.txt index 8a29906d..05c3b2d1 100644 --- a/test/roundtrip/inline-export-table.txt +++ b/test/roundtrip/inline-export-table.txt @@ -3,7 +3,7 @@ (module (func $f1) (func $f2) - (table $foo anyfunc (elem $f1 $f2)) + (table $foo funcref (elem $f1 $f2)) (export "foo" (table $foo))) (;; STDOUT ;;; (module diff --git a/test/roundtrip/inline-import-export.txt b/test/roundtrip/inline-import-export.txt index 623b1911..23f6d064 100644 --- a/test/roundtrip/inline-import-export.txt +++ b/test/roundtrip/inline-import-export.txt @@ -3,7 +3,7 @@ (module (import "mod" "f" (func $f (param i32))) (import "mod" "g" (global $g f32)) - (import "mod" "t" (table $t 1 2 anyfunc)) + (import "mod" "t" (table $t 1 2 funcref)) (import "mod" "m" (memory $m 3)) (export "F" (func $f)) diff --git a/test/roundtrip/inline-import-table.txt b/test/roundtrip/inline-import-table.txt index 2934e5b6..93bf19a8 100644 --- a/test/roundtrip/inline-import-table.txt +++ b/test/roundtrip/inline-import-table.txt @@ -1,7 +1,7 @@ ;;; TOOL: run-roundtrip ;;; ARGS: --stdout --inline-import (module - (import "mod" "t1" (table 1 anyfunc)) + (import "mod" "t1" (table 1 funcref)) ) (;; STDOUT ;;; (module diff --git a/test/roundtrip/invalid-local-index.txt b/test/roundtrip/invalid-local-index.txt index ba43106d..7fc258bd 100644 --- a/test/roundtrip/invalid-local-index.txt +++ b/test/roundtrip/invalid-local-index.txt @@ -2,7 +2,7 @@ ;;; ARGS: --stdout --no-check (module (func - set_local 0)) + local.set 0)) (;; STDOUT ;;; (module (type (;0;) (func)) diff --git a/test/roundtrip/label.txt b/test/roundtrip/label.txt index 0cf39792..1a9869b8 100644 --- a/test/roundtrip/label.txt +++ b/test/roundtrip/label.txt @@ -4,7 +4,7 @@ (func (param i32) (result f32) block (result f32) f32.const 1 - get_local 0 + local.get 0 i32.eqz br_if 0 drop diff --git a/test/roundtrip/table-index.txt b/test/roundtrip/table-index.txt index c988679d..3802d8d5 100644 --- a/test/roundtrip/table-index.txt +++ b/test/roundtrip/table-index.txt @@ -1,7 +1,7 @@ ;;; TOOL: run-roundtrip ;;; ARGS: --stdout (module - (import "a" "b" (table 2 anyfunc))) + (import "a" "b" (table 2 funcref))) (;; STDOUT ;;; (module (import "a" "b" (table (;0;) 2 funcref))) diff --git a/test/strip/names.txt b/test/strip/names.txt index dbd375bb..dd27b75a 100644 --- a/test/strip/names.txt +++ b/test/strip/names.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } section("name") { diff --git a/test/strip/no-custom-sections.txt b/test/strip/no-custom-sections.txt index c2e3703f..aac0d9eb 100644 --- a/test/strip/no-custom-sections.txt +++ b/test/strip/no-custom-sections.txt @@ -7,7 +7,7 @@ section(CODE) { count[1] func { locals[decl_count[1] i32_count[1] i32] - get_local 0 + local.get 0 } } (;; STDOUT ;;; diff --git a/test/typecheck/atomic-no-shared-memory.txt b/test/typecheck/atomic-no-shared-memory.txt index cff33f5c..91006fdf 100644 --- a/test/typecheck/atomic-no-shared-memory.txt +++ b/test/typecheck/atomic-no-shared-memory.txt @@ -4,9 +4,9 @@ (module (memory 1) (func - i32.const 0 i32.const 0 atomic.notify drop - i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop - i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop + i32.const 0 i32.const 0 memory.atomic.notify drop + i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop + i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop i32.const 0 i32.atomic.load drop i32.const 0 i64.atomic.load drop diff --git a/test/typecheck/bad-assertexception-type-mismatch.txt b/test/typecheck/bad-assertexception-type-mismatch.txt index bdfb1ae2..ffafedcf 100644 --- a/test/typecheck/bad-assertexception-type-mismatch.txt +++ b/test/typecheck/bad-assertexception-type-mismatch.txt @@ -1,7 +1,7 @@ ;;; TOOL: wast2json ;;; ERROR: 1 (module - (func (export "foo") (param i32) (result i32) get_local 0) + (func (export "foo") (param i32) (result i32) local.get 0) ) (assert_exception (invoke "foo" (f32.const 0))) (;; STDERR ;;; diff --git a/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt b/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt index 39e2d482..1b3311a0 100644 --- a/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt +++ b/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt @@ -1,7 +1,7 @@ ;;; TOOL: wast2json ;;; ERROR: 1 (module - (func (param i32) (result i32) get_local 0) + (func (param i32) (result i32) local.get 0) (export "foo" (func 0))) (assert_return (invoke "foo" (f32.const 0)) (i32.const 0)) (;; STDERR ;;; diff --git a/test/typecheck/bad-assertreturn-type-mismatch.txt b/test/typecheck/bad-assertreturn-type-mismatch.txt index c9132c33..9330a076 100644 --- a/test/typecheck/bad-assertreturn-type-mismatch.txt +++ b/test/typecheck/bad-assertreturn-type-mismatch.txt @@ -1,7 +1,7 @@ ;;; TOOL: wast2json ;;; ERROR: 1 (module - (func (param i32) (result i32) get_local 0) + (func (param i32) (result i32) local.get 0) (export "foo" (func 0))) (assert_return (invoke "foo" (i32.const 0)) (f32.const 0)) (;; STDERR ;;; diff --git a/test/typecheck/bad-atomic-type-mismatch.txt b/test/typecheck/bad-atomic-type-mismatch.txt index 95de1a14..85ca6147 100644 --- a/test/typecheck/bad-atomic-type-mismatch.txt +++ b/test/typecheck/bad-atomic-type-mismatch.txt @@ -6,9 +6,9 @@ (memory 1 1 shared) ;; Mismatch address. - (func f32.const 0 i32.const 0 atomic.notify drop) - (func f32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop) - (func f32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop) + (func f32.const 0 i32.const 0 memory.atomic.notify drop) + (func f32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop) + (func f32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop) (func f32.const 0 i32.atomic.load drop) (func f32.const 0 i64.atomic.load drop) (func f32.const 0 i32.atomic.load8_u drop) @@ -74,9 +74,9 @@ (func f32.const 0 i64.const 0 i64.const 0 i64.atomic.rmw32.cmpxchg_u drop) ;; Mismatch first value operand. - (func i32.const 0 f32.const 0 atomic.notify drop) - (func i32.const 0 f32.const 0 i64.const 0 i32.atomic.wait drop) - (func i32.const 0 f64.const 0 i64.const 0 i64.atomic.wait drop) + (func i32.const 0 f32.const 0 memory.atomic.notify drop) + (func i32.const 0 f32.const 0 i64.const 0 memory.atomic.wait32 drop) + (func i32.const 0 f64.const 0 i64.const 0 memory.atomic.wait64 drop) (func i32.const 0 f32.const 0 i32.atomic.store) (func i32.const 0 f64.const 0 i64.atomic.store) (func i32.const 0 f32.const 0 i32.atomic.store8) @@ -135,8 +135,8 @@ (func i32.const 0 f64.const 0 i64.const 0 i64.atomic.rmw32.cmpxchg_u drop) ;; Mismatch second value operand. - (func i32.const 0 i32.const 0 f64.const 0 i32.atomic.wait drop) - (func i32.const 0 i64.const 0 f64.const 0 i64.atomic.wait drop) + (func i32.const 0 i32.const 0 f64.const 0 memory.atomic.wait32 drop) + (func i32.const 0 i64.const 0 f64.const 0 memory.atomic.wait64 drop) (func i32.const 0 i32.const 0 f32.const 0 i32.atomic.rmw.cmpxchg drop) (func i32.const 0 i64.const 0 f64.const 0 i64.atomic.rmw.cmpxchg drop) (func i32.const 0 i32.const 0 f32.const 0 i32.atomic.rmw8.cmpxchg_u drop) @@ -146,9 +146,9 @@ (func i32.const 0 i64.const 0 f64.const 0 i64.atomic.rmw32.cmpxchg_u drop) ;; Mismatch result. - (func (result f32) i32.const 0 i32.const 0 atomic.notify) - (func (result f32) i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait) - (func (result f32) i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait) + (func (result f32) i32.const 0 i32.const 0 memory.atomic.notify) + (func (result f32) i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32) + (func (result f32) i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64) (func (result f32) i32.const 0 i32.atomic.load) (func (result f64) i32.const 0 i64.atomic.load) (func (result f32) i32.const 0 i32.atomic.load8_u) @@ -209,14 +209,14 @@ ) (;; STDERR ;;; out/test/typecheck/bad-atomic-type-mismatch.txt:9:33: error: type mismatch in memory.atomic.notify, expected [i32, i32] but got [f32, i32] - (func f32.const 0 i32.const 0 atomic.notify drop) - ^^^^^^^^^^^^^ + (func f32.const 0 i32.const 0 memory.atomic.notify drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:10:45: error: type mismatch in memory.atomic.wait32, expected [i32, i32, i64] but got [f32, i32, i64] - (func f32.const 0 i32.const 0 i64.const 0 i32.atomic.wait drop) - ^^^^^^^^^^^^^^^ + (func f32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32 drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:11:45: error: type mismatch in memory.atomic.wait64, expected [i32, i64, i64] but got [f32, i64, i64] - (func f32.const 0 i64.const 0 i64.const 0 i64.atomic.wait drop) - ^^^^^^^^^^^^^^^ + (func f32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64 drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:12:21: error: type mismatch in i32.atomic.load, expected [i32] but got [f32] (func f32.const 0 i32.atomic.load drop) ^^^^^^^^^^^^^^^ @@ -407,14 +407,14 @@ out/test/typecheck/bad-atomic-type-mismatch.txt:74:45: error: type mismatch in i (func f32.const 0 i64.const 0 i64.const 0 i64.atomic.rmw32.cmpxchg_u drop) ^^^^^^^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:77:33: error: type mismatch in memory.atomic.notify, expected [i32, i32] but got [i32, f32] - (func i32.const 0 f32.const 0 atomic.notify drop) - ^^^^^^^^^^^^^ + (func i32.const 0 f32.const 0 memory.atomic.notify drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:78:45: error: type mismatch in memory.atomic.wait32, expected [i32, i32, i64] but got [i32, f32, i64] - (func i32.const 0 f32.const 0 i64.const 0 i32.atomic.wait drop) - ^^^^^^^^^^^^^^^ + (func i32.const 0 f32.const 0 i64.const 0 memory.atomic.wait32 drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:79:45: error: type mismatch in memory.atomic.wait64, expected [i32, i64, i64] but got [i32, f64, i64] - (func i32.const 0 f64.const 0 i64.const 0 i64.atomic.wait drop) - ^^^^^^^^^^^^^^^ + (func i32.const 0 f64.const 0 i64.const 0 memory.atomic.wait64 drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:80:33: error: type mismatch in i32.atomic.store, expected [i32, i32] but got [i32, f32] (func i32.const 0 f32.const 0 i32.atomic.store) ^^^^^^^^^^^^^^^^ @@ -584,11 +584,11 @@ out/test/typecheck/bad-atomic-type-mismatch.txt:135:45: error: type mismatch in (func i32.const 0 f64.const 0 i64.const 0 i64.atomic.rmw32.cmpxchg_u drop) ^^^^^^^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:138:45: error: type mismatch in memory.atomic.wait32, expected [i32, i32, i64] but got [i32, i32, f64] - (func i32.const 0 i32.const 0 f64.const 0 i32.atomic.wait drop) - ^^^^^^^^^^^^^^^ + (func i32.const 0 i32.const 0 f64.const 0 memory.atomic.wait32 drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:139:45: error: type mismatch in memory.atomic.wait64, expected [i32, i64, i64] but got [i32, i64, f64] - (func i32.const 0 i64.const 0 f64.const 0 i64.atomic.wait drop) - ^^^^^^^^^^^^^^^ + (func i32.const 0 i64.const 0 f64.const 0 memory.atomic.wait64 drop) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:140:45: error: type mismatch in i32.atomic.rmw.cmpxchg, expected [i32, i32, i32] but got [i32, i32, f32] (func i32.const 0 i32.const 0 f32.const 0 i32.atomic.rmw.cmpxchg drop) ^^^^^^^^^^^^^^^^^^^^^^ @@ -611,14 +611,14 @@ out/test/typecheck/bad-atomic-type-mismatch.txt:146:45: error: type mismatch in (func i32.const 0 i64.const 0 f64.const 0 i64.atomic.rmw32.cmpxchg_u drop) ^^^^^^^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:149:46: error: type mismatch in implicit return, expected [f32] but got [i32] - (func (result f32) i32.const 0 i32.const 0 atomic.notify) - ^^^^^^^^^^^^^ + (func (result f32) i32.const 0 i32.const 0 memory.atomic.notify) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:150:58: error: type mismatch in implicit return, expected [f32] but got [i32] - (func (result f32) i32.const 0 i32.const 0 i64.const 0 i32.atomic.wait) - ^^^^^^^^^^^^^^^ + (func (result f32) i32.const 0 i32.const 0 i64.const 0 memory.atomic.wait32) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:151:58: error: type mismatch in implicit return, expected [f32] but got [i32] - (func (result f32) i32.const 0 i64.const 0 i64.const 0 i64.atomic.wait) - ^^^^^^^^^^^^^^^ + (func (result f32) i32.const 0 i64.const 0 i64.const 0 memory.atomic.wait64) + ^^^^^^^^^^^^^^^^^^^^ out/test/typecheck/bad-atomic-type-mismatch.txt:152:34: error: type mismatch in implicit return, expected [f32] but got [i32] (func (result f32) i32.const 0 i32.atomic.load) ^^^^^^^^^^^^^^^ diff --git a/test/typecheck/bad-bulk-memory-invalid-segment.txt b/test/typecheck/bad-bulk-memory-invalid-segment.txt index d17b6fd2..b33d9820 100644 --- a/test/typecheck/bad-bulk-memory-invalid-segment.txt +++ b/test/typecheck/bad-bulk-memory-invalid-segment.txt @@ -8,7 +8,7 @@ data.drop 0 ) - (table 1 anyfunc) + (table 1 funcref) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 elem.drop 0 diff --git a/test/typecheck/bad-bulk-memory-type-mismatch.txt b/test/typecheck/bad-bulk-memory-type-mismatch.txt index 0fab19d3..03737a48 100644 --- a/test/typecheck/bad-bulk-memory-type-mismatch.txt +++ b/test/typecheck/bad-bulk-memory-type-mismatch.txt @@ -4,7 +4,7 @@ (module (memory 1) (data "a") - (table 1 anyfunc) + (table 1 funcref) (elem funcref 0) (func diff --git a/test/typecheck/bad-call-result-mismatch.txt b/test/typecheck/bad-call-result-mismatch.txt index 16f642c7..60be1416 100644 --- a/test/typecheck/bad-call-result-mismatch.txt +++ b/test/typecheck/bad-call-result-mismatch.txt @@ -4,7 +4,7 @@ (import "foo" "bar" (func $import (result f32))) (func $direct (result i64) (i64.const 0)) (type $indirect (func (result i64))) - (table anyfunc (elem $direct)) + (table funcref (elem $direct)) (func if diff --git a/test/typecheck/bad-callindirect-func-type-mismatch.txt b/test/typecheck/bad-callindirect-func-type-mismatch.txt index 44c6743f..e4990a1a 100644 --- a/test/typecheck/bad-callindirect-func-type-mismatch.txt +++ b/test/typecheck/bad-callindirect-func-type-mismatch.txt @@ -1,7 +1,7 @@ ;;; TOOL: wat2wasm ;;; ERROR: 1 (module - (table anyfunc (elem 0)) + (table funcref (elem 0)) (type $t (func)) (func f32.const 0 diff --git a/test/typecheck/bad-callindirect-type-mismatch.txt b/test/typecheck/bad-callindirect-type-mismatch.txt index e4829c2d..d52d0814 100644 --- a/test/typecheck/bad-callindirect-type-mismatch.txt +++ b/test/typecheck/bad-callindirect-type-mismatch.txt @@ -3,7 +3,7 @@ (module (type $t (func (param i32) (result i32))) (func $f (type $t) (i32.const 0)) - (table anyfunc (elem $f)) + (table funcref (elem $f)) (func f32.const 0 i32.const 0 diff --git a/test/typecheck/bad-cast-type-mismatch.txt b/test/typecheck/bad-cast-type-mismatch.txt index 0ec52a18..812329d1 100644 --- a/test/typecheck/bad-cast-type-mismatch.txt +++ b/test/typecheck/bad-cast-type-mismatch.txt @@ -3,10 +3,10 @@ (module (func f32.const 0 - f32.reinterpret/i32 + f32.reinterpret_i32 drop)) (;; STDERR ;;; out/test/typecheck/bad-cast-type-mismatch.txt:6:5: error: type mismatch in f32.reinterpret_i32, expected [i32] but got [f32] - f32.reinterpret/i32 + f32.reinterpret_i32 ^^^^^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-convert-type-mismatch.txt b/test/typecheck/bad-convert-type-mismatch.txt index 6ffedff5..0c4de46c 100644 --- a/test/typecheck/bad-convert-type-mismatch.txt +++ b/test/typecheck/bad-convert-type-mismatch.txt @@ -3,10 +3,10 @@ (module (func i32.const 0 - i32.trunc_s/f32 + i32.trunc_f32_s drop)) (;; STDERR ;;; out/test/typecheck/bad-convert-type-mismatch.txt:6:5: error: type mismatch in i32.trunc_f32_s, expected [f32] but got [i32] - i32.trunc_s/f32 + i32.trunc_f32_s ^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-global-getglobal-type-mismatch.txt b/test/typecheck/bad-global-globalget-type-mismatch.txt index 2dad8c06..b7c0c5c9 100644 --- a/test/typecheck/bad-global-getglobal-type-mismatch.txt +++ b/test/typecheck/bad-global-globalget-type-mismatch.txt @@ -2,9 +2,9 @@ ;;; ERROR: 1 (module (import "foo" "bar" (global i32)) - (global f32 (get_global 0))) + (global f32 (global.get 0))) (;; STDERR ;;; -out/test/typecheck/bad-global-getglobal-type-mismatch.txt:5:16: error: type mismatch in initializer expression, expected [f32] but got [i32] - (global f32 (get_global 0))) +out/test/typecheck/bad-global-globalget-type-mismatch.txt:5:16: error: type mismatch in initializer expression, expected [f32] but got [i32] + (global f32 (global.get 0))) ^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-setlocal-type-mismatch.txt b/test/typecheck/bad-localset-type-mismatch.txt index e38168b2..d947a9e6 100644 --- a/test/typecheck/bad-setlocal-type-mismatch.txt +++ b/test/typecheck/bad-localset-type-mismatch.txt @@ -3,9 +3,9 @@ (module (func (local i32) f32.const 0 - set_local 0)) + local.set 0)) (;; STDERR ;;; -out/test/typecheck/bad-setlocal-type-mismatch.txt:6:5: error: type mismatch in local.set, expected [i32] but got [f32] - set_local 0)) +out/test/typecheck/bad-localset-type-mismatch.txt:6:5: error: type mismatch in local.set, expected [i32] but got [f32] + local.set 0)) ^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-grow-memory-type-mismatch.txt b/test/typecheck/bad-memory-grow-type-mismatch.txt index 289cedfd..cd88d9c4 100644 --- a/test/typecheck/bad-grow-memory-type-mismatch.txt +++ b/test/typecheck/bad-memory-grow-type-mismatch.txt @@ -4,10 +4,10 @@ (memory 0) (func f32.const 100 - grow_memory + memory.grow drop)) (;; STDERR ;;; -out/test/typecheck/bad-grow-memory-type-mismatch.txt:7:5: error: type mismatch in memory.grow, expected [i32] but got [f32] - grow_memory +out/test/typecheck/bad-memory-grow-type-mismatch.txt:7:5: error: type mismatch in memory.grow, expected [i32] but got [f32] + memory.grow ^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-returncallindirect-type-mismatch.txt b/test/typecheck/bad-returncallindirect-type-mismatch.txt index 5cbbb7ff..06752ac7 100644 --- a/test/typecheck/bad-returncallindirect-type-mismatch.txt +++ b/test/typecheck/bad-returncallindirect-type-mismatch.txt @@ -2,7 +2,7 @@ ;;; ARGS: --enable-tail-call ;;; ERROR: 1 (module - (table 1 anyfunc) + (table 1 funcref) (type $v_v (func)) (type $l_l (func (param i64) (result i64))) diff --git a/test/typecheck/br-table-loop.txt b/test/typecheck/br-table-loop.txt index 880a4c19..a23e1664 100644 --- a/test/typecheck/br-table-loop.txt +++ b/test/typecheck/br-table-loop.txt @@ -1,12 +1,12 @@ ;;; TOOL: wat2wasm (module - (table 0 anyfunc) + (table 0 funcref) (memory $0 17) (func $foo (param $0 i32) (result i32) (loop $label$1 (result i32) (block $label$2 (br_table $label$1 $label$2 $label$2 - (get_local $0) + (local.get $0) ) (return (i32.const 0) diff --git a/wasm2c/README.md b/wasm2c/README.md index 9aaabdf4..43af5e40 100644 --- a/wasm2c/README.md +++ b/wasm2c/README.md @@ -17,10 +17,10 @@ Let's look at a simple example of a factorial function. ```wasm (func (export "fac") (param $x i32) (result i32) - (if (result i32) (i32.eq (get_local $x) (i32.const 0)) + (if (result i32) (i32.eq (local.get $x) (i32.const 0)) (then (i32.const 1)) (else - (i32.mul (get_local $x) (call 0 (i32.sub (get_local $x) (i32.const 1)))) + (i32.mul (local.get $x) (call 0 (i32.sub (local.get $x) (i32.const 1)))) ) ) ) @@ -237,12 +237,12 @@ typedef enum { } wasm_rt_type_t; ``` -Next is `wasm_rt_anyfunc_t`, the function signature for a generic function +Next is `wasm_rt_funcref_t`, the function signature for a generic function callback. Since a WebAssembly table can contain functions of any given signature, it is necessary to convert them to a canonical form: ```c -typedef void (*wasm_rt_anyfunc_t)(void); +typedef void (*wasm_rt_funcref_t)(void); ``` Next are the definitions for a table element. `func_type` is a function index @@ -251,7 +251,7 @@ as returned by `wasm_rt_register_func_type` described below. ```c typedef struct { uint32_t func_type; - wasm_rt_anyfunc_t func; + wasm_rt_funcref_t func; } wasm_rt_elem_t; ``` @@ -391,14 +391,14 @@ that there is a 1-1 mapping in the output: ```wasm (func $fac (param $x i32) (result i32) - get_local $x + local.get $x i32.const 0 i32.eq if (result i32) i32.const 1 else - get_local $x - get_local $x + local.get $x + local.get $x i32.const 1 i32.sub call 0 @@ -419,16 +419,16 @@ $ wat-desugar fac-flat.wat --fold -o fac-folded.wat (func (;0;) (param i32) (result i32) (if (result i32) ;; label = @1 (i32.eq - (get_local 0) + (local.get 0) (i32.const 0)) (then (i32.const 1)) (else (i32.mul - (get_local 0) + (local.get 0) (call 0 (i32.sub - (get_local 0) + (local.get 0) (i32.const 1))))))) (export "fac" (func 0)) (type (;0;) (func (param i32) (result i32)))) diff --git a/wasm2c/examples/fac/fac.wat b/wasm2c/examples/fac/fac.wat index 5dd79a08..017a97aa 100644 --- a/wasm2c/examples/fac/fac.wat +++ b/wasm2c/examples/fac/fac.wat @@ -1,8 +1,8 @@ (func (export "fac") (param i32) (result i32) - (if (result i32) (i32.eq (get_local 0) (i32.const 0)) + (if (result i32) (i32.eq (local.get 0) (i32.const 0)) (then (i32.const 1)) (else - (i32.mul (get_local 0) (call 0 (i32.sub (get_local 0) (i32.const 1)))) + (i32.mul (local.get 0) (call 0 (i32.sub (local.get 0) (i32.const 1)))) ) ) ) diff --git a/wasm2c/examples/rot13/rot13.wat b/wasm2c/examples/rot13/rot13.wat index 0a33d80e..4f1bb4be 100644 --- a/wasm2c/examples/rot13/rot13.wat +++ b/wasm2c/examples/rot13/rot13.wat @@ -6,22 +6,22 @@ (local $uc i32) ;; No change if < 'A'. - (if (i32.lt_u (get_local $c) (i32.const 65)) - (return (get_local $c))) + (if (i32.lt_u (local.get $c) (i32.const 65)) + (return (local.get $c))) ;; Clear 5th bit of c, to force uppercase. 0xdf = 0b11011111 - (set_local $uc (i32.and (get_local $c) (i32.const 0xdf))) + (local.set $uc (i32.and (local.get $c) (i32.const 0xdf))) ;; In range ['A', 'M'] return |c| + 13. - (if (i32.le_u (get_local $uc) (i32.const 77)) - (return (i32.add (get_local $c) (i32.const 13)))) + (if (i32.le_u (local.get $uc) (i32.const 77)) + (return (i32.add (local.get $c) (i32.const 13)))) ;; In range ['N', 'Z'] return |c| - 13. - (if (i32.le_u (get_local $uc) (i32.const 90)) - (return (i32.sub (get_local $c) (i32.const 13)))) + (if (i32.le_u (local.get $uc) (i32.const 90)) + (return (i32.sub (local.get $c) (i32.const 13)))) ;; No change for everything else. - (return (get_local $c)) + (return (local.get $c)) ) (func (export "rot13") @@ -32,25 +32,25 @@ (call $fill_buf (i32.const 0) (i32.const 1024)) ;; The host returns the size filled. - (set_local $size) + (local.set $size) ;; Loop over all bytes and rot13 them. (block $exit (loop $top ;; if (i >= size) break - (if (i32.ge_u (get_local $i) (get_local $size)) (br $exit)) + (if (i32.ge_u (local.get $i) (local.get $size)) (br $exit)) ;; mem[i] = rot13c(mem[i]) (i32.store8 - (get_local $i) + (local.get $i) (call $rot13c - (i32.load8_u (get_local $i)))) + (i32.load8_u (local.get $i)))) ;; i++ - (set_local $i (i32.add (get_local $i) (i32.const 1))) + (local.set $i (i32.add (local.get $i) (i32.const 1))) (br $top) ) ) - (call $buf_done (i32.const 0) (get_local $size)) + (call $buf_done (i32.const 0) (local.get $size)) ) diff --git a/wasm2c/wasm-rt.h b/wasm2c/wasm-rt.h index 2797e8f7..b0577b36 100644 --- a/wasm2c/wasm-rt.h +++ b/wasm2c/wasm-rt.h @@ -88,10 +88,10 @@ typedef enum { WASM_RT_F64, } wasm_rt_type_t; -/** A function type for all `anyfunc` functions in a Table. All functions are +/** A function type for all `funcref` functions in a Table. All functions are * stored in this canonical form, but must be cast to their proper signature to * call. */ -typedef void (*wasm_rt_anyfunc_t)(void); +typedef void (*wasm_rt_funcref_t)(void); /** A single element of a Table. */ typedef struct { @@ -99,7 +99,7 @@ typedef struct { uint32_t func_type; /** The function. The embedder must know the actual C signature of the * function and cast to it before calling. */ - wasm_rt_anyfunc_t func; + wasm_rt_funcref_t func; } wasm_rt_elem_t; /** A Memory object. */ |