diff options
Diffstat (limited to 'src')
36 files changed, 1576 insertions, 1516 deletions
diff --git a/src/binary-reader-ir.cc b/src/binary-reader-ir.cc index e1bac665..d1a4ecf2 100644 --- a/src/binary-reader-ir.cc +++ b/src/binary-reader-ir.cc @@ -184,8 +184,8 @@ class BinaryReaderIR : public BinaryReaderNop { Result OnTableSizeExpr(Index table_index) override; Result OnTableFillExpr(Index table_index) override; Result OnRefFuncExpr(Index func_index) override; - Result OnRefNullExpr() override; - Result OnRefIsNullExpr() override; + Result OnRefNullExpr(Type type) override; + Result OnRefIsNullExpr(Type type) override; Result OnNopExpr() override; Result OnRethrowExpr() override; Result OnReturnExpr() override; @@ -213,7 +213,7 @@ class BinaryReaderIR : public BinaryReaderNop { Result EndElemSegmentInitExpr(Index index) override; Result OnElemSegmentElemType(Index index, Type elem_type) override; Result OnElemSegmentElemExprCount(Index index, Index count) override; - Result OnElemSegmentElemExpr_RefNull(Index segment_index) override; + Result OnElemSegmentElemExpr_RefNull(Index segment_index, Type type) override; Result OnElemSegmentElemExpr_RefFunc(Index segment_index, Index func_index) override; @@ -247,7 +247,7 @@ class BinaryReaderIR : public BinaryReaderNop { Result OnInitExprGlobalGetExpr(Index index, Index global_index) override; Result OnInitExprI32ConstExpr(Index index, uint32_t value) override; Result OnInitExprI64ConstExpr(Index index, uint64_t value) override; - Result OnInitExprRefNull(Index index) override; + Result OnInitExprRefNull(Index index, Type type) override; Result OnInitExprRefFunc(Index index, Index func_index) override; Result OnDataSymbol(Index index, uint32_t flags, string_view name, @@ -914,12 +914,12 @@ Result BinaryReaderIR::OnRefFuncExpr(Index func_index) { return AppendExpr(MakeUnique<RefFuncExpr>(Var(func_index))); } -Result BinaryReaderIR::OnRefNullExpr() { - return AppendExpr(MakeUnique<RefNullExpr>()); +Result BinaryReaderIR::OnRefNullExpr(Type type) { + return AppendExpr(MakeUnique<RefNullExpr>(type)); } -Result BinaryReaderIR::OnRefIsNullExpr() { - return AppendExpr(MakeUnique<RefIsNullExpr>()); +Result BinaryReaderIR::OnRefIsNullExpr(Type type) { + return AppendExpr(MakeUnique<RefIsNullExpr>(type)); } Result BinaryReaderIR::OnNopExpr() { @@ -1073,10 +1073,11 @@ Result BinaryReaderIR::OnElemSegmentElemExprCount(Index index, Index count) { return Result::Ok; } -Result BinaryReaderIR::OnElemSegmentElemExpr_RefNull(Index segment_index) { +Result BinaryReaderIR::OnElemSegmentElemExpr_RefNull(Index segment_index, + Type type) { assert(segment_index == module_->elem_segments.size() - 1); ElemSegment* segment = module_->elem_segments[segment_index]; - segment->elem_exprs.emplace_back(); + segment->elem_exprs.emplace_back(type); return Result::Ok; } @@ -1226,9 +1227,9 @@ Result BinaryReaderIR::OnInitExprI64ConstExpr(Index index, uint64_t value) { return Result::Ok; } -Result BinaryReaderIR::OnInitExprRefNull(Index index) { +Result BinaryReaderIR::OnInitExprRefNull(Index index, Type type) { Location loc = GetLocation(); - current_init_expr_->push_back(MakeUnique<RefNullExpr>(loc)); + current_init_expr_->push_back(MakeUnique<RefNullExpr>(type, loc)); return Result::Ok; } diff --git a/src/binary-reader-logging.cc b/src/binary-reader-logging.cc index c3e7e750..ef24ad0e 100644 --- a/src/binary-reader-logging.cc +++ b/src/binary-reader-logging.cc @@ -652,12 +652,24 @@ Result BinaryReaderLogging::OnComdatEntry(ComdatType kind, Index index) { return reader_->name(value); \ } +#define DEFINE_TYPE(name) \ + Result BinaryReaderLogging::name(Type type) { \ + LOGF(#name "(%s)\n", type.GetName()); \ + return reader_->name(type); \ + } + #define DEFINE_INDEX_DESC(name, desc) \ Result BinaryReaderLogging::name(Index value) { \ LOGF(#name "(" desc ": %" PRIindex ")\n", value); \ return reader_->name(value); \ } +#define DEFINE_INDEX_TYPE(name) \ + Result BinaryReaderLogging::name(Index value, Type type) { \ + LOGF(#name "(index: %" PRIindex ", type: %s)\n", value, type.GetName()); \ + return reader_->name(value, type); \ + } + #define DEFINE_INDEX_INDEX(name, desc0, desc1) \ Result BinaryReaderLogging::name(Index value0, Index value1) { \ LOGF(#name "(" desc0 ": %" PRIindex ", " desc1 ": %" PRIindex ")\n", \ @@ -777,8 +789,8 @@ DEFINE_INDEX(OnTableGrowExpr) DEFINE_INDEX(OnTableSizeExpr) DEFINE_INDEX_DESC(OnTableFillExpr, "table index") DEFINE_INDEX(OnRefFuncExpr) -DEFINE0(OnRefNullExpr) -DEFINE0(OnRefIsNullExpr) +DEFINE_TYPE(OnRefNullExpr) +DEFINE_TYPE(OnRefIsNullExpr) DEFINE0(OnNopExpr) DEFINE0(OnRethrowExpr); DEFINE_INDEX_DESC(OnReturnCallExpr, "func_index") @@ -798,7 +810,7 @@ DEFINE_INDEX(OnElemSegmentCount) DEFINE_INDEX(BeginElemSegmentInitExpr) DEFINE_INDEX(EndElemSegmentInitExpr) DEFINE_INDEX_INDEX(OnElemSegmentElemExprCount, "index", "count") -DEFINE_INDEX(OnElemSegmentElemExpr_RefNull) +DEFINE_INDEX_TYPE(OnElemSegmentElemExpr_RefNull) DEFINE_INDEX_INDEX(OnElemSegmentElemExpr_RefFunc, "index", "func_index") DEFINE_INDEX(EndElemSegment) DEFINE_END(EndElemSection) @@ -825,7 +837,7 @@ DEFINE_BEGIN(BeginRelocSection) DEFINE_END(EndRelocSection) DEFINE_INDEX_INDEX(OnInitExprGlobalGetExpr, "index", "global_index") -DEFINE_INDEX(OnInitExprRefNull) +DEFINE_INDEX_TYPE(OnInitExprRefNull) DEFINE_INDEX_INDEX(OnInitExprRefFunc, "index", "func_index") DEFINE_BEGIN(BeginDylinkSection) @@ -891,6 +903,10 @@ Result BinaryReaderLogging::OnOpcodeBlockSig(Type sig_type) { return reader_->OnOpcodeBlockSig(sig_type); } +Result BinaryReaderLogging::OnOpcodeType(Type type) { + return reader_->OnOpcodeType(type); +} + Result BinaryReaderLogging::OnEndFunc() { return reader_->OnEndFunc(); } diff --git a/src/binary-reader-logging.h b/src/binary-reader-logging.h index 9f70b61a..f5936562 100644 --- a/src/binary-reader-logging.h +++ b/src/binary-reader-logging.h @@ -140,6 +140,7 @@ class BinaryReaderLogging : public BinaryReaderDelegate { Result OnOpcodeF64(uint64_t value) override; Result OnOpcodeV128(v128 value) override; Result OnOpcodeBlockSig(Type sig_type) override; + Result OnOpcodeType(Type type) override; Result OnAtomicLoadExpr(Opcode opcode, uint32_t alignment_log2, Address offset) override; @@ -199,8 +200,8 @@ class BinaryReaderLogging : public BinaryReaderDelegate { Result OnTableSizeExpr(Index table) override; Result OnTableFillExpr(Index table) override; Result OnRefFuncExpr(Index index) override; - Result OnRefNullExpr() override; - Result OnRefIsNullExpr() override; + Result OnRefNullExpr(Type type) override; + Result OnRefIsNullExpr(Type type) override; Result OnNopExpr() override; Result OnRethrowExpr() override; Result OnReturnCallExpr(Index func_index) override; @@ -239,7 +240,7 @@ class BinaryReaderLogging : public BinaryReaderDelegate { Result EndElemSegmentInitExpr(Index index) override; Result OnElemSegmentElemType(Index index, Type elem_type) override; Result OnElemSegmentElemExprCount(Index index, Index count) override; - Result OnElemSegmentElemExpr_RefNull(Index segment_index) override; + Result OnElemSegmentElemExpr_RefNull(Index segment_index, Type type) override; Result OnElemSegmentElemExpr_RefFunc(Index segment_index, Index func_index) override; Result EndElemSegment(Index index) override; @@ -347,7 +348,7 @@ class BinaryReaderLogging : public BinaryReaderDelegate { Result OnInitExprGlobalGetExpr(Index index, Index global_index) override; Result OnInitExprI32ConstExpr(Index index, uint32_t value) override; Result OnInitExprI64ConstExpr(Index index, uint64_t value) override; - Result OnInitExprRefNull(Index index) override; + Result OnInitExprRefNull(Index index, Type type) override; Result OnInitExprRefFunc(Index index, Index func_index) override; private: diff --git a/src/binary-reader-nop.h b/src/binary-reader-nop.h index 6caed9a8..1159476a 100644 --- a/src/binary-reader-nop.h +++ b/src/binary-reader-nop.h @@ -190,6 +190,7 @@ class BinaryReaderNop : public BinaryReaderDelegate { Result OnOpcodeF64(uint64_t value) override { return Result::Ok; } Result OnOpcodeV128(v128 value) override { return Result::Ok; } Result OnOpcodeBlockSig(Type sig_type) override { return Result::Ok; } + Result OnOpcodeType(Type type) override { return Result::Ok; } Result OnAtomicLoadExpr(Opcode opcode, uint32_t alignment_log2, Address offset) override { @@ -276,8 +277,8 @@ class BinaryReaderNop : public BinaryReaderDelegate { Result OnTableSizeExpr(Index table_index) override { return Result::Ok; } Result OnTableFillExpr(Index table_index) override { return Result::Ok; } Result OnRefFuncExpr(Index func_index) override { return Result::Ok; } - Result OnRefNullExpr() override { return Result::Ok; } - Result OnRefIsNullExpr() override { return Result::Ok; } + Result OnRefNullExpr(Type type) override { return Result::Ok; } + Result OnRefIsNullExpr(Type type) override { return Result::Ok; } Result OnNopExpr() override { return Result::Ok; } Result OnRethrowExpr() override { return Result::Ok; } Result OnReturnCallExpr(Index sig_index) override { return Result::Ok; } @@ -324,7 +325,8 @@ class BinaryReaderNop : public BinaryReaderDelegate { Result OnElemSegmentElemExprCount(Index index, Index count) override { return Result::Ok; } - Result OnElemSegmentElemExpr_RefNull(Index segment_index) override { + Result OnElemSegmentElemExpr_RefNull(Index segment_index, + Type type) override { return Result::Ok; } Result OnElemSegmentElemExpr_RefFunc(Index segment_index, @@ -508,7 +510,7 @@ class BinaryReaderNop : public BinaryReaderDelegate { Result OnInitExprI64ConstExpr(Index index, uint64_t value) override { return Result::Ok; } - Result OnInitExprRefNull(Index index) override { + Result OnInitExprRefNull(Index index, Type type) override { return Result::Ok; } Result OnInitExprRefFunc(Index index, Index func_index) override { diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc index e21a7ff9..7570b8df 100644 --- a/src/binary-reader-objdump.cc +++ b/src/binary-reader-objdump.cc @@ -403,6 +403,7 @@ class BinaryReaderObjdumpDisassemble : public BinaryReaderObjdumpBase { Result OnOpcodeF64(uint64_t value) override; Result OnOpcodeV128(v128 value) override; Result OnOpcodeBlockSig(Type sig_type) override; + Result OnOpcodeType(Type type) override; Result OnBrTableExpr(Index num_targets, Index* target_depths, @@ -636,6 +637,12 @@ Result BinaryReaderObjdumpDisassemble::OnOpcodeV128(v128 value) { return Result::Ok; } +Result BinaryReaderObjdumpDisassemble::OnOpcodeType(Type type) { + Offset immediate_len = state->offset - current_opcode_offset; + LogOpcode(immediate_len, type.GetRefKindName()); + return Result::Ok; +} + Result BinaryReaderObjdumpDisassemble::OnBrTableExpr( Index num_targets, Index* target_depths, @@ -697,6 +704,8 @@ enum class InitExprType { V128, Global, FuncRef, + // TODO: There isn't a nullref anymore, this just represents ref.null of some + // type T. NullRef, }; @@ -709,6 +718,7 @@ struct InitExpr { uint64_t i64; uint64_t f64; v128 v128_v; + Type type; } value; }; @@ -804,7 +814,7 @@ class BinaryReaderObjdump : public BinaryReaderObjdumpBase { uint8_t flags) override; Result OnElemSegmentElemType(Index index, Type elem_type) override; Result OnElemSegmentElemExprCount(Index index, Index count) override; - Result OnElemSegmentElemExpr_RefNull(Index segment_index) override; + Result OnElemSegmentElemExpr_RefNull(Index segment_index, Type type) override; Result OnElemSegmentElemExpr_RefFunc(Index segment_index, Index func_index) override; @@ -838,7 +848,7 @@ class BinaryReaderObjdump : public BinaryReaderObjdumpBase { Result OnInitExprGlobalGetExpr(Index index, Index global_index) override; Result OnInitExprI32ConstExpr(Index index, uint32_t value) override; Result OnInitExprI64ConstExpr(Index index, uint64_t value) override; - Result OnInitExprRefNull(Index index) override; + Result OnInitExprRefNull(Index index, Type type) override; Result OnInitExprRefFunc(Index index, Index func_index) override; Result OnDylinkInfo(uint32_t mem_size, @@ -1286,8 +1296,10 @@ Result BinaryReaderObjdump::OnExport(Index index, return Result::Ok; } -Result BinaryReaderObjdump::OnElemSegmentElemExpr_RefNull(Index segment_index) { - PrintDetails(" - elem[%" PRIindex "] = nullref\n", elem_offset_ + elem_index_); +Result BinaryReaderObjdump::OnElemSegmentElemExpr_RefNull(Index segment_index, + Type type) { + PrintDetails(" - elem[%" PRIindex "] = ref.null %s\n", + elem_offset_ + elem_index_, type.GetName()); elem_index_++; return Result::Ok; } @@ -1395,7 +1407,7 @@ void BinaryReaderObjdump::PrintInitExpr(const InitExpr& expr) { break; } case InitExprType::NullRef: { - PrintDetails(" - init nullref\n"); + PrintDetails(" - init null\n"); break; } } @@ -1489,9 +1501,10 @@ Result BinaryReaderObjdump::OnInitExprI64ConstExpr(Index index, return Result::Ok; } -Result BinaryReaderObjdump::OnInitExprRefNull(Index index) { +Result BinaryReaderObjdump::OnInitExprRefNull(Index index, Type type) { InitExpr expr; expr.type = InitExprType::NullRef; + expr.value.type = type; HandleInitExpr(expr); return Result::Ok; } diff --git a/src/binary-reader.cc b/src/binary-reader.cc index 9a09560e..9780e39c 100644 --- a/src/binary-reader.cc +++ b/src/binary-reader.cc @@ -99,6 +99,7 @@ class BinaryReader { Result ReadS32Leb128(uint32_t* out_value, const char* desc) WABT_WARN_UNUSED; Result ReadS64Leb128(uint64_t* out_value, const char* desc) WABT_WARN_UNUSED; Result ReadType(Type* out_value, const char* desc) WABT_WARN_UNUSED; + Result ReadRefType(Type* out_value, const char* desc) WABT_WARN_UNUSED; Result ReadExternalKind(ExternalKind* out_value, const char* desc) WABT_WARN_UNUSED; Result ReadStr(string_view* out_str, const char* desc) WABT_WARN_UNUSED; @@ -302,6 +303,14 @@ Result BinaryReader::ReadType(Type* out_value, const char* desc) { return Result::Ok; } +Result BinaryReader::ReadRefType(Type* out_value, const char* desc) { + uint32_t type = 0; + CHECK_RESULT(ReadS32Leb128(&type, desc)); + *out_value = static_cast<Type>(type); + ERROR_UNLESS(out_value->IsRef(), "%s must be a reference type", desc); + return Result::Ok; +} + Result BinaryReader::ReadExternalKind(ExternalKind* out_value, const char* desc) { uint8_t value = 0; @@ -401,12 +410,11 @@ bool BinaryReader::IsConcreteType(Type type) { case Type::V128: return options_.features.simd_enabled(); - case Type::Funcref: - case Type::Anyref: - case Type::Nullref: + case Type::FuncRef: + case Type::ExternRef: return options_.features.reference_types_enabled(); - case Type::Exnref: + case Type::ExnRef: return options_.features.exceptions_enabled(); default: @@ -483,9 +491,12 @@ Result BinaryReader::ReadInitExpr(Index index, bool require_i32) { break; } - case Opcode::RefNull: - CALLBACK(OnInitExprRefNull, index); + case Opcode::RefNull: { + Type type; + CHECK_RESULT(ReadRefType(&type, "ref.null type")); + CALLBACK(OnInitExprRefNull, index, type); break; + } case Opcode::RefFunc: { Index func_index; @@ -514,9 +525,7 @@ Result BinaryReader::ReadInitExpr(Index index, bool require_i32) { } Result BinaryReader::ReadTable(Type* out_elem_type, Limits* out_elem_limits) { - CHECK_RESULT(ReadType(out_elem_type, "table elem type")); - ERROR_UNLESS(out_elem_type->IsRef(), - "table elem type must be a reference type"); + CHECK_RESULT(ReadRefType(out_elem_type, "table elem type")); uint32_t flags; uint32_t initial; @@ -1545,14 +1554,18 @@ Result BinaryReader::ReadFunctionBody(Offset end_offset) { } case Opcode::RefNull: { - CALLBACK(OnRefNullExpr); - CALLBACK0(OnOpcodeBare); + Type type; + CHECK_RESULT(ReadRefType(&type, "ref.null type")); + CALLBACK(OnRefNullExpr, type); + CALLBACK(OnOpcodeType, type); break; } case Opcode::RefIsNull: { - CALLBACK(OnRefIsNullExpr); - CALLBACK0(OnOpcodeBare); + Type type; + CHECK_RESULT(ReadRefType(&type, "ref.is_null type")); + CALLBACK(OnRefIsNullExpr, type); + CALLBACK(OnOpcodeType, type); break; } @@ -2184,7 +2197,7 @@ Result BinaryReader::ReadElemSection(Offset section_size) { if ((flags & (SegPassive | SegExplicitIndex)) == SegExplicitIndex) { CHECK_RESULT(ReadIndex(&table_index, "elem segment table index")); } - Type elem_type = Type::Funcref; + Type elem_type = Type::FuncRef; CALLBACK(BeginElemSegment, i, table_index, flags); @@ -2197,17 +2210,14 @@ Result BinaryReader::ReadElemSection(Offset section_size) { // For backwards compat we support not declaring the element kind. if (flags & (SegPassive | SegExplicitIndex)) { if (flags & SegUseElemExprs) { - CHECK_RESULT(ReadType(&elem_type, "table elem type")); - ERROR_UNLESS(elem_type.IsRef(), - "segment elem expr type must be a reference type (got %s)", - elem_type.GetName()); + CHECK_RESULT(ReadRefType(&elem_type, "table elem type")); } else { ExternalKind kind; CHECK_RESULT(ReadExternalKind(&kind, "export kind")); ERROR_UNLESS(kind == ExternalKind::Func, "segment elem type must be func (%s)", elem_type.GetName()); - elem_type = Type::Funcref; + elem_type = Type::FuncRef; } } @@ -2222,7 +2232,9 @@ Result BinaryReader::ReadElemSection(Offset section_size) { Opcode opcode; CHECK_RESULT(ReadOpcode(&opcode, "elem expr opcode")); if (opcode == Opcode::RefNull) { - CALLBACK(OnElemSegmentElemExpr_RefNull, i); + Type type; + CHECK_RESULT(ReadRefType(&type, "elem expr ref.null type")); + CALLBACK(OnElemSegmentElemExpr_RefNull, i, type); } else if (opcode == Opcode::RefFunc) { Index func_index; CHECK_RESULT(ReadIndex(&func_index, "elem expr func index")); diff --git a/src/binary-reader.h b/src/binary-reader.h index 405387ba..eae1e87d 100644 --- a/src/binary-reader.h +++ b/src/binary-reader.h @@ -199,6 +199,7 @@ class BinaryReaderDelegate { virtual Result OnOpcodeF64(uint64_t value) = 0; virtual Result OnOpcodeV128(v128 value) = 0; virtual Result OnOpcodeBlockSig(Type sig_type) = 0; + virtual Result OnOpcodeType(Type type) = 0; virtual Result OnAtomicLoadExpr(Opcode opcode, uint32_t alignment_log2, Address offset) = 0; @@ -265,8 +266,8 @@ class BinaryReaderDelegate { virtual Result OnTableSizeExpr(Index table_index) = 0; virtual Result OnTableFillExpr(Index table_index) = 0; virtual Result OnRefFuncExpr(Index func_index) = 0; - virtual Result OnRefNullExpr() = 0; - virtual Result OnRefIsNullExpr() = 0; + virtual Result OnRefNullExpr(Type type) = 0; + virtual Result OnRefIsNullExpr(Type type) = 0; virtual Result OnNopExpr() = 0; virtual Result OnRethrowExpr() = 0; virtual Result OnReturnExpr() = 0; @@ -304,7 +305,8 @@ class BinaryReaderDelegate { virtual Result EndElemSegmentInitExpr(Index index) = 0; virtual Result OnElemSegmentElemType(Index index, Type elem_type) = 0; virtual Result OnElemSegmentElemExprCount(Index index, Index count) = 0; - virtual Result OnElemSegmentElemExpr_RefNull(Index segment_index) = 0; + virtual Result OnElemSegmentElemExpr_RefNull(Index segment_index, + Type type) = 0; virtual Result OnElemSegmentElemExpr_RefFunc(Index segment_index, Index func_index) = 0; virtual Result EndElemSegment(Index index) = 0; @@ -425,7 +427,7 @@ class BinaryReaderDelegate { virtual Result OnInitExprGlobalGetExpr(Index index, Index global_index) = 0; virtual Result OnInitExprI32ConstExpr(Index index, uint32_t value) = 0; virtual Result OnInitExprI64ConstExpr(Index index, uint64_t value) = 0; - virtual Result OnInitExprRefNull(Index index) = 0; + virtual Result OnInitExprRefNull(Index index, Type type) = 0; virtual Result OnInitExprRefFunc(Index index, Index func_index) = 0; const State* state = nullptr; diff --git a/src/binary-writer-spec.cc b/src/binary-writer-spec.cc index 27c83767..4499e0ff 100644 --- a/src/binary-writer-spec.cc +++ b/src/binary-writer-spec.cc @@ -56,6 +56,7 @@ class BinaryWriterSpec { void WriteTypeObject(Type type); void WriteF32(uint32_t, ExpectedNan); void WriteF64(uint64_t, ExpectedNan); + void WriteRefBits(uintptr_t ref_bits); void WriteConst(const Const& const_); void WriteConstVector(const ConstVector& consts); void WriteAction(const Action& action); @@ -194,6 +195,14 @@ void BinaryWriterSpec::WriteF64(uint64_t f64_bits, ExpectedNan expected) { } } +void BinaryWriterSpec::WriteRefBits(uintptr_t ref_bits) { + if (ref_bits == Const::kRefNullBits) { + json_stream_->Writef("\"null\""); + } else { + json_stream_->Writef("\"%" PRIu64 "\"", ref_bits); + } +} + void BinaryWriterSpec::WriteConst(const Const& const_) { json_stream_->Writef("{"); WriteKey("type"); @@ -229,28 +238,19 @@ void BinaryWriterSpec::WriteConst(const Const& const_) { WriteF64(const_.f64_bits(), const_.expected_nan()); break; - case Type::Nullref: - WriteString("nullref"); - WriteSeparator(); - WriteKey("value"); - json_stream_->Writef("\"0\""); - break; - - case Type::Funcref: { + case Type::FuncRef: { WriteString("funcref"); WriteSeparator(); WriteKey("value"); - int64_t ref_bits = static_cast<int64_t>(const_.ref_bits()); - json_stream_->Writef("\"%" PRIu64 "\"", ref_bits); + WriteRefBits(const_.ref_bits()); break; } - case Type::Hostref: { - WriteString("hostref"); + case Type::ExternRef: { + WriteString("externref"); WriteSeparator(); WriteKey("value"); - int64_t ref_bits = static_cast<int64_t>(const_.ref_bits()); - json_stream_->Writef("\"%" PRIu64 "\"", ref_bits); + WriteRefBits(const_.ref_bits()); break; } diff --git a/src/binary-writer.cc b/src/binary-writer.cc index 03ee2147..b574402c 100644 --- a/src/binary-writer.cc +++ b/src/binary-writer.cc @@ -681,10 +681,12 @@ void BinaryWriter::WriteExpr(const Func* func, const Expr* expr) { } case ExprType::RefNull: { WriteOpcode(stream_, Opcode::RefNull); + WriteType(stream_, cast<RefNullExpr>(expr)->type, "ref.null type"); break; } case ExprType::RefIsNull: { WriteOpcode(stream_, Opcode::RefIsNull); + WriteType(stream_, cast<RefIsNullExpr>(expr)->type, "ref.is_null type"); break; } case ExprType::Nop: @@ -1126,6 +1128,7 @@ Result BinaryWriter::WriteModule() { switch (elem_expr.kind) { case ElemExprKind::RefNull: WriteOpcode(stream_, Opcode::RefNull); + WriteType(stream_, elem_expr.type, "elem expr ref.null type"); break; case ElemExprKind::RefFunc: diff --git a/src/decompiler-ls.h b/src/decompiler-ls.h index e58f6da1..b9261e8b 100644 --- a/src/decompiler-ls.h +++ b/src/decompiler-ls.h @@ -37,10 +37,9 @@ inline const char *GetDecompTypeName(Type t) { case Type::F64: return "double"; case Type::V128: return "simd"; case Type::Func: return "func"; - case Type::Funcref: return "funcref"; - case Type::Anyref: return "anyref"; - case Type::Nullref: return "nullref"; - case Type::Exnref: return "exnref"; + case Type::FuncRef: return "funcref"; + case Type::ExternRef: return "externref"; + case Type::ExnRef: return "exnref"; case Type::Void: return "void"; default: return "ILLEGAL"; } diff --git a/src/feature.def b/src/feature.def index 880ccde9..7e46c2e2 100644 --- a/src/feature.def +++ b/src/feature.def @@ -31,6 +31,6 @@ WABT_FEATURE(threads, "threads", false, "Threading su WABT_FEATURE(multi_value, "multi-value", true, "Multi-value") WABT_FEATURE(tail_call, "tail-call", false, "Tail-call support") WABT_FEATURE(bulk_memory, "bulk-memory", false, "Bulk-memory operations") -WABT_FEATURE(reference_types, "reference-types", false, "Reference types (anyref)") +WABT_FEATURE(reference_types, "reference-types", false, "Reference types (externref)") WABT_FEATURE(annotations, "annotations", false, "Custom annotation syntax") WABT_FEATURE(gc, "gc", false, "Garbage collection") diff --git a/src/interp/binary-reader-interp.cc b/src/interp/binary-reader-interp.cc index 96eaeadd..20a8368c 100644 --- a/src/interp/binary-reader-interp.cc +++ b/src/interp/binary-reader-interp.cc @@ -191,8 +191,8 @@ class BinaryReaderInterp : public BinaryReaderNop { Result OnMemoryInitExpr(Index segment_index) override; Result OnMemorySizeExpr() override; Result OnRefFuncExpr(Index func_index) override; - Result OnRefNullExpr() override; - Result OnRefIsNullExpr() override; + Result OnRefNullExpr(Type type) override; + Result OnRefIsNullExpr(Type type) override; Result OnNopExpr() override; Result OnReturnExpr() override; Result OnSelectExpr(Type result_type) override; @@ -224,7 +224,7 @@ class BinaryReaderInterp : public BinaryReaderNop { Result EndElemSegmentInitExpr(Index index) override; Result OnElemSegmentElemType(Index index, Type elem_type) override; Result OnElemSegmentElemExprCount(Index index, Index count) override; - Result OnElemSegmentElemExpr_RefNull(Index segment_index) override; + Result OnElemSegmentElemExpr_RefNull(Index segment_index, Type type) override; Result OnElemSegmentElemExpr_RefFunc(Index segment_index, Index func_index) override; @@ -243,7 +243,7 @@ class BinaryReaderInterp : public BinaryReaderNop { Result OnInitExprGlobalGetExpr(Index index, Index global_index) override; Result OnInitExprI32ConstExpr(Index index, uint32_t value) override; Result OnInitExprI64ConstExpr(Index index, uint64_t value) override; - Result OnInitExprRefNull(Index index) override; + Result OnInitExprRefNull(Index index, Type type) override; Result OnInitExprRefFunc(Index index, Index func_index) override; private: @@ -582,7 +582,7 @@ Result BinaryReaderInterp::EndGlobalInitExpr(Index index) { break; case InitExprKind::RefNull: - CHECK_RESULT(validator_.OnGlobalInitExpr_RefNull(loc)); + CHECK_RESULT(validator_.OnGlobalInitExpr_RefNull(loc, init_expr_.type_)); break; case InitExprKind::RefFunc: @@ -640,8 +640,9 @@ Result BinaryReaderInterp::OnInitExprI64ConstExpr(Index index, uint64_t value) { return Result::Ok; } -Result BinaryReaderInterp::OnInitExprRefNull(Index index) { +Result BinaryReaderInterp::OnInitExprRefNull(Index index, Type type) { init_expr_.kind = InitExprKind::RefNull; + init_expr_.type_ = type; return Result::Ok; } @@ -731,8 +732,9 @@ Result BinaryReaderInterp::OnElemSegmentElemExprCount(Index index, return Result::Ok; } -Result BinaryReaderInterp::OnElemSegmentElemExpr_RefNull(Index segment_index) { - CHECK_RESULT(validator_.OnElemSegmentElemExpr_RefNull(loc)); +Result BinaryReaderInterp::OnElemSegmentElemExpr_RefNull(Index segment_index, + Type type) { + CHECK_RESULT(validator_.OnElemSegmentElemExpr_RefNull(loc, type)); ElemDesc& elem = module_.elems.back(); elem.elements.push_back(ElemExpr{ElemKind::RefNull, 0}); return Result::Ok; @@ -1232,14 +1234,14 @@ Result BinaryReaderInterp::OnRefFuncExpr(Index func_index) { return Result::Ok; } -Result BinaryReaderInterp::OnRefNullExpr() { - CHECK_RESULT(validator_.OnRefNull(loc)); +Result BinaryReaderInterp::OnRefNullExpr(Type type) { + CHECK_RESULT(validator_.OnRefNull(loc, type)); istream_.Emit(Opcode::RefNull); return Result::Ok; } -Result BinaryReaderInterp::OnRefIsNullExpr() { - CHECK_RESULT(validator_.OnRefIsNull(loc)); +Result BinaryReaderInterp::OnRefIsNullExpr(Type type) { + CHECK_RESULT(validator_.OnRefIsNull(loc, type)); istream_.Emit(Opcode::RefIsNull); return Result::Ok; } diff --git a/src/interp/interp-inl.h b/src/interp/interp-inl.h index 7650ff1b..0d306ebe 100644 --- a/src/interp/interp-inl.h +++ b/src/interp/interp-inl.h @@ -365,16 +365,9 @@ template <typename T> void RequireType(ValueType type) { } inline bool TypesMatch(ValueType expected, ValueType actual) { - if (expected == actual) { - return true; - } - if (!IsReference(expected)) { - return false; - } - if (expected == ValueType::Anyref || actual == ValueType::Nullref) { - return true; - } - return false; + // Currently there is no subtyping, so expected and actual must match + // exactly. In the future this may be expanded. + return expected == actual; } //// Value //// diff --git a/src/interp/interp-util.cc b/src/interp/interp-util.cc index 60f17152..5b9e702b 100644 --- a/src/interp/interp-util.cc +++ b/src/interp/interp-util.cc @@ -49,20 +49,14 @@ std::string TypedValueToString(const TypedValue& tv) { case Type::I16: // For SIMD lane. return StringPrintf("i16:%u", tv.value.Get<u32>() & 0xffff); - case Type::Nullref: - return StringPrintf("nullref"); - - case Type::Hostref: - return StringPrintf("hostref:%" PRIzd, tv.value.Get<Ref>().index); - - case Type::Funcref: + case Type::FuncRef: return StringPrintf("funcref:%" PRIzd, tv.value.Get<Ref>().index); - case Type::Exnref: - return StringPrintf("exnref:%" PRIzd, tv.value.Get<Ref>().index); + case Type::ExternRef: + return StringPrintf("externref:%" PRIzd, tv.value.Get<Ref>().index); - case Type::Anyref: - return StringPrintf("anyref:%" PRIzd, tv.value.Get<Ref>().index); + case Type::ExnRef: + return StringPrintf("exnref:%" PRIzd, tv.value.Get<Ref>().index); case Type::Func: case Type::Struct: diff --git a/src/interp/interp-wasm-c-api.cc b/src/interp/interp-wasm-c-api.cc index 193f1144..e3c7b620 100644 --- a/src/interp/interp-wasm-c-api.cc +++ b/src/interp/interp-wasm-c-api.cc @@ -310,9 +310,9 @@ static ValueType ToWabtValueType(wasm_valkind_t kind) { case WASM_F64: return ValueType::F64; case WASM_ANYREF: - return ValueType::Anyref; + return ValueType::ExternRef; case WASM_FUNCREF: - return ValueType::Funcref; + return ValueType::FuncRef; default: TRACE("unexpected wasm_valkind_t: %d", kind); WABT_UNREACHABLE; @@ -330,11 +330,9 @@ static wasm_valkind_t FromWabtValueType(ValueType type) { return WASM_F32; case ValueType::F64: return WASM_F64; - case ValueType::Anyref: - case ValueType::Hostref: - case ValueType::Nullref: + case ValueType::ExternRef: return WASM_ANYREF; - case ValueType::Funcref: + case ValueType::FuncRef: return WASM_FUNCREF; default: WABT_UNREACHABLE; @@ -431,30 +429,16 @@ static wasm_val_t FromWabtValue(Store& store, const TypedValue& tv) { out_value.kind = WASM_F64; out_value.of.f64 = tv.value.Get<f64>(); break; - case Type::Anyref: - case Type::Funcref: - case Type::Hostref: - case Type::Nullref: { + case Type::FuncRef: { Ref ref = tv.value.Get<Ref>(); - // Get the actual type for this reference; tv.type uses the function - // signature, which may be to general (e.g. anyref). - Type type = store.GetValueType(ref); - out_value.kind = FromWabtValueType(type); - switch (type) { - case Type::Funcref: - out_value.of.ref = new wasm_func_t(store.UnsafeGet<Func>(ref)); - break; - - case Type::Hostref: - out_value.of.ref = new wasm_foreign_t(store.UnsafeGet<Foreign>(ref)); - break; - - case Type::Nullref: - out_value.of.ref = nullptr; - break; - - default: WABT_UNREACHABLE; - } + out_value.kind = WASM_FUNCREF; + out_value.of.ref = new wasm_func_t(store.UnsafeGet<Func>(ref)); + break; + } + case Type::ExternRef: { + Ref ref = tv.value.Get<Ref>(); + out_value.kind = WASM_ANYREF; + out_value.of.ref = new wasm_foreign_t(store.UnsafeGet<Foreign>(ref)); break; } default: diff --git a/src/interp/interp.cc b/src/interp/interp.cc index d9cb9797..7aee6012 100644 --- a/src/interp/interp.cc +++ b/src/interp/interp.cc @@ -204,7 +204,7 @@ bool Store::HasValueType(Ref ref, ValueType type) const { if (!IsValid(ref)) { return false; } - if (type == ValueType::Anyref) { + if (type == ValueType::ExternRef) { return true; } if (ref == Ref::Null) { @@ -213,29 +213,16 @@ bool Store::HasValueType(Ref ref, ValueType type) const { Object* obj = objects_.Get(ref.index).get(); switch (type) { - case ValueType::Funcref: + case ValueType::FuncRef: return obj->kind() == ObjectKind::DefinedFunc || obj->kind() == ObjectKind::HostFunc; - case ValueType::Nullref: - return ref.index == 0; - case ValueType::Exnref: // TODO + case ValueType::ExnRef: // TODO return false; default: return false; } } -ValueType Store::GetValueType(Ref ref) const { - Object* obj = objects_.Get(ref.index).get(); - switch (obj->kind()) { - case ObjectKind::Null: return ValueType::Nullref; - case ObjectKind::Foreign: return ValueType::Hostref; - case ObjectKind::DefinedFunc: - case ObjectKind::HostFunc: return ValueType::Funcref; - default: return ValueType::Anyref; - } -} - Store::RootList::Index Store::NewRoot(Ref ref) { return roots_.New(ref); } @@ -2210,10 +2197,9 @@ std::string Thread::TraceSource::Pick(Index index, Instr instr) { v.u32(2), v.u32(3)); } - case ValueType::Nullref: reftype = "nullref"; break; - case ValueType::Funcref: reftype = "funcref"; break; - case ValueType::Exnref: reftype = "exnref"; break; - case ValueType::Anyref: reftype = "anyref"; break; + case ValueType::FuncRef: reftype = "funcref"; break; + case ValueType::ExternRef: reftype = "externref"; break; + case ValueType::ExnRef: reftype = "exnref"; break; default: WABT_UNREACHABLE; diff --git a/src/interp/interp.h b/src/interp/interp.h index ec7a6f78..8ebd43df 100644 --- a/src/interp/interp.h +++ b/src/interp/interp.h @@ -115,6 +115,7 @@ struct InitExpr { f64 f64_; v128 v128_; Index index_; + Type type_; }; }; @@ -426,7 +427,6 @@ class Store { bool IsValid(Ref) const; bool HasValueType(Ref, ValueType) const; - ValueType GetValueType(Ref) const; template <typename T> bool Is(Ref) const; @@ -641,7 +641,7 @@ void Var::Destroy() { uint8_t ElemSegment::GetFlags(const Module* module) const { uint8_t flags = 0; - bool all_ref_func = elem_type == Type::Funcref; + bool all_ref_func = elem_type == Type::FuncRef; switch (kind) { case SegmentKind::Active: { @@ -74,6 +74,8 @@ struct Var { typedef std::vector<Var> VarVector; struct Const { + static constexpr uintptr_t kRefNullBits = ~uintptr_t(0); + Const() : Const(Type::I32, uint32_t(0)) {} static Const I32(uint32_t val = 0, const Location& loc = Location()) { @@ -132,9 +134,9 @@ struct Const { // Only used for expectations. (e.g. wast assertions) void set_f32(ExpectedNan nan) { set_f32(0); set_expected_nan(0, nan); } void set_f64(ExpectedNan nan) { set_f64(0); set_expected_nan(0, nan); } - void set_hostref(uintptr_t x) { From(Type::Hostref, x); } - void set_nullref() { From<uintptr_t>(Type::Nullref, 0); } - void set_funcref() { From<uintptr_t>(Type::Funcref, 0); } + void set_funcref() { From<uintptr_t>(Type::FuncRef, 0); } + void set_externref(uintptr_t x) { From(Type::ExternRef, x); } + void set_null(Type type) { From<uintptr_t>(type, kRefNullBits); } bool is_expected_nan(int lane = 0) const { return expected_nan(lane) != ExpectedNan::None; @@ -396,8 +398,18 @@ typedef ExprMixin<ExprType::Nop> NopExpr; typedef ExprMixin<ExprType::Rethrow> RethrowExpr; typedef ExprMixin<ExprType::Return> ReturnExpr; typedef ExprMixin<ExprType::Unreachable> UnreachableExpr; -typedef ExprMixin<ExprType::RefNull> RefNullExpr; -typedef ExprMixin<ExprType::RefIsNull> RefIsNullExpr; + +template <ExprType TypeEnum> +class RefTypeExpr : public ExprMixin<TypeEnum> { + public: + RefTypeExpr(Type type, const Location& loc = Location()) + : ExprMixin<TypeEnum>(loc), type(type) {} + + Type type; +}; + +typedef RefTypeExpr<ExprType::RefNull> RefNullExpr; +typedef RefTypeExpr<ExprType::RefIsNull> RefIsNullExpr; template <ExprType TypeEnum> class OpcodeExpr : public ExprMixin<TypeEnum> { @@ -707,7 +719,7 @@ struct Global { struct Table { explicit Table(string_view name) - : name(name.to_string()), elem_type(Type::Funcref) {} + : name(name.to_string()), elem_type(Type::FuncRef) {} std::string name; Limits elem_limits; @@ -720,11 +732,13 @@ enum class ElemExprKind { }; struct ElemExpr { - ElemExpr() : kind(ElemExprKind::RefNull) {} + ElemExpr() : kind(ElemExprKind::RefNull), type(Type::FuncRef) {} explicit ElemExpr(Var var) : kind(ElemExprKind::RefFunc), var(var) {} + explicit ElemExpr(Type type) : kind(ElemExprKind::RefNull), type(type) {} ElemExprKind kind; - Var var; // Only used when kind == RefFunc. + Var var; // Only used when kind == RefFunc. + Type type; // Only used when kind == RefNull }; typedef std::vector<ElemExpr> ElemExprVector; diff --git a/src/lexer-keywords.txt b/src/lexer-keywords.txt index edb319ba..fbf87ebe 100644 --- a/src/lexer-keywords.txt +++ b/src/lexer-keywords.txt @@ -4,6 +4,8 @@ struct TokenInfo { : name(name), token_type(token_type) {} TokenInfo(const char* name, Type value_type) : name(name), token_type(TokenType::ValueType), value_type(value_type) {} + TokenInfo(const char* name, Type value_type, TokenType token_type) + : name(name), token_type(token_type), value_type(value_type) {} TokenInfo(const char* name, TokenType token_type, Opcode opcode) : name(name), token_type(token_type), opcode(opcode) {} @@ -15,8 +17,7 @@ struct TokenInfo { }; }; %% -anyref, Type::Anyref -array, TokenType::Array +array, Type::Array, TokenType::Array assert_exhaustion, TokenType::AssertExhaustion assert_invalid, TokenType::AssertInvalid assert_malformed, TokenType::AssertMalformed @@ -45,7 +46,10 @@ elem, TokenType::Elem else, TokenType::Else, Opcode::Else end, TokenType::End, Opcode::End event, TokenType::Event -exnref, Type::Exnref +exn, Type::ExnRef, TokenType::Exn +exnref, Type::ExnRef +extern, Type::ExternRef, TokenType::Extern +externref, Type::ExternRef export, TokenType::Export f32.abs, TokenType::Unary, Opcode::F32Abs f32.add, TokenType::Binary, Opcode::F32Add @@ -148,8 +152,8 @@ f64x2.sqrt, TokenType::Unary, Opcode::F64X2Sqrt f64x2.sub, TokenType::Binary, Opcode::F64X2Sub f64x2, TokenType::F64X2 field, TokenType::Field -funcref, Type::Funcref -func, TokenType::Func +funcref, Type::FuncRef +func, Type::FuncRef, TokenType::Func get, TokenType::Get global.get, TokenType::GlobalGet, Opcode::GlobalGet global.set, TokenType::GlobalSet, Opcode::GlobalSet @@ -473,12 +477,11 @@ mut, TokenType::Mut nan:arithmetic, TokenType::NanArithmetic nan:canonical, TokenType::NanCanonical nop, TokenType::Nop, Opcode::Nop -nullref, Type::Nullref offset, TokenType::Offset param, TokenType::Param quote, TokenType::Quote +ref.extern, TokenType::RefExtern ref.func, TokenType::RefFunc, Opcode::RefFunc -ref.host, TokenType::RefHost ref.is_null, TokenType::RefIsNull, Opcode::RefIsNull ref.null, TokenType::RefNull, Opcode::RefNull register, TokenType::Register @@ -490,7 +493,7 @@ return, TokenType::Return, Opcode::Return select, TokenType::Select, Opcode::Select shared, TokenType::Shared start, TokenType::Start -struct, TokenType::Struct +struct, Type::Struct, TokenType::Struct table.copy, TokenType::TableCopy, Opcode::TableCopy table.fill, TokenType::TableFill, Opcode::TableFill table.get, TokenType::TableGet, Opcode::TableGet @@ -521,7 +524,7 @@ v8x16.load_splat, TokenType::Load, Opcode::V8X16LoadSplat v8x16.shuffle, TokenType::SimdShuffleOp, Opcode::V8X16Shuffle v8x16.swizzle, TokenType::Binary, Opcode::V8X16Swizzle # Deprecated names. -anyfunc, Type::Funcref +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 diff --git a/src/prebuilt/lexer-keywords.cc b/src/prebuilt/lexer-keywords.cc index 5f695a43..adbe2248 100644 --- a/src/prebuilt/lexer-keywords.cc +++ b/src/prebuilt/lexer-keywords.cc @@ -36,6 +36,8 @@ struct TokenInfo { : name(name), token_type(token_type) {} TokenInfo(const char* name, Type value_type) : name(name), token_type(TokenType::ValueType), value_type(value_type) {} + TokenInfo(const char* name, Type value_type, TokenType token_type) + : name(name), token_type(token_type), value_type(value_type) {} TokenInfo(const char* name, TokenType token_type, Opcode opcode) : name(name), token_type(token_type), opcode(opcode) {} @@ -46,7 +48,7 @@ struct TokenInfo { Opcode opcode; }; }; -/* maximum key range = 2173, duplicates = 0 */ +/* maximum key range = 2156, duplicates = 0 */ class Perfect_Hash { @@ -61,32 +63,32 @@ Perfect_Hash::hash (const char *str, size_t len) { static unsigned short asso_values[] = { - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 9, 42, 2196, 111, - 10, 137, 9, 385, 126, 321, 259, 525, 12, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 9, 15, 63, 12, 110, - 22, 15, 9, 401, 552, 12, 96, 18, 39, 10, - 26, 63, 334, 479, 57, 9, 9, 11, 41, 17, - 315, 431, 92, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, 2196, - 2196, 2196, 2196, 2196, 2196, 2196, 2196 + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 17, 27, 2179, 44, + 10, 94, 9, 392, 162, 310, 240, 516, 11, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 49, 11, 77, 46, 91, + 14, 9, 9, 508, 515, 12, 48, 14, 59, 22, + 20, 11, 416, 585, 10, 12, 12, 25, 101, 22, + 314, 331, 77, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, 2179, + 2179, 2179, 2179, 2179, 2179, 2179, 2179 }; unsigned int hval = len; @@ -150,11 +152,11 @@ Perfect_Hash::InWordSet (const char *str, size_t len) { enum { - TOTAL_KEYWORDS = 544, + TOTAL_KEYWORDS = 545, MIN_WORD_LENGTH = 2, MAX_WORD_LENGTH = 26, MIN_HASH_VALUE = 23, - MAX_HASH_VALUE = 2195 + MAX_HASH_VALUE = 2178 }; static struct TokenInfo wordlist[] = @@ -162,1428 +164,1413 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 456 "src/lexer-keywords.txt" +#line 460 "src/lexer-keywords.txt" {"if", TokenType::If, Opcode::If}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 130 "src/lexer-keywords.txt" + {""}, {""}, {""}, +#line 42 "src/lexer-keywords.txt" + {"do", TokenType::Do}, + {""}, {""}, +#line 134 "src/lexer-keywords.txt" {"f64", Type::F64}, -#line 472 "src/lexer-keywords.txt" - {"mut", TokenType::Mut}, -#line 79 "src/lexer-keywords.txt" + {""}, +#line 83 "src/lexer-keywords.txt" {"f32", Type::F32}, -#line 406 "src/lexer-keywords.txt" +#line 410 "src/lexer-keywords.txt" {"i64", Type::I64}, - {""}, -#line 276 "src/lexer-keywords.txt" +#line 46 "src/lexer-keywords.txt" + {"else", TokenType::Else, Opcode::Else}, +#line 280 "src/lexer-keywords.txt" {"i32", Type::I32}, - {""}, {""}, {""}, {""}, {""}, -#line 459 "src/lexer-keywords.txt" - {"item", TokenType::Item}, - {""}, + {""}, {""}, {""}, {""}, +#line 47 "src/lexer-keywords.txt" + {"end", TokenType::End, Opcode::End}, + {""}, {""}, {""}, #line 45 "src/lexer-keywords.txt" - {"else", TokenType::Else, Opcode::Else}, -#line 44 "src/lexer-keywords.txt" {"elem", TokenType::Elem}, - {""}, {""}, {""}, {""}, {""}, -#line 501 "src/lexer-keywords.txt" - {"table", TokenType::Table}, - {""}, -#line 117 "src/lexer-keywords.txt" - {"f64.lt", TokenType::Compare, Opcode::F64Lt}, -#line 67 "src/lexer-keywords.txt" - {"f32.lt", TokenType::Compare, Opcode::F32Lt}, -#line 502 "src/lexer-keywords.txt" +#line 505 "src/lexer-keywords.txt" {"then", TokenType::Then}, -#line 47 "src/lexer-keywords.txt" - {"event", TokenType::Event}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 46 "src/lexer-keywords.txt" - {"end", TokenType::End, Opcode::End}, - {""}, -#line 115 "src/lexer-keywords.txt" - {"f64.le", TokenType::Compare, Opcode::F64Le}, -#line 65 "src/lexer-keywords.txt" - {"f32.le", TokenType::Compare, Opcode::F32Le}, -#line 150 "src/lexer-keywords.txt" +#line 154 "src/lexer-keywords.txt" {"field", TokenType::Field}, -#line 101 "src/lexer-keywords.txt" - {"f64.abs", TokenType::Unary, Opcode::F64Abs}, -#line 50 "src/lexer-keywords.txt" - {"f32.abs", TokenType::Unary, Opcode::F32Abs}, -#line 128 "src/lexer-keywords.txt" - {"f64.sub", TokenType::Binary, Opcode::F64Sub}, -#line 77 "src/lexer-keywords.txt" - {"f32.sub", TokenType::Binary, Opcode::F32Sub}, -#line 33 "src/lexer-keywords.txt" - {"br", TokenType::Br, Opcode::Br}, -#line 397 "src/lexer-keywords.txt" - {"i64.sub", TokenType::Binary, Opcode::I64Sub}, -#line 267 "src/lexer-keywords.txt" - {"i32.sub", TokenType::Binary, Opcode::I32Sub}, -#line 48 "src/lexer-keywords.txt" - {"exnref", Type::Exnref}, -#line 379 "src/lexer-keywords.txt" - {"i64.lt_s", TokenType::Compare, Opcode::I64LtS}, -#line 250 "src/lexer-keywords.txt" - {"i32.lt_s", TokenType::Compare, Opcode::I32LtS}, - {""}, -#line 471 "src/lexer-keywords.txt" - {"module", TokenType::Module}, -#line 380 "src/lexer-keywords.txt" - {"i64.lt_u", TokenType::Compare, Opcode::I64LtU}, -#line 251 "src/lexer-keywords.txt" - {"i32.lt_u", TokenType::Compare, Opcode::I32LtU}, -#line 370 "src/lexer-keywords.txt" - {"i64.le_s", TokenType::Compare, Opcode::I64LeS}, -#line 243 "src/lexer-keywords.txt" - {"i32.le_s", TokenType::Compare, Opcode::I32LeS}, +#line 463 "src/lexer-keywords.txt" + {"item", TokenType::Item}, {""}, -#line 151 "src/lexer-keywords.txt" - {"funcref", Type::Funcref}, -#line 371 "src/lexer-keywords.txt" - {"i64.le_u", TokenType::Compare, Opcode::I64LeU}, -#line 244 "src/lexer-keywords.txt" - {"i32.le_u", TokenType::Compare, Opcode::I32LeU}, -#line 41 "src/lexer-keywords.txt" - {"do", TokenType::Do}, +#line 476 "src/lexer-keywords.txt" + {"mut", TokenType::Mut}, {""}, {""}, -#line 499 "src/lexer-keywords.txt" - {"table.set", TokenType::TableSet, Opcode::TableSet}, +#line 49 "src/lexer-keywords.txt" + {"exn", Type::ExnRef, TokenType::Exn}, +#line 127 "src/lexer-keywords.txt" + {"f64.ne", TokenType::Compare, Opcode::F64Ne}, +#line 77 "src/lexer-keywords.txt" + {"f32.ne", TokenType::Compare, Opcode::F32Ne}, + {""}, #line 386 "src/lexer-keywords.txt" - {"i64.rem_s", TokenType::Binary, Opcode::I64RemS}, + {"i64.ne", TokenType::Compare, Opcode::I64Ne}, #line 257 "src/lexer-keywords.txt" - {"i32.rem_s", TokenType::Binary, Opcode::I32RemS}, - {""}, -#line 490 "src/lexer-keywords.txt" - {"select", TokenType::Select, Opcode::Select}, -#line 387 "src/lexer-keywords.txt" - {"i64.rem_u", TokenType::Binary, Opcode::I64RemU}, -#line 258 "src/lexer-keywords.txt" - {"i32.rem_u", TokenType::Binary, Opcode::I32RemU}, -#line 492 "src/lexer-keywords.txt" - {"start", TokenType::Start}, -#line 39 "src/lexer-keywords.txt" - {"data", TokenType::Data}, - {""}, -#line 485 "src/lexer-keywords.txt" - {"result", TokenType::Result}, - {""}, {""}, -#line 102 "src/lexer-keywords.txt" - {"f64.add", TokenType::Binary, Opcode::F64Add}, -#line 51 "src/lexer-keywords.txt" - {"f32.add", TokenType::Binary, Opcode::F32Add}, -#line 477 "src/lexer-keywords.txt" + {"i32.ne", TokenType::Compare, Opcode::I32Ne}, +#line 34 "src/lexer-keywords.txt" + {"br", TokenType::Br, Opcode::Br}, +#line 480 "src/lexer-keywords.txt" {"offset", TokenType::Offset}, -#line 315 "src/lexer-keywords.txt" - {"i64.add", TokenType::Binary, Opcode::I64Add}, -#line 200 "src/lexer-keywords.txt" - {"i32.add", TokenType::Binary, Opcode::I32Add}, -#line 498 "src/lexer-keywords.txt" - {"table.init", TokenType::TableInit, Opcode::TableInit}, +#line 48 "src/lexer-keywords.txt" + {"event", TokenType::Event}, {""}, -#line 316 "src/lexer-keywords.txt" - {"i64.and", TokenType::Binary, Opcode::I64And}, -#line 201 "src/lexer-keywords.txt" - {"i32.and", TokenType::Binary, Opcode::I32And}, -#line 493 "src/lexer-keywords.txt" - {"struct", TokenType::Struct}, +#line 50 "src/lexer-keywords.txt" + {"exnref", Type::ExnRef}, {""}, -#line 476 "src/lexer-keywords.txt" - {"nullref", Type::Nullref}, #line 119 "src/lexer-keywords.txt" - {"f64.min", TokenType::Binary, Opcode::F64Min}, + {"f64.le", TokenType::Compare, Opcode::F64Le}, #line 69 "src/lexer-keywords.txt" - {"f32.min", TokenType::Binary, Opcode::F32Min}, -#line 123 "src/lexer-keywords.txt" - {"f64.ne", TokenType::Compare, Opcode::F64Ne}, -#line 73 "src/lexer-keywords.txt" - {"f32.ne", TokenType::Compare, Opcode::F32Ne}, - {""}, -#line 382 "src/lexer-keywords.txt" - {"i64.ne", TokenType::Compare, Opcode::I64Ne}, -#line 253 "src/lexer-keywords.txt" - {"i32.ne", TokenType::Compare, Opcode::I32Ne}, -#line 32 "src/lexer-keywords.txt" - {"br_table", TokenType::BrTable, Opcode::BrTable}, + {"f32.le", TokenType::Compare, Opcode::F32Le}, +#line 496 "src/lexer-keywords.txt" + {"struct", Type::Struct, TokenType::Struct}, + {""}, {""}, {""}, +#line 121 "src/lexer-keywords.txt" + {"f64.lt", TokenType::Compare, Opcode::F64Lt}, +#line 71 "src/lexer-keywords.txt" + {"f32.lt", TokenType::Compare, Opcode::F32Lt}, {""}, {""}, -#line 357 "src/lexer-keywords.txt" - {"i64.div_s", TokenType::Binary, Opcode::I64DivS}, -#line 233 "src/lexer-keywords.txt" - {"i32.div_s", TokenType::Binary, Opcode::I32DivS}, - {""}, -#line 458 "src/lexer-keywords.txt" - {"invoke", TokenType::Invoke}, -#line 358 "src/lexer-keywords.txt" - {"i64.div_u", TokenType::Binary, Opcode::I64DivU}, -#line 234 "src/lexer-keywords.txt" - {"i32.div_u", TokenType::Binary, Opcode::I32DivU}, -#line 491 "src/lexer-keywords.txt" - {"shared", TokenType::Shared}, - {""}, -#line 489 "src/lexer-keywords.txt" +#line 488 "src/lexer-keywords.txt" + {"result", TokenType::Result}, +#line 155 "src/lexer-keywords.txt" + {"funcref", Type::FuncRef}, + {""}, {""}, {""}, +#line 51 "src/lexer-keywords.txt" + {"extern", Type::ExternRef, TokenType::Extern}, +#line 492 "src/lexer-keywords.txt" {"return", TokenType::Return, Opcode::Return}, -#line 110 "src/lexer-keywords.txt" - {"f64.div", TokenType::Binary, Opcode::F64Div}, -#line 60 "src/lexer-keywords.txt" - {"f32.div", TokenType::Binary, Opcode::F32Div}, +#line 504 "src/lexer-keywords.txt" + {"table", TokenType::Table}, +#line 475 "src/lexer-keywords.txt" + {"module", TokenType::Module}, {""}, -#line 29 "src/lexer-keywords.txt" - {"block", TokenType::Block, Opcode::Block}, - {""}, {""}, -#line 120 "src/lexer-keywords.txt" - {"f64.mul", TokenType::Binary, Opcode::F64Mul}, -#line 70 "src/lexer-keywords.txt" - {"f32.mul", TokenType::Binary, Opcode::F32Mul}, +#line 393 "src/lexer-keywords.txt" + {"i64.rotr", TokenType::Binary, Opcode::I64Rotr}, +#line 264 "src/lexer-keywords.txt" + {"i32.rotr", TokenType::Binary, Opcode::I32Rotr}, + {""}, {""}, {""}, {""}, +#line 131 "src/lexer-keywords.txt" + {"f64.store", TokenType::Store, Opcode::F64Store}, +#line 80 "src/lexer-keywords.txt" + {"f32.store", TokenType::Store, Opcode::F32Store}, {""}, -#line 381 "src/lexer-keywords.txt" - {"i64.mul", TokenType::Binary, Opcode::I64Mul}, -#line 252 "src/lexer-keywords.txt" - {"i32.mul", TokenType::Binary, Opcode::I32Mul}, - {""}, {""}, {""}, -#line 495 "src/lexer-keywords.txt" - {"table.fill", TokenType::TableFill, Opcode::TableFill}, -#line 152 "src/lexer-keywords.txt" - {"func", TokenType::Func}, - {""}, {""}, {""}, -#line 103 "src/lexer-keywords.txt" - {"f64.ceil", TokenType::Unary, Opcode::F64Ceil}, -#line 52 "src/lexer-keywords.txt" - {"f32.ceil", TokenType::Unary, Opcode::F32Ceil}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 400 "src/lexer-keywords.txt" + {"i64.store", TokenType::Store, Opcode::I64Store}, +#line 270 "src/lexer-keywords.txt" + {"i32.store", TokenType::Store, Opcode::I32Store}, {""}, -#line 104 "src/lexer-keywords.txt" +#line 489 "src/lexer-keywords.txt" + {"rethrow", TokenType::Rethrow, Opcode::Rethrow}, +#line 123 "src/lexer-keywords.txt" + {"f64.min", TokenType::Binary, Opcode::F64Min}, +#line 73 "src/lexer-keywords.txt" + {"f32.min", TokenType::Binary, Opcode::F32Min}, +#line 52 "src/lexer-keywords.txt" + {"externref", Type::ExternRef}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 398 "src/lexer-keywords.txt" + {"i64.store32", TokenType::Store, Opcode::I64Store32}, +#line 40 "src/lexer-keywords.txt" + {"data", TokenType::Data}, +#line 108 "src/lexer-keywords.txt" {"f64.const", TokenType::Const, Opcode::F64Const}, -#line 53 "src/lexer-keywords.txt" +#line 57 "src/lexer-keywords.txt" {"f32.const", TokenType::Const, Opcode::F32Const}, {""}, -#line 355 "src/lexer-keywords.txt" +#line 359 "src/lexer-keywords.txt" {"i64.const", TokenType::Const, Opcode::I64Const}, -#line 231 "src/lexer-keywords.txt" +#line 235 "src/lexer-keywords.txt" {"i32.const", TokenType::Const, Opcode::I32Const}, -#line 149 "src/lexer-keywords.txt" +#line 106 "src/lexer-keywords.txt" + {"f64.add", TokenType::Binary, Opcode::F64Add}, +#line 55 "src/lexer-keywords.txt" + {"f32.add", TokenType::Binary, Opcode::F32Add}, +#line 493 "src/lexer-keywords.txt" + {"select", TokenType::Select, Opcode::Select}, +#line 319 "src/lexer-keywords.txt" + {"i64.add", TokenType::Binary, Opcode::I64Add}, +#line 204 "src/lexer-keywords.txt" + {"i32.add", TokenType::Binary, Opcode::I32Add}, + {""}, {""}, {""}, {""}, +#line 320 "src/lexer-keywords.txt" + {"i64.and", TokenType::Binary, Opcode::I64And}, +#line 205 "src/lexer-keywords.txt" + {"i32.and", TokenType::Binary, Opcode::I32And}, +#line 156 "src/lexer-keywords.txt" + {"func", Type::FuncRef, TokenType::Func}, + {""}, {""}, +#line 153 "src/lexer-keywords.txt" {"f64x2", TokenType::F64X2}, {""}, {""}, -#line 419 "src/lexer-keywords.txt" +#line 423 "src/lexer-keywords.txt" {"i64x2", TokenType::I64X2}, +#line 495 "src/lexer-keywords.txt" + {"start", TokenType::Start}, +#line 494 "src/lexer-keywords.txt" + {"shared", TokenType::Shared}, +#line 374 "src/lexer-keywords.txt" + {"i64.le_s", TokenType::Compare, Opcode::I64LeS}, +#line 247 "src/lexer-keywords.txt" + {"i32.le_s", TokenType::Compare, Opcode::I32LeS}, +#line 30 "src/lexer-keywords.txt" + {"block", TokenType::Block, Opcode::Block}, +#line 383 "src/lexer-keywords.txt" + {"i64.lt_s", TokenType::Compare, Opcode::I64LtS}, +#line 254 "src/lexer-keywords.txt" + {"i32.lt_s", TokenType::Compare, Opcode::I32LtS}, +#line 502 "src/lexer-keywords.txt" + {"table.set", TokenType::TableSet, Opcode::TableSet}, {""}, {""}, -#line 481 "src/lexer-keywords.txt" - {"ref.host", TokenType::RefHost}, -#line 500 "src/lexer-keywords.txt" - {"table.size", TokenType::TableSize, Opcode::TableSize}, - {""}, -#line 486 "src/lexer-keywords.txt" - {"rethrow", TokenType::Rethrow, Opcode::Rethrow}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 388 "src/lexer-keywords.txt" - {"i64.rotl", TokenType::Binary, Opcode::I64Rotl}, -#line 259 "src/lexer-keywords.txt" - {"i32.rotl", TokenType::Binary, Opcode::I32Rotl}, - {""}, {""}, -#line 35 "src/lexer-keywords.txt" - {"call", TokenType::Call, Opcode::Call}, +#line 105 "src/lexer-keywords.txt" + {"f64.abs", TokenType::Unary, Opcode::F64Abs}, +#line 54 "src/lexer-keywords.txt" + {"f32.abs", TokenType::Unary, Opcode::F32Abs}, + {""}, {""}, {""}, +#line 390 "src/lexer-keywords.txt" + {"i64.rem_s", TokenType::Binary, Opcode::I64RemS}, +#line 261 "src/lexer-keywords.txt" + {"i32.rem_s", TokenType::Binary, Opcode::I32RemS}, {""}, {""}, -#line 127 "src/lexer-keywords.txt" - {"f64.store", TokenType::Store, Opcode::F64Store}, -#line 76 "src/lexer-keywords.txt" - {"f32.store", TokenType::Store, Opcode::F32Store}, - {""}, -#line 396 "src/lexer-keywords.txt" - {"i64.store", TokenType::Store, Opcode::I64Store}, -#line 266 "src/lexer-keywords.txt" - {"i32.store", TokenType::Store, Opcode::I32Store}, +#line 501 "src/lexer-keywords.txt" + {"table.init", TokenType::TableInit, Opcode::TableInit}, {""}, {""}, {""}, -#line 463 "src/lexer-keywords.txt" - {"local", TokenType::Local}, +#line 132 "src/lexer-keywords.txt" + {"f64.sub", TokenType::Binary, Opcode::F64Sub}, +#line 81 "src/lexer-keywords.txt" + {"f32.sub", TokenType::Binary, Opcode::F32Sub}, {""}, -#line 394 "src/lexer-keywords.txt" - {"i64.store32", TokenType::Store, Opcode::I64Store32}, -#line 116 "src/lexer-keywords.txt" +#line 401 "src/lexer-keywords.txt" + {"i64.sub", TokenType::Binary, Opcode::I64Sub}, +#line 271 "src/lexer-keywords.txt" + {"i32.sub", TokenType::Binary, Opcode::I32Sub}, +#line 375 "src/lexer-keywords.txt" + {"i64.le_u", TokenType::Compare, Opcode::I64LeU}, +#line 248 "src/lexer-keywords.txt" + {"i32.le_u", TokenType::Compare, Opcode::I32LeU}, + {""}, +#line 384 "src/lexer-keywords.txt" + {"i64.lt_u", TokenType::Compare, Opcode::I64LtU}, +#line 255 "src/lexer-keywords.txt" + {"i32.lt_u", TokenType::Compare, Opcode::I32LtU}, +#line 120 "src/lexer-keywords.txt" {"f64.load", TokenType::Load, Opcode::F64Load}, -#line 66 "src/lexer-keywords.txt" +#line 70 "src/lexer-keywords.txt" {"f32.load", TokenType::Load, Opcode::F32Load}, -#line 512 "src/lexer-keywords.txt" - {"v128.not", TokenType::Unary, Opcode::V128Not}, -#line 378 "src/lexer-keywords.txt" + {""}, +#line 382 "src/lexer-keywords.txt" {"i64.load", TokenType::Load, Opcode::I64Load}, -#line 249 "src/lexer-keywords.txt" +#line 253 "src/lexer-keywords.txt" {"i32.load", TokenType::Load, Opcode::I32Load}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 148 "src/lexer-keywords.txt" - {"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub}, +#line 125 "src/lexer-keywords.txt" + {"f64.nearest", TokenType::Unary, Opcode::F64Nearest}, +#line 75 "src/lexer-keywords.txt" + {"f32.nearest", TokenType::Unary, Opcode::F32Nearest}, {""}, -#line 461 "src/lexer-keywords.txt" - {"local.set", TokenType::LocalSet, Opcode::LocalSet}, -#line 418 "src/lexer-keywords.txt" - {"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub}, - {""}, {""}, {""}, -#line 389 "src/lexer-keywords.txt" - {"i64.rotr", TokenType::Binary, Opcode::I64Rotr}, -#line 260 "src/lexer-keywords.txt" - {"i32.rotr", TokenType::Binary, Opcode::I32Rotr}, - {""}, {""}, -#line 144 "src/lexer-keywords.txt" +#line 391 "src/lexer-keywords.txt" + {"i64.rem_u", TokenType::Binary, Opcode::I64RemU}, +#line 262 "src/lexer-keywords.txt" + {"i32.rem_u", TokenType::Binary, Opcode::I32RemU}, + {""}, +#line 148 "src/lexer-keywords.txt" {"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne}, -#line 139 "src/lexer-keywords.txt" - {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt}, +#line 516 "src/lexer-keywords.txt" + {"v128.or", TokenType::Binary, Opcode::V128Or}, + {""}, {""}, +#line 107 "src/lexer-keywords.txt" + {"f64.ceil", TokenType::Unary, Opcode::F64Ceil}, +#line 56 "src/lexer-keywords.txt" + {"f32.ceil", TokenType::Unary, Opcode::F32Ceil}, {""}, -#line 462 "src/lexer-keywords.txt" - {"local.tee", TokenType::LocalTee, Opcode::LocalTee}, +#line 392 "src/lexer-keywords.txt" + {"i64.rotl", TokenType::Binary, Opcode::I64Rotl}, +#line 263 "src/lexer-keywords.txt" + {"i32.rotl", TokenType::Binary, Opcode::I32Rotl}, {""}, {""}, -#line 508 "src/lexer-keywords.txt" - {"v128.and", TokenType::Binary, Opcode::V128And}, - {""}, {""}, {""}, -#line 40 "src/lexer-keywords.txt" +#line 41 "src/lexer-keywords.txt" {"declare", TokenType::Declare}, - {""}, {""}, -#line 138 "src/lexer-keywords.txt" - {"f64x2.le", TokenType::Compare, Opcode::F64X2Le}, {""}, -#line 356 "src/lexer-keywords.txt" - {"i64.ctz", TokenType::Unary, Opcode::I64Ctz}, -#line 232 "src/lexer-keywords.txt" - {"i32.ctz", TokenType::Unary, Opcode::I32Ctz}, - {""}, {""}, -#line 141 "src/lexer-keywords.txt" - {"f64x2.min", TokenType::Binary, Opcode::F64X2Min}, +#line 124 "src/lexer-keywords.txt" + {"f64.mul", TokenType::Binary, Opcode::F64Mul}, +#line 74 "src/lexer-keywords.txt" + {"f32.mul", TokenType::Binary, Opcode::F32Mul}, + {""}, +#line 385 "src/lexer-keywords.txt" + {"i64.mul", TokenType::Binary, Opcode::I64Mul}, +#line 256 "src/lexer-keywords.txt" + {"i32.mul", TokenType::Binary, Opcode::I32Mul}, + {""}, {""}, {""}, +#line 462 "src/lexer-keywords.txt" + {"invoke", TokenType::Invoke}, {""}, {""}, {""}, {""}, -#line 353 "src/lexer-keywords.txt" - {"i64.atomic.wait", TokenType::AtomicWait, Opcode::I64AtomicWait}, -#line 229 "src/lexer-keywords.txt" - {"i32.atomic.wait", TokenType::AtomicWait, Opcode::I32AtomicWait}, - {""}, {""}, -#line 514 "src/lexer-keywords.txt" +#line 515 "src/lexer-keywords.txt" + {"v128.not", TokenType::Unary, Opcode::V128Not}, +#line 517 "src/lexer-keywords.txt" {"v128.store", TokenType::Store, Opcode::V128Store}, - {""}, {""}, -#line 507 "src/lexer-keywords.txt" - {"v128.andnot", TokenType::Binary, Opcode::V128Andnot}, -#line 121 "src/lexer-keywords.txt" - {"f64.nearest", TokenType::Unary, Opcode::F64Nearest}, -#line 71 "src/lexer-keywords.txt" - {"f32.nearest", TokenType::Unary, Opcode::F32Nearest}, {""}, -#line 352 "src/lexer-keywords.txt" +#line 503 "src/lexer-keywords.txt" + {"table.size", TokenType::TableSize, Opcode::TableSize}, + {""}, {""}, {""}, +#line 360 "src/lexer-keywords.txt" + {"i64.ctz", TokenType::Unary, Opcode::I64Ctz}, +#line 236 "src/lexer-keywords.txt" + {"i32.ctz", TokenType::Unary, Opcode::I32Ctz}, +#line 356 "src/lexer-keywords.txt" {"i64.atomic.store", TokenType::AtomicStore, Opcode::I64AtomicStore}, -#line 228 "src/lexer-keywords.txt" +#line 232 "src/lexer-keywords.txt" {"i32.atomic.store", TokenType::AtomicStore, Opcode::I32AtomicStore}, -#line 483 "src/lexer-keywords.txt" - {"ref.null", TokenType::RefNull, Opcode::RefNull}, -#line 131 "src/lexer-keywords.txt" - {"f64x2.abs", TokenType::Unary, Opcode::F64X2Abs}, - {""}, {""}, {""}, {""}, {""}, +#line 145 "src/lexer-keywords.txt" + {"f64x2.min", TokenType::Binary, Opcode::F64X2Min}, +#line 36 "src/lexer-keywords.txt" + {"call", TokenType::Call, Opcode::Call}, #line 142 "src/lexer-keywords.txt" - {"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul}, + {"f64x2.le", TokenType::Compare, Opcode::F64X2Le}, + {""}, {""}, {""}, {""}, {""}, +#line 143 "src/lexer-keywords.txt" + {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt}, + {""}, {""}, {""}, {""}, +#line 361 "src/lexer-keywords.txt" + {"i64.div_s", TokenType::Binary, Opcode::I64DivS}, +#line 237 "src/lexer-keywords.txt" + {"i32.div_s", TokenType::Binary, Opcode::I32DivS}, + {""}, {""}, {""}, {""}, {""}, #line 354 "src/lexer-keywords.txt" + {"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32}, +#line 498 "src/lexer-keywords.txt" + {"table.fill", TokenType::TableFill, Opcode::TableFill}, + {""}, {""}, +#line 467 "src/lexer-keywords.txt" + {"local", TokenType::Local}, +#line 466 "src/lexer-keywords.txt" + {"local.tee", TokenType::LocalTee, Opcode::LocalTee}, + {""}, {""}, +#line 486 "src/lexer-keywords.txt" + {"ref.null", TokenType::RefNull, Opcode::RefNull}, + {""}, {""}, +#line 465 "src/lexer-keywords.txt" + {"local.set", TokenType::LocalSet, Opcode::LocalSet}, + {""}, +#line 349 "src/lexer-keywords.txt" + {"i64.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I64AtomicRmwOr}, +#line 226 "src/lexer-keywords.txt" + {"i32.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I32AtomicRmwOr}, + {""}, +#line 114 "src/lexer-keywords.txt" + {"f64.div", TokenType::Binary, Opcode::F64Div}, +#line 64 "src/lexer-keywords.txt" + {"f32.div", TokenType::Binary, Opcode::F32Div}, + {""}, +#line 362 "src/lexer-keywords.txt" + {"i64.div_u", TokenType::Binary, Opcode::I64DivU}, +#line 238 "src/lexer-keywords.txt" + {"i32.div_u", TokenType::Binary, Opcode::I32DivU}, + {""}, {""}, +#line 358 "src/lexer-keywords.txt" {"i64.clz", TokenType::Unary, Opcode::I64Clz}, -#line 230 "src/lexer-keywords.txt" +#line 234 "src/lexer-keywords.txt" {"i32.clz", TokenType::Unary, Opcode::I32Clz}, +#line 136 "src/lexer-keywords.txt" + {"f64x2.add", TokenType::Binary, Opcode::F64X2Add}, + {""}, {""}, #line 411 "src/lexer-keywords.txt" - {"i64x2.mul", TokenType::Binary, Opcode::I64X2Mul}, + {"i64x2.add", TokenType::Binary, Opcode::I64X2Add}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 152 "src/lexer-keywords.txt" + {"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub}, {""}, -#line 513 "src/lexer-keywords.txt" - {"v128.or", TokenType::Binary, Opcode::V128Or}, +#line 24 "src/lexer-keywords.txt" + {"assert_return", TokenType::AssertReturn}, +#line 422 "src/lexer-keywords.txt" + {"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub}, +#line 511 "src/lexer-keywords.txt" + {"v128.and", TokenType::Binary, Opcode::V128And}, +#line 33 "src/lexer-keywords.txt" + {"br_table", TokenType::BrTable, Opcode::BrTable}, {""}, -#line 350 "src/lexer-keywords.txt" - {"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 376 "src/lexer-keywords.txt" + {"i64.load16_s", TokenType::Load, Opcode::I64Load16S}, +#line 249 "src/lexer-keywords.txt" + {"i32.load16_s", TokenType::Load, Opcode::I32Load16S}, + {""}, {""}, {""}, +#line 357 "src/lexer-keywords.txt" + {"i64.atomic.wait", TokenType::AtomicWait, Opcode::I64AtomicWait}, +#line 233 "src/lexer-keywords.txt" + {"i32.atomic.wait", TokenType::AtomicWait, Opcode::I32AtomicWait}, + {""}, {""}, {""}, {""}, +#line 135 "src/lexer-keywords.txt" + {"f64x2.abs", TokenType::Unary, Opcode::F64X2Abs}, + {""}, {""}, {""}, #line 133 "src/lexer-keywords.txt" - {"f64x2.div", TokenType::Binary, Opcode::F64X2Div}, + {"f64.trunc", TokenType::Unary, Opcode::F64Trunc}, +#line 82 "src/lexer-keywords.txt" + {"f32.trunc", TokenType::Unary, Opcode::F32Trunc}, {""}, {""}, {""}, -#line 339 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8SubU}, -#line 216 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8SubU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 132 "src/lexer-keywords.txt" - {"f64x2.add", TokenType::Binary, Opcode::F64X2Add}, - {""}, -#line 23 "src/lexer-keywords.txt" - {"assert_return", TokenType::AssertReturn}, -#line 407 "src/lexer-keywords.txt" - {"i64x2.add", TokenType::Binary, Opcode::I64X2Add}, -#line 482 "src/lexer-keywords.txt" +#line 513 "src/lexer-keywords.txt" + {"v128.const", TokenType::Const, Opcode::V128Const}, + {""}, {""}, {""}, {""}, +#line 335 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32OrU}, +#line 377 "src/lexer-keywords.txt" + {"i64.load16_u", TokenType::Load, Opcode::I64Load16U}, +#line 250 "src/lexer-keywords.txt" + {"i32.load16_u", TokenType::Load, Opcode::I32Load16U}, +#line 485 "src/lexer-keywords.txt" {"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull}, -#line 59 "src/lexer-keywords.txt" - {"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64}, - {""}, -#line 21 "src/lexer-keywords.txt" - {"assert_invalid", TokenType::AssertInvalid}, +#line 146 "src/lexer-keywords.txt" + {"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul}, +#line 510 "src/lexer-keywords.txt" + {"v128.andnot", TokenType::Binary, Opcode::V128Andnot}, {""}, -#line 511 "src/lexer-keywords.txt" +#line 415 "src/lexer-keywords.txt" + {"i64x2.mul", TokenType::Binary, Opcode::I64X2Mul}, + {""}, {""}, {""}, {""}, {""}, +#line 532 "src/lexer-keywords.txt" + {"f32.demote/f64", TokenType::Convert, Opcode::F32DemoteF64}, + {""}, {""}, {""}, +#line 336 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU}, +#line 324 "src/lexer-keywords.txt" + {"i64.atomic.load", TokenType::AtomicLoad, Opcode::I64AtomicLoad}, +#line 208 "src/lexer-keywords.txt" + {"i32.atomic.load", TokenType::AtomicLoad, Opcode::I32AtomicLoad}, + {""}, {""}, {""}, +#line 514 "src/lexer-keywords.txt" {"v128.load", TokenType::Load, Opcode::V128Load}, + {""}, +#line 378 "src/lexer-keywords.txt" + {"i64.load32_s", TokenType::Load, Opcode::I64Load32S}, +#line 399 "src/lexer-keywords.txt" + {"i64.store8", TokenType::Store, Opcode::I64Store8}, +#line 269 "src/lexer-keywords.txt" + {"i32.store8", TokenType::Store, Opcode::I32Store8}, #line 346 "src/lexer-keywords.txt" - {"i64.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I64AtomicRmwSub}, + {"i64.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I64AtomicRmwAdd}, #line 223 "src/lexer-keywords.txt" - {"i32.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I32AtomicRmwSub}, -#line 515 "src/lexer-keywords.txt" - {"v128", Type::V128}, - {""}, {""}, -#line 335 "src/lexer-keywords.txt" + {"i32.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I32AtomicRmwAdd}, +#line 347 "src/lexer-keywords.txt" + {"i64.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I64AtomicRmwAnd}, +#line 224 "src/lexer-keywords.txt" + {"i32.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I32AtomicRmwAnd}, + {""}, +#line 339 "src/lexer-keywords.txt" {"i64.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AddU}, -#line 212 "src/lexer-keywords.txt" +#line 216 "src/lexer-keywords.txt" {"i32.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AddU}, - {""}, -#line 510 "src/lexer-keywords.txt" - {"v128.const", TokenType::Const, Opcode::V128Const}, -#line 336 "src/lexer-keywords.txt" +#line 63 "src/lexer-keywords.txt" + {"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64}, + {""}, {""}, {""}, +#line 340 "src/lexer-keywords.txt" {"i64.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AndU}, -#line 213 "src/lexer-keywords.txt" +#line 217 "src/lexer-keywords.txt" {"i32.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AndU}, - {""}, {""}, -#line 332 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU}, - {""}, {""}, {""}, -#line 372 "src/lexer-keywords.txt" - {"i64.load16_s", TokenType::Load, Opcode::I64Load16S}, -#line 245 "src/lexer-keywords.txt" - {"i32.load16_s", TokenType::Load, Opcode::I32Load16S}, -#line 509 "src/lexer-keywords.txt" - {"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect}, {""}, -#line 373 "src/lexer-keywords.txt" - {"i64.load16_u", TokenType::Load, Opcode::I64Load16U}, -#line 246 "src/lexer-keywords.txt" - {"i32.load16_u", TokenType::Load, Opcode::I32Load16U}, -#line 25 "src/lexer-keywords.txt" - {"assert_unlinkable", TokenType::AssertUnlinkable}, - {""}, {""}, -#line 320 "src/lexer-keywords.txt" - {"i64.atomic.load", TokenType::AtomicLoad, Opcode::I64AtomicLoad}, -#line 204 "src/lexer-keywords.txt" - {"i32.atomic.load", TokenType::AtomicLoad, Opcode::I32AtomicLoad}, -#line 529 "src/lexer-keywords.txt" - {"f32.demote/f64", TokenType::Convert, Opcode::F32DemoteF64}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, -#line 561 "src/lexer-keywords.txt" - {"set_local", TokenType::LocalSet, Opcode::LocalSet}, -#line 129 "src/lexer-keywords.txt" - {"f64.trunc", TokenType::Unary, Opcode::F64Trunc}, -#line 78 "src/lexer-keywords.txt" - {"f32.trunc", TokenType::Unary, Opcode::F32Trunc}, - {""}, -#line 374 "src/lexer-keywords.txt" - {"i64.load32_s", TokenType::Load, Opcode::I64Load32S}, - {""}, -#line 562 "src/lexer-keywords.txt" +#line 343 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8SubU}, +#line 220 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8SubU}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 565 "src/lexer-keywords.txt" {"tee_local", TokenType::LocalTee, Opcode::LocalTee}, - {""}, -#line 375 "src/lexer-keywords.txt" +#line 379 "src/lexer-keywords.txt" {"i64.load32_u", TokenType::Load, Opcode::I64Load32U}, -#line 342 "src/lexer-keywords.txt" - {"i64.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I64AtomicRmwAdd}, -#line 219 "src/lexer-keywords.txt" - {"i32.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I32AtomicRmwAdd}, -#line 505 "src/lexer-keywords.txt" - {"type", TokenType::Type}, - {""}, {""}, {""}, -#line 345 "src/lexer-keywords.txt" - {"i64.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I64AtomicRmwOr}, -#line 222 "src/lexer-keywords.txt" - {"i32.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I32AtomicRmwOr}, - {""}, {""}, {""}, -#line 22 "src/lexer-keywords.txt" + {""}, +#line 564 "src/lexer-keywords.txt" + {"set_local", TokenType::LocalSet, Opcode::LocalSet}, + {""}, {""}, +#line 518 "src/lexer-keywords.txt" + {"v128", Type::V128}, +#line 35 "src/lexer-keywords.txt" + {"call_indirect", TokenType::CallIndirect, Opcode::CallIndirect}, +#line 23 "src/lexer-keywords.txt" {"assert_malformed", TokenType::AssertMalformed}, -#line 488 "src/lexer-keywords.txt" - {"return_call", TokenType::ReturnCall, Opcode::ReturnCall}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 457 "src/lexer-keywords.txt" - {"import", TokenType::Import}, + {""}, +#line 555 "src/lexer-keywords.txt" + {"i64.trunc_s/f32", TokenType::Convert, Opcode::I64TruncF32S}, +#line 543 "src/lexer-keywords.txt" + {"i32.trunc_s/f32", TokenType::Convert, Opcode::I32TruncF32S}, {""}, {""}, -#line 49 "src/lexer-keywords.txt" - {"export", TokenType::Export}, +#line 506 "src/lexer-keywords.txt" + {"throw", TokenType::Throw, Opcode::Throw}, {""}, {""}, -#line 107 "src/lexer-keywords.txt" - {"f64.convert_i64_s", TokenType::Convert, Opcode::F64ConvertI64S}, -#line 56 "src/lexer-keywords.txt" - {"f32.convert_i64_s", TokenType::Convert, Opcode::F32ConvertI64S}, +#line 137 "src/lexer-keywords.txt" + {"f64x2.div", TokenType::Binary, Opcode::F64X2Div}, {""}, {""}, {""}, -#line 328 "src/lexer-keywords.txt" +#line 332 "src/lexer-keywords.txt" {"i64.atomic.rmw32.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AddU}, {""}, -#line 34 "src/lexer-keywords.txt" - {"call_indirect", TokenType::CallIndirect, Opcode::CallIndirect}, - {""}, -#line 329 "src/lexer-keywords.txt" +#line 559 "src/lexer-keywords.txt" + {"i64.trunc_u/f32", TokenType::Convert, Opcode::I64TruncF32U}, +#line 547 "src/lexer-keywords.txt" + {"i32.trunc_u/f32", TokenType::Convert, Opcode::I32TruncF32U}, + {""}, {""}, +#line 333 "src/lexer-keywords.txt" {"i64.atomic.rmw32.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AndU}, - {""}, -#line 105 "src/lexer-keywords.txt" - {"f64.convert_i32_s", TokenType::Convert, Opcode::F64ConvertI32S}, -#line 54 "src/lexer-keywords.txt" - {"f32.convert_i32_s", TokenType::Convert, Opcode::F32ConvertI32S}, - {""}, {""}, {""}, {""}, {""}, -#line 503 "src/lexer-keywords.txt" - {"throw", TokenType::Throw, Opcode::Throw}, {""}, {""}, {""}, {""}, -#line 343 "src/lexer-keywords.txt" - {"i64.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I64AtomicRmwAnd}, -#line 220 "src/lexer-keywords.txt" - {"i32.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I32AtomicRmwAnd}, - {""}, {""}, {""}, -#line 400 "src/lexer-keywords.txt" - {"i64.trunc_f64_s", TokenType::Convert, Opcode::I64TruncF64S}, -#line 270 "src/lexer-keywords.txt" - {"i32.trunc_f64_s", TokenType::Convert, Opcode::I32TruncF64S}, -#line 401 "src/lexer-keywords.txt" - {"i64.trunc_f64_u", TokenType::Convert, Opcode::I64TruncF64U}, -#line 271 "src/lexer-keywords.txt" - {"i32.trunc_f64_u", TokenType::Convert, Opcode::I32TruncF64U}, - {""}, -#line 100 "src/lexer-keywords.txt" - {"f32x4", TokenType::F32X4}, -#line 108 "src/lexer-keywords.txt" - {"f64.convert_i64_u", TokenType::Convert, Opcode::F64ConvertI64U}, -#line 57 "src/lexer-keywords.txt" - {"f32.convert_i64_u", TokenType::Convert, Opcode::F32ConvertI64U}, -#line 307 "src/lexer-keywords.txt" - {"i32x4", TokenType::I32X4}, -#line 153 "src/lexer-keywords.txt" - {"get", TokenType::Get}, -#line 42 "src/lexer-keywords.txt" - {"drop", TokenType::Drop, Opcode::Drop}, -#line 331 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32OrU}, -#line 398 "src/lexer-keywords.txt" +#line 402 "src/lexer-keywords.txt" {"i64.trunc_f32_s", TokenType::Convert, Opcode::I64TruncF32S}, -#line 268 "src/lexer-keywords.txt" +#line 272 "src/lexer-keywords.txt" {"i32.trunc_f32_s", TokenType::Convert, Opcode::I32TruncF32S}, -#line 399 "src/lexer-keywords.txt" +#line 27 "src/lexer-keywords.txt" + {"atomic.fence", TokenType::AtomicFence, Opcode::AtomicFence}, +#line 22 "src/lexer-keywords.txt" + {"assert_invalid", TokenType::AssertInvalid}, + {""}, {""}, {""}, {""}, {""}, +#line 424 "src/lexer-keywords.txt" + {"i64.xor", TokenType::Binary, Opcode::I64Xor}, +#line 318 "src/lexer-keywords.txt" + {"i32.xor", TokenType::Binary, Opcode::I32Xor}, + {""}, {""}, +#line 403 "src/lexer-keywords.txt" {"i64.trunc_f32_u", TokenType::Convert, Opcode::I64TruncF32U}, -#line 269 "src/lexer-keywords.txt" +#line 273 "src/lexer-keywords.txt" {"i32.trunc_f32_u", TokenType::Convert, Opcode::I32TruncF32U}, -#line 330 "src/lexer-keywords.txt" +#line 334 "src/lexer-keywords.txt" {"i64.atomic.rmw32.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw32CmpxchgU}, -#line 106 "src/lexer-keywords.txt" - {"f64.convert_i32_u", TokenType::Convert, Opcode::F64ConvertI32U}, -#line 55 "src/lexer-keywords.txt" - {"f32.convert_i32_u", TokenType::Convert, Opcode::F32ConvertI32U}, -#line 478 "src/lexer-keywords.txt" - {"param", TokenType::Param}, {""}, {""}, {""}, -#line 30 "src/lexer-keywords.txt" - {"br_if", TokenType::BrIf, Opcode::BrIf}, -#line 393 "src/lexer-keywords.txt" +#line 491 "src/lexer-keywords.txt" + {"return_call", TokenType::ReturnCall, Opcode::ReturnCall}, + {""}, {""}, +#line 483 "src/lexer-keywords.txt" + {"ref.extern", TokenType::RefExtern}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 397 "src/lexer-keywords.txt" {"i64.store16", TokenType::Store, Opcode::I64Store16}, -#line 264 "src/lexer-keywords.txt" +#line 268 "src/lexer-keywords.txt" {"i32.store16", TokenType::Store, Opcode::I32Store16}, - {""}, -#line 464 "src/lexer-keywords.txt" - {"loop", TokenType::Loop, Opcode::Loop}, -#line 325 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16SubU}, -#line 209 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16SubU}, -#line 395 "src/lexer-keywords.txt" - {"i64.store8", TokenType::Store, Opcode::I64Store8}, -#line 265 "src/lexer-keywords.txt" - {"i32.store8", TokenType::Store, Opcode::I32Store8}, - {""}, -#line 553 "src/lexer-keywords.txt" + {""}, {""}, {""}, {""}, {""}, +#line 512 "src/lexer-keywords.txt" + {"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect}, +#line 350 "src/lexer-keywords.txt" + {"i64.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I64AtomicRmwSub}, +#line 227 "src/lexer-keywords.txt" + {"i32.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I32AtomicRmwSub}, +#line 380 "src/lexer-keywords.txt" + {"i64.load8_s", TokenType::Load, Opcode::I64Load8S}, +#line 251 "src/lexer-keywords.txt" + {"i32.load8_s", TokenType::Load, Opcode::I32Load8S}, + {""}, {""}, +#line 26 "src/lexer-keywords.txt" + {"assert_unlinkable", TokenType::AssertUnlinkable}, +#line 104 "src/lexer-keywords.txt" + {"f32x4", TokenType::F32X4}, +#line 556 "src/lexer-keywords.txt" {"i64.trunc_s/f64", TokenType::Convert, Opcode::I64TruncF64S}, -#line 541 "src/lexer-keywords.txt" +#line 544 "src/lexer-keywords.txt" {"i32.trunc_s/f64", TokenType::Convert, Opcode::I32TruncF64S}, -#line 557 "src/lexer-keywords.txt" +#line 311 "src/lexer-keywords.txt" + {"i32x4", TokenType::I32X4}, + {""}, +#line 109 "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 560 "src/lexer-keywords.txt" {"i64.trunc_u/f64", TokenType::Convert, Opcode::I64TruncF64U}, -#line 545 "src/lexer-keywords.txt" +#line 548 "src/lexer-keywords.txt" {"i32.trunc_u/f64", TokenType::Convert, Opcode::I32TruncF64U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 552 "src/lexer-keywords.txt" - {"i64.trunc_s/f32", TokenType::Convert, Opcode::I64TruncF32S}, -#line 540 "src/lexer-keywords.txt" - {"i32.trunc_s/f32", TokenType::Convert, Opcode::I32TruncF32S}, -#line 556 "src/lexer-keywords.txt" - {"i64.trunc_u/f32", TokenType::Convert, Opcode::I64TruncF32U}, -#line 544 "src/lexer-keywords.txt" - {"i32.trunc_u/f32", TokenType::Convert, Opcode::I32TruncF32U}, - {""}, {""}, {""}, {""}, -#line 99 "src/lexer-keywords.txt" - {"f32x4.sub", TokenType::Binary, Opcode::F32X4Sub}, -#line 376 "src/lexer-keywords.txt" - {"i64.load8_s", TokenType::Load, Opcode::I64Load8S}, -#line 247 "src/lexer-keywords.txt" - {"i32.load8_s", TokenType::Load, Opcode::I32Load8S}, -#line 306 "src/lexer-keywords.txt" - {"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub}, - {""}, -#line 377 "src/lexer-keywords.txt" +#line 508 "src/lexer-keywords.txt" + {"type", TokenType::Type}, + {""}, {""}, {""}, +#line 43 "src/lexer-keywords.txt" + {"drop", TokenType::Drop, Opcode::Drop}, +#line 381 "src/lexer-keywords.txt" {"i64.load8_u", TokenType::Load, Opcode::I64Load8U}, -#line 248 "src/lexer-keywords.txt" +#line 252 "src/lexer-keywords.txt" {"i32.load8_u", TokenType::Load, Opcode::I32Load8U}, - {""}, {""}, -#line 383 "src/lexer-keywords.txt" +#line 404 "src/lexer-keywords.txt" + {"i64.trunc_f64_s", TokenType::Convert, Opcode::I64TruncF64S}, +#line 274 "src/lexer-keywords.txt" + {"i32.trunc_f64_s", TokenType::Convert, Opcode::I32TruncF64S}, + {""}, +#line 328 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU}, +#line 212 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16OrU}, + {""}, {""}, {""}, {""}, +#line 473 "src/lexer-keywords.txt" + {"memory.size", TokenType::MemorySize, Opcode::MemorySize}, + {""}, {""}, {""}, +#line 405 "src/lexer-keywords.txt" + {"i64.trunc_f64_u", TokenType::Convert, Opcode::I64TruncF64U}, +#line 275 "src/lexer-keywords.txt" + {"i32.trunc_f64_u", TokenType::Convert, Opcode::I32TruncF64U}, +#line 387 "src/lexer-keywords.txt" {"i64.or", TokenType::Binary, Opcode::I64Or}, -#line 254 "src/lexer-keywords.txt" +#line 258 "src/lexer-keywords.txt" {"i32.or", TokenType::Binary, Opcode::I32Or}, -#line 95 "src/lexer-keywords.txt" - {"f32x4.ne", TokenType::Compare, Opcode::F32X4Ne}, -#line 90 "src/lexer-keywords.txt" - {"f32x4.lt", TokenType::Compare, Opcode::F32X4Lt}, + {""}, {""}, +#line 53 "src/lexer-keywords.txt" + {"export", TokenType::Export}, +#line 329 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16SubU}, +#line 213 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16SubU}, +#line 461 "src/lexer-keywords.txt" + {"import", TokenType::Import}, +#line 472 "src/lexer-keywords.txt" + {"memory.init", TokenType::MemoryInit, Opcode::MemoryInit}, {""}, -#line 300 "src/lexer-keywords.txt" +#line 481 "src/lexer-keywords.txt" + {"param", TokenType::Param}, +#line 99 "src/lexer-keywords.txt" + {"f32x4.ne", TokenType::Compare, Opcode::F32X4Ne}, + {""}, {""}, +#line 304 "src/lexer-keywords.txt" {"i32x4.ne", TokenType::Compare, Opcode::I32X4Ne}, + {""}, {""}, {""}, +#line 478 "src/lexer-keywords.txt" + {"nan:canonical", TokenType::NanCanonical}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 534 "src/lexer-keywords.txt" + {"f64.convert_s/i32", TokenType::Convert, Opcode::F64ConvertI32S}, +#line 528 "src/lexer-keywords.txt" + {"f32.convert_s/i32", TokenType::Convert, Opcode::F32ConvertI32S}, +#line 468 "src/lexer-keywords.txt" + {"loop", TokenType::Loop, Opcode::Loop}, +#line 519 "src/lexer-keywords.txt" + {"v128.xor", TokenType::Binary, Opcode::V128Xor}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 111 "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 20 "src/lexer-keywords.txt" + {"array", Type::Array, TokenType::Array}, +#line 536 "src/lexer-keywords.txt" + {"f64.convert_u/i32", TokenType::Convert, Opcode::F64ConvertI32U}, +#line 530 "src/lexer-keywords.txt" + {"f32.convert_u/i32", TokenType::Convert, Opcode::F32ConvertI32U}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 96 "src/lexer-keywords.txt" + {"f32x4.min", TokenType::Binary, Opcode::F32X4Min}, {""}, -#line 496 "src/lexer-keywords.txt" - {"table.get", TokenType::TableGet, Opcode::TableGet}, - {""}, -#line 31 "src/lexer-keywords.txt" - {"br_on_exn", TokenType::BrOnExn, Opcode::BrOnExn}, - {""}, {""}, {""}, {""}, {""}, -#line 89 "src/lexer-keywords.txt" +#line 93 "src/lexer-keywords.txt" {"f32x4.le", TokenType::Compare, Opcode::F32X4Le}, - {""}, -#line 292 "src/lexer-keywords.txt" - {"i32x4.lt_s", TokenType::Compare, Opcode::I32X4LtS}, -#line 296 "src/lexer-keywords.txt" + {""}, {""}, {""}, {""}, {""}, +#line 94 "src/lexer-keywords.txt" + {"f32x4.lt", TokenType::Compare, Opcode::F32X4Lt}, +#line 300 "src/lexer-keywords.txt" {"i32x4.min_s", TokenType::Binary, Opcode::I32X4MinS}, -#line 293 "src/lexer-keywords.txt" - {"i32x4.lt_u", TokenType::Compare, Opcode::I32X4LtU}, - {""}, -#line 92 "src/lexer-keywords.txt" - {"f32x4.min", TokenType::Binary, Opcode::F32X4Min}, -#line 297 "src/lexer-keywords.txt" - {"i32x4.min_u", TokenType::Binary, Opcode::I32X4MinU}, -#line 288 "src/lexer-keywords.txt" - {"i32x4.le_s", TokenType::Compare, Opcode::I32X4LeS}, - {""}, -#line 289 "src/lexer-keywords.txt" - {"i32x4.le_u", TokenType::Compare, Opcode::I32X4LeU}, - {""}, {""}, -#line 549 "src/lexer-keywords.txt" +#line 552 "src/lexer-keywords.txt" {"i64.extend_s/i32", TokenType::Convert, Opcode::I64ExtendI32S}, - {""}, -#line 550 "src/lexer-keywords.txt" - {"i64.extend_u/i32", TokenType::Convert, Opcode::I64ExtendI32U}, -#line 321 "src/lexer-keywords.txt" +#line 325 "src/lexer-keywords.txt" {"i64.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AddU}, -#line 205 "src/lexer-keywords.txt" +#line 209 "src/lexer-keywords.txt" {"i32.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AddU}, - {""}, {""}, -#line 322 "src/lexer-keywords.txt" + {""}, {""}, {""}, +#line 32 "src/lexer-keywords.txt" + {"br_on_exn", TokenType::BrOnExn, Opcode::BrOnExn}, +#line 326 "src/lexer-keywords.txt" {"i64.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AndU}, -#line 206 "src/lexer-keywords.txt" +#line 210 "src/lexer-keywords.txt" {"i32.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AndU}, -#line 349 "src/lexer-keywords.txt" - {"i64.atomic.store16", TokenType::AtomicStore, Opcode::I64AtomicStore16}, -#line 226 "src/lexer-keywords.txt" - {"i32.atomic.store16", TokenType::AtomicStore, Opcode::I32AtomicStore16}, - {""}, -#line 80 "src/lexer-keywords.txt" - {"f32x4.abs", TokenType::Unary, Opcode::F32X4Abs}, -#line 474 "src/lexer-keywords.txt" - {"nan:canonical", TokenType::NanCanonical}, -#line 26 "src/lexer-keywords.txt" - {"atomic.fence", TokenType::AtomicFence, Opcode::AtomicFence}, -#line 278 "src/lexer-keywords.txt" - {"i32x4.abs", TokenType::Unary, Opcode::I32X4Abs}, - {""}, {""}, -#line 93 "src/lexer-keywords.txt" - {"f32x4.mul", TokenType::Binary, Opcode::F32X4Mul}, {""}, {""}, -#line 298 "src/lexer-keywords.txt" - {"i32x4.mul", TokenType::Binary, Opcode::I32X4Mul}, - {""}, {""}, -#line 18 "src/lexer-keywords.txt" - {"anyref", Type::Anyref}, - {""}, {""}, {""}, -#line 469 "src/lexer-keywords.txt" - {"memory.size", TokenType::MemorySize, Opcode::MemorySize}, - {""}, {""}, {""}, {""}, -#line 468 "src/lexer-keywords.txt" - {"memory.init", TokenType::MemoryInit, Opcode::MemoryInit}, +#line 110 "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 553 "src/lexer-keywords.txt" + {"i64.extend_u/i32", TokenType::Convert, Opcode::I64ExtendI32U}, +#line 157 "src/lexer-keywords.txt" + {"get", TokenType::Get}, {""}, -#line 84 "src/lexer-keywords.txt" - {"f32x4.div", TokenType::Binary, Opcode::F32X4Div}, +#line 353 "src/lexer-keywords.txt" + {"i64.atomic.store16", TokenType::AtomicStore, Opcode::I64AtomicStore16}, +#line 230 "src/lexer-keywords.txt" + {"i32.atomic.store16", TokenType::AtomicStore, Opcode::I32AtomicStore16}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 301 "src/lexer-keywords.txt" + {"i32x4.min_u", TokenType::Binary, Opcode::I32X4MinU}, {""}, -#line 324 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU}, -#line 208 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16OrU}, - {""}, {""}, -#line 487 "src/lexer-keywords.txt" - {"return_call_indirect", TokenType::ReturnCallIndirect, Opcode::ReturnCallIndirect}, -#line 323 "src/lexer-keywords.txt" +#line 327 "src/lexer-keywords.txt" {"i64.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw16CmpxchgU}, -#line 207 "src/lexer-keywords.txt" +#line 211 "src/lexer-keywords.txt" {"i32.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw16CmpxchgU}, {""}, {""}, {""}, {""}, -#line 81 "src/lexer-keywords.txt" +#line 470 "src/lexer-keywords.txt" + {"memory.fill", TokenType::MemoryFill, Opcode::MemoryFill}, + {""}, +#line 85 "src/lexer-keywords.txt" {"f32x4.add", TokenType::Binary, Opcode::F32X4Add}, - {""}, {""}, -#line 279 "src/lexer-keywords.txt" +#line 117 "src/lexer-keywords.txt" + {"f64.ge", TokenType::Compare, Opcode::F64Ge}, +#line 67 "src/lexer-keywords.txt" + {"f32.ge", TokenType::Compare, Opcode::F32Ge}, +#line 283 "src/lexer-keywords.txt" {"i32x4.add", TokenType::Binary, Opcode::I32X4Add}, -#line 531 "src/lexer-keywords.txt" - {"f64.convert_s/i32", TokenType::Convert, Opcode::F64ConvertI32S}, -#line 525 "src/lexer-keywords.txt" - {"f32.convert_s/i32", TokenType::Convert, Opcode::F32ConvertI32S}, -#line 533 "src/lexer-keywords.txt" - {"f64.convert_u/i32", TokenType::Convert, Opcode::F64ConvertI32U}, -#line 527 "src/lexer-keywords.txt" - {"f32.convert_u/i32", TokenType::Convert, Opcode::F32ConvertI32U}, - {""}, -#line 156 "src/lexer-keywords.txt" - {"global", TokenType::Global}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 155 "src/lexer-keywords.txt" - {"global.set", TokenType::GlobalSet, Opcode::GlobalSet}, - {""}, {""}, {""}, -#line 479 "src/lexer-keywords.txt" - {"quote", TokenType::Quote}, {""}, {""}, {""}, -#line 146 "src/lexer-keywords.txt" - {"f64x2.splat", TokenType::Unary, Opcode::F64X2Splat}, - {""}, {""}, -#line 417 "src/lexer-keywords.txt" - {"i64x2.splat", TokenType::Unary, Opcode::I64X2Splat}, -#line 466 "src/lexer-keywords.txt" - {"memory.fill", TokenType::MemoryFill, Opcode::MemoryFill}, - {""}, {""}, {""}, -#line 362 "src/lexer-keywords.txt" - {"i64.extend32_s", TokenType::Unary, Opcode::I64Extend32S}, - {""}, {""}, {""}, -#line 497 "src/lexer-keywords.txt" - {"table.grow", TokenType::TableGrow, Opcode::TableGrow}, - {""}, -#line 126 "src/lexer-keywords.txt" - {"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt}, -#line 75 "src/lexer-keywords.txt" - {"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt}, -#line 137 "src/lexer-keywords.txt" - {"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt}, - {""}, -#line 516 "src/lexer-keywords.txt" - {"v128.xor", TokenType::Binary, Opcode::V128Xor}, -#line 114 "src/lexer-keywords.txt" +#line 118 "src/lexer-keywords.txt" {"f64.gt", TokenType::Compare, Opcode::F64Gt}, -#line 64 "src/lexer-keywords.txt" +#line 68 "src/lexer-keywords.txt" {"f32.gt", TokenType::Compare, Opcode::F32Gt}, {""}, -#line 364 "src/lexer-keywords.txt" - {"i64.extend_i32_s", TokenType::Convert, Opcode::I64ExtendI32S}, +#line 103 "src/lexer-keywords.txt" + {"f32x4.sub", TokenType::Binary, Opcode::F32X4Sub}, +#line 490 "src/lexer-keywords.txt" + {"return_call_indirect", TokenType::ReturnCallIndirect, Opcode::ReturnCallIndirect}, + {""}, +#line 310 "src/lexer-keywords.txt" + {"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub}, +#line 292 "src/lexer-keywords.txt" + {"i32x4.le_s", TokenType::Compare, Opcode::I32X4LeS}, + {""}, {""}, +#line 296 "src/lexer-keywords.txt" + {"i32x4.lt_s", TokenType::Compare, Opcode::I32X4LtS}, + {""}, {""}, +#line 366 "src/lexer-keywords.txt" + {"i64.extend32_s", TokenType::Unary, Opcode::I64Extend32S}, + {""}, {""}, +#line 487 "src/lexer-keywords.txt" + {"register", TokenType::Register}, {""}, {""}, {""}, -#line 365 "src/lexer-keywords.txt" - {"i64.extend_i32_u", TokenType::Convert, Opcode::I64ExtendI32U}, +#line 293 "src/lexer-keywords.txt" + {"i32x4.le_u", TokenType::Compare, Opcode::I32X4LeU}, +#line 84 "src/lexer-keywords.txt" + {"f32x4.abs", TokenType::Unary, Opcode::F32X4Abs}, {""}, -#line 136 "src/lexer-keywords.txt" - {"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge}, +#line 297 "src/lexer-keywords.txt" + {"i32x4.lt_u", TokenType::Compare, Opcode::I32X4LtU}, +#line 282 "src/lexer-keywords.txt" + {"i32x4.abs", TokenType::Unary, Opcode::I32X4Abs}, {""}, {""}, -#line 113 "src/lexer-keywords.txt" - {"f64.ge", TokenType::Compare, Opcode::F64Ge}, -#line 63 "src/lexer-keywords.txt" - {"f32.ge", TokenType::Compare, Opcode::F32Ge}, +#line 368 "src/lexer-keywords.txt" + {"i64.extend_i32_s", TokenType::Convert, Opcode::I64ExtendI32S}, {""}, {""}, {""}, -#line 460 "src/lexer-keywords.txt" - {"local.get", TokenType::LocalGet, Opcode::LocalGet}, +#line 322 "src/lexer-keywords.txt" + {"i64.atomic.load32_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad32U}, + {""}, {""}, {""}, {""}, {""}, +#line 112 "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 97 "src/lexer-keywords.txt" + {"f32x4.mul", TokenType::Binary, Opcode::F32X4Mul}, {""}, -#line 484 "src/lexer-keywords.txt" - {"register", TokenType::Register}, +#line 338 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XorU}, +#line 302 "src/lexer-keywords.txt" + {"i32x4.mul", TokenType::Binary, Opcode::I32X4Mul}, {""}, -#line 319 "src/lexer-keywords.txt" +#line 323 "src/lexer-keywords.txt" {"i64.atomic.load8_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad8U}, -#line 203 "src/lexer-keywords.txt" +#line 207 "src/lexer-keywords.txt" {"i32.atomic.load8_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad8U}, -#line 368 "src/lexer-keywords.txt" - {"i64.gt_s", TokenType::Compare, Opcode::I64GtS}, -#line 241 "src/lexer-keywords.txt" - {"i32.gt_s", TokenType::Compare, Opcode::I32GtS}, - {""}, {""}, + {""}, +#line 345 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU}, +#line 222 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XorU}, + {""}, {""}, {""}, {""}, #line 369 "src/lexer-keywords.txt" - {"i64.gt_u", TokenType::Compare, Opcode::I64GtU}, -#line 242 "src/lexer-keywords.txt" - {"i32.gt_u", TokenType::Compare, Opcode::I32GtU}, -#line 366 "src/lexer-keywords.txt" - {"i64.ge_s", TokenType::Compare, Opcode::I64GeS}, -#line 239 "src/lexer-keywords.txt" - {"i32.ge_s", TokenType::Compare, Opcode::I32GeS}, -#line 318 "src/lexer-keywords.txt" - {"i64.atomic.load32_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad32U}, + {"i64.extend_i32_u", TokenType::Convert, Opcode::I64ExtendI32U}, +#line 31 "src/lexer-keywords.txt" + {"br_if", TokenType::BrIf, Opcode::BrIf}, {""}, -#line 367 "src/lexer-keywords.txt" - {"i64.ge_u", TokenType::Compare, Opcode::I64GeU}, -#line 240 "src/lexer-keywords.txt" - {"i32.ge_u", TokenType::Compare, Opcode::I32GeU}, +#line 482 "src/lexer-keywords.txt" + {"quote", TokenType::Quote}, {""}, {""}, -#line 337 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw8CmpxchgU}, -#line 214 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw8CmpxchgU}, - {""}, {""}, {""}, -#line 420 "src/lexer-keywords.txt" - {"i64.xor", TokenType::Binary, Opcode::I64Xor}, -#line 314 "src/lexer-keywords.txt" - {"i32.xor", TokenType::Binary, Opcode::I32Xor}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 402 "src/lexer-keywords.txt" +#line 406 "src/lexer-keywords.txt" {"i64.trunc_sat_f32_s", TokenType::Convert, Opcode::I64TruncSatF32S}, -#line 272 "src/lexer-keywords.txt" +#line 276 "src/lexer-keywords.txt" {"i32.trunc_sat_f32_s", TokenType::Convert, Opcode::I32TruncSatF32S}, -#line 19 "src/lexer-keywords.txt" - {"array", TokenType::Array}, + {""}, {""}, +#line 370 "src/lexer-keywords.txt" + {"i64.ge_s", TokenType::Compare, Opcode::I64GeS}, +#line 243 "src/lexer-keywords.txt" + {"i32.ge_s", TokenType::Compare, Opcode::I32GeS}, {""}, -#line 403 "src/lexer-keywords.txt" +#line 372 "src/lexer-keywords.txt" + {"i64.gt_s", TokenType::Compare, Opcode::I64GtS}, +#line 245 "src/lexer-keywords.txt" + {"i32.gt_s", TokenType::Compare, Opcode::I32GtS}, + {""}, {""}, {""}, +#line 499 "src/lexer-keywords.txt" + {"table.get", TokenType::TableGet, Opcode::TableGet}, +#line 37 "src/lexer-keywords.txt" + {"catch", TokenType::Catch, Opcode::Catch}, +#line 116 "src/lexer-keywords.txt" + {"f64.floor", TokenType::Unary, Opcode::F64Floor}, +#line 66 "src/lexer-keywords.txt" + {"f32.floor", TokenType::Unary, Opcode::F32Floor}, + {""}, {""}, +#line 395 "src/lexer-keywords.txt" + {"i64.shr_s", TokenType::Binary, Opcode::I64ShrS}, +#line 266 "src/lexer-keywords.txt" + {"i32.shr_s", TokenType::Binary, Opcode::I32ShrS}, + {""}, {""}, {""}, +#line 500 "src/lexer-keywords.txt" + {"table.grow", TokenType::TableGrow, Opcode::TableGrow}, + {""}, {""}, +#line 407 "src/lexer-keywords.txt" {"i64.trunc_sat_f32_u", TokenType::Convert, Opcode::I64TruncSatF32U}, -#line 273 "src/lexer-keywords.txt" +#line 277 "src/lexer-keywords.txt" {"i32.trunc_sat_f32_u", TokenType::Convert, Opcode::I32TruncSatF32U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 338 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU}, -#line 215 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8OrU}, - {""}, {""}, {""}, {""}, {""}, -#line 390 "src/lexer-keywords.txt" - {"i64.shl", TokenType::Binary, Opcode::I64Shl}, -#line 261 "src/lexer-keywords.txt" - {"i32.shl", TokenType::Binary, Opcode::I32Shl}, + {""}, +#line 150 "src/lexer-keywords.txt" + {"f64x2.splat", TokenType::Unary, Opcode::F64X2Splat}, +#line 371 "src/lexer-keywords.txt" + {"i64.ge_u", TokenType::Compare, Opcode::I64GeU}, +#line 244 "src/lexer-keywords.txt" + {"i32.ge_u", TokenType::Compare, Opcode::I32GeU}, +#line 421 "src/lexer-keywords.txt" + {"i64x2.splat", TokenType::Unary, Opcode::I64X2Splat}, +#line 373 "src/lexer-keywords.txt" + {"i64.gt_u", TokenType::Compare, Opcode::I64GtU}, +#line 246 "src/lexer-keywords.txt" + {"i32.gt_u", TokenType::Compare, Opcode::I32GtU}, +#line 130 "src/lexer-keywords.txt" + {"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt}, +#line 79 "src/lexer-keywords.txt" + {"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt}, {""}, {""}, {""}, {""}, -#line 361 "src/lexer-keywords.txt" - {"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S}, -#line 237 "src/lexer-keywords.txt" - {"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S}, -#line 391 "src/lexer-keywords.txt" - {"i64.shr_s", TokenType::Binary, Opcode::I64ShrS}, -#line 262 "src/lexer-keywords.txt" - {"i32.shr_s", TokenType::Binary, Opcode::I32ShrS}, +#line 140 "src/lexer-keywords.txt" + {"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge}, {""}, -#line 280 "src/lexer-keywords.txt" - {"i32x4.all_true", TokenType::Unary, Opcode::I32X4AllTrue}, -#line 392 "src/lexer-keywords.txt" +#line 88 "src/lexer-keywords.txt" + {"f32x4.div", TokenType::Binary, Opcode::F32X4Div}, +#line 396 "src/lexer-keywords.txt" {"i64.shr_u", TokenType::Binary, Opcode::I64ShrU}, -#line 263 "src/lexer-keywords.txt" +#line 267 "src/lexer-keywords.txt" {"i32.shr_u", TokenType::Binary, Opcode::I32ShrU}, - {""}, {""}, -#line 334 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XorU}, - {""}, {""}, {""}, {""}, -#line 36 "src/lexer-keywords.txt" - {"catch", TokenType::Catch, Opcode::Catch}, {""}, -#line 20 "src/lexer-keywords.txt" +#line 141 "src/lexer-keywords.txt" + {"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt}, +#line 21 "src/lexer-keywords.txt" {"assert_exhaustion", TokenType::AssertExhaustion}, + {""}, {""}, +#line 394 "src/lexer-keywords.txt" + {"i64.shl", TokenType::Binary, Opcode::I64Shl}, +#line 265 "src/lexer-keywords.txt" + {"i32.shl", TokenType::Binary, Opcode::I32Shl}, + {""}, {""}, +#line 507 "src/lexer-keywords.txt" + {"try", TokenType::Try, Opcode::Try}, +#line 365 "src/lexer-keywords.txt" + {"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S}, +#line 241 "src/lexer-keywords.txt" + {"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S}, + {""}, {""}, {""}, {""}, +#line 159 "src/lexer-keywords.txt" + {"global.set", TokenType::GlobalSet, Opcode::GlobalSet}, +#line 337 "src/lexer-keywords.txt" + {"i64.atomic.rmw32.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XchgU}, {""}, {""}, {""}, -#line 363 "src/lexer-keywords.txt" +#line 160 "src/lexer-keywords.txt" + {"global", TokenType::Global}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 450 "src/lexer-keywords.txt" + {"i8x16.ne", TokenType::Compare, Opcode::I8X16Ne}, + {""}, {""}, {""}, {""}, +#line 419 "src/lexer-keywords.txt" + {"i64x2.shr_s", TokenType::Binary, Opcode::I64X2ShrS}, +#line 284 "src/lexer-keywords.txt" + {"i32x4.all_true", TokenType::Unary, Opcode::I32X4AllTrue}, + {""}, {""}, {""}, {""}, {""}, +#line 367 "src/lexer-keywords.txt" {"i64.extend8_s", TokenType::Unary, Opcode::I64Extend8S}, -#line 238 "src/lexer-keywords.txt" +#line 242 "src/lexer-keywords.txt" {"i32.extend8_s", TokenType::Unary, Opcode::I32Extend8S}, {""}, -#line 475 "src/lexer-keywords.txt" - {"nop", TokenType::Nop, Opcode::Nop}, +#line 341 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw8CmpxchgU}, +#line 218 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw8CmpxchgU}, {""}, {""}, -#line 360 "src/lexer-keywords.txt" - {"i64.eqz", TokenType::Convert, Opcode::I64Eqz}, -#line 236 "src/lexer-keywords.txt" - {"i32.eqz", TokenType::Convert, Opcode::I32Eqz}, +#line 527 "src/lexer-keywords.txt" + {"anyfunc", Type::FuncRef}, {""}, {""}, {""}, {""}, {""}, -#line 112 "src/lexer-keywords.txt" - {"f64.floor", TokenType::Unary, Opcode::F64Floor}, -#line 62 "src/lexer-keywords.txt" - {"f32.floor", TokenType::Unary, Opcode::F32Floor}, +#line 474 "src/lexer-keywords.txt" + {"memory", TokenType::Memory}, + {""}, {""}, {""}, {""}, {""}, +#line 420 "src/lexer-keywords.txt" + {"i64x2.shr_u", TokenType::Binary, Opcode::I64X2ShrU}, {""}, -#line 454 "src/lexer-keywords.txt" - {"i8x16.sub", TokenType::Binary, Opcode::I8X16Sub}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 342 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU}, +#line 219 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8OrU}, + {""}, {""}, {""}, +#line 533 "src/lexer-keywords.txt" + {"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32}, {""}, -#line 446 "src/lexer-keywords.txt" - {"i8x16.ne", TokenType::Compare, Opcode::I8X16Ne}, +#line 464 "src/lexer-keywords.txt" + {"local.get", TokenType::LocalGet, Opcode::LocalGet}, + {""}, {""}, +#line 445 "src/lexer-keywords.txt" + {"i8x16.min_s", TokenType::Binary, Opcode::I8X16MinS}, {""}, {""}, {""}, -#line 194 "src/lexer-keywords.txt" - {"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub}, +#line 29 "src/lexer-keywords.txt" + {"binary", TokenType::Bin}, +#line 413 "src/lexer-keywords.txt" + {"i64x2.load32x2_s", TokenType::Load, Opcode::I64X2Load32X2S}, {""}, {""}, -#line 147 "src/lexer-keywords.txt" - {"f64x2.sqrt", TokenType::Unary, Opcode::F64X2Sqrt}, +#line 122 "src/lexer-keywords.txt" + {"f64.max", TokenType::Binary, Opcode::F64Max}, +#line 72 "src/lexer-keywords.txt" + {"f32.max", TokenType::Binary, Opcode::F32Max}, + {""}, +#line 190 "src/lexer-keywords.txt" + {"i16x8.ne", TokenType::Compare, Opcode::I16X8Ne}, {""}, {""}, -#line 333 "src/lexer-keywords.txt" - {"i64.atomic.rmw32.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XchgU}, -#line 480 "src/lexer-keywords.txt" +#line 331 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XorU}, +#line 215 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XorU}, +#line 151 "src/lexer-keywords.txt" + {"f64x2.sqrt", TokenType::Unary, Opcode::F64X2Sqrt}, +#line 78 "src/lexer-keywords.txt" + {"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32}, +#line 321 "src/lexer-keywords.txt" + {"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U}, +#line 206 "src/lexer-keywords.txt" + {"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U}, +#line 484 "src/lexer-keywords.txt" {"ref.func", TokenType::RefFunc, Opcode::RefFunc}, -#line 437 "src/lexer-keywords.txt" - {"i8x16.lt_s", TokenType::Compare, Opcode::I8X16LtS}, -#line 441 "src/lexer-keywords.txt" - {"i8x16.min_s", TokenType::Binary, Opcode::I8X16MinS}, -#line 438 "src/lexer-keywords.txt" - {"i8x16.lt_u", TokenType::Compare, Opcode::I8X16LtU}, -#line 186 "src/lexer-keywords.txt" - {"i16x8.ne", TokenType::Compare, Opcode::I16X8Ne}, - {""}, -#line 442 "src/lexer-keywords.txt" + {""}, {""}, {""}, {""}, {""}, +#line 446 "src/lexer-keywords.txt" {"i8x16.min_u", TokenType::Binary, Opcode::I8X16MinU}, -#line 435 "src/lexer-keywords.txt" + {""}, {""}, {""}, {""}, +#line 414 "src/lexer-keywords.txt" + {"i64x2.load32x2_u", TokenType::Load, Opcode::I64X2Load32X2U}, + {""}, {""}, +#line 364 "src/lexer-keywords.txt" + {"i64.eqz", TokenType::Convert, Opcode::I64Eqz}, +#line 240 "src/lexer-keywords.txt" + {"i32.eqz", TokenType::Convert, Opcode::I32Eqz}, + {""}, {""}, {""}, +#line 428 "src/lexer-keywords.txt" + {"i8x16.add", TokenType::Binary, Opcode::I8X16Add}, + {""}, {""}, {""}, {""}, +#line 418 "src/lexer-keywords.txt" + {"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl}, + {""}, {""}, {""}, {""}, +#line 458 "src/lexer-keywords.txt" + {"i8x16.sub", TokenType::Binary, Opcode::I8X16Sub}, +#line 439 "src/lexer-keywords.txt" {"i8x16.le_s", TokenType::Compare, Opcode::I8X16LeS}, + {""}, {""}, +#line 441 "src/lexer-keywords.txt" + {"i8x16.lt_s", TokenType::Compare, Opcode::I8X16LtS}, +#line 184 "src/lexer-keywords.txt" + {"i16x8.min_s", TokenType::Binary, Opcode::I16X8MinS}, + {""}, {""}, {""}, {""}, +#line 563 "src/lexer-keywords.txt" + {"set_global", TokenType::GlobalSet, Opcode::GlobalSet}, +#line 539 "src/lexer-keywords.txt" + {"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64}, +#line 459 "src/lexer-keywords.txt" + {"i8x16", TokenType::I8X16}, {""}, -#line 436 "src/lexer-keywords.txt" +#line 440 "src/lexer-keywords.txt" {"i8x16.le_u", TokenType::Compare, Opcode::I8X16LeU}, - {""}, -#line 538 "src/lexer-keywords.txt" - {"get_local", TokenType::LocalGet, Opcode::LocalGet}, -#line 118 "src/lexer-keywords.txt" - {"f64.max", TokenType::Binary, Opcode::F64Max}, -#line 68 "src/lexer-keywords.txt" - {"f32.max", TokenType::Binary, Opcode::F32Max}, {""}, {""}, -#line 176 "src/lexer-keywords.txt" - {"i16x8.lt_s", TokenType::Compare, Opcode::I16X8LtS}, -#line 180 "src/lexer-keywords.txt" - {"i16x8.min_s", TokenType::Binary, Opcode::I16X8MinS}, -#line 177 "src/lexer-keywords.txt" - {"i16x8.lt_u", TokenType::Compare, Opcode::I16X8LtU}, +#line 442 "src/lexer-keywords.txt" + {"i8x16.lt_u", TokenType::Compare, Opcode::I8X16LtU}, +#line 425 "src/lexer-keywords.txt" + {"i8x16.abs", TokenType::Unary, Opcode::I8X16Abs}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 139 "src/lexer-keywords.txt" + {"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane}, {""}, {""}, -#line 181 "src/lexer-keywords.txt" +#line 412 "src/lexer-keywords.txt" + {"i64x2.extract_lane", TokenType::SimdLaneOp, Opcode::I64X2ExtractLane}, +#line 538 "src/lexer-keywords.txt" + {"f64.promote/f32", TokenType::Convert, Opcode::F64PromoteF32}, +#line 185 "src/lexer-keywords.txt" {"i16x8.min_u", TokenType::Binary, Opcode::I16X8MinU}, -#line 172 "src/lexer-keywords.txt" - {"i16x8.le_s", TokenType::Compare, Opcode::I16X8LeS}, {""}, -#line 173 "src/lexer-keywords.txt" - {"i16x8.le_u", TokenType::Compare, Opcode::I16X8LeU}, - {""}, {""}, -#line 421 "src/lexer-keywords.txt" - {"i8x16.abs", TokenType::Unary, Opcode::I8X16Abs}, +#line 129 "src/lexer-keywords.txt" + {"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 158 "src/lexer-keywords.txt" - {"i16x8.abs", TokenType::Unary, Opcode::I16X8Abs}, - {""}, {""}, {""}, {""}, -#line 455 "src/lexer-keywords.txt" - {"i8x16", TokenType::I8X16}, -#line 182 "src/lexer-keywords.txt" - {"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul}, - {""}, {""}, -#line 317 "src/lexer-keywords.txt" - {"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U}, -#line 202 "src/lexer-keywords.txt" - {"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U}, {""}, -#line 519 "src/lexer-keywords.txt" - {"v64x2.load_splat", TokenType::Load, Opcode::V64X2LoadSplat}, +#line 165 "src/lexer-keywords.txt" + {"i16x8.add", TokenType::Binary, Opcode::I16X8Add}, {""}, -#line 524 "src/lexer-keywords.txt" - {"anyfunc", Type::Funcref}, - {""}, {""}, -#line 532 "src/lexer-keywords.txt" +#line 330 "src/lexer-keywords.txt" + {"i64.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XchgU}, +#line 214 "src/lexer-keywords.txt" + {"i32.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XchgU}, +#line 509 "src/lexer-keywords.txt" + {"unreachable", TokenType::Unreachable, Opcode::Unreachable}, + {""}, {""}, {""}, +#line 128 "src/lexer-keywords.txt" + {"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32}, + {""}, +#line 198 "src/lexer-keywords.txt" + {"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub}, +#line 176 "src/lexer-keywords.txt" + {"i16x8.le_s", TokenType::Compare, Opcode::I16X8LeS}, + {""}, +#line 541 "src/lexer-keywords.txt" + {"get_local", TokenType::LocalGet, Opcode::LocalGet}, +#line 180 "src/lexer-keywords.txt" + {"i16x8.lt_s", TokenType::Compare, Opcode::I16X8LtS}, + {""}, {""}, {""}, +#line 535 "src/lexer-keywords.txt" {"f64.convert_s/i64", TokenType::Convert, Opcode::F64ConvertI64S}, -#line 526 "src/lexer-keywords.txt" +#line 529 "src/lexer-keywords.txt" {"f32.convert_s/i64", TokenType::Convert, Opcode::F32ConvertI64S}, -#line 534 "src/lexer-keywords.txt" +#line 479 "src/lexer-keywords.txt" + {"nop", TokenType::Nop, Opcode::Nop}, + {""}, {""}, {""}, +#line 177 "src/lexer-keywords.txt" + {"i16x8.le_u", TokenType::Compare, Opcode::I16X8LeU}, + {""}, {""}, +#line 181 "src/lexer-keywords.txt" + {"i16x8.lt_u", TokenType::Compare, Opcode::I16X8LtU}, +#line 162 "src/lexer-keywords.txt" + {"i16x8.abs", TokenType::Unary, Opcode::I16X8Abs}, +#line 477 "src/lexer-keywords.txt" + {"nan:arithmetic", TokenType::NanArithmetic}, +#line 144 "src/lexer-keywords.txt" + {"f64x2.max", TokenType::Binary, Opcode::F64X2Max}, +#line 537 "src/lexer-keywords.txt" {"f64.convert_u/i64", TokenType::Convert, Opcode::F64ConvertI64U}, -#line 528 "src/lexer-keywords.txt" +#line 531 "src/lexer-keywords.txt" {"f32.convert_u/i64", TokenType::Convert, Opcode::F32ConvertI64U}, -#line 424 "src/lexer-keywords.txt" - {"i8x16.add", TokenType::Binary, Opcode::I8X16Add}, -#line 560 "src/lexer-keywords.txt" - {"set_global", TokenType::GlobalSet, Opcode::GlobalSet}, - {""}, {""}, -#line 327 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XorU}, -#line 211 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XorU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 161 "src/lexer-keywords.txt" - {"i16x8.add", TokenType::Binary, Opcode::I16X8Add}, - {""}, -#line 341 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU}, -#line 218 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XorU}, -#line 415 "src/lexer-keywords.txt" - {"i64x2.shr_s", TokenType::Binary, Opcode::I64X2ShrS}, -#line 414 "src/lexer-keywords.txt" - {"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl}, {""}, {""}, -#line 416 "src/lexer-keywords.txt" - {"i64x2.shr_u", TokenType::Binary, Opcode::I64X2ShrU}, +#line 298 "src/lexer-keywords.txt" + {"i32x4.max_s", TokenType::Binary, Opcode::I32X4MaxS}, {""}, -#line 125 "src/lexer-keywords.txt" - {"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64}, +#line 186 "src/lexer-keywords.txt" + {"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, +#line 299 "src/lexer-keywords.txt" + {"i32x4.max_u", TokenType::Binary, Opcode::I32X4MaxU}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 149 "src/lexer-keywords.txt" + {"f64x2.replace_lane", TokenType::SimdLaneOp, Opcode::F64X2ReplaceLane}, + {""}, {""}, +#line 417 "src/lexer-keywords.txt" + {"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane}, {""}, {""}, {""}, -#line 97 "src/lexer-keywords.txt" - {"f32x4.splat", TokenType::Unary, Opcode::F32X4Splat}, +#line 44 "src/lexer-keywords.txt" + {"elem.drop", TokenType::ElemDrop, Opcode::ElemDrop}, + {""}, {""}, {""}, {""}, {""}, +#line 429 "src/lexer-keywords.txt" + {"i8x16.all_true", TokenType::Unary, Opcode::I8X16AllTrue}, + {""}, +#line 39 "src/lexer-keywords.txt" + {"data.drop", TokenType::DataDrop, Opcode::DataDrop}, {""}, {""}, -#line 305 "src/lexer-keywords.txt" - {"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat}, +#line 38 "src/lexer-keywords.txt" + {"current_memory", TokenType::MemorySize, Opcode::MemorySize}, + {""}, {""}, +#line 199 "src/lexer-keywords.txt" + {"i16x8", TokenType::I16X8}, + {""}, {""}, +#line 285 "src/lexer-keywords.txt" + {"i32x4.any_true", TokenType::Unary, Opcode::I32X4AnyTrue}, + {""}, {""}, {""}, {""}, +#line 497 "src/lexer-keywords.txt" + {"table.copy", TokenType::TableCopy, Opcode::TableCopy}, +#line 522 "src/lexer-keywords.txt" + {"v64x2.load_splat", TokenType::Load, Opcode::V64X2LoadSplat}, {""}, {""}, {""}, {""}, {""}, -#line 294 "src/lexer-keywords.txt" - {"i32x4.max_s", TokenType::Binary, Opcode::I32X4MaxS}, -#line 74 "src/lexer-keywords.txt" - {"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32}, +#line 101 "src/lexer-keywords.txt" + {"f32x4.splat", TokenType::Unary, Opcode::F32X4Splat}, {""}, {""}, -#line 295 "src/lexer-keywords.txt" - {"i32x4.max_u", TokenType::Binary, Opcode::I32X4MaxU}, -#line 409 "src/lexer-keywords.txt" - {"i64x2.load32x2_s", TokenType::Load, Opcode::I64X2Load32X2S}, - {""}, -#line 88 "src/lexer-keywords.txt" - {"f32x4.gt", TokenType::Compare, Opcode::F32X4Gt}, +#line 309 "src/lexer-keywords.txt" + {"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat}, {""}, -#line 410 "src/lexer-keywords.txt" - {"i64x2.load32x2_u", TokenType::Load, Opcode::I64X2Load32X2U}, +#line 525 "src/lexer-keywords.txt" + {"v8x16.swizzle", TokenType::Binary, Opcode::V8X16Swizzle}, +#line 316 "src/lexer-keywords.txt" + {"i32x4.widen_low_i16x8_s", TokenType::Unary, Opcode::I32X4WidenLowI16X8S}, {""}, -#line 24 "src/lexer-keywords.txt" - {"assert_trap", TokenType::AssertTrap}, +#line 355 "src/lexer-keywords.txt" + {"i64.atomic.store8", TokenType::AtomicStore, Opcode::I64AtomicStore8}, +#line 231 "src/lexer-keywords.txt" + {"i32.atomic.store8", TokenType::AtomicStore, Opcode::I32AtomicStore8}, {""}, {""}, -#line 326 "src/lexer-keywords.txt" - {"i64.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XchgU}, -#line 210 "src/lexer-keywords.txt" - {"i32.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XchgU}, - {""}, {""}, {""}, -#line 87 "src/lexer-keywords.txt" +#line 91 "src/lexer-keywords.txt" {"f32x4.ge", TokenType::Compare, Opcode::F32X4Ge}, -#line 536 "src/lexer-keywords.txt" - {"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64}, -#line 286 "src/lexer-keywords.txt" - {"i32x4.gt_s", TokenType::Compare, Opcode::I32X4GtS}, - {""}, -#line 287 "src/lexer-keywords.txt" - {"i32x4.gt_u", TokenType::Compare, Opcode::I32X4GtU}, - {""}, -#line 506 "src/lexer-keywords.txt" - {"unreachable", TokenType::Unreachable, Opcode::Unreachable}, +#line 352 "src/lexer-keywords.txt" + {"i64.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I64AtomicRmwXor}, +#line 229 "src/lexer-keywords.txt" + {"i32.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I32AtomicRmwXor}, + {""}, {""}, {""}, +#line 92 "src/lexer-keywords.txt" + {"f32x4.gt", TokenType::Compare, Opcode::F32X4Gt}, +#line 317 "src/lexer-keywords.txt" + {"i32x4.widen_low_i16x8_u", TokenType::Unary, Opcode::I32X4WidenLowI16X8U}, {""}, -#line 284 "src/lexer-keywords.txt" - {"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS}, +#line 28 "src/lexer-keywords.txt" + {"atomic.notify", TokenType::AtomicNotify, Opcode::AtomicNotify}, +#line 557 "src/lexer-keywords.txt" + {"i64.trunc_s:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32S}, +#line 545 "src/lexer-keywords.txt" + {"i32.trunc_s:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32S}, + {""}, {""}, {""}, +#line 471 "src/lexer-keywords.txt" + {"memory.grow", TokenType::MemoryGrow, Opcode::MemoryGrow}, + {""}, {""}, {""}, +#line 166 "src/lexer-keywords.txt" + {"i16x8.all_true", TokenType::Unary, Opcode::I16X8AllTrue}, + {""}, {""}, {""}, +#line 561 "src/lexer-keywords.txt" + {"i64.trunc_u:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32U}, +#line 549 "src/lexer-keywords.txt" + {"i32.trunc_u:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32U}, {""}, -#line 285 "src/lexer-keywords.txt" - {"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU}, - {""}, {""}, {""}, {""}, -#line 530 "src/lexer-keywords.txt" - {"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32}, -#line 135 "src/lexer-keywords.txt" - {"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane}, - {""}, {""}, #line 408 "src/lexer-keywords.txt" - {"i64x2.extract_lane", TokenType::SimdLaneOp, Opcode::I64X2ExtractLane}, - {""}, {""}, -#line 504 "src/lexer-keywords.txt" - {"try", TokenType::Try, Opcode::Try}, - {""}, -#line 140 "src/lexer-keywords.txt" - {"f64x2.max", TokenType::Binary, Opcode::F64X2Max}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 404 "src/lexer-keywords.txt" {"i64.trunc_sat_f64_s", TokenType::Convert, Opcode::I64TruncSatF64S}, -#line 274 "src/lexer-keywords.txt" +#line 278 "src/lexer-keywords.txt" {"i32.trunc_sat_f64_s", TokenType::Convert, Opcode::I32TruncSatF64S}, -#line 124 "src/lexer-keywords.txt" - {"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, +#line 307 "src/lexer-keywords.txt" + {"i32x4.shr_s", TokenType::Binary, Opcode::I32X4ShrS}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 405 "src/lexer-keywords.txt" +#line 409 "src/lexer-keywords.txt" {"i64.trunc_sat_f64_u", TokenType::Convert, Opcode::I64TruncSatF64U}, -#line 275 "src/lexer-keywords.txt" +#line 279 "src/lexer-keywords.txt" {"i32.trunc_sat_f64_u", TokenType::Convert, Opcode::I32TruncSatF64U}, + {""}, {""}, {""}, +#line 288 "src/lexer-keywords.txt" + {"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS}, {""}, {""}, -#line 43 "src/lexer-keywords.txt" - {"elem.drop", TokenType::ElemDrop, Opcode::ElemDrop}, -#line 38 "src/lexer-keywords.txt" - {"data.drop", TokenType::DataDrop, Opcode::DataDrop}, +#line 290 "src/lexer-keywords.txt" + {"i32x4.gt_s", TokenType::Compare, Opcode::I32X4GtS}, {""}, {""}, {""}, {""}, -#line 470 "src/lexer-keywords.txt" - {"memory", TokenType::Memory}, -#line 522 "src/lexer-keywords.txt" - {"v8x16.swizzle", TokenType::Binary, Opcode::V8X16Swizzle}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 122 "src/lexer-keywords.txt" - {"f64.neg", TokenType::Unary, Opcode::F64Neg}, -#line 72 "src/lexer-keywords.txt" - {"f32.neg", TokenType::Unary, Opcode::F32Neg}, - {""}, -#line 452 "src/lexer-keywords.txt" - {"i8x16.sub_saturate_s", TokenType::Binary, Opcode::I8X16SubSaturateS}, +#line 25 "src/lexer-keywords.txt" + {"assert_trap", TokenType::AssertTrap}, {""}, -#line 453 "src/lexer-keywords.txt" - {"i8x16.sub_saturate_u", TokenType::Binary, Opcode::I8X16SubSaturateU}, - {""}, {""}, {""}, {""}, -#line 28 "src/lexer-keywords.txt" - {"binary", TokenType::Bin}, +#line 308 "src/lexer-keywords.txt" + {"i32x4.shr_u", TokenType::Binary, Opcode::I32X4ShrU}, {""}, {""}, -#line 535 "src/lexer-keywords.txt" - {"f64.promote/f32", TokenType::Convert, Opcode::F64PromoteF32}, -#line 425 "src/lexer-keywords.txt" - {"i8x16.all_true", TokenType::Unary, Opcode::I8X16AllTrue}, - {""}, {""}, {""}, -#line 192 "src/lexer-keywords.txt" - {"i16x8.sub_saturate_s", TokenType::Binary, Opcode::I16X8SubSaturateS}, - {""}, -#line 193 "src/lexer-keywords.txt" - {"i16x8.sub_saturate_u", TokenType::Binary, Opcode::I16X8SubSaturateU}, - {""}, -#line 195 "src/lexer-keywords.txt" - {"i16x8", TokenType::I16X8}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 162 "src/lexer-keywords.txt" - {"i16x8.all_true", TokenType::Unary, Opcode::I16X8AllTrue}, -#line 555 "src/lexer-keywords.txt" +#line 289 "src/lexer-keywords.txt" + {"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU}, + {""}, {""}, +#line 291 "src/lexer-keywords.txt" + {"i32x4.gt_u", TokenType::Compare, Opcode::I32X4GtU}, + {""}, {""}, +#line 558 "src/lexer-keywords.txt" {"i64.trunc_s:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64S}, -#line 543 "src/lexer-keywords.txt" +#line 546 "src/lexer-keywords.txt" {"i32.trunc_s:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64S}, -#line 559 "src/lexer-keywords.txt" + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 562 "src/lexer-keywords.txt" {"i64.trunc_u:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64U}, -#line 547 "src/lexer-keywords.txt" +#line 550 "src/lexer-keywords.txt" {"i32.trunc_u:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64U}, + {""}, +#line 456 "src/lexer-keywords.txt" + {"i8x16.sub_saturate_s", TokenType::Binary, Opcode::I8X16SubSaturateS}, {""}, {""}, -#line 145 "src/lexer-keywords.txt" - {"f64x2.replace_lane", TokenType::SimdLaneOp, Opcode::F64X2ReplaceLane}, +#line 102 "src/lexer-keywords.txt" + {"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt}, +#line 551 "src/lexer-keywords.txt" + {"i32.wrap/i64", TokenType::Convert, Opcode::I32WrapI64}, {""}, {""}, -#line 413 "src/lexer-keywords.txt" - {"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane}, - {""}, {""}, {""}, -#line 554 "src/lexer-keywords.txt" - {"i64.trunc_s:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32S}, -#line 542 "src/lexer-keywords.txt" - {"i32.trunc_s:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32S}, -#line 558 "src/lexer-keywords.txt" - {"i64.trunc_u:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32U}, -#line 546 "src/lexer-keywords.txt" - {"i32.trunc_u:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32U}, +#line 126 "src/lexer-keywords.txt" + {"f64.neg", TokenType::Unary, Opcode::F64Neg}, +#line 76 "src/lexer-keywords.txt" + {"f32.neg", TokenType::Unary, Opcode::F32Neg}, {""}, {""}, {""}, {""}, -#line 277 "src/lexer-keywords.txt" +#line 457 "src/lexer-keywords.txt" + {"i8x16.sub_saturate_u", TokenType::Binary, Opcode::I8X16SubSaturateU}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 426 "src/lexer-keywords.txt" + {"i8x16.add_saturate_s", TokenType::Binary, Opcode::I8X16AddSaturateS}, + {""}, {""}, {""}, +#line 281 "src/lexer-keywords.txt" {"i32.wrap_i64", TokenType::Convert, Opcode::I32WrapI64}, - {""}, {""}, -#line 154 "src/lexer-keywords.txt" - {"global.get", TokenType::GlobalGet, Opcode::GlobalGet}, {""}, {""}, {""}, {""}, -#line 473 "src/lexer-keywords.txt" - {"nan:arithmetic", TokenType::NanArithmetic}, +#line 306 "src/lexer-keywords.txt" + {"i32x4.shl", TokenType::Binary, Opcode::I32X4Shl}, + {""}, {""}, {""}, +#line 427 "src/lexer-keywords.txt" + {"i8x16.add_saturate_u", TokenType::Binary, Opcode::I8X16AddSaturateU}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 443 "src/lexer-keywords.txt" + {"i8x16.max_s", TokenType::Binary, Opcode::I8X16MaxS}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 196 "src/lexer-keywords.txt" + {"i16x8.sub_saturate_s", TokenType::Binary, Opcode::I16X8SubSaturateS}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 467 "src/lexer-keywords.txt" - {"memory.grow", TokenType::MemoryGrow, Opcode::MemoryGrow}, - {""}, {""}, {""}, {""}, -#line 98 "src/lexer-keywords.txt" - {"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt}, -#line 312 "src/lexer-keywords.txt" - {"i32x4.widen_low_i16x8_s", TokenType::Unary, Opcode::I32X4WidenLowI16X8S}, - {""}, -#line 313 "src/lexer-keywords.txt" - {"i32x4.widen_low_i16x8_u", TokenType::Unary, Opcode::I32X4WidenLowI16X8U}, +#line 90 "src/lexer-keywords.txt" + {"f32x4.extract_lane", TokenType::SimdLaneOp, Opcode::F32X4ExtractLane}, {""}, {""}, -#line 422 "src/lexer-keywords.txt" - {"i8x16.add_saturate_s", TokenType::Binary, Opcode::I8X16AddSaturateS}, - {""}, -#line 423 "src/lexer-keywords.txt" - {"i8x16.add_saturate_u", TokenType::Binary, Opcode::I8X16AddSaturateU}, - {""}, -#line 494 "src/lexer-keywords.txt" - {"table.copy", TokenType::TableCopy, Opcode::TableCopy}, - {""}, -#line 548 "src/lexer-keywords.txt" - {"i32.wrap/i64", TokenType::Convert, Opcode::I32WrapI64}, - {""}, -#line 111 "src/lexer-keywords.txt" - {"f64.eq", TokenType::Compare, Opcode::F64Eq}, -#line 61 "src/lexer-keywords.txt" - {"f32.eq", TokenType::Compare, Opcode::F32Eq}, +#line 287 "src/lexer-keywords.txt" + {"i32x4.extract_lane", TokenType::SimdLaneOp, Opcode::I32X4ExtractLane}, {""}, -#line 359 "src/lexer-keywords.txt" - {"i64.eq", TokenType::Compare, Opcode::I64Eq}, -#line 235 "src/lexer-keywords.txt" - {"i32.eq", TokenType::Compare, Opcode::I32Eq}, +#line 197 "src/lexer-keywords.txt" + {"i16x8.sub_saturate_u", TokenType::Binary, Opcode::I16X8SubSaturateU}, + {""}, {""}, {""}, {""}, {""}, +#line 444 "src/lexer-keywords.txt" + {"i8x16.max_u", TokenType::Binary, Opcode::I8X16MaxU}, {""}, {""}, -#line 159 "src/lexer-keywords.txt" +#line 163 "src/lexer-keywords.txt" {"i16x8.add_saturate_s", TokenType::Binary, Opcode::I16X8AddSaturateS}, - {""}, -#line 160 "src/lexer-keywords.txt" - {"i16x8.add_saturate_u", TokenType::Binary, Opcode::I16X8AddSaturateU}, -#line 348 "src/lexer-keywords.txt" - {"i64.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I64AtomicRmwXor}, -#line 225 "src/lexer-keywords.txt" - {"i32.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I32AtomicRmwXor}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, -#line 143 "src/lexer-keywords.txt" - {"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg}, - {""}, {""}, -#line 412 "src/lexer-keywords.txt" - {"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, -#line 351 "src/lexer-keywords.txt" - {"i64.atomic.store8", TokenType::AtomicStore, Opcode::I64AtomicStore8}, -#line 227 "src/lexer-keywords.txt" - {"i32.atomic.store8", TokenType::AtomicStore, Opcode::I32AtomicStore8}, -#line 518 "src/lexer-keywords.txt" - {"v32x4.load_splat", TokenType::Load, Opcode::V32X4LoadSplat}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 164 "src/lexer-keywords.txt" + {"i16x8.add_saturate_u", TokenType::Binary, Opcode::I16X8AddSaturateU}, + {""}, {""}, {""}, +#line 294 "src/lexer-keywords.txt" + {"i32x4.load16x4_s", TokenType::Load, Opcode::I32X4Load16X4S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 384 "src/lexer-keywords.txt" +#line 182 "src/lexer-keywords.txt" + {"i16x8.max_s", TokenType::Binary, Opcode::I16X8MaxS}, + {""}, {""}, {""}, {""}, +#line 430 "src/lexer-keywords.txt" + {"i8x16.any_true", TokenType::Unary, Opcode::I8X16AnyTrue}, + {""}, {""}, {""}, +#line 95 "src/lexer-keywords.txt" + {"f32x4.max", TokenType::Binary, Opcode::F32X4Max}, + {""}, +#line 388 "src/lexer-keywords.txt" {"i64.popcnt", TokenType::Unary, Opcode::I64Popcnt}, -#line 255 "src/lexer-keywords.txt" +#line 259 "src/lexer-keywords.txt" {"i32.popcnt", TokenType::Unary, Opcode::I32Popcnt}, - {""}, {""}, {""}, -#line 281 "src/lexer-keywords.txt" - {"i32x4.any_true", TokenType::Unary, Opcode::I32X4AnyTrue}, {""}, {""}, {""}, {""}, {""}, -#line 303 "src/lexer-keywords.txt" - {"i32x4.shr_s", TokenType::Binary, Opcode::I32X4ShrS}, -#line 302 "src/lexer-keywords.txt" - {"i32x4.shl", TokenType::Binary, Opcode::I32X4Shl}, - {""}, {""}, -#line 304 "src/lexer-keywords.txt" - {"i32x4.shr_u", TokenType::Binary, Opcode::I32X4ShrU}, -#line 451 "src/lexer-keywords.txt" +#line 295 "src/lexer-keywords.txt" + {"i32x4.load16x4_u", TokenType::Load, Opcode::I32X4Load16X4U}, +#line 86 "src/lexer-keywords.txt" + {"f32x4.convert_i32x4_s", TokenType::Unary, Opcode::F32X4ConvertI32X4S}, +#line 455 "src/lexer-keywords.txt" {"i8x16.splat", TokenType::Unary, Opcode::I8X16Splat}, - {""}, {""}, {""}, {""}, {""}, -#line 439 "src/lexer-keywords.txt" - {"i8x16.max_s", TokenType::Binary, Opcode::I8X16MaxS}, - {""}, {""}, {""}, -#line 440 "src/lexer-keywords.txt" - {"i8x16.max_u", TokenType::Binary, Opcode::I8X16MaxU}, - {""}, {""}, {""}, {""}, -#line 191 "src/lexer-keywords.txt" - {"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat}, - {""}, {""}, {""}, {""}, {""}, -#line 178 "src/lexer-keywords.txt" - {"i16x8.max_s", TokenType::Binary, Opcode::I16X8MaxS}, {""}, {""}, {""}, -#line 179 "src/lexer-keywords.txt" +#line 469 "src/lexer-keywords.txt" + {"memory.copy", TokenType::MemoryCopy, Opcode::MemoryCopy}, +#line 158 "src/lexer-keywords.txt" + {"global.get", TokenType::GlobalGet, Opcode::GlobalGet}, +#line 183 "src/lexer-keywords.txt" {"i16x8.max_u", TokenType::Binary, Opcode::I16X8MaxU}, {""}, -#line 433 "src/lexer-keywords.txt" - {"i8x16.gt_s", TokenType::Compare, Opcode::I8X16GtS}, +#line 147 "src/lexer-keywords.txt" + {"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg}, + {""}, {""}, +#line 416 "src/lexer-keywords.txt" + {"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg}, +#line 87 "src/lexer-keywords.txt" + {"f32x4.convert_i32x4_u", TokenType::Unary, Opcode::F32X4ConvertI32X4U}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 344 "src/lexer-keywords.txt" + {"i64.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XchgU}, +#line 221 "src/lexer-keywords.txt" + {"i32.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XchgU}, + {""}, {""}, +#line 542 "src/lexer-keywords.txt" + {"i32.reinterpret/f32", TokenType::Convert, Opcode::I32ReinterpretF32}, + {""}, {""}, +#line 115 "src/lexer-keywords.txt" + {"f64.eq", TokenType::Compare, Opcode::F64Eq}, +#line 65 "src/lexer-keywords.txt" + {"f32.eq", TokenType::Compare, Opcode::F32Eq}, {""}, -#line 434 "src/lexer-keywords.txt" - {"i8x16.gt_u", TokenType::Compare, Opcode::I8X16GtU}, +#line 363 "src/lexer-keywords.txt" + {"i64.eq", TokenType::Compare, Opcode::I64Eq}, +#line 239 "src/lexer-keywords.txt" + {"i32.eq", TokenType::Compare, Opcode::I32Eq}, + {""}, {""}, {""}, {""}, {""}, +#line 100 "src/lexer-keywords.txt" + {"f32x4.replace_lane", TokenType::SimdLaneOp, Opcode::F32X4ReplaceLane}, +#line 167 "src/lexer-keywords.txt" + {"i16x8.any_true", TokenType::Unary, Opcode::I16X8AnyTrue}, + {""}, +#line 305 "src/lexer-keywords.txt" + {"i32x4.replace_lane", TokenType::SimdLaneOp, Opcode::I32X4ReplaceLane}, + {""}, {""}, {""}, {""}, {""}, +#line 260 "src/lexer-keywords.txt" + {"i32.reinterpret_f32", TokenType::Convert, Opcode::I32ReinterpretF32}, + {""}, {""}, +#line 453 "src/lexer-keywords.txt" + {"i8x16.shr_s", TokenType::Binary, Opcode::I8X16ShrS}, {""}, {""}, {""}, -#line 431 "src/lexer-keywords.txt" +#line 195 "src/lexer-keywords.txt" + {"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 435 "src/lexer-keywords.txt" {"i8x16.ge_s", TokenType::Compare, Opcode::I8X16GeS}, {""}, -#line 432 "src/lexer-keywords.txt" - {"i8x16.ge_u", TokenType::Compare, Opcode::I8X16GeU}, +#line 521 "src/lexer-keywords.txt" + {"v32x4.load_splat", TokenType::Load, Opcode::V32X4LoadSplat}, +#line 437 "src/lexer-keywords.txt" + {"i8x16.gt_s", TokenType::Compare, Opcode::I8X16GtS}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 170 "src/lexer-keywords.txt" - {"i16x8.gt_s", TokenType::Compare, Opcode::I16X8GtS}, - {""}, -#line 171 "src/lexer-keywords.txt" - {"i16x8.gt_u", TokenType::Compare, Opcode::I16X8GtU}, - {""}, {""}, {""}, -#line 168 "src/lexer-keywords.txt" - {"i16x8.ge_s", TokenType::Compare, Opcode::I16X8GeS}, -#line 86 "src/lexer-keywords.txt" - {"f32x4.extract_lane", TokenType::SimdLaneOp, Opcode::F32X4ExtractLane}, -#line 169 "src/lexer-keywords.txt" - {"i16x8.ge_u", TokenType::Compare, Opcode::I16X8GeU}, - {""}, -#line 283 "src/lexer-keywords.txt" - {"i32x4.extract_lane", TokenType::SimdLaneOp, Opcode::I32X4ExtractLane}, - {""}, {""}, {""}, {""}, -#line 91 "src/lexer-keywords.txt" - {"f32x4.max", TokenType::Binary, Opcode::F32X4Max}, +#line 454 "src/lexer-keywords.txt" + {"i8x16.shr_u", TokenType::Binary, Opcode::I8X16ShrU}, {""}, {""}, -#line 385 "src/lexer-keywords.txt" - {"i64.reinterpret_f64", TokenType::Convert, Opcode::I64ReinterpretF64}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, -#line 256 "src/lexer-keywords.txt" - {"i32.reinterpret_f32", TokenType::Convert, Opcode::I32ReinterpretF32}, +#line 436 "src/lexer-keywords.txt" + {"i8x16.ge_u", TokenType::Compare, Opcode::I8X16GeU}, {""}, {""}, -#line 134 "src/lexer-keywords.txt" - {"f64x2.eq", TokenType::Compare, Opcode::F64X2Eq}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 551 "src/lexer-keywords.txt" - {"i64.reinterpret/f64", TokenType::Convert, Opcode::I64ReinterpretF64}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, -#line 539 "src/lexer-keywords.txt" - {"i32.reinterpret/f32", TokenType::Convert, Opcode::I32ReinterpretF32}, -#line 290 "src/lexer-keywords.txt" - {"i32x4.load16x4_s", TokenType::Load, Opcode::I32X4Load16X4S}, - {""}, {""}, {""}, -#line 291 "src/lexer-keywords.txt" - {"i32x4.load16x4_u", TokenType::Load, Opcode::I32X4Load16X4U}, +#line 438 "src/lexer-keywords.txt" + {"i8x16.gt_u", TokenType::Compare, Opcode::I8X16GtU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 537 "src/lexer-keywords.txt" - {"get_global", TokenType::GlobalGet, Opcode::GlobalGet}, +#line 554 "src/lexer-keywords.txt" + {"i64.reinterpret/f64", TokenType::Convert, Opcode::I64ReinterpretF64}, {""}, -#line 96 "src/lexer-keywords.txt" - {"f32x4.replace_lane", TokenType::SimdLaneOp, Opcode::F32X4ReplaceLane}, - {""}, {""}, -#line 301 "src/lexer-keywords.txt" - {"i32x4.replace_lane", TokenType::SimdLaneOp, Opcode::I32X4ReplaceLane}, +#line 161 "src/lexer-keywords.txt" + {"grow_memory", TokenType::MemoryGrow, Opcode::MemoryGrow}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 427 "src/lexer-keywords.txt" - {"i8x16.avgr_u", TokenType::Binary, Opcode::I8X16AvgrU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 164 "src/lexer-keywords.txt" - {"i16x8.avgr_u", TokenType::Binary, Opcode::I16X8AvgrU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 193 "src/lexer-keywords.txt" + {"i16x8.shr_s", TokenType::Binary, Opcode::I16X8ShrS}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 389 "src/lexer-keywords.txt" + {"i64.reinterpret_f64", TokenType::Convert, Opcode::I64ReinterpretF64}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 172 "src/lexer-keywords.txt" + {"i16x8.ge_s", TokenType::Compare, Opcode::I16X8GeS}, + {""}, +#line 540 "src/lexer-keywords.txt" + {"get_global", TokenType::GlobalGet, Opcode::GlobalGet}, +#line 174 "src/lexer-keywords.txt" + {"i16x8.gt_s", TokenType::Compare, Opcode::I16X8GtS}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 37 "src/lexer-keywords.txt" - {"current_memory", TokenType::MemorySize, Opcode::MemorySize}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 194 "src/lexer-keywords.txt" + {"i16x8.shr_u", TokenType::Binary, Opcode::I16X8ShrU}, {""}, -#line 94 "src/lexer-keywords.txt" - {"f32x4.neg", TokenType::Unary, Opcode::F32X4Neg}, +#line 452 "src/lexer-keywords.txt" + {"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl}, +#line 173 "src/lexer-keywords.txt" + {"i16x8.ge_u", TokenType::Compare, Opcode::I16X8GeU}, {""}, {""}, -#line 299 "src/lexer-keywords.txt" - {"i32x4.neg", TokenType::Unary, Opcode::I32X4Neg}, +#line 175 "src/lexer-keywords.txt" + {"i16x8.gt_u", TokenType::Compare, Opcode::I16X8GtU}, {""}, {""}, {""}, {""}, -#line 308 "src/lexer-keywords.txt" - {"i32x4.trunc_sat_f32x4_s", TokenType::Unary, Opcode::I32X4TruncSatF32X4S}, - {""}, -#line 309 "src/lexer-keywords.txt" - {"i32x4.trunc_sat_f32x4_u", TokenType::Unary, Opcode::I32X4TruncSatF32X4U}, -#line 520 "src/lexer-keywords.txt" - {"v8x16.load_splat", TokenType::Load, Opcode::V8X16LoadSplat}, +#line 138 "src/lexer-keywords.txt" + {"f64x2.eq", TokenType::Compare, Opcode::F64X2Eq}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 517 "src/lexer-keywords.txt" - {"v16x8.load_splat", TokenType::Load, Opcode::V16X8LoadSplat}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 426 "src/lexer-keywords.txt" - {"i8x16.any_true", TokenType::Unary, Opcode::I8X16AnyTrue}, - {""}, {""}, {""}, {""}, {""}, -#line 449 "src/lexer-keywords.txt" - {"i8x16.shr_s", TokenType::Binary, Opcode::I8X16ShrS}, -#line 448 "src/lexer-keywords.txt" - {"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl}, - {""}, {""}, -#line 450 "src/lexer-keywords.txt" - {"i8x16.shr_u", TokenType::Binary, Opcode::I8X16ShrU}, {""}, {""}, {""}, {""}, -#line 163 "src/lexer-keywords.txt" - {"i16x8.any_true", TokenType::Unary, Opcode::I16X8AnyTrue}, - {""}, {""}, {""}, {""}, {""}, -#line 189 "src/lexer-keywords.txt" - {"i16x8.shr_s", TokenType::Binary, Opcode::I16X8ShrS}, +#line 187 "src/lexer-keywords.txt" + {"i16x8.narrow_i32x4_s", TokenType::Binary, Opcode::I16X8NarrowI32X4S}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, #line 188 "src/lexer-keywords.txt" + {"i16x8.narrow_i32x4_u", TokenType::Binary, Opcode::I16X8NarrowI32X4U}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 192 "src/lexer-keywords.txt" {"i16x8.shl", TokenType::Binary, Opcode::I16X8Shl}, - {""}, {""}, -#line 190 "src/lexer-keywords.txt" - {"i16x8.shr_u", TokenType::Binary, Opcode::I16X8ShrU}, - {""}, {""}, -#line 27 "src/lexer-keywords.txt" - {"atomic.notify", TokenType::AtomicNotify, Opcode::AtomicNotify}, - {""}, {""}, {""}, -#line 82 "src/lexer-keywords.txt" - {"f32x4.convert_i32x4_s", TokenType::Unary, Opcode::F32X4ConvertI32X4S}, - {""}, -#line 83 "src/lexer-keywords.txt" - {"f32x4.convert_i32x4_u", TokenType::Unary, Opcode::F32X4ConvertI32X4U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 109 "src/lexer-keywords.txt" +#line 113 "src/lexer-keywords.txt" {"f64.copysign", TokenType::Binary, Opcode::F64Copysign}, -#line 58 "src/lexer-keywords.txt" +#line 62 "src/lexer-keywords.txt" {"f32.copysign", TokenType::Binary, Opcode::F32Copysign}, - {""}, {""}, {""}, {""}, {""}, -#line 521 "src/lexer-keywords.txt" - {"v8x16.shuffle", TokenType::SimdShuffleOp, Opcode::V8X16Shuffle}, - {""}, {""}, {""}, {""}, {""}, -#line 340 "src/lexer-keywords.txt" - {"i64.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XchgU}, -#line 217 "src/lexer-keywords.txt" - {"i32.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XchgU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 429 "src/lexer-keywords.txt" - {"i8x16.extract_lane_s", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneS}, - {""}, -#line 430 "src/lexer-keywords.txt" - {"i8x16.extract_lane_u", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, -#line 166 "src/lexer-keywords.txt" - {"i16x8.extract_lane_s", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneS}, - {""}, -#line 167 "src/lexer-keywords.txt" - {"i16x8.extract_lane_u", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, -#line 85 "src/lexer-keywords.txt" - {"f32x4.eq", TokenType::Compare, Opcode::F32X4Eq}, {""}, {""}, -#line 282 "src/lexer-keywords.txt" - {"i32x4.eq", TokenType::Compare, Opcode::I32X4Eq}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 183 "src/lexer-keywords.txt" - {"i16x8.narrow_i32x4_s", TokenType::Binary, Opcode::I16X8NarrowI32X4S}, +#line 524 "src/lexer-keywords.txt" + {"v8x16.shuffle", TokenType::SimdShuffleOp, Opcode::V8X16Shuffle}, {""}, -#line 184 "src/lexer-keywords.txt" - {"i16x8.narrow_i32x4_u", TokenType::Binary, Opcode::I16X8NarrowI32X4U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 344 "src/lexer-keywords.txt" - {"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg}, -#line 221 "src/lexer-keywords.txt" - {"i32.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmwCmpxchg}, +#line 433 "src/lexer-keywords.txt" + {"i8x16.extract_lane_s", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneS}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 312 "src/lexer-keywords.txt" + {"i32x4.trunc_sat_f32x4_s", TokenType::Unary, Opcode::I32X4TruncSatF32X4S}, {""}, {""}, {""}, {""}, -#line 447 "src/lexer-keywords.txt" - {"i8x16.replace_lane", TokenType::SimdLaneOp, Opcode::I8X16ReplaceLane}, +#line 434 "src/lexer-keywords.txt" + {"i8x16.extract_lane_u", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneU}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 313 "src/lexer-keywords.txt" + {"i32x4.trunc_sat_f32x4_u", TokenType::Unary, Opcode::I32X4TruncSatF32X4U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 187 "src/lexer-keywords.txt" - {"i16x8.replace_lane", TokenType::SimdLaneOp, Opcode::I16X8ReplaceLane}, -#line 157 "src/lexer-keywords.txt" - {"grow_memory", TokenType::MemoryGrow, Opcode::MemoryGrow}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 451 "src/lexer-keywords.txt" + {"i8x16.replace_lane", TokenType::SimdLaneOp, Opcode::I8X16ReplaceLane}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, +#line 170 "src/lexer-keywords.txt" + {"i16x8.extract_lane_s", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneS}, +#line 431 "src/lexer-keywords.txt" + {"i8x16.avgr_u", TokenType::Binary, Opcode::I8X16AvgrU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 171 "src/lexer-keywords.txt" + {"i16x8.extract_lane_u", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU}, + {""}, {""}, +#line 523 "src/lexer-keywords.txt" + {"v8x16.load_splat", TokenType::Load, Opcode::V8X16LoadSplat}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 98 "src/lexer-keywords.txt" + {"f32x4.neg", TokenType::Unary, Opcode::F32X4Neg}, + {""}, {""}, +#line 303 "src/lexer-keywords.txt" + {"i32x4.neg", TokenType::Unary, Opcode::I32X4Neg}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 191 "src/lexer-keywords.txt" + {"i16x8.replace_lane", TokenType::SimdLaneOp, Opcode::I16X8ReplaceLane}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 168 "src/lexer-keywords.txt" + {"i16x8.avgr_u", TokenType::Binary, Opcode::I16X8AvgrU}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, -#line 445 "src/lexer-keywords.txt" - {"i8x16.neg", TokenType::Unary, Opcode::I8X16Neg}, {""}, {""}, {""}, {""}, {""}, -#line 465 "src/lexer-keywords.txt" - {"memory.copy", TokenType::MemoryCopy, Opcode::MemoryCopy}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 185 "src/lexer-keywords.txt" - {"i16x8.neg", TokenType::Unary, Opcode::I16X8Neg}, +#line 520 "src/lexer-keywords.txt" + {"v16x8.load_splat", TokenType::Load, Opcode::V16X8LoadSplat}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 198 "src/lexer-keywords.txt" - {"i16x8.widen_low_i8x16_s", TokenType::Unary, Opcode::I16X8WidenLowI8X16S}, - {""}, -#line 199 "src/lexer-keywords.txt" - {"i16x8.widen_low_i8x16_u", TokenType::Unary, Opcode::I16X8WidenLowI8X16U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 348 "src/lexer-keywords.txt" + {"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg}, +#line 225 "src/lexer-keywords.txt" + {"i32.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmwCmpxchg}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 202 "src/lexer-keywords.txt" + {"i16x8.widen_low_i8x16_s", TokenType::Unary, Opcode::I16X8WidenLowI8X16S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 203 "src/lexer-keywords.txt" + {"i16x8.widen_low_i8x16_u", TokenType::Unary, Opcode::I16X8WidenLowI8X16U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, -#line 428 "src/lexer-keywords.txt" - {"i8x16.eq", TokenType::Compare, Opcode::I8X16Eq}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, -#line 165 "src/lexer-keywords.txt" - {"i16x8.eq", TokenType::Compare, Opcode::I16X8Eq}, + {""}, {""}, {""}, +#line 89 "src/lexer-keywords.txt" + {"f32x4.eq", TokenType::Compare, Opcode::F32X4Eq}, + {""}, {""}, +#line 286 "src/lexer-keywords.txt" + {"i32x4.eq", TokenType::Compare, Opcode::I32X4Eq}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 174 "src/lexer-keywords.txt" - {"i16x8.load8x8_s", TokenType::Load, Opcode::I16X8Load8X8S}, - {""}, -#line 175 "src/lexer-keywords.txt" - {"i16x8.load8x8_u", TokenType::Load, Opcode::I16X8Load8X8U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 447 "src/lexer-keywords.txt" + {"i8x16.narrow_i16x8_s", TokenType::Binary, Opcode::I8X16NarrowI16X8S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 448 "src/lexer-keywords.txt" + {"i8x16.narrow_i16x8_u", TokenType::Binary, Opcode::I8X16NarrowI16X8U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 314 "src/lexer-keywords.txt" + {"i32x4.widen_high_i16x8_s", TokenType::Unary, Opcode::I32X4WidenHighI16X8S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 315 "src/lexer-keywords.txt" + {"i32x4.widen_high_i16x8_u", TokenType::Unary, Opcode::I32X4WidenHighI16X8U}, +#line 449 "src/lexer-keywords.txt" + {"i8x16.neg", TokenType::Unary, Opcode::I8X16Neg}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 443 "src/lexer-keywords.txt" - {"i8x16.narrow_i16x8_s", TokenType::Binary, Opcode::I8X16NarrowI16X8S}, - {""}, -#line 444 "src/lexer-keywords.txt" - {"i8x16.narrow_i16x8_u", TokenType::Binary, Opcode::I8X16NarrowI16X8U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 178 "src/lexer-keywords.txt" + {"i16x8.load8x8_s", TokenType::Load, Opcode::I16X8Load8X8S}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, -#line 310 "src/lexer-keywords.txt" - {"i32x4.widen_high_i16x8_s", TokenType::Unary, Opcode::I32X4WidenHighI16X8S}, - {""}, -#line 311 "src/lexer-keywords.txt" - {"i32x4.widen_high_i16x8_u", TokenType::Unary, Opcode::I32X4WidenHighI16X8U}, + {""}, {""}, {""}, +#line 179 "src/lexer-keywords.txt" + {"i16x8.load8x8_u", TokenType::Load, Opcode::I16X8Load8X8U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, +#line 189 "src/lexer-keywords.txt" + {"i16x8.neg", TokenType::Unary, Opcode::I16X8Neg}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1592,16 +1579,17 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, +#line 432 "src/lexer-keywords.txt" + {"i8x16.eq", TokenType::Compare, Opcode::I8X16Eq}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, -#line 347 "src/lexer-keywords.txt" - {"i64.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I64AtomicRmwXchg}, -#line 224 "src/lexer-keywords.txt" - {"i32.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I32AtomicRmwXchg}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 169 "src/lexer-keywords.txt" + {"i16x8.eq", TokenType::Compare, Opcode::I16X8Eq}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1621,6 +1609,11 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, +#line 351 "src/lexer-keywords.txt" + {"i64.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I64AtomicRmwXchg}, +#line 228 "src/lexer-keywords.txt" + {"i32.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I32AtomicRmwXchg}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1631,10 +1624,11 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 196 "src/lexer-keywords.txt" +#line 200 "src/lexer-keywords.txt" {"i16x8.widen_high_i8x16_s", TokenType::Unary, Opcode::I16X8WidenHighI8X16S}, - {""}, -#line 197 "src/lexer-keywords.txt" + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 201 "src/lexer-keywords.txt" {"i16x8.widen_high_i8x16_u", TokenType::Unary, Opcode::I16X8WidenHighI8X16U} }; diff --git a/src/shared-validator.cc b/src/shared-validator.cc index e84ccf12..f4a7303e 100644 --- a/src/shared-validator.cc +++ b/src/shared-validator.cc @@ -119,7 +119,7 @@ Result SharedValidator::OnTable(const Location& loc, if (limits.is_shared) { result |= PrintError(loc, "tables may not be shared"); } - if (elem_type != Type::Funcref && + if (elem_type != Type::FuncRef && !options_.features.reference_types_enabled()) { result |= PrintError(loc, "tables must have funcref type"); } @@ -209,8 +209,9 @@ Result SharedValidator::OnGlobalInitExpr_GlobalGet(const Location& loc, return result; } -Result SharedValidator::OnGlobalInitExpr_RefNull(const Location& loc) { - return CheckType(loc, Type::Nullref, globals_.back().type, +Result SharedValidator::OnGlobalInitExpr_RefNull(const Location& loc, + Type type) { + return CheckType(loc, type, globals_.back().type, "global initializer expression"); } @@ -219,7 +220,7 @@ Result SharedValidator::OnGlobalInitExpr_RefFunc(const Location& loc, Result result = Result::Ok; result |= CheckFuncIndex(func_var); init_expr_funcs_.push_back(func_var); - result |= CheckType(loc, Type::Funcref, globals_.back().type, + result |= CheckType(loc, Type::FuncRef, globals_.back().type, "global initializer expression"); return result; } @@ -335,8 +336,9 @@ Result SharedValidator::OnElemSegmentInitExpr_Other(const Location& loc) { "global.get."); } -Result SharedValidator::OnElemSegmentElemExpr_RefNull(const Location& loc) { - return Result::Ok; +Result SharedValidator::OnElemSegmentElemExpr_RefNull(const Location& loc, + Type type) { + return CheckType(loc, type, elems_.back().element, "elem expression"); } Result SharedValidator::OnElemSegmentElemExpr_RefFunc(const Location& loc, @@ -966,17 +968,17 @@ Result SharedValidator::OnRefFunc(const Location& loc, Var func_var) { return result; } -Result SharedValidator::OnRefIsNull(const Location& loc) { +Result SharedValidator::OnRefIsNull(const Location& loc, Type type) { Result result = Result::Ok; expr_loc_ = &loc; - result |= typechecker_.OnRefIsNullExpr(); + result |= typechecker_.OnRefIsNullExpr(type); return result; } -Result SharedValidator::OnRefNull(const Location& loc) { +Result SharedValidator::OnRefNull(const Location& loc, Type type) { Result result = Result::Ok; expr_loc_ = &loc; - result |= typechecker_.OnRefNullExpr(); + result |= typechecker_.OnRefNullExpr(type); return result; } diff --git a/src/shared-validator.h b/src/shared-validator.h index 71032e16..dadb0930 100644 --- a/src/shared-validator.h +++ b/src/shared-validator.h @@ -76,7 +76,7 @@ class SharedValidator { Result OnGlobal(const Location&, Type type, bool mutable_); Result OnGlobalInitExpr_Const(const Location&, Type); Result OnGlobalInitExpr_GlobalGet(const Location&, Var global_var); - Result OnGlobalInitExpr_RefNull(const Location&); + Result OnGlobalInitExpr_RefNull(const Location&, Type type); Result OnGlobalInitExpr_RefFunc(const Location&, Var func_var); Result OnGlobalInitExpr_Other(const Location&); Result OnEvent(const Location&, Var sig_var); @@ -93,7 +93,7 @@ class SharedValidator { Result OnElemSegmentInitExpr_Const(const Location&, Type); Result OnElemSegmentInitExpr_GlobalGet(const Location&, Var global_var); Result OnElemSegmentInitExpr_Other(const Location&); - Result OnElemSegmentElemExpr_RefNull(const Location&); + Result OnElemSegmentElemExpr_RefNull(const Location&, Type type); Result OnElemSegmentElemExpr_RefFunc(const Location&, Var func_var); Result OnElemSegmentElemExpr_Other(const Location&); @@ -150,8 +150,8 @@ class SharedValidator { Result OnMemorySize(const Location&); Result OnNop(const Location&); Result OnRefFunc(const Location&, Var func_var); - Result OnRefIsNull(const Location&); - Result OnRefNull(const Location&); + Result OnRefIsNull(const Location&, Type type); + Result OnRefNull(const Location&, Type type); Result OnRethrow(const Location&); Result OnReturnCall(const Location&, Var func_var); Result OnReturnCallIndirect(const Location&, Var sig_var, Var table_var); diff --git a/src/test-interp.cc b/src/test-interp.cc index 983aae5f..737f440c 100644 --- a/src/test-interp.cc +++ b/src/test-interp.cc @@ -575,7 +575,7 @@ TEST_F(InterpGCTest, Collect_Basic) { } TEST_F(InterpGCTest, Collect_GlobalCycle) { - auto gt = GlobalType{ValueType::Anyref, Mutability::Var}; + auto gt = GlobalType{ValueType::ExternRef, Mutability::Var}; auto g1 = Global::New(store_, gt, Value::Make(Ref::Null)); auto g2 = Global::New(store_, gt, Value::Make(g1->self())); g1->Set(store_, g2->self()); @@ -593,7 +593,7 @@ TEST_F(InterpGCTest, Collect_GlobalCycle) { } TEST_F(InterpGCTest, Collect_TableCycle) { - auto tt = TableType{ValueType::Anyref, Limits{2}}; + auto tt = TableType{ValueType::ExternRef, Limits{2}}; auto t1 = Table::New(store_, tt); auto t2 = Table::New(store_, tt); auto t3 = Table::New(store_, tt); @@ -645,7 +645,7 @@ TEST_F(InterpGCTest, Collect_InstanceImport) { auto f = HostFunc::New(store_, FuncType{{}, {}}, [](Thread& thread, const Values&, Values&, Trap::Ptr*) -> Result { return Result::Ok; }); - auto t = Table::New(store_, TableType{ValueType::Funcref, Limits{0}}); + auto t = Table::New(store_, TableType{ValueType::FuncRef, Limits{0}}); auto m = Memory::New(store_, MemoryType{Limits{0}}); auto g = Global::New(store_, GlobalType{ValueType::I32, Mutability::Const}, Value::Make(5)); diff --git a/src/token.cc b/src/token.cc index f5aef786..657d37be 100644 --- a/src/token.cc +++ b/src/token.cc @@ -79,6 +79,8 @@ std::string Token::to_string() const { return opcode_.GetName(); } else if (HasText()) { return text_.to_string(); + } else if (IsTokenTypeRefKind(token_type_)) { + return type_.GetRefKindName(); } else { assert(HasType()); return type_.GetName(); diff --git a/src/token.def b/src/token.def index 26177787..23d5d796 100644 --- a/src/token.def +++ b/src/token.def @@ -37,7 +37,6 @@ WABT_TOKEN(Eof, "EOF") WABT_TOKEN(Event, "event") WABT_TOKEN(Export, "export") WABT_TOKEN(Field, "field") -WABT_TOKEN(Func, "func") WABT_TOKEN(Get, "get") WABT_TOKEN(Global, "global") WABT_TOKEN(Import, "import") @@ -116,10 +115,10 @@ WABT_TOKEN(MemoryGrow, "memory.grow") WABT_TOKEN(MemoryInit, "memory.init") WABT_TOKEN(MemorySize, "memory.size") WABT_TOKEN(Nop, "nop") +WABT_TOKEN(RefExtern, "ref.extern") WABT_TOKEN(RefFunc, "ref.func") WABT_TOKEN(RefIsNull, "ref.is_null") WABT_TOKEN(RefNull, "ref.null") -WABT_TOKEN(RefHost, "ref.host") WABT_TOKEN(Rethrow, "rethrow") WABT_TOKEN(ReturnCallIndirect, "return_call_indirect") WABT_TOKEN(ReturnCall, "return_call") @@ -158,3 +157,10 @@ WABT_TOKEN_LAST(String, Var) WABT_TOKEN(ValueType, "VALUETYPE") WABT_TOKEN_FIRST(Type, ValueType) WABT_TOKEN_LAST(Type, ValueType) + +/* Tokens with Type data, but are reference kinds. */ +WABT_TOKEN(Func, "func") +WABT_TOKEN(Extern, "extern") +WABT_TOKEN(Exn, "exn") +WABT_TOKEN_FIRST(RefKind, Func) +WABT_TOKEN_LAST(RefKind, Exn) diff --git a/src/token.h b/src/token.h index 8a3b1f00..719e1aee 100644 --- a/src/token.h +++ b/src/token.h @@ -41,7 +41,7 @@ enum class TokenType { #undef WABT_TOKEN_LAST First = First_Bare, - Last = Last_Type, + Last = Last_RefKind, }; const char* GetTokenTypeName(TokenType); @@ -70,6 +70,11 @@ inline bool IsTokenTypeLiteral(TokenType token_type) { token_type <= TokenType::Last_Literal; } +inline bool IsTokenTypeRefKind(TokenType token_type) { + return token_type >= TokenType::First_RefKind && + token_type <= TokenType::Last_RefKind; +} + struct Token { Token() : token_type_(TokenType::Invalid) {} Token(Location, TokenType); @@ -83,7 +88,9 @@ struct Token { TokenType token_type() const { return token_type_; } bool HasText() const { return IsTokenTypeString(token_type_); } - bool HasType() const { return IsTokenTypeType(token_type_); } + bool HasType() const { + return IsTokenTypeType(token_type_) || IsTokenTypeRefKind(token_type_); + } bool HasOpcode() const { return IsTokenTypeOpcode(token_type_); } bool HasLiteral() const { return IsTokenTypeLiteral(token_type_); } diff --git a/src/tools/spectest-interp.cc b/src/tools/spectest-interp.cc index dc278954..693f2eaa 100644 --- a/src/tools/spectest-interp.cc +++ b/src/tools/spectest-interp.cc @@ -587,15 +587,11 @@ wabt::Result JSONParser::ParseType(Type* out_type) { } else if (type_str == "i16") { *out_type = Type::I16; } else if (type_str == "funcref") { - *out_type = Type::Funcref; - } else if (type_str == "anyref") { - *out_type = Type::Anyref; - } else if (type_str == "nullref") { - *out_type = Type::Nullref; + *out_type = Type::FuncRef; + } else if (type_str == "externref") { + *out_type = Type::ExternRef; } else if (type_str == "exnref") { - *out_type = Type::Exnref; - } else if (type_str == "hostref") { - *out_type = Type::Hostref; + *out_type = Type::ExnRef; } else { PrintError("unknown type: \"%s\"", type_str.c_str()); return wabt::Result::Error; @@ -807,26 +803,26 @@ wabt::Result JSONParser::ParseConstValue(Type type, assert(false); // Should use ParseLaneConstValue instead. break; - case Type::Nullref: { - out_value->Set(Ref::Null); - break; - } - - case Type::Hostref: { - uint32_t value; - CHECK_RESULT(ParseI32Value(&value, value_str)); - // TODO: hack, just whatever ref is at this index; but skip null (which is - // always 0). - out_value->Set(Ref{value + 1}); + case Type::FuncRef: + if (value_str == "null") { + out_value->Set(Ref::Null); + } else { + assert(allow_expected == AllowExpected::Yes); + out_value->Set(Ref{1}); + } break; - } - case Type::Funcref: { - uint32_t value; - CHECK_RESULT(ParseI32Value(&value, value_str)); - out_value->Set(Ref{value}); + case Type::ExternRef: + if (value_str == "null") { + out_value->Set(Ref::Null); + } else { + uint32_t value; + CHECK_RESULT(ParseI32Value(&value, value_str)); + // TODO: hack, just whatever ref is at this index; but skip null (which + // is always 0). + out_value->Set(Ref{value + 1}); + } break; - } default: PrintError("unknown concrete type: \"%s\"", type.GetName()); @@ -1234,7 +1230,7 @@ CommandRunner::CommandRunner() : store_(s_features) { } spectest["table"] = - interp::Table::New(store_, TableType{ValueType::Funcref, Limits{10, 20}}); + interp::Table::New(store_, TableType{ValueType::FuncRef, Limits{10, 20}}); spectest["memory"] = interp::Memory::New(store_, MemoryType{Limits{1, 2}}); @@ -1727,17 +1723,13 @@ wabt::Result CommandRunner::CheckAssertReturnResult( break; } - case Type::Nullref: - ok = actual.value.Get<Ref>() == Ref::Null; - break; - - case Type::Funcref: + case Type::FuncRef: // A funcref expectation only requires that the reference be a function, // but it doesn't check the actual index. - ok = store_.HasValueType(actual.value.Get<Ref>(), Type::Funcref); + ok = (actual.type == Type::FuncRef); break; - case Type::Hostref: + case Type::ExternRef: ok = expected.value.value.Get<Ref>() == actual.value.Get<Ref>(); break; diff --git a/src/type-checker.cc b/src/type-checker.cc index 4ffdee8c..a025a4a8 100644 --- a/src/type-checker.cc +++ b/src/type-checker.cc @@ -165,31 +165,13 @@ Result TypeChecker::CheckTypeStackEnd(const char* desc) { return result; } -static bool IsSubtype(Type sub, Type super) { - if (super == sub) { - return true; - } - if (super.IsRef() != sub.IsRef()) { - return false; - } - if (super == Type::Anyref) { - return sub.IsRef(); - } - if (super.IsNullableRef()) { - return sub == Type::Nullref; - } - return false; -} - Result TypeChecker::CheckType(Type actual, Type expected) { if (expected == Type::Any || actual == Type::Any) { return Result::Ok; } - - if (!IsSubtype(actual, expected)) { + if (actual != expected) { return Result::Error; } - return Result::Ok; } @@ -408,7 +390,7 @@ Result TypeChecker::OnBrIf(Index depth) { } Result TypeChecker::OnBrOnExn(Index depth, const TypeVector& types) { - Result result = PopAndCheck1Type(Type::Exnref, "br_on_exn"); + Result result = PopAndCheck1Type(Type::ExnRef, "br_on_exn"); Label* label; CHECK_RESULT(GetLabel(depth, &label)); if (Failed(CheckTypes(types, label->br_types()))) { @@ -417,7 +399,7 @@ Result TypeChecker::OnBrOnExn(Index depth, const TypeVector& types) { TypesToString(types).c_str()); result = Result::Error; } - PushType(Type::Exnref); + PushType(Type::ExnRef); return result; } @@ -515,7 +497,7 @@ Result TypeChecker::OnCatch() { ResetTypeStackToLabel(label); label->label_type = LabelType::Catch; label->unreachable = false; - PushType(Type::Exnref); + PushType(Type::ExnRef); return result; } @@ -689,23 +671,23 @@ Result TypeChecker::OnTableFill(Type elem_type) { } Result TypeChecker::OnRefFuncExpr(Index) { - PushType(Type::Funcref); + PushType(Type::FuncRef); return Result::Ok; } -Result TypeChecker::OnRefNullExpr() { - PushType(Type::Nullref); +Result TypeChecker::OnRefNullExpr(Type type) { + PushType(type); return Result::Ok; } -Result TypeChecker::OnRefIsNullExpr() { - Result result = PopAndCheck1Type(Type::Anyref, "ref.is_null"); +Result TypeChecker::OnRefIsNullExpr(Type type) { + Result result = PopAndCheck1Type(type, "ref.is_null"); PushType(Type::I32); return result; } Result TypeChecker::OnRethrow() { - Result result = PopAndCheck1Type(Type::Exnref, "rethrow"); + Result result = PopAndCheck1Type(Type::ExnRef, "rethrow"); CHECK_RESULT(SetUnreachable()); return result; } diff --git a/src/type-checker.h b/src/type-checker.h index b59e5588..0b3560a9 100644 --- a/src/type-checker.h +++ b/src/type-checker.h @@ -109,8 +109,8 @@ class TypeChecker { Result OnTableSize(); Result OnTableFill(Type elem_type); Result OnRefFuncExpr(Index func_index); - Result OnRefNullExpr(); - Result OnRefIsNullExpr(); + Result OnRefNullExpr(Type type); + Result OnRefIsNullExpr(Type type); Result OnRethrow(); Result OnReturn(); Result OnSelect(Type expected); @@ -31,25 +31,23 @@ class Type { public: // Matches binary format, do not change. enum Enum { - I32 = -0x01, // 0x7f - I64 = -0x02, // 0x7e - F32 = -0x03, // 0x7d - F64 = -0x04, // 0x7c - V128 = -0x05, // 0x7b - I8 = -0x06, // 0x7a : packed-type only, used in gc and as v128 lane - I16 = -0x07, // 0x79 : packed-type only, used in gc and as v128 lane - Funcref = -0x10, // 0x70 - Anyref = -0x11, // 0x6f - Nullref = -0x12, // 0x6e - Exnref = -0x18, // 0x68 - Func = -0x20, // 0x60 - Struct = -0x21, // 0x5f - Array = -0x22, // 0x5e - Void = -0x40, // 0x40 - ___ = Void, // Convenient for the opcode table in opcode.h + I32 = -0x01, // 0x7f + I64 = -0x02, // 0x7e + F32 = -0x03, // 0x7d + F64 = -0x04, // 0x7c + V128 = -0x05, // 0x7b + I8 = -0x06, // 0x7a : packed-type only, used in gc and as v128 lane + I16 = -0x07, // 0x79 : packed-type only, used in gc and as v128 lane + FuncRef = -0x10, // 0x70 + ExternRef = -0x11, // 0x6f + ExnRef = -0x18, // 0x68 + Func = -0x20, // 0x60 + Struct = -0x21, // 0x5f + Array = -0x22, // 0x5e + Void = -0x40, // 0x40 + ___ = Void, // Convenient for the opcode table in opcode.h Any = 0, // Not actually specified, but useful for type-checking - Hostref = 2, // Not actually specified, but used in testing and type-checking I8U = 4, // Not actually specified, but used internally with load/store I16U = 6, // Not actually specified, but used internally with load/store I32U = 7, // Not actually specified, but used internally with load/store @@ -61,9 +59,8 @@ class Type { operator Enum() const { return enum_; } bool IsRef() const { - return enum_ == Type::Anyref || enum_ == Type::Funcref || - enum_ == Type::Nullref || enum_ == Type::Exnref || - enum_ == Type::Hostref; + return enum_ == Type::ExternRef || enum_ == Type::FuncRef || + enum_ == Type::ExnRef; } bool IsNullableRef() const { @@ -73,21 +70,31 @@ class Type { const char* GetName() const { switch (enum_) { - case Type::I32: return "i32"; - case Type::I64: return "i64"; - case Type::F32: return "f32"; - case Type::F64: return "f64"; - case Type::V128: return "v128"; - case Type::I8: return "i8"; - case Type::I16: return "i16"; - case Type::Funcref: return "funcref"; - case Type::Func: return "func"; - case Type::Exnref: return "exnref"; - case Type::Void: return "void"; - case Type::Any: return "any"; - case Type::Anyref: return "anyref"; - case Type::Nullref: return "nullref"; - default: return "<type_index>"; + case Type::I32: return "i32"; + case Type::I64: return "i64"; + case Type::F32: return "f32"; + case Type::F64: return "f64"; + case Type::V128: return "v128"; + case Type::I8: return "i8"; + case Type::I16: return "i16"; + case Type::FuncRef: return "funcref"; + case Type::Func: return "func"; + case Type::ExnRef: return "exnref"; + case Type::Void: return "void"; + case Type::Any: return "any"; + case Type::ExternRef: return "externref"; + default: return "<type_index>"; + } + } + + const char* GetRefKindName() const { + switch (enum_) { + case Type::FuncRef: return "func"; + case Type::ExternRef: return "extern"; + case Type::ExnRef: return "exn"; + case Type::Struct: return "struct"; + case Type::Array: return "array"; + default: return "<invalid>"; } } @@ -121,10 +128,9 @@ class Type { case Type::F32: case Type::F64: case Type::V128: - case Type::Funcref: - case Type::Anyref: - case Type::Nullref: - case Type::Exnref: + case Type::FuncRef: + case Type::ExternRef: + case Type::ExnRef: return TypeVector(this, this + 1); default: diff --git a/src/validator.cc b/src/validator.cc index b879d2ea..8884059e 100644 --- a/src/validator.cc +++ b/src/validator.cc @@ -433,12 +433,12 @@ Result Validator::OnRefFuncExpr(RefFuncExpr* expr) { } Result Validator::OnRefNullExpr(RefNullExpr* expr) { - result_ |= validator_.OnRefNull(expr->loc); + result_ |= validator_.OnRefNull(expr->loc, expr->type); return Result::Ok; } Result Validator::OnRefIsNullExpr(RefIsNullExpr* expr) { - result_ |= validator_.OnRefIsNull(expr->loc); + result_ |= validator_.OnRefIsNull(expr->loc, expr->type); return Result::Ok; } @@ -715,7 +715,8 @@ Result Validator::CheckModule() { break; case ExprType::RefNull: - result_ |= validator_.OnGlobalInitExpr_RefNull(expr->loc); + result_ |= validator_.OnGlobalInitExpr_RefNull( + expr->loc, cast<RefNullExpr>(expr)->type); break; default: @@ -789,7 +790,8 @@ Result Validator::CheckModule() { switch (elem_expr.kind) { case ElemExprKind::RefNull: // TODO: better location? - result_ |= validator_.OnElemSegmentElemExpr_RefNull(field.loc); + result_ |= validator_.OnElemSegmentElemExpr_RefNull(field.loc, + elem_expr.type); break; case ElemExprKind::RefFunc: diff --git a/src/wast-lexer.cc b/src/wast-lexer.cc index 59bc0d71..05ac736a 100644 --- a/src/wast-lexer.cc +++ b/src/wast-lexer.cc @@ -540,7 +540,8 @@ Token WastLexer::GetKeywordToken() { } if (IsTokenTypeBare(info->token_type)) { return BareToken(info->token_type); - } else if (IsTokenTypeType(info->token_type)) { + } else if (IsTokenTypeType(info->token_type) || + IsTokenTypeRefKind(info->token_type)) { return Token(GetLocation(), info->token_type, info->value_type); } else { assert(IsTokenTypeOpcode(info->token_type)); diff --git a/src/wast-parser.cc b/src/wast-parser.cc index 2824a382..88189f0a 100644 --- a/src/wast-parser.cc +++ b/src/wast-parser.cc @@ -731,7 +731,9 @@ bool WastParser::ParseElemExprOpt(ElemExpr* out_elem_expr) { options_->features.reference_types_enabled())) { Error(loc, "ref.null not allowed"); } - *out_elem_expr = ElemExpr(); + Type type; + CHECK_RESULT(ParseRefKind(&type)); + *out_elem_expr = ElemExpr(type); } else if (Match(TokenType::RefFunc)) { Var var; CHECK_RESULT(ParseVar(&var)); @@ -768,7 +770,7 @@ bool WastParser::ParseElemExprVarListOpt(ElemExprVector* out_list) { Result WastParser::ParseValueType(Type* out_type) { WABT_TRACE(ParseValueType); if (!PeekMatch(TokenType::ValueType)) { - return ErrorExpected({"i32", "i64", "f32", "f64", "v128", "anyref"}); + return ErrorExpected({"i32", "i64", "f32", "f64", "v128", "externref"}); } Token token = Consume(); @@ -778,12 +780,11 @@ Result WastParser::ParseValueType(Type* out_type) { case Type::V128: is_enabled = options_->features.simd_enabled(); break; - case Type::Anyref: - case Type::Funcref: - case Type::Hostref: + case Type::FuncRef: + case Type::ExternRef: is_enabled = options_->features.reference_types_enabled(); break; - case Type::Exnref: + case Type::ExnRef: is_enabled = options_->features.exceptions_enabled(); break; default: @@ -808,15 +809,37 @@ Result WastParser::ParseValueTypeList(TypeVector* out_type_list) { return Result::Ok; } +Result WastParser::ParseRefKind(Type* out_type) { + WABT_TRACE(ParseRefKind); + if (!IsTokenTypeRefKind(Peek())) { + return ErrorExpected({"func", "extern", "exn"}); + } + + Token token = Consume(); + Type type = token.type(); + + if ((type == Type::ExternRef && + !options_->features.reference_types_enabled()) || + ((type == Type::Struct || type == Type::Array) && + !options_->features.gc_enabled())) { + Error(token.loc, "value type not allowed: %s", type.GetName()); + return Result::Error; + } + + *out_type = type; + return Result::Ok; +} + Result WastParser::ParseRefType(Type* out_type) { WABT_TRACE(ParseRefType); if (!PeekMatch(TokenType::ValueType)) { - return ErrorExpected({"funcref", "anyref", "nullref", "exnref"}); + return ErrorExpected({"funcref", "externref", "exnref"}); } Token token = Consume(); Type type = token.type(); - if (type == Type::Anyref && !options_->features.reference_types_enabled()) { + if (type == Type::ExternRef && + !options_->features.reference_types_enabled()) { Error(token.loc, "value type not allowed: %s", type.GetName()); return Result::Error; } @@ -833,7 +856,8 @@ bool WastParser::ParseRefTypeOpt(Type* out_type) { Token token = Consume(); Type type = token.type(); - if (type == Type::Anyref && !options_->features.reference_types_enabled()) { + if (type == Type::ExternRef && + !options_->features.reference_types_enabled()) { return false; } @@ -1107,7 +1131,7 @@ Result WastParser::ParseElemModuleField(Module* module) { if (ParseRefTypeOpt(&field->elem_segment.elem_type)) { ParseElemExprListOpt(&field->elem_segment.elem_exprs); } else { - field->elem_segment.elem_type = Type::Funcref; + field->elem_segment.elem_type = Type::FuncRef; if (PeekMatch(TokenType::Func)) { EXPECT(Func); } @@ -1949,15 +1973,21 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) { CHECK_RESULT(ParsePlainInstrVar<RefFuncExpr>(loc, out_expr)); break; - case TokenType::RefNull: + case TokenType::RefNull: { ErrorUnlessOpcodeEnabled(Consume()); - out_expr->reset(new RefNullExpr(loc)); + Type type; + CHECK_RESULT(ParseRefKind(&type)); + out_expr->reset(new RefNullExpr(type, loc)); break; + } - case TokenType::RefIsNull: + case TokenType::RefIsNull: { ErrorUnlessOpcodeEnabled(Consume()); - out_expr->reset(new RefIsNullExpr(loc)); + Type type; + CHECK_RESULT(ParseRefKind(&type)); + out_expr->reset(new RefIsNullExpr(type, loc)); break; + } case TokenType::Throw: ErrorUnlessOpcodeEnabled(Consume()); @@ -2360,11 +2390,11 @@ Result WastParser::ParseConst(Const* const_, ConstType const_type) { return Result::Ok; } -Result WastParser::ParseHostRef(Const* const_) { - WABT_TRACE(ParseHostRef); +Result WastParser::ParseExternref(Const* const_) { + WABT_TRACE(ParseExternref); Token token = Consume(); if (!options_->features.reference_types_enabled()) { - Error(token.loc, "hostref not allowed"); + Error(token.loc, "externref not allowed"); return Result::Error; } @@ -2391,7 +2421,7 @@ Result WastParser::ParseHostRef(Const* const_) { uint64_t ref_bits; Result result = ParseInt64(s, end, &ref_bits, ParseIntType::UnsignedOnly); - const_->set_hostref(static_cast<uintptr_t>(ref_bits)); + const_->set_externref(static_cast<uintptr_t>(ref_bits)); if (Failed(result)) { Error(const_->loc, "invalid literal \"" PRIstringview "\"", @@ -2406,7 +2436,7 @@ Result WastParser::ParseHostRef(Const* const_) { Result WastParser::ParseConstList(ConstVector* consts, ConstType type) { WABT_TRACE(ParseConstList); while (PeekMatchLpar(TokenType::Const) || PeekMatchLpar(TokenType::RefNull) || - PeekMatchLpar(TokenType::RefHost) || + PeekMatchLpar(TokenType::RefExtern) || PeekMatchLpar(TokenType::RefFunc)) { Consume(); Const const_; @@ -2416,9 +2446,11 @@ Result WastParser::ParseConstList(ConstVector* consts, ConstType type) { break; case TokenType::RefNull: { auto token = Consume(); + Type type; + CHECK_RESULT(ParseRefKind(&type)); ErrorUnlessOpcodeEnabled(token); const_.loc = GetLocation(); - const_.set_nullref(); + const_.set_null(type); break; } case TokenType::RefFunc: { @@ -2428,8 +2460,8 @@ Result WastParser::ParseConstList(ConstVector* consts, ConstType type) { const_.set_funcref(); break; } - case TokenType::RefHost: - CHECK_RESULT(ParseHostRef(&const_)); + case TokenType::RefExtern: + CHECK_RESULT(ParseExternref(&const_)); break; default: assert(!"unreachable"); diff --git a/src/wast-parser.h b/src/wast-parser.h index 7dd4d038..adac244d 100644 --- a/src/wast-parser.h +++ b/src/wast-parser.h @@ -131,6 +131,7 @@ class WastParser { bool ParseElemExprVarListOpt(ElemExprVector* out_list); Result ParseValueType(Type* out_type); Result ParseValueTypeList(TypeVector* out_type_list); + Result ParseRefKind(Type* out_type); Result ParseRefType(Type* out_type); bool ParseRefTypeOpt(Type* out_type); Result ParseQuotedText(std::string* text); @@ -172,7 +173,7 @@ class WastParser { Result ParseF32(Const*, ConstType type); Result ParseF64(Const*, ConstType type); Result ParseConst(Const*, ConstType type); - Result ParseHostRef(Const*); + Result ParseExternref(Const*); Result ParseExpectedNan(ExpectedNan* expected); Result ParseConstList(ConstVector*, ConstType type); Result ParseBlockInstr(std::unique_ptr<Expr>*); diff --git a/src/wat-writer.cc b/src/wat-writer.cc index 53c14216..573cb6f4 100644 --- a/src/wat-writer.cc +++ b/src/wat-writer.cc @@ -122,6 +122,7 @@ class WatWriter : ModuleContext { void WriteQuotedString(string_view str, NextChar next_char); void WriteVar(const Var& var, NextChar next_char); void WriteBrVar(const Var& var, NextChar next_char); + void WriteRefKind(Type type, NextChar next_char); void WriteType(Type type, NextChar next_char); void WriteTypes(const TypeVector& types, const char* name); void WriteFuncSigSpace(const FuncSignature& func_sig); @@ -377,6 +378,10 @@ void WatWriter::WriteBrVar(const Var& var, NextChar next_char) { } } +void WatWriter::WriteRefKind(Type type, NextChar next_char) { + WritePuts(type.GetRefKindName(), next_char); +} + void WatWriter::WriteType(Type type, NextChar next_char) { const char* type_name = type.GetName(); assert(type_name); @@ -797,12 +802,14 @@ Result WatWriter::ExprVisitorDelegate::OnRefFuncExpr(RefFuncExpr* expr) { } Result WatWriter::ExprVisitorDelegate::OnRefNullExpr(RefNullExpr* expr) { - writer_->WritePutsNewline(Opcode::RefNull_Opcode.GetName()); + writer_->WritePutsSpace(Opcode::RefNull_Opcode.GetName()); + writer_->WriteRefKind(expr->type, NextChar::Newline); return Result::Ok; } Result WatWriter::ExprVisitorDelegate::OnRefIsNullExpr(RefIsNullExpr* expr) { - writer_->WritePutsNewline(Opcode::RefIsNull_Opcode.GetName()); + writer_->WritePutsSpace(Opcode::RefIsNull_Opcode.GetName()); + writer_->WriteRefKind(expr->type, NextChar::Newline); return Result::Ok; } @@ -1279,7 +1286,7 @@ void WatWriter::WriteElemSegment(const ElemSegment& segment) { if (flags & SegUseElemExprs) { WriteType(segment.elem_type, NextChar::Space); } else { - assert(segment.elem_type == Type::Funcref); + assert(segment.elem_type == Type::FuncRef); WritePuts("func", NextChar::Space); } @@ -1287,6 +1294,7 @@ void WatWriter::WriteElemSegment(const ElemSegment& segment) { if (flags & SegUseElemExprs) { if (expr.kind == ElemExprKind::RefNull) { WriteOpenSpace("ref.null"); + WriteRefKind(expr.type, NextChar::Space); WriteCloseSpace(); } else { WriteOpenSpace("ref.func"); |