diff options
| author | Ben Smith <binji@chromium.org> | 2019-07-16 16:46:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 16:46:41 -0700 |
| commit | 0b039bf756178160c54c94d1b0bce9322cf6cd88 (patch) | |
| tree | 79c118df125696c3f4c69914f7d8ede83af709cf | |
| parent | b973cd4ed4ffb6a3c7e797b126a8a79b72b14234 (diff) | |
| download | wabt-0b039bf756178160c54c94d1b0bce9322cf6cd88.tar.gz wabt-0b039bf756178160c54c94d1b0bce9322cf6cd88.tar.bz2 wabt-0b039bf756178160c54c94d1b0bce9322cf6cd88.zip | |
Update spec testsuite (#1111)
* Remove passive keyword from bulk-memory
* Fix rounding on hex floats
* Allow underscores in NaN payloads
43 files changed, 981 insertions, 670 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index b07300e7..19522c4f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,12 +18,15 @@ environment: JOBS_FLAG: -j EXE_DIR: . DEPLOY: false - - GENERATOR: Visual Studio 14 2015 - CONFIG: Release - JOBS_FLAG: "/m:" - EXE_DIR: '%CONFIG%' - DEPLOY: true - DEPLOY_NAME: wabt-%APPVEYOR_REPO_TAG_NAME%-win32.zip +# TODO(binji): re-enable. This is disabled because of a test failure in the +# spec testsuite, and because it's unlikely that most users need a 32-bit +# build. See https://github.com/WebAssembly/wabt/issues/1113 +# - GENERATOR: Visual Studio 14 2015 +# CONFIG: Release +# JOBS_FLAG: "/m:" +# EXE_DIR: '%CONFIG%' +# DEPLOY: true +# DEPLOY_NAME: wabt-%APPVEYOR_REPO_TAG_NAME%-win32.zip - GENERATOR: Visual Studio 14 2015 Win64 CONFIG: Debug JOBS_FLAG: "/m:" diff --git a/src/config.cc b/src/config.cc index 516fa44e..4e95a487 100644 --- a/src/config.cc +++ b/src/config.cc @@ -19,6 +19,10 @@ #include <cstdarg> #include <cstdio> +#if COMPILER_IS_MSVC && _M_X64 +#include <emmintrin.h> +#endif + /* c99-style vsnprintf for MSVC < 2015. See http://stackoverflow.com/a/8712996 using _snprintf or vsnprintf will not-properly null-terminate, and will return -1 instead of the number of characters needed on overflow. */ @@ -43,7 +47,84 @@ int wabt_snprintf(char* str, size_t size, const char* format, ...) { return result; } #endif +#endif -#elif COMPILER_IS_CLANG -void wabt_config_cc_dummy(void) {} +double wabt_convert_uint64_to_double(uint64_t x) { +#if COMPILER_IS_MSVC && _M_X64 + // MSVC on x64 generates uint64 -> float conversions but doesn't do + // round-to-nearest-ties-to-even, which is required by WebAssembly. + __m128d result = _mm_setzero_pd(); + if (x & 0x8000000000000000ULL) { + result = _mm_cvtsi64_sd(result, (x >> 1) | (x & 1)); + result = _mm_add_sd(result, result); + } else { + result = _mm_cvtsi64_sd(result, x); + } + return _mm_cvtsd_f64(result); +#elif COMPILER_IS_MSVC && _M_IX86 + // MSVC on x86 converts from i64 -> double -> float, which causes incorrect + // rounding. Using the x87 float stack instead preserves the correct + // rounding. + static const double c = 18446744073709551616.0; + double result; + __asm fild x; + if (x & 0x8000000000000000ULL) { + __asm fadd c; + } + __asm fstp result; + return result; +#else + return static_cast<double>(x); #endif +} + +float wabt_convert_uint64_to_float(uint64_t x) { +#if COMPILER_IS_MSVC && _M_X64 + // MSVC on x64 generates uint64 -> float conversions but doesn't do + // round-to-nearest-ties-to-even, which is required by WebAssembly. + __m128 result = _mm_setzero_ps(); + if (x & 0x8000000000000000ULL) { + result = _mm_cvtsi64_ss(result, (x >> 1) | (x & 1)); + result = _mm_add_ss(result, result); + } else { + result = _mm_cvtsi64_ss(result, x); + } + return _mm_cvtss_f32(result); +#elif COMPILER_IS_MSVC && _M_IX86 + // MSVC on x86 converts from i64 -> double -> float, which causes incorrect + // rounding. Using the x87 float stack instead preserves the correct + // rounding. + static const float c = 18446744073709551616.0f; + float result; + __asm fild x; + if (x & 0x8000000000000000ULL) { + __asm fadd c; + } + __asm fstp result; + return result; +#else + return static_cast<float>(x); +#endif +} + +double wabt_convert_int64_to_double(int64_t x) { +#if COMPILER_IS_MSVC && _M_IX86 + double result; + __asm fild x; + __asm fstp result; + return result; +#else + return static_cast<double>(x); +#endif +} + +float wabt_convert_int64_to_float(int64_t x) { +#if COMPILER_IS_MSVC && _M_IX86 + float result; + __asm fild x; + __asm fstp result; + return result; +#else + return static_cast<float>(x); +#endif +} diff --git a/src/config.h.in b/src/config.h.in index deb5c12f..d2078c9a 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -292,41 +292,10 @@ typedef long ssize_t; #endif #endif -#if COMPILER_IS_MSVC && defined(_M_X64) -// MSVC on x64 generates uint64 -> float conversions but doesn't do -// round-to-nearest-ties-to-even, which is required by WebAssembly. -#include <emmintrin.h> -__inline double wabt_convert_uint64_to_double(unsigned __int64 x) { - __m128d result = _mm_setzero_pd(); - if (x & 0x8000000000000000ULL) { - result = _mm_cvtsi64_sd(result, (x >> 1) | (x & 1)); - result = _mm_add_sd(result, result); - } else { - result = _mm_cvtsi64_sd(result, x); - } - return _mm_cvtsd_f64(result); -} - -__inline float wabt_convert_uint64_to_float(unsigned __int64 x) { - __m128 result = _mm_setzero_ps(); - if (x & 0x8000000000000000ULL) { - result = _mm_cvtsi64_ss(result, (x >> 1) | (x & 1)); - result = _mm_add_ss(result, result); - } else { - result = _mm_cvtsi64_ss(result, x); - } - return _mm_cvtss_f32(result); -} - -#else -__inline double wabt_convert_uint64_to_double(uint64_t x) { - return static_cast<double>(x); -} - -__inline float wabt_convert_uint64_to_float(uint64_t x) { - return static_cast<float>(x); -} -#endif +double wabt_convert_uint64_to_double(uint64_t x); +float wabt_convert_uint64_to_float(uint64_t x); +double wabt_convert_int64_to_double(int64_t x); +float wabt_convert_int64_to_float(int64_t x); #endif // __cplusplus diff --git a/src/interp/interp.cc b/src/interp/interp.cc index 3d5ee30e..858487f6 100644 --- a/src/interp/interp.cc +++ b/src/interp/interp.cc @@ -2537,7 +2537,7 @@ Result Thread::Run(int num_instructions) { break; case Opcode::F32ConvertI64S: - CHECK_TRAP(Push<float>(Pop<int64_t>())); + CHECK_TRAP(Push<float>(wabt_convert_int64_to_float(Pop<int64_t>()))); break; case Opcode::F32ConvertI64U: @@ -2577,7 +2577,7 @@ Result Thread::Run(int num_instructions) { break; case Opcode::F64ConvertI64S: - CHECK_TRAP(Push<double>(Pop<int64_t>())); + CHECK_TRAP(Push<double>(wabt_convert_int64_to_double(Pop<int64_t>()))); break; case Opcode::F64ConvertI64U: diff --git a/src/lexer-keywords.txt b/src/lexer-keywords.txt index ce395e17..4e530ab8 100644 --- a/src/lexer-keywords.txt +++ b/src/lexer-keywords.txt @@ -439,7 +439,6 @@ mut, TokenType::Mut nop, TokenType::Nop, Opcode::Nop offset, TokenType::Offset param, TokenType::Param -passive, TokenType::Passive quote, TokenType::Quote ref.func, TokenType::RefFunc, Opcode::RefFunc ref.is_null, TokenType::RefIsNull, Opcode::RefIsNull diff --git a/src/literal.cc b/src/literal.cc index 4c367ed9..710547b5 100644 --- a/src/literal.cc +++ b/src/literal.cc @@ -93,7 +93,9 @@ class FloatParser { const char* end, const char* prefix); static Uint Make(bool sign, int exp, Uint sig); - static Uint ShiftAndRoundToNearest(Uint significand, int shift); + static Uint ShiftAndRoundToNearest(Uint significand, + int shift, + bool seen_trailing_non_zero); static Result ParseFloat(const char* s, const char* end, Uint* out_bits); static Result ParseNan(const char* s, const char* end, Uint* out_bits); @@ -188,10 +190,11 @@ typename FloatParser<T>::Uint FloatParser<T>::Make(bool sign, template <typename T> typename FloatParser<T>::Uint FloatParser<T>::ShiftAndRoundToNearest( Uint significand, - int shift) { + int shift, + bool seen_trailing_non_zero) { assert(shift > 0); // Round ties to even. - if (significand & (Uint(1) << shift)) { + if ((significand & (Uint(1) << shift)) || seen_trailing_non_zero) { significand += Uint(1) << (shift - 1); } significand >>= shift; @@ -220,6 +223,9 @@ Result FloatParser<T>::ParseNan(const char* s, s += 3; for (; s < end; ++s) { + if (*s == '_') { + continue; + } uint32_t digit; CHECK_RESULT(ParseHexdigit(*s, &digit)); tag = tag * 16 + digit; @@ -264,6 +270,7 @@ Result FloatParser<T>::ParseHex(const char* s, // 0x10000000.0p0 => significand = 1, significand_exponent = 28 // 0x0.000001p0 => significand = 1, significand_exponent = -24 bool seen_dot = false; + bool seen_trailing_non_zero = false; Uint significand = 0; int significand_exponent = 0; // Exponent adjustment due to dot placement. for (; s < end; ++s) { @@ -278,8 +285,13 @@ Result FloatParser<T>::ParseHex(const char* s, if (seen_dot) { significand_exponent -= 4; } - } else if (!seen_dot) { - significand_exponent += 4; + } else { + if (!seen_trailing_non_zero && digit != 0) { + seen_trailing_non_zero = true; + } + if (!seen_dot) { + significand_exponent += 4; + } } } else { break; @@ -334,18 +346,28 @@ Result FloatParser<T>::ParseHex(const char* s, if (exponent <= Traits::kMinExp) { // Maybe subnormal. + auto update_seen_trailing_non_zero = [&](int shift) { + assert(shift > 0); + auto mask = (Uint(1) << (shift - 1)) - 1; + seen_trailing_non_zero |= (significand & mask) != 0; + }; + + // Normalize significand. if (significand_bits > Traits::kSigBits) { - significand = ShiftAndRoundToNearest(significand, - significand_bits - Traits::kSigBits); + int shift = significand_bits - Traits::kSigBits; + update_seen_trailing_non_zero(shift); + significand >>= shift; } else if (significand_bits < Traits::kSigBits) { significand <<= (Traits::kSigBits - significand_bits); } int shift = Traits::kMinExp - exponent; - if (shift < Traits::kSigBits) { + if (shift <= Traits::kSigBits) { if (shift) { + update_seen_trailing_non_zero(shift); significand = - ShiftAndRoundToNearest(significand, shift) & Traits::kSigMask; + ShiftAndRoundToNearest(significand, shift, seen_trailing_non_zero) & + Traits::kSigMask; } exponent = Traits::kMinExp; @@ -361,7 +383,8 @@ Result FloatParser<T>::ParseHex(const char* s, // Maybe Normal value. if (significand_bits > Traits::kSigPlusOneBits) { significand = ShiftAndRoundToNearest( - significand, significand_bits - Traits::kSigPlusOneBits); + significand, significand_bits - Traits::kSigPlusOneBits, + seen_trailing_non_zero); if (significand > Traits::kSigPlusOneMask) { exponent++; } diff --git a/src/prebuilt/lexer-keywords.cc b/src/prebuilt/lexer-keywords.cc index d553bfa4..721f82a0 100644 --- a/src/prebuilt/lexer-keywords.cc +++ b/src/prebuilt/lexer-keywords.cc @@ -65,13 +65,13 @@ Perfect_Hash::hash (const char *str, size_t len) 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, - 1864, 1864, 1864, 1864, 1864, 1864, 9, 43, 1864, 19, - 10, 143, 9, 312, 202, 146, 282, 485, 102, 1864, + 1864, 1864, 1864, 1864, 1864, 1864, 9, 43, 1864, 14, + 10, 143, 9, 312, 202, 146, 282, 485, 87, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 9, 9, 63, 12, 9, - 22, 15, 9, 317, 554, 12, 27, 9, 44, 10, + 22, 15, 9, 317, 554, 12, 13, 9, 44, 10, 26, 63, 423, 467, 46, 9, 9, 11, 86, 39, 402, 563, 17, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, 1864, @@ -150,7 +150,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) { enum { - TOTAL_KEYWORDS = 499, + TOTAL_KEYWORDS = 498, MIN_WORD_LENGTH = 2, MAX_WORD_LENGTH = 28, MIN_HASH_VALUE = 23, @@ -185,14 +185,14 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 150 "src/lexer-keywords.txt" {"func", TokenType::Func}, {""}, -#line 462 "src/lexer-keywords.txt" +#line 461 "src/lexer-keywords.txt" {"table", TokenType::Table}, {""}, #line 114 "src/lexer-keywords.txt" {"f64.lt", TokenType::Compare, Opcode::F64Lt}, #line 64 "src/lexer-keywords.txt" {"f32.lt", TokenType::Compare, Opcode::F32Lt}, -#line 463 "src/lexer-keywords.txt" +#line 462 "src/lexer-keywords.txt" {"then", TokenType::Then}, #line 45 "src/lexer-keywords.txt" {"event", TokenType::Event}, @@ -245,9 +245,9 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 228 "src/lexer-keywords.txt" {"i32.le_u", TokenType::Compare, Opcode::I32LeU}, {""}, {""}, -#line 448 "src/lexer-keywords.txt" +#line 447 "src/lexer-keywords.txt" {"result", TokenType::Result}, -#line 460 "src/lexer-keywords.txt" +#line 459 "src/lexer-keywords.txt" {"table.set", TokenType::TableSet, Opcode::TableSet}, #line 359 "src/lexer-keywords.txt" {"i64.rem_s", TokenType::Binary, Opcode::I64RemS}, @@ -261,16 +261,16 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"i64.rem_u", TokenType::Binary, Opcode::I64RemU}, #line 242 "src/lexer-keywords.txt" {"i32.rem_u", TokenType::Binary, Opcode::I32RemU}, -#line 455 "src/lexer-keywords.txt" +#line 454 "src/lexer-keywords.txt" {"start", TokenType::Start}, #line 39 "src/lexer-keywords.txt" {"data", TokenType::Data}, -#line 453 "src/lexer-keywords.txt" +#line 452 "src/lexer-keywords.txt" {"select", TokenType::Select, Opcode::Select}, {""}, #line 35 "src/lexer-keywords.txt" {"call", TokenType::Call, Opcode::Call}, -#line 461 "src/lexer-keywords.txt" +#line 460 "src/lexer-keywords.txt" {"table.size", TokenType::TableSize, Opcode::TableSize}, #line 99 "src/lexer-keywords.txt" {"f64.add", TokenType::Binary, Opcode::F64Add}, @@ -282,7 +282,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"i64.add", TokenType::Binary, Opcode::I64Add}, #line 184 "src/lexer-keywords.txt" {"i32.add", TokenType::Binary, Opcode::I32Add}, -#line 459 "src/lexer-keywords.txt" +#line 458 "src/lexer-keywords.txt" {"table.init", TokenType::TableInit, Opcode::TableInit}, {""}, #line 289 "src/lexer-keywords.txt" @@ -305,7 +305,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"i64.ne", TokenType::Compare, Opcode::I64Ne}, #line 237 "src/lexer-keywords.txt" {"i32.ne", TokenType::Compare, Opcode::I32Ne}, -#line 452 "src/lexer-keywords.txt" +#line 451 "src/lexer-keywords.txt" {"return", TokenType::Return, Opcode::Return}, #line 427 "src/lexer-keywords.txt" {"local.set", TokenType::LocalSet, Opcode::LocalSet}, @@ -317,7 +317,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 214 "src/lexer-keywords.txt" {"i32.clz", TokenType::Unary, Opcode::I32Clz}, {""}, -#line 454 "src/lexer-keywords.txt" +#line 453 "src/lexer-keywords.txt" {"shared", TokenType::Shared}, {""}, #line 29 "src/lexer-keywords.txt" @@ -406,10 +406,11 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 233 "src/lexer-keywords.txt" {"i32.load", TokenType::Load, Opcode::I32Load}, {""}, -#line 449 "src/lexer-keywords.txt" +#line 448 "src/lexer-keywords.txt" {"rethrow", TokenType::Rethrow, Opcode::Rethrow}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, +#line 444 "src/lexer-keywords.txt" + {"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull}, #line 147 "src/lexer-keywords.txt" {"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub}, #line 107 "src/lexer-keywords.txt" @@ -418,24 +419,22 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"f32.div", TokenType::Binary, Opcode::F32Div}, #line 390 "src/lexer-keywords.txt" {"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 143 "src/lexer-keywords.txt" - {"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne}, - {""}, -#line 445 "src/lexer-keywords.txt" - {"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull}, + {""}, {""}, {""}, {""}, {""}, #line 345 "src/lexer-keywords.txt" {"i64.load16_s", TokenType::Load, Opcode::I64Load16S}, #line 229 "src/lexer-keywords.txt" {"i32.load16_s", TokenType::Load, Opcode::I32Load16S}, +#line 143 "src/lexer-keywords.txt" + {"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne}, {""}, -#line 138 "src/lexer-keywords.txt" - {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt}, #line 346 "src/lexer-keywords.txt" {"i64.load16_u", TokenType::Load, Opcode::I64Load16U}, #line 230 "src/lexer-keywords.txt" {"i32.load16_u", TokenType::Load, Opcode::I32Load16U}, - {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 138 "src/lexer-keywords.txt" + {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, #line 118 "src/lexer-keywords.txt" {"f64.nearest", TokenType::Unary, Opcode::F64Nearest}, #line 68 "src/lexer-keywords.txt" @@ -445,24 +444,24 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"f64x2.le", TokenType::Compare, Opcode::F64X2Le}, #line 140 "src/lexer-keywords.txt" {"f64x2.min", TokenType::Binary, Opcode::F64X2Min}, -#line 472 "src/lexer-keywords.txt" +#line 471 "src/lexer-keywords.txt" {"v128.not", TokenType::Unary, Opcode::V128Not}, {""}, {""}, {""}, {""}, {""}, -#line 516 "src/lexer-keywords.txt" +#line 515 "src/lexer-keywords.txt" {"set_local", TokenType::LocalSet, Opcode::LocalSet}, {""}, {""}, #line 325 "src/lexer-keywords.txt" {"i64.atomic.store", TokenType::AtomicStore, Opcode::I64AtomicStore}, #line 212 "src/lexer-keywords.txt" {"i32.atomic.store", TokenType::AtomicStore, Opcode::I32AtomicStore}, -#line 470 "src/lexer-keywords.txt" +#line 469 "src/lexer-keywords.txt" {"v128.const", TokenType::Const, Opcode::V128Const}, -#line 517 "src/lexer-keywords.txt" +#line 516 "src/lexer-keywords.txt" {"tee_local", TokenType::LocalTee, Opcode::LocalTee}, {""}, {""}, -#line 446 "src/lexer-keywords.txt" +#line 445 "src/lexer-keywords.txt" {"ref.null", TokenType::RefNull, Opcode::RefNull}, -#line 451 "src/lexer-keywords.txt" +#line 450 "src/lexer-keywords.txt" {"return_call", TokenType::ReturnCall, Opcode::ReturnCall}, {""}, #line 128 "src/lexer-keywords.txt" @@ -475,9 +474,9 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, #line 323 "src/lexer-keywords.txt" {"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32}, -#line 468 "src/lexer-keywords.txt" +#line 467 "src/lexer-keywords.txt" {"v128.and", TokenType::Binary, Opcode::V128And}, -#line 469 "src/lexer-keywords.txt" +#line 468 "src/lexer-keywords.txt" {"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect}, #line 24 "src/lexer-keywords.txt" {"assert_return", TokenType::AssertReturn}, @@ -485,10 +484,10 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 141 "src/lexer-keywords.txt" {"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul}, {""}, {""}, -#line 474 "src/lexer-keywords.txt" +#line 473 "src/lexer-keywords.txt" {"v128.store", TokenType::Store, Opcode::V128Store}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 473 "src/lexer-keywords.txt" +#line 472 "src/lexer-keywords.txt" {"v128.or", TokenType::Binary, Opcode::V128Or}, {""}, {""}, #line 312 "src/lexer-keywords.txt" @@ -526,7 +525,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 197 "src/lexer-keywords.txt" {"i32.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AndU}, {""}, {""}, -#line 450 "src/lexer-keywords.txt" +#line 449 "src/lexer-keywords.txt" {"return_call_indirect", TokenType::ReturnCallIndirect, Opcode::ReturnCallIndirect}, #line 305 "src/lexer-keywords.txt" {"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU}, @@ -548,20 +547,20 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, #line 30 "src/lexer-keywords.txt" {"br_if", TokenType::BrIf, Opcode::BrIf}, -#line 507 "src/lexer-keywords.txt" +#line 506 "src/lexer-keywords.txt" {"i64.trunc_s/f32", TokenType::Convert, Opcode::I64TruncF32S}, -#line 495 "src/lexer-keywords.txt" +#line 494 "src/lexer-keywords.txt" {"i32.trunc_s/f32", TokenType::Convert, Opcode::I32TruncF32S}, -#line 511 "src/lexer-keywords.txt" +#line 510 "src/lexer-keywords.txt" {"i64.trunc_u/f32", TokenType::Convert, Opcode::I64TruncF32U}, -#line 499 "src/lexer-keywords.txt" +#line 498 "src/lexer-keywords.txt" {"i32.trunc_u/f32", TokenType::Convert, Opcode::I32TruncF32U}, {""}, {""}, {""}, #line 21 "src/lexer-keywords.txt" {"assert_malformed", TokenType::AssertMalformed}, #line 347 "src/lexer-keywords.txt" {"i64.load32_s", TokenType::Load, Opcode::I64Load32S}, -#line 471 "src/lexer-keywords.txt" +#line 470 "src/lexer-keywords.txt" {"v128.load", TokenType::Load, Opcode::V128Load}, {""}, {""}, #line 348 "src/lexer-keywords.txt" @@ -589,7 +588,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 255 "src/lexer-keywords.txt" {"i32.trunc_f64_u", TokenType::Convert, Opcode::I32TruncF64U}, {""}, -#line 475 "src/lexer-keywords.txt" +#line 474 "src/lexer-keywords.txt" {"v128", Type::V128}, #line 56 "src/lexer-keywords.txt" {"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64}, @@ -603,7 +602,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 283 "src/lexer-keywords.txt" {"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub}, {""}, -#line 457 "src/lexer-keywords.txt" +#line 456 "src/lexer-keywords.txt" {"table.get", TokenType::TableGet, Opcode::TableGet}, {""}, {""}, {""}, #line 301 "src/lexer-keywords.txt" @@ -619,16 +618,16 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, #line 87 "src/lexer-keywords.txt" {"f32x4.lt", TokenType::Compare, Opcode::F32X4Lt}, -#line 508 "src/lexer-keywords.txt" +#line 507 "src/lexer-keywords.txt" {"i64.trunc_s/f64", TokenType::Convert, Opcode::I64TruncF64S}, -#line 496 "src/lexer-keywords.txt" +#line 495 "src/lexer-keywords.txt" {"i32.trunc_s/f64", TokenType::Convert, Opcode::I32TruncF64S}, -#line 512 "src/lexer-keywords.txt" +#line 511 "src/lexer-keywords.txt" {"i64.trunc_u/f64", TokenType::Convert, Opcode::I64TruncF64U}, -#line 500 "src/lexer-keywords.txt" +#line 499 "src/lexer-keywords.txt" {"i32.trunc_u/f64", TokenType::Convert, Opcode::I32TruncF64U}, {""}, {""}, -#line 484 "src/lexer-keywords.txt" +#line 483 "src/lexer-keywords.txt" {"f32.demote/f64", TokenType::Convert, Opcode::F32DemoteF64}, {""}, #line 316 "src/lexer-keywords.txt" @@ -656,7 +655,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, #line 381 "src/lexer-keywords.txt" {"i64x2.all_true", TokenType::Unary, Opcode::I64X2AllTrue}, -#line 444 "src/lexer-keywords.txt" +#line 443 "src/lexer-keywords.txt" {"ref.func", TokenType::RefFunc, Opcode::RefFunc}, {""}, {""}, {""}, {""}, {""}, {""}, #line 77 "src/lexer-keywords.txt" @@ -667,7 +666,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 51 "src/lexer-keywords.txt" {"f32.convert_i32_s", TokenType::Convert, Opcode::F32ConvertI32S}, {""}, {""}, -#line 466 "src/lexer-keywords.txt" +#line 465 "src/lexer-keywords.txt" {"type", TokenType::Type}, {""}, {""}, {""}, #line 368 "src/lexer-keywords.txt" @@ -708,10 +707,10 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"i64.load8_u", TokenType::Load, Opcode::I64Load8U}, #line 232 "src/lexer-keywords.txt" {"i32.load8_u", TokenType::Load, Opcode::I32Load8U}, -#line 447 "src/lexer-keywords.txt" +#line 446 "src/lexer-keywords.txt" {"register", TokenType::Register}, {""}, {""}, {""}, {""}, -#line 464 "src/lexer-keywords.txt" +#line 463 "src/lexer-keywords.txt" {"throw", TokenType::Throw, Opcode::Throw}, {""}, {""}, {""}, {""}, #line 104 "src/lexer-keywords.txt" @@ -726,16 +725,17 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"drop", TokenType::Drop, Opcode::Drop}, #line 136 "src/lexer-keywords.txt" {"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt}, -#line 458 "src/lexer-keywords.txt" +#line 457 "src/lexer-keywords.txt" {"table.grow", TokenType::TableGrow, Opcode::TableGrow}, - {""}, {""}, {""}, {""}, {""}, -#line 23 "src/lexer-keywords.txt" - {"assert_return_canonical_nan", TokenType::AssertReturnCanonicalNan}, + {""}, #line 290 "src/lexer-keywords.txt" {"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U}, #line 186 "src/lexer-keywords.txt" {"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U}, {""}, {""}, +#line 23 "src/lexer-keywords.txt" + {"assert_return_canonical_nan", TokenType::AssertReturnCanonicalNan}, + {""}, {""}, {""}, {""}, #line 135 "src/lexer-keywords.txt" {"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge}, #line 103 "src/lexer-keywords.txt" @@ -778,14 +778,14 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 81 "src/lexer-keywords.txt" {"f32x4.div", TokenType::Binary, Opcode::F32X4Div}, {""}, {""}, {""}, -#line 443 "src/lexer-keywords.txt" +#line 442 "src/lexer-keywords.txt" {"quote", TokenType::Quote}, {""}, {""}, {""}, {""}, {""}, {""}, #line 123 "src/lexer-keywords.txt" {"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt}, #line 72 "src/lexer-keywords.txt" {"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt}, -#line 493 "src/lexer-keywords.txt" +#line 492 "src/lexer-keywords.txt" {"get_local", TokenType::LocalGet, Opcode::LocalGet}, {""}, {""}, #line 31 "src/lexer-keywords.txt" @@ -795,10 +795,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"i64.store16", TokenType::Store, Opcode::I64Store16}, #line 248 "src/lexer-keywords.txt" {"i32.store16", TokenType::Store, Opcode::I32Store16}, - {""}, {""}, -#line 442 "src/lexer-keywords.txt" - {"passive", TokenType::Passive}, - {""}, {""}, + {""}, {""}, {""}, {""}, {""}, #line 105 "src/lexer-keywords.txt" {"f64.convert_i64_u", TokenType::Convert, Opcode::F64ConvertI64U}, #line 54 "src/lexer-keywords.txt" @@ -807,10 +804,10 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 36 "src/lexer-keywords.txt" {"catch", TokenType::Catch, Opcode::Catch}, {""}, -#line 504 "src/lexer-keywords.txt" +#line 503 "src/lexer-keywords.txt" {"i64.extend_s/i32", TokenType::Convert, Opcode::I64ExtendI32S}, {""}, -#line 505 "src/lexer-keywords.txt" +#line 504 "src/lexer-keywords.txt" {"i64.extend_u/i32", TokenType::Convert, Opcode::I64ExtendI32U}, #line 294 "src/lexer-keywords.txt" {"i64.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AddU}, @@ -837,13 +834,13 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 60 "src/lexer-keywords.txt" {"f32.ge", TokenType::Compare, Opcode::F32Ge}, {""}, {""}, {""}, -#line 486 "src/lexer-keywords.txt" +#line 485 "src/lexer-keywords.txt" {"f64.convert_s/i32", TokenType::Convert, Opcode::F64ConvertI32S}, -#line 480 "src/lexer-keywords.txt" +#line 479 "src/lexer-keywords.txt" {"f32.convert_s/i32", TokenType::Convert, Opcode::F32ConvertI32S}, -#line 488 "src/lexer-keywords.txt" +#line 487 "src/lexer-keywords.txt" {"f64.convert_u/i32", TokenType::Convert, Opcode::F64ConvertI32U}, -#line 482 "src/lexer-keywords.txt" +#line 481 "src/lexer-keywords.txt" {"f32.convert_u/i32", TokenType::Convert, Opcode::F32ConvertI32U}, #line 297 "src/lexer-keywords.txt" {"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU}, @@ -947,7 +944,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, #line 267 "src/lexer-keywords.txt" {"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS}, -#line 476 "src/lexer-keywords.txt" +#line 475 "src/lexer-keywords.txt" {"v128.xor", TokenType::Binary, Opcode::V128Xor}, #line 268 "src/lexer-keywords.txt" {"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU}, @@ -973,16 +970,16 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {"f64.neg", TokenType::Unary, Opcode::F64Neg}, #line 69 "src/lexer-keywords.txt" {"f32.neg", TokenType::Unary, Opcode::F32Neg}, - {""}, {""}, {""}, {""}, {""}, #line 334 "src/lexer-keywords.txt" {"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S}, #line 221 "src/lexer-keywords.txt" {"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S}, + {""}, {""}, {""}, {""}, {""}, #line 394 "src/lexer-keywords.txt" {"i64.xor", TokenType::Binary, Opcode::I64Xor}, #line 287 "src/lexer-keywords.txt" {"i32.xor", TokenType::Binary, Opcode::I32Xor}, -#line 467 "src/lexer-keywords.txt" +#line 466 "src/lexer-keywords.txt" {"unreachable", TokenType::Unreachable, Opcode::Unreachable}, #line 311 "src/lexer-keywords.txt" {"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU}, @@ -993,7 +990,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 182 "src/lexer-keywords.txt" {"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub}, {""}, -#line 479 "src/lexer-keywords.txt" +#line 478 "src/lexer-keywords.txt" {"anyfunc", Type::Funcref}, {""}, {""}, {""}, #line 422 "src/lexer-keywords.txt" @@ -1035,7 +1032,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 222 "src/lexer-keywords.txt" {"i32.extend8_s", TokenType::Unary, Opcode::I32Extend8S}, {""}, {""}, -#line 515 "src/lexer-keywords.txt" +#line 514 "src/lexer-keywords.txt" {"set_global", TokenType::GlobalSet, Opcode::GlobalSet}, {""}, {""}, #line 387 "src/lexer-keywords.txt" @@ -1049,7 +1046,10 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, #line 420 "src/lexer-keywords.txt" {"i8x16.sub_saturate_u", TokenType::Binary, Opcode::I8X16SubSaturateU}, - {""}, {""}, {""}, + {""}, +#line 71 "src/lexer-keywords.txt" + {"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32}, + {""}, #line 172 "src/lexer-keywords.txt" {"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul}, {""}, {""}, {""}, @@ -1058,17 +1058,22 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, #line 386 "src/lexer-keywords.txt" {"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl}, - {""}, {""}, {""}, {""}, -#line 71 "src/lexer-keywords.txt" - {"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32}, - {""}, -#line 487 "src/lexer-keywords.txt" +#line 508 "src/lexer-keywords.txt" + {"i64.trunc_s:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32S}, +#line 496 "src/lexer-keywords.txt" + {"i32.trunc_s:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32S}, +#line 512 "src/lexer-keywords.txt" + {"i64.trunc_u:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32U}, +#line 500 "src/lexer-keywords.txt" + {"i32.trunc_u:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32U}, + {""}, {""}, +#line 486 "src/lexer-keywords.txt" {"f64.convert_s/i64", TokenType::Convert, Opcode::F64ConvertI64S}, -#line 481 "src/lexer-keywords.txt" +#line 480 "src/lexer-keywords.txt" {"f32.convert_s/i64", TokenType::Convert, Opcode::F32ConvertI64S}, -#line 489 "src/lexer-keywords.txt" +#line 488 "src/lexer-keywords.txt" {"f64.convert_u/i64", TokenType::Convert, Opcode::F64ConvertI64U}, -#line 483 "src/lexer-keywords.txt" +#line 482 "src/lexer-keywords.txt" {"f32.convert_u/i64", TokenType::Convert, Opcode::F32ConvertI64U}, {""}, #line 94 "src/lexer-keywords.txt" @@ -1078,21 +1083,15 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, #line 282 "src/lexer-keywords.txt" {"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat}, -#line 509 "src/lexer-keywords.txt" - {"i64.trunc_s:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32S}, -#line 497 "src/lexer-keywords.txt" - {"i32.trunc_s:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32S}, -#line 513 "src/lexer-keywords.txt" - {"i64.trunc_u:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32U}, -#line 501 "src/lexer-keywords.txt" - {"i32.trunc_u:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32U}, - {""}, + {""}, {""}, {""}, {""}, {""}, #line 142 "src/lexer-keywords.txt" {"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg}, {""}, {""}, #line 384 "src/lexer-keywords.txt" {"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg}, - {""}, {""}, +#line 484 "src/lexer-keywords.txt" + {"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32}, + {""}, #line 134 "src/lexer-keywords.txt" {"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane}, {""}, {""}, @@ -1101,19 +1100,23 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, {""}, #line 121 "src/lexer-keywords.txt" {"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32}, - {""}, {""}, {""}, -#line 485 "src/lexer-keywords.txt" - {"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32}, - {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, #line 439 "src/lexer-keywords.txt" {"nop", TokenType::Nop, Opcode::Nop}, - {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, +#line 122 "src/lexer-keywords.txt" + {"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64}, #line 95 "src/lexer-keywords.txt" {"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, -#line 122 "src/lexer-keywords.txt" - {"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64}, +#line 509 "src/lexer-keywords.txt" + {"i64.trunc_s:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64S}, +#line 497 "src/lexer-keywords.txt" + {"i32.trunc_s:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64S}, +#line 513 "src/lexer-keywords.txt" + {"i64.trunc_u:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64U}, +#line 501 "src/lexer-keywords.txt" + {"i32.trunc_u:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64U}, #line 395 "src/lexer-keywords.txt" {"i8x16.add_saturate_s", TokenType::Binary, Opcode::I8X16AddSaturateS}, {""}, @@ -1125,18 +1128,13 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 393 "src/lexer-keywords.txt" {"i64x2.trunc_sat_f64x2_u", TokenType::Unary, Opcode::I64X2TruncSatF64X2U}, {""}, -#line 490 "src/lexer-keywords.txt" +#line 489 "src/lexer-keywords.txt" {"f64.promote/f32", TokenType::Convert, Opcode::F64PromoteF32}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, +#line 490 "src/lexer-keywords.txt" + {"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64}, {""}, {""}, {""}, -#line 510 "src/lexer-keywords.txt" - {"i64.trunc_s:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64S}, -#line 498 "src/lexer-keywords.txt" - {"i32.trunc_s:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64S}, -#line 514 "src/lexer-keywords.txt" - {"i64.trunc_u:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64U}, -#line 502 "src/lexer-keywords.txt" - {"i32.trunc_u:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64U}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, #line 115 "src/lexer-keywords.txt" {"f64.max", TokenType::Binary, Opcode::F64Max}, #line 65 "src/lexer-keywords.txt" @@ -1155,8 +1153,8 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, #line 385 "src/lexer-keywords.txt" {"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane}, -#line 491 "src/lexer-keywords.txt" - {"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64}, +#line 22 "src/lexer-keywords.txt" + {"assert_return_arithmetic_nan", TokenType::AssertReturnArithmeticNan}, #line 403 "src/lexer-keywords.txt" {"i8x16.ge_s", TokenType::Compare, Opcode::I8X16GeS}, {""}, @@ -1165,10 +1163,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, {""}, {""}, #line 382 "src/lexer-keywords.txt" {"i64x2.any_true", TokenType::Unary, Opcode::I64X2AnyTrue}, - {""}, {""}, {""}, {""}, {""}, {""}, -#line 22 "src/lexer-keywords.txt" - {"assert_return_arithmetic_nan", TokenType::AssertReturnArithmeticNan}, - {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, #line 314 "src/lexer-keywords.txt" {"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU}, #line 202 "src/lexer-keywords.txt" @@ -1279,10 +1274,10 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 264 "src/lexer-keywords.txt" {"i32x4.any_true", TokenType::Unary, Opcode::I32X4AnyTrue}, {""}, -#line 456 "src/lexer-keywords.txt" +#line 455 "src/lexer-keywords.txt" {"table.copy", TokenType::TableCopy, Opcode::TableCopy}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 492 "src/lexer-keywords.txt" +#line 491 "src/lexer-keywords.txt" {"get_global", TokenType::GlobalGet, Opcode::GlobalGet}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1292,7 +1287,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 240 "src/lexer-keywords.txt" {"i32.reinterpret_f32", TokenType::Convert, Opcode::I32ReinterpretF32}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 465 "src/lexer-keywords.txt" +#line 464 "src/lexer-keywords.txt" {"try", TokenType::Try, Opcode::Try}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1300,7 +1295,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 436 "src/lexer-keywords.txt" {"memory", TokenType::Memory}, {""}, {""}, {""}, -#line 494 "src/lexer-keywords.txt" +#line 493 "src/lexer-keywords.txt" {"i32.reinterpret/f32", TokenType::Convert, Opcode::I32ReinterpretF32}, #line 321 "src/lexer-keywords.txt" {"i64.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I64AtomicRmwXor}, @@ -1326,7 +1321,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 179 "src/lexer-keywords.txt" {"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 506 "src/lexer-keywords.txt" +#line 505 "src/lexer-keywords.txt" {"i64.reinterpret/f64", TokenType::Convert, Opcode::I64ReinterpretF64}, {""}, {""}, {""}, {""}, #line 88 "src/lexer-keywords.txt" @@ -1335,7 +1330,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 415 "src/lexer-keywords.txt" {"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl}, {""}, -#line 503 "src/lexer-keywords.txt" +#line 502 "src/lexer-keywords.txt" {"i32.wrap/i64", TokenType::Convert, Opcode::I32WrapI64}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -1370,7 +1365,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len) #line 131 "src/lexer-keywords.txt" {"f64x2.convert_i64x2_u", TokenType::Unary, Opcode::F64X2ConvertI64X2U}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 477 "src/lexer-keywords.txt" +#line 476 "src/lexer-keywords.txt" {"v8x16.shuffle", TokenType::SimdShuffleOp, Opcode::V8X16Shuffle}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, #line 414 "src/lexer-keywords.txt" @@ -1407,11 +1402,11 @@ Perfect_Hash::InWordSet (const char *str, size_t len) {""}, #line 163 "src/lexer-keywords.txt" {"i16x8.extract_lane_u", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, #line 27 "src/lexer-keywords.txt" {"atomic.notify", TokenType::AtomicNotify, Opcode::AtomicNotify}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, {""}, {""}, #line 317 "src/lexer-keywords.txt" {"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg}, #line 205 "src/lexer-keywords.txt" diff --git a/src/test-literal.cc b/src/test-literal.cc index e094d879..9e38114b 100644 --- a/src/test-literal.cc +++ b/src/test-literal.cc @@ -146,7 +146,7 @@ void AssertHexFloatEquals(uint32_t expected_bits, const char* s) { ASSERT_EQ(Result::Ok, ParseFloat(LiteralType::Hexfloat, s, s + strlen(s), &actual_bits)) << s; - ASSERT_EQ(expected_bits, actual_bits); + ASSERT_EQ(expected_bits, actual_bits) << s; } void AssertHexFloatFails(const char* s) { @@ -417,6 +417,11 @@ TEST(ParseFloat, NonCanonical) { AssertHexFloatEquals(0x3f800000, "0x0.0000000000000000000001p88"); } +TEST(ParseFloat, Basic) { + AssertHexFloatEquals(0, "0x0p0"); + AssertHexFloatEquals(0x3f800000, "0x1"); +} + TEST(ParseFloat, Rounding) { // |------- 23 bits -----| V-- extra bit // @@ -432,6 +437,148 @@ TEST(ParseFloat, Rounding) { AssertHexFloatEquals(0x7f7fffff, "0x1.fffffep127"); } +// Duplicate the spec tests here for easier debugging. +TEST(ParseFloat, RoundingSpec) { + static const struct { + const char* input; + uint32_t output; + } kTests[] = { + {"+0x1.00000100000000000p-50", 0x26800000}, + {"-0x1.00000100000000000p-50", 0xa6800000}, + {"+0x1.00000100000000001p-50", 0x26800001}, + {"-0x1.00000100000000001p-50", 0xa6800001}, + {"+0x1.000001fffffffffffp-50", 0x26800001}, + {"-0x1.000001fffffffffffp-50", 0xa6800001}, + {"+0x1.00000200000000000p-50", 0x26800001}, + {"-0x1.00000200000000000p-50", 0xa6800001}, + {"+0x1.00000200000000001p-50", 0x26800001}, + {"-0x1.00000200000000001p-50", 0xa6800001}, + {"+0x1.000002fffffffffffp-50", 0x26800001}, + {"-0x1.000002fffffffffffp-50", 0xa6800001}, + {"+0x1.00000300000000000p-50", 0x26800002}, + {"-0x1.00000300000000000p-50", 0xa6800002}, + {"+0x1.00000300000000001p-50", 0x26800002}, + {"-0x1.00000300000000001p-50", 0xa6800002}, + {"+0x1.000003fffffffffffp-50", 0x26800002}, + {"-0x1.000003fffffffffffp-50", 0xa6800002}, + {"+0x1.00000400000000000p-50", 0x26800002}, + {"-0x1.00000400000000000p-50", 0xa6800002}, + {"+0x1.00000400000000001p-50", 0x26800002}, + {"-0x1.00000400000000001p-50", 0xa6800002}, + {"+0x1.000004fffffffffffp-50", 0x26800002}, + {"-0x1.000004fffffffffffp-50", 0xa6800002}, + {"+0x1.00000500000000000p-50", 0x26800002}, + {"-0x1.00000500000000000p-50", 0xa6800002}, + {"+0x1.00000500000000001p-50", 0x26800003}, + {"-0x1.00000500000000001p-50", 0xa6800003}, + {"+0x4000.004000000p-64", 0x26800000}, + {"-0x4000.004000000p-64", 0xa6800000}, + {"+0x4000.004000001p-64", 0x26800001}, + {"-0x4000.004000001p-64", 0xa6800001}, + {"+0x4000.007ffffffp-64", 0x26800001}, + {"-0x4000.007ffffffp-64", 0xa6800001}, + {"+0x4000.008000000p-64", 0x26800001}, + {"-0x4000.008000000p-64", 0xa6800001}, + {"+0x4000.008000001p-64", 0x26800001}, + {"-0x4000.008000001p-64", 0xa6800001}, + {"+0x4000.00bffffffp-64", 0x26800001}, + {"-0x4000.00bffffffp-64", 0xa6800001}, + {"+0x4000.00c000000p-64", 0x26800002}, + {"-0x4000.00c000000p-64", 0xa6800002}, + {"+0x4000.00c000001p-64", 0x26800002}, + {"-0x4000.00c000001p-64", 0xa6800002}, + {"+0x4000.00fffffffp-64", 0x26800002}, + {"-0x4000.00fffffffp-64", 0xa6800002}, + {"+0x4000.010000001p-64", 0x26800002}, + {"-0x4000.010000001p-64", 0xa6800002}, + {"+0x4000.013ffffffp-64", 0x26800002}, + {"-0x4000.013ffffffp-64", 0xa6800002}, + {"+0x4000.014000001p-64", 0x26800003}, + {"-0x4000.014000001p-64", 0xa6800003}, + {"+0x1.00000100000000000p+50", 0x58800000}, + {"-0x1.00000100000000000p+50", 0xd8800000}, + {"+0x1.00000100000000001p+50", 0x58800001}, + {"-0x1.00000100000000001p+50", 0xd8800001}, + {"+0x1.000001fffffffffffp+50", 0x58800001}, + {"-0x1.000001fffffffffffp+50", 0xd8800001}, + {"+0x1.00000200000000000p+50", 0x58800001}, + {"-0x1.00000200000000000p+50", 0xd8800001}, + {"+0x1.00000200000000001p+50", 0x58800001}, + {"-0x1.00000200000000001p+50", 0xd8800001}, + {"+0x1.000002fffffffffffp+50", 0x58800001}, + {"-0x1.000002fffffffffffp+50", 0xd8800001}, + {"+0x1.00000300000000000p+50", 0x58800002}, + {"-0x1.00000300000000000p+50", 0xd8800002}, + {"+0x1.00000300000000001p+50", 0x58800002}, + {"-0x1.00000300000000001p+50", 0xd8800002}, + {"+0x1.000003fffffffffffp+50", 0x58800002}, + {"-0x1.000003fffffffffffp+50", 0xd8800002}, + {"+0x1.00000400000000000p+50", 0x58800002}, + {"-0x1.00000400000000000p+50", 0xd8800002}, + {"+0x1.00000400000000001p+50", 0x58800002}, + {"-0x1.00000400000000001p+50", 0xd8800002}, + {"+0x1.000004fffffffffffp+50", 0x58800002}, + {"-0x1.000004fffffffffffp+50", 0xd8800002}, + {"+0x1.00000500000000000p+50", 0x58800002}, + {"-0x1.00000500000000000p+50", 0xd8800002}, + {"+0x1.00000500000000001p+50", 0x58800003}, + {"-0x1.00000500000000001p+50", 0xd8800003}, + {"+0x4000004000000", 0x58800000}, + {"-0x4000004000000", 0xd8800000}, + {"+0x4000004000001", 0x58800001}, + {"-0x4000004000001", 0xd8800001}, + {"+0x4000007ffffff", 0x58800001}, + {"-0x4000007ffffff", 0xd8800001}, + {"+0x4000008000000", 0x58800001}, + {"-0x4000008000000", 0xd8800001}, + {"+0x4000008000001", 0x58800001}, + {"-0x4000008000001", 0xd8800001}, + {"+0x400000bffffff", 0x58800001}, + {"-0x400000bffffff", 0xd8800001}, + {"+0x400000c000000", 0x58800002}, + {"-0x400000c000000", 0xd8800002}, + {"+0x0.00000100000000000p-126", 0x0}, + {"-0x0.00000100000000000p-126", 0x80000000}, + {"+0x0.00000100000000001p-126", 0x1}, + {"-0x0.00000100000000001p-126", 0x80000001}, + {"+0x0.00000101000000000p-126", 0x1}, + {"+0x0.000001fffffffffffp-126", 0x1}, + {"-0x0.000001fffffffffffp-126", 0x80000001}, + {"+0x0.00000200000000000p-126", 0x1}, + {"-0x0.00000200000000000p-126", 0x80000001}, + {"+0x0.00000200000000001p-126", 0x1}, + {"-0x0.00000200000000001p-126", 0x80000001}, + {"+0x0.000002fffffffffffp-126", 0x1}, + {"-0x0.000002fffffffffffp-126", 0x80000001}, + {"+0x0.00000300000000000p-126", 0x2}, + {"-0x0.00000300000000000p-126", 0x80000002}, + {"+0x0.00000300000000001p-126", 0x2}, + {"-0x0.00000300000000001p-126", 0x80000002}, + {"+0x0.000003fffffffffffp-126", 0x2}, + {"-0x0.000003fffffffffffp-126", 0x80000002}, + {"+0x0.00000400000000000p-126", 0x2}, + {"-0x0.00000400000000000p-126", 0x80000002}, + {"+0x0.00000400000000001p-126", 0x2}, + {"-0x0.00000400000000001p-126", 0x80000002}, + {"+0x0.000004fffffffffffp-126", 0x2}, + {"-0x0.000004fffffffffffp-126", 0x80000002}, + {"+0x0.00000500000000000p-126", 0x2}, + {"-0x0.00000500000000000p-126", 0x80000002}, + {"+0x0.00000500000000001p-126", 0x3}, + {"-0x0.00000500000000001p-126", 0x80000003}, + {"+0x1.fffffe8p127", 0x7f7fffff}, + {"-0x1.fffffe8p127", 0xff7fffff}, + {"+0x1.fffffefffffff8p127", 0x7f7fffff}, + {"-0x1.fffffefffffff8p127", 0xff7fffff}, + {"+0x1.fffffefffffffffffp127", 0x7f7fffff}, + {"-0x1.fffffefffffffffffp127", 0xff7fffff}, + }; + + for (auto test: kTests) { + AssertHexFloatEquals(test.output, test.input); + } +} + TEST(ParseFloat, OutOfRange) { AssertHexFloatFails("0x1p128"); AssertHexFloatFails("-0x1p128"); @@ -466,3 +613,156 @@ TEST(ParseDouble, OutOfRange) { AssertHexDoubleFails("0x1.fffffffffffff8p1023"); AssertHexDoubleFails("-0x1.fffffffffffff8p1023"); } + +// Duplicate the spec tests here for easier debugging. +TEST(ParseDouble, RoundingSpec) { + static const struct { + const char* input; + uint64_t output; + } kTests[] = { + {"+0x1.000000000000080000000000p-600", 1905022642377719808ull}, + {"-0x1.000000000000080000000000p-600", 11128394679232495616ull}, + {"+0x1.000000000000080000000001p-600", 1905022642377719809ull}, + {"-0x1.000000000000080000000001p-600", 11128394679232495617ull}, + {"+0x1.0000000000000fffffffffffp-600", 1905022642377719809ull}, + {"-0x1.0000000000000fffffffffffp-600", 11128394679232495617ull}, + {"+0x1.000000000000100000000000p-600", 1905022642377719809ull}, + {"-0x1.000000000000100000000000p-600", 11128394679232495617ull}, + {"+0x1.000000000000100000000001p-600", 1905022642377719809ull}, + {"-0x1.000000000000100000000001p-600", 11128394679232495617ull}, + {"+0x1.00000000000017ffffffffffp-600", 1905022642377719809ull}, + {"-0x1.00000000000017ffffffffffp-600", 11128394679232495617ull}, + {"+0x1.000000000000180000000000p-600", 1905022642377719810ull}, + {"-0x1.000000000000180000000000p-600", 11128394679232495618ull}, + {"+0x1.000000000000180000000001p-600", 1905022642377719810ull}, + {"-0x1.000000000000180000000001p-600", 11128394679232495618ull}, + {"+0x1.0000000000001fffffffffffp-600", 1905022642377719810ull}, + {"-0x1.0000000000001fffffffffffp-600", 11128394679232495618ull}, + {"+0x1.000000000000200000000000p-600", 1905022642377719810ull}, + {"-0x1.000000000000200000000000p-600", 11128394679232495618ull}, + {"+0x1.000000000000200000000001p-600", 1905022642377719810ull}, + {"-0x1.000000000000200000000001p-600", 11128394679232495618ull}, + {"+0x1.00000000000027ffffffffffp-600", 1905022642377719810ull}, + {"-0x1.00000000000027ffffffffffp-600", 11128394679232495618ull}, + {"+0x1.000000000000280000000001p-600", 1905022642377719811ull}, + {"-0x1.000000000000280000000001p-600", 11128394679232495619ull}, + {"+0x8000000.000000400000000000p-627", 1905022642377719808ull}, + {"-0x8000000.000000400000000000p-627", 11128394679232495616ull}, + {"+0x8000000.000000400000000001p-627", 1905022642377719809ull}, + {"-0x8000000.000000400000000001p-627", 11128394679232495617ull}, + {"+0x8000000.0000007fffffffffffp-627", 1905022642377719809ull}, + {"-0x8000000.0000007fffffffffffp-627", 11128394679232495617ull}, + {"+0x8000000.000000800000000000p-627", 1905022642377719809ull}, + {"-0x8000000.000000800000000000p-627", 11128394679232495617ull}, + {"+0x8000000.000000800000000001p-627", 1905022642377719809ull}, + {"-0x8000000.000000800000000001p-627", 11128394679232495617ull}, + {"+0x8000000.000000bfffffffffffp-627", 1905022642377719809ull}, + {"-0x8000000.000000bfffffffffffp-627", 11128394679232495617ull}, + {"+0x8000000.000000c00000000000p-627", 1905022642377719810ull}, + {"-0x8000000.000000c00000000000p-627", 11128394679232495618ull}, + {"+0x8000000.000000c00000000001p-627", 1905022642377719810ull}, + {"-0x8000000.000000c00000000001p-627", 11128394679232495618ull}, + {"+0x8000000.000000ffffffffffffp-627", 1905022642377719810ull}, + {"-0x8000000.000000ffffffffffffp-627", 11128394679232495618ull}, + {"+0x8000000.000001000000000000p-627", 1905022642377719810ull}, + {"-0x8000000.000001000000000000p-627", 11128394679232495618ull}, + {"+0x8000000.000001000000000001p-627", 1905022642377719810ull}, + {"-0x8000000.000001000000000001p-627", 11128394679232495618ull}, + {"+0x8000000.0000013fffffffffffp-627", 1905022642377719810ull}, + {"-0x8000000.0000013fffffffffffp-627", 11128394679232495618ull}, + {"+0x8000000.000001400000000001p-627", 1905022642377719811ull}, + {"-0x8000000.000001400000000001p-627", 11128394679232495619ull}, + {"+0x1.000000000000080000000000p+600", 7309342195222315008ull}, + {"-0x1.000000000000080000000000p+600", 16532714232077090816ull}, + {"+0x1.000000000000080000000001p+600", 7309342195222315009ull}, + {"-0x1.000000000000080000000001p+600", 16532714232077090817ull}, + {"+0x1.0000000000000fffffffffffp+600", 7309342195222315009ull}, + {"-0x1.0000000000000fffffffffffp+600", 16532714232077090817ull}, + {"+0x1.000000000000100000000000p+600", 7309342195222315009ull}, + {"-0x1.000000000000100000000000p+600", 16532714232077090817ull}, + {"+0x1.000000000000100000000001p+600", 7309342195222315009ull}, + {"-0x1.000000000000100000000001p+600", 16532714232077090817ull}, + {"+0x1.00000000000017ffffffffffp+600", 7309342195222315009ull}, + {"-0x1.00000000000017ffffffffffp+600", 16532714232077090817ull}, + {"+0x1.000000000000180000000000p+600", 7309342195222315010ull}, + {"-0x1.000000000000180000000000p+600", 16532714232077090818ull}, + {"+0x1.000000000000180000000001p+600", 7309342195222315010ull}, + {"-0x1.000000000000180000000001p+600", 16532714232077090818ull}, + {"+0x1.0000000000001fffffffffffp+600", 7309342195222315010ull}, + {"-0x1.0000000000001fffffffffffp+600", 16532714232077090818ull}, + {"+0x1.000000000000200000000000p+600", 7309342195222315010ull}, + {"-0x1.000000000000200000000000p+600", 16532714232077090818ull}, + {"+0x1.000000000000200000000001p+600", 7309342195222315010ull}, + {"-0x1.000000000000200000000001p+600", 16532714232077090818ull}, + {"+0x1.00000000000027ffffffffffp+600", 7309342195222315010ull}, + {"-0x1.00000000000027ffffffffffp+600", 16532714232077090818ull}, + {"+0x1.000000000000280000000000p+600", 7309342195222315010ull}, + {"-0x1.000000000000280000000000p+600", 16532714232077090818ull}, + {"+0x1.000000000000280000000001p+600", 7309342195222315011ull}, + {"-0x1.000000000000280000000001p+600", 16532714232077090819ull}, + {"+0x2000000000000100000000000", 5044031582654955520ull}, + {"-0x2000000000000100000000000", 14267403619509731328ull}, + {"+0x2000000000000100000000001", 5044031582654955521ull}, + {"-0x2000000000000100000000001", 14267403619509731329ull}, + {"+0x20000000000001fffffffffff", 5044031582654955521ull}, + {"-0x20000000000001fffffffffff", 14267403619509731329ull}, + {"+0x2000000000000200000000000", 5044031582654955521ull}, + {"-0x2000000000000200000000000", 14267403619509731329ull}, + {"+0x2000000000000200000000001", 5044031582654955521ull}, + {"-0x2000000000000200000000001", 14267403619509731329ull}, + {"+0x20000000000002fffffffffff", 5044031582654955521ull}, + {"-0x20000000000002fffffffffff", 14267403619509731329ull}, + {"+0x2000000000000300000000000", 5044031582654955522ull}, + {"-0x2000000000000300000000000", 14267403619509731330ull}, + {"+0x2000000000000300000000001", 5044031582654955522ull}, + {"-0x2000000000000300000000001", 14267403619509731330ull}, + {"+0x20000000000003fffffffffff", 5044031582654955522ull}, + {"-0x20000000000003fffffffffff", 14267403619509731330ull}, + {"+0x2000000000000400000000000", 5044031582654955522ull}, + {"-0x2000000000000400000000000", 14267403619509731330ull}, + {"+0x2000000000000400000000001", 5044031582654955522ull}, + {"-0x2000000000000400000000001", 14267403619509731330ull}, + {"+0x20000000000004fffffffffff", 5044031582654955522ull}, + {"-0x20000000000004fffffffffff", 14267403619509731330ull}, + {"+0x2000000000000500000000000", 5044031582654955522ull}, + {"-0x2000000000000500000000000", 14267403619509731330ull}, + {"+0x2000000000000500000000001", 5044031582654955523ull}, + {"-0x2000000000000500000000001", 14267403619509731331ull}, + {"+0x0.000000000000080000000000p-1022", 0ull}, + {"-0x0.000000000000080000000000p-1022", 9223372036854775808ull}, + {"+0x0.000000000000080000000001p-1022", 1ull}, + {"-0x0.000000000000080000000001p-1022", 9223372036854775809ull}, + {"+0x0.0000000000000fffffffffffp-1022", 1ull}, + {"-0x0.0000000000000fffffffffffp-1022", 9223372036854775809ull}, + {"+0x0.000000000000100000000000p-1022", 1ull}, + {"-0x0.000000000000100000000000p-1022", 9223372036854775809ull}, + {"+0x0.000000000000100000000001p-1022", 1ull}, + {"-0x0.000000000000100000000001p-1022", 9223372036854775809ull}, + {"+0x0.00000000000017ffffffffffp-1022", 1ull}, + {"-0x0.00000000000017ffffffffffp-1022", 9223372036854775809ull}, + {"+0x0.000000000000180000000000p-1022", 2ull}, + {"-0x0.000000000000180000000000p-1022", 9223372036854775810ull}, + {"+0x0.000000000000180000000001p-1022", 2ull}, + {"-0x0.000000000000180000000001p-1022", 9223372036854775810ull}, + {"+0x0.0000000000001fffffffffffp-1022", 2ull}, + {"-0x0.0000000000001fffffffffffp-1022", 9223372036854775810ull}, + {"+0x0.000000000000200000000000p-1022", 2ull}, + {"-0x0.000000000000200000000000p-1022", 9223372036854775810ull}, + {"+0x0.000000000000200000000001p-1022", 2ull}, + {"-0x0.000000000000200000000001p-1022", 9223372036854775810ull}, + {"+0x0.00000000000027ffffffffffp-1022", 2ull}, + {"-0x0.00000000000027ffffffffffp-1022", 9223372036854775810ull}, + {"+0x0.000000000000280000000000p-1022", 2ull}, + {"-0x0.000000000000280000000000p-1022", 9223372036854775810ull}, + {"+0x1.000000000000280000000001p-1022", 4503599627370499ull}, + {"-0x1.000000000000280000000001p-1022", 9227875636482146307ull}, + {"+0x1.fffffffffffff4p1023", 9218868437227405311ull}, + {"-0x1.fffffffffffff4p1023", 18442240474082181119ull}, + {"+0x1.fffffffffffff7ffffffp1023", 9218868437227405311ull}, + {"-0x1.fffffffffffff7ffffffp1023", 18442240474082181119ull}, + }; + + for (auto test: kTests) { + AssertHexDoubleEquals(test.output, test.input); + } +} diff --git a/src/test-wast-parser.cc b/src/test-wast-parser.cc index f51c9402..0b9c6fd6 100644 --- a/src/test-wast-parser.cc +++ b/src/test-wast-parser.cc @@ -47,11 +47,9 @@ Errors ParseInvalidModule(std::string text) { TEST(WastParser, LongToken) { std::string text; - text = "(module (data \""; + text = "(module (data "; text += repeat("a", 0x5000); - text += "\" \""; - text += repeat("a", 0x10000); - text += "\"))"; + text += "))"; Errors errors = ParseInvalidModule(text); ASSERT_EQ(1u, errors.size()); @@ -60,7 +58,7 @@ TEST(WastParser, LongToken) { ASSERT_EQ(1, errors[0].loc.line); ASSERT_EQ(15, errors[0].loc.first_column); ASSERT_STREQ( - R"(unexpected token ""aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...", expected an offset expr (e.g. (i32.const 123)).)", + R"(unexpected token aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..., expected ).)", errors[0].message.c_str()); } diff --git a/src/token.def b/src/token.def index 005e2b45..680811ba 100644 --- a/src/token.def +++ b/src/token.def @@ -46,7 +46,6 @@ WABT_TOKEN(Module, "module") WABT_TOKEN(Mut, "mut") WABT_TOKEN(Offset, "offset") WABT_TOKEN(Param, "param") -WABT_TOKEN(Passive, "passive") WABT_TOKEN(Quote, "quote") WABT_TOKEN(Register, "register") WABT_TOKEN(Result, "result") diff --git a/src/wast-parser.cc b/src/wast-parser.cc index 63929706..f7d8ca01 100644 --- a/src/wast-parser.cc +++ b/src/wast-parser.cc @@ -587,15 +587,24 @@ bool WastParser::ParseVarOpt(Var* out_var, Var default_var) { Result WastParser::ParseOffsetExpr(ExprList* out_expr_list) { WABT_TRACE(ParseOffsetExpr); + if (!ParseOffsetExprOpt(out_expr_list)) { + return ErrorExpected({"an offset expr"}, "(i32.const 123)"); + } + return Result::Ok; +} + +bool WastParser::ParseOffsetExprOpt(ExprList* out_expr_list) { + WABT_TRACE(ParseOffsetExprOpt); if (MatchLpar(TokenType::Offset)) { CHECK_RESULT(ParseTerminatingInstrList(out_expr_list)); EXPECT(Rpar); + return true; } else if (PeekMatchExpr()) { CHECK_RESULT(ParseExpr(out_expr_list)); + return true; } else { - return ErrorExpected({"an offset expr"}, "(i32.const 123)"); + return false; } - return Result::Ok; } Result WastParser::ParseTextList(std::vector<uint8_t>* out_data) { @@ -698,6 +707,22 @@ Result WastParser::ParseRefType(Type* out_type) { return Result::Ok; } +bool WastParser::ParseRefTypeOpt(Type* out_type) { + WABT_TRACE(ParseRefTypeOpt); + if (!PeekMatch(TokenType::ValueType)) { + return false; + } + + Token token = Consume(); + Type type = token.type(); + if (type == Type::Anyref && !options_->features.reference_types_enabled()) { + return false; + } + + *out_type = type; + return true; +} + Result WastParser::ParseQuotedText(std::string* text) { WABT_TRACE(ParseQuotedText); if (!PeekMatch(TokenType::Text)) { @@ -889,13 +914,12 @@ Result WastParser::ParseDataModuleField(Module* module) { ParseBindVarOpt(&name); auto field = MakeUnique<DataSegmentModuleField>(loc, name); - if (Peek() == TokenType::Passive) { - Consume(); - field->data_segment.passive = true; - } else { - ParseVarOpt(&field->data_segment.memory_var, Var(0, loc)); + if (ParseVarOpt(&field->data_segment.memory_var, Var(0, loc))) { CHECK_RESULT(ParseOffsetExpr(&field->data_segment.offset)); + } else if (!ParseOffsetExprOpt(&field->data_segment.offset)) { + field->data_segment.passive = true; } + ParseTextListOpt(&field->data_segment.data); EXPECT(Rpar); module->AppendField(std::move(field)); @@ -911,10 +935,8 @@ Result WastParser::ParseElemModuleField(Module* module) { ParseBindVarOpt(&name); auto field = MakeUnique<ElemSegmentModuleField>(loc, name); - if (Peek() == TokenType::Passive) { - Consume(); + if (ParseRefTypeOpt(&field->elem_segment.elem_type)) { field->elem_segment.passive = true; - CHECK_RESULT(ParseRefType(&field->elem_segment.elem_type)); // Parse a potentially empty sequence of ElemExprs. while (true) { Var var; diff --git a/src/wast-parser.h b/src/wast-parser.h index f2e0b102..9667920b 100644 --- a/src/wast-parser.h +++ b/src/wast-parser.h @@ -117,6 +117,7 @@ class WastParser { Result ParseVar(Var* out_var); bool ParseVarOpt(Var* out_var, Var default_var = Var()); Result ParseOffsetExpr(ExprList* out_expr_list); + bool ParseOffsetExprOpt(ExprList* out_expr_list); Result ParseTextList(std::vector<uint8_t>* out_data); bool ParseTextListOpt(std::vector<uint8_t>* out_data); Result ParseVarList(VarVector* out_var_list); @@ -125,6 +126,7 @@ class WastParser { Result ParseValueType(Type* out_type); Result ParseValueTypeList(TypeVector* out_type_list); Result ParseRefType(Type* out_type); + bool ParseRefTypeOpt(Type* out_type); Result ParseQuotedText(std::string* text); bool ParseOffsetOpt(uint32_t* offset); bool ParseAlignOpt(uint32_t* align); diff --git a/src/wat-writer.cc b/src/wat-writer.cc index 43480ad9..10fa9eb2 100644 --- a/src/wat-writer.cc +++ b/src/wat-writer.cc @@ -1488,7 +1488,6 @@ void WatWriter::WriteElemSegment(const ElemSegment& segment) { WriteOpenSpace("elem"); WriteNameOrIndex(segment.name, elem_segment_index_, NextChar::Space); if (segment.passive) { - WritePutsSpace("passive"); WriteType(segment.elem_type, NextChar::Space); } else { WriteInitExpr(segment.offset); @@ -1525,9 +1524,7 @@ void WatWriter::WriteMemory(const Memory& memory) { void WatWriter::WriteDataSegment(const DataSegment& segment) { WriteOpenSpace("data"); WriteNameOrIndex(segment.name, data_segment_index_, NextChar::Space); - if (segment.passive) { - WritePutsSpace("passive"); - } else { + if (!segment.passive) { WriteInitExpr(segment.offset); } WriteQuotedData(segment.data.data(), segment.data.size()); diff --git a/test/dump/bulk-memory.txt b/test/dump/bulk-memory.txt index 15e47758..fb985eff 100644 --- a/test/dump/bulk-memory.txt +++ b/test/dump/bulk-memory.txt @@ -3,7 +3,7 @@ (module (memory 1) - (data passive "a") + (data "a") (func i32.const 0 i32.const 0 i32.const 0 memory.init 0 data.drop 0 @@ -12,7 +12,7 @@ ) (table 1 anyfunc) - (elem passive funcref 0) + (elem funcref 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 elem.drop 0 diff --git a/test/interp/logging-all-opcodes.txt b/test/interp/logging-all-opcodes.txt index 77a2e8c3..daba3312 100644 --- a/test/interp/logging-all-opcodes.txt +++ b/test/interp/logging-all-opcodes.txt @@ -10,8 +10,8 @@ (memory 1 1 shared) (table anyfunc (elem $empty $empty)) (global $g (mut i32) (i32.const 0)) - (data passive "") - (elem passive funcref) + (data "") + (elem funcref) (; 0x00 ;) (func (export "unreachable") unreachable) (; 0x01 ;) ;; nop -- not generated in interpreter diff --git a/test/interp/tracing-all-opcodes.txt b/test/interp/tracing-all-opcodes.txt index 727fb09b..6d49950b 100644 --- a/test/interp/tracing-all-opcodes.txt +++ b/test/interp/tracing-all-opcodes.txt @@ -10,8 +10,8 @@ (memory 1 1 shared) (table anyfunc (elem $empty $empty)) (global $g (mut i32) (i32.const 0)) - (data passive) - (elem passive funcref) + (data "") + (elem funcref) (; 0x00 ;) (func (export "unreachable") unreachable) (; 0x01 ;) ;; nop -- not generated in interpreter diff --git a/test/parse/expr/bulk-memory-disabled.txt b/test/parse/expr/bulk-memory-disabled.txt index d6a1057b..bf05f11b 100644 --- a/test/parse/expr/bulk-memory-disabled.txt +++ b/test/parse/expr/bulk-memory-disabled.txt @@ -3,7 +3,7 @@ (module (memory 1) - (data $data passive "a") + (data $data "a") (func i32.const 0 i32.const 0 i32.const 0 memory.init 0 data.drop 0 @@ -12,7 +12,7 @@ ) (table 1 anyfunc) - (elem $elem passive funcref 0) + (elem $elem funcref 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 elem.drop 0 diff --git a/test/parse/expr/bulk-memory-named.txt b/test/parse/expr/bulk-memory-named.txt index f6a09e2a..22a94d2f 100644 --- a/test/parse/expr/bulk-memory-named.txt +++ b/test/parse/expr/bulk-memory-named.txt @@ -3,15 +3,15 @@ (module (memory 1) - (data $data passive "a") + (data $data "a") (func i32.const 0 i32.const 0 i32.const 0 memory.init $data data.drop $data ) (table 1 anyfunc) - (elem $elem passive funcref (ref.func 0) (ref.null)) - (elem $elem passive funcref 0) + (elem $elem funcref (ref.func 0) (ref.null)) + (elem $elem funcref 0) (func i32.const 0 i32.const 0 i32.const 0 table.init $elem elem.drop $elem diff --git a/test/parse/expr/memory-drop.txt b/test/parse/expr/memory-drop.txt index 5554e303..2df3c997 100644 --- a/test/parse/expr/memory-drop.txt +++ b/test/parse/expr/memory-drop.txt @@ -6,4 +6,4 @@ (func data.drop 0) - (data passive "hi")) + (data "hi")) diff --git a/test/parse/expr/memory-init.txt b/test/parse/expr/memory-init.txt index 01b02c86..4bade7e6 100644 --- a/test/parse/expr/memory-init.txt +++ b/test/parse/expr/memory-init.txt @@ -9,4 +9,4 @@ i32.const 0 memory.init 0) - (data passive "hi")) + (data "hi")) diff --git a/test/parse/expr/table-drop.txt b/test/parse/expr/table-drop.txt index 63c76d8e..aa7fb781 100644 --- a/test/parse/expr/table-drop.txt +++ b/test/parse/expr/table-drop.txt @@ -9,4 +9,4 @@ (func) (table 0 funcref) - (elem passive funcref 1)) + (elem funcref 1)) diff --git a/test/parse/expr/table-init.txt b/test/parse/expr/table-init.txt index 67756ab6..f15f0770 100644 --- a/test/parse/expr/table-init.txt +++ b/test/parse/expr/table-init.txt @@ -12,4 +12,4 @@ (func) (table 0 funcref) - (elem passive funcref 1)) + (elem funcref 1)) diff --git a/test/parse/module/bad-memory-segment-address.txt b/test/parse/module/bad-memory-segment-address.txt index 7cbf23c4..b170260f 100644 --- a/test/parse/module/bad-memory-segment-address.txt +++ b/test/parse/module/bad-memory-segment-address.txt @@ -4,7 +4,7 @@ (memory 100) (data foo)) (;; STDERR ;;; -out/test/parse/module/bad-memory-segment-address.txt:5:9: error: unexpected token "foo", expected an offset expr (e.g. (i32.const 123)). +out/test/parse/module/bad-memory-segment-address.txt:5:9: error: unexpected token foo, expected ). (data foo)) ^^^ ;;; STDERR ;;) diff --git a/test/parse/module/memory-segment-passive.txt b/test/parse/module/memory-segment-passive.txt index 0eb64787..1a117935 100644 --- a/test/parse/module/memory-segment-passive.txt +++ b/test/parse/module/memory-segment-passive.txt @@ -1,4 +1,4 @@ ;;; TOOL: wat2wasm (module (memory 1) - (data passive "hi")) + (data "hi")) diff --git a/test/roundtrip/bulk-memory.txt b/test/roundtrip/bulk-memory.txt index 2c52063b..8d56ac10 100644 --- a/test/roundtrip/bulk-memory.txt +++ b/test/roundtrip/bulk-memory.txt @@ -38,9 +38,9 @@ (func) - (data passive "hi") - (elem passive funcref (ref.func 0) (ref.null)) - (elem passive funcref 1) + (data "hi") + (elem funcref (ref.func 0) (ref.null)) + (elem funcref 1) ) (;; STDOUT ;;; @@ -72,7 +72,7 @@ (func (;1;) (type 0)) (table (;0;) 0 funcref) (memory (;0;) 0) - (elem (;0;) passive funcref (ref.func 0) (ref.null)) - (elem (;1;) passive funcref (ref.func 1)) - (data (;0;) passive "hi")) + (elem (;0;) funcref (ref.func 0) (ref.null)) + (elem (;1;) funcref (ref.func 1)) + (data (;0;) "hi")) ;;; STDOUT ;;) diff --git a/test/roundtrip/fold-bulk-memory.txt b/test/roundtrip/fold-bulk-memory.txt index d0a15fa2..9e676f7a 100644 --- a/test/roundtrip/fold-bulk-memory.txt +++ b/test/roundtrip/fold-bulk-memory.txt @@ -3,7 +3,7 @@ (module (memory 1) - (data passive "a") + (data "a") (func i32.const 0 i32.const 0 i32.const 0 memory.init 0 data.drop 0 @@ -12,7 +12,7 @@ ) (table 1 anyfunc) - (elem passive funcref 0) + (elem funcref 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 elem.drop 0 @@ -48,6 +48,6 @@ (i32.const 0))) (table (;0;) 1 funcref) (memory (;0;) 1) - (elem (;0;) passive funcref (ref.func 0)) - (data (;0;) passive "a")) + (elem (;0;) funcref (ref.func 0)) + (data (;0;) "a")) ;;; STDOUT ;;) diff --git a/test/roundtrip/generate-bulk-memory-names.txt b/test/roundtrip/generate-bulk-memory-names.txt index 9d2b09dd..189ae928 100644 --- a/test/roundtrip/generate-bulk-memory-names.txt +++ b/test/roundtrip/generate-bulk-memory-names.txt @@ -3,14 +3,14 @@ (module (memory 1) - (data passive "a") + (data "a") (func i32.const 0 i32.const 0 i32.const 0 memory.init 0 data.drop 0 ) (table 1 anyfunc) - (elem passive funcref 0) + (elem funcref 0) (func i32.const 0 i32.const 0 i32.const 0 table.init 0 elem.drop 0 @@ -33,6 +33,6 @@ elem.drop $e0) (table $T0 1 funcref) (memory $M0 1) - (elem $e0 passive funcref (ref.func $f0)) - (data $d0 passive "a")) + (elem $e0 funcref (ref.func $f0)) + (data $d0 "a")) ;;; STDOUT ;;) diff --git a/test/run-tests.py b/test/run-tests.py index f6e10d86..b7e0efd2 100755 --- a/test/run-tests.py +++ b/test/run-tests.py @@ -37,7 +37,7 @@ TEST_DIR = os.path.dirname(os.path.abspath(__file__)) REPO_ROOT_DIR = os.path.dirname(TEST_DIR) OUT_DIR = os.path.join(REPO_ROOT_DIR, 'out') DEFAULT_TIMEOUT = 10 # seconds -SLOW_TIMEOUT_MULTIPLIER = 2 +SLOW_TIMEOUT_MULTIPLIER = 3 # default configurations for tests TOOLS = { diff --git a/test/spec/align.txt b/test/spec/align.txt index 26ba73be..31eb1b08 100644 --- a/test/spec/align.txt +++ b/test/spec/align.txt @@ -295,6 +295,6 @@ out/test/spec/align.wast:448: assert_invalid passed: 0000026: error: OnStoreExpr callback failed out/test/spec/align.wast:452: assert_invalid passed: error: alignment must not be larger than natural alignment (8) - 0000026: error: OnStoreExpr callback failed + 000002a: error: OnStoreExpr callback failed 131/131 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/binary.txt b/test/spec/binary.txt index a6b53953..f471c030 100644 --- a/test/spec/binary.txt +++ b/test/spec/binary.txt @@ -39,117 +39,63 @@ out/test/spec/binary.wast:31: assert_malformed passed: 0000004: error: bad magic value out/test/spec/binary.wast:34: assert_malformed passed: 0000004: error: bad magic value -out/test/spec/binary.wast:36: assert_malformed passed: - 0000004: error: unable to read uint32_t: version out/test/spec/binary.wast:37: assert_malformed passed: 0000004: error: unable to read uint32_t: version out/test/spec/binary.wast:38: assert_malformed passed: 0000004: error: unable to read uint32_t: version out/test/spec/binary.wast:39: assert_malformed passed: - 0000008: error: bad wasm file version: 0 (expected 0x1) + 0000004: error: unable to read uint32_t: version out/test/spec/binary.wast:40: assert_malformed passed: - 0000008: error: bad wasm file version: 0xd (expected 0x1) + 0000008: error: bad wasm file version: 0 (expected 0x1) out/test/spec/binary.wast:41: assert_malformed passed: - 0000008: error: bad wasm file version: 0xe (expected 0x1) + 0000008: error: bad wasm file version: 0xd (expected 0x1) out/test/spec/binary.wast:42: assert_malformed passed: - 0000008: error: bad wasm file version: 0x100 (expected 0x1) + 0000008: error: bad wasm file version: 0xe (expected 0x1) out/test/spec/binary.wast:43: assert_malformed passed: - 0000008: error: bad wasm file version: 0x10000 (expected 0x1) + 0000008: error: bad wasm file version: 0x100 (expected 0x1) out/test/spec/binary.wast:44: assert_malformed passed: + 0000008: error: bad wasm file version: 0x10000 (expected 0x1) +out/test/spec/binary.wast:45: assert_malformed passed: 0000008: error: bad wasm file version: 0x1000000 (expected 0x1) -out/test/spec/binary.wast:139: assert_malformed passed: - 000000c: error: unable to read u32 leb128: memory initial page count -out/test/spec/binary.wast:147: assert_malformed passed: - 0000022: error: unable to read u32 leb128: load offset -out/test/spec/binary.wast:166: assert_malformed passed: - 0000021: error: unable to read u32 leb128: load alignment -out/test/spec/binary.wast:185: assert_malformed passed: - 0000023: error: unable to read u32 leb128: store alignment -out/test/spec/binary.wast:204: assert_malformed passed: - 0000024: error: unable to read u32 leb128: store offset -out/test/spec/binary.wast:225: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/binary.wast:235: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/binary.wast:246: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/binary.wast:256: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/binary.wast:268: assert_malformed passed: - 000000c: error: unable to read u32 leb128: memory initial page count -out/test/spec/binary.wast:276: assert_malformed passed: - 000000c: error: unable to read u32 leb128: memory initial page count -out/test/spec/binary.wast:284: assert_malformed passed: - 0000022: error: unable to read u32 leb128: load offset -out/test/spec/binary.wast:303: assert_malformed passed: - 0000022: error: unable to read u32 leb128: load offset -out/test/spec/binary.wast:322: assert_malformed passed: - 0000021: error: unable to read u32 leb128: load alignment -out/test/spec/binary.wast:340: assert_malformed passed: - 0000021: error: unable to read u32 leb128: load alignment -out/test/spec/binary.wast:359: assert_malformed passed: - 0000023: error: unable to read u32 leb128: store alignment -out/test/spec/binary.wast:378: assert_malformed passed: - 0000023: error: unable to read u32 leb128: store alignment -out/test/spec/binary.wast:397: assert_malformed passed: - 0000024: error: unable to read u32 leb128: store offset -out/test/spec/binary.wast:416: assert_malformed passed: - 0000024: error: unable to read u32 leb128: store offset -out/test/spec/binary.wast:438: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/binary.wast:448: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/binary.wast:458: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/binary.wast:468: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/binary.wast:479: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/binary.wast:489: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/binary.wast:499: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/binary.wast:509: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/binary.wast:521: assert_malformed passed: +out/test/spec/binary.wast:50: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/binary.wast:540: assert_malformed passed: +out/test/spec/binary.wast:69: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/binary.wast:559: assert_malformed passed: +out/test/spec/binary.wast:88: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/binary.wast:577: assert_malformed passed: +out/test/spec/binary.wast:106: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/binary.wast:595: assert_malformed passed: +out/test/spec/binary.wast:124: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/binary.wast:614: assert_malformed passed: +out/test/spec/binary.wast:143: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/binary.wast:634: assert_malformed passed: +out/test/spec/binary.wast:163: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/binary.wast:654: assert_malformed passed: +out/test/spec/binary.wast:183: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/binary.wast:673: assert_malformed passed: +out/test/spec/binary.wast:202: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/binary.wast:692: assert_malformed passed: +out/test/spec/binary.wast:221: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/binary.wast:712: assert_malformed passed: +out/test/spec/binary.wast:241: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/binary.wast:731: assert_malformed passed: +out/test/spec/binary.wast:260: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/binary.wast:750: assert_malformed passed: +out/test/spec/binary.wast:279: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/binary.wast:768: assert_malformed passed: +out/test/spec/binary.wast:297: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/binary.wast:786: assert_malformed passed: +out/test/spec/binary.wast:315: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/binary.wast:805: assert_malformed passed: +out/test/spec/binary.wast:334: assert_malformed passed: 000001c: error: local count must be < 0x10000000 -out/test/spec/binary.wast:837: assert_malformed passed: +out/test/spec/binary.wast:366: assert_malformed passed: 0000013: error: function signature count != function body count -out/test/spec/binary.wast:847: assert_malformed passed: +out/test/spec/binary.wast:376: assert_malformed passed: 000000b: error: function signature count != function body count -out/test/spec/binary.wast:856: assert_malformed passed: +out/test/spec/binary.wast:385: assert_malformed passed: 0000016: error: function signature count != function body count -out/test/spec/binary.wast:867: assert_malformed passed: +out/test/spec/binary.wast:396: assert_malformed passed: 0000015: error: function signature count != function body count -75/75 tests passed. +48/48 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/bulk-memory-operations/binary.txt b/test/spec/bulk-memory-operations/binary.txt index 0fc428d6..4eea1dad 100644 --- a/test/spec/bulk-memory-operations/binary.txt +++ b/test/spec/bulk-memory-operations/binary.txt @@ -40,132 +40,78 @@ out/test/spec/bulk-memory-operations/binary.wast:31: assert_malformed passed: 0000004: error: bad magic value out/test/spec/bulk-memory-operations/binary.wast:34: assert_malformed passed: 0000004: error: bad magic value -out/test/spec/bulk-memory-operations/binary.wast:36: assert_malformed passed: - 0000004: error: unable to read uint32_t: version out/test/spec/bulk-memory-operations/binary.wast:37: assert_malformed passed: 0000004: error: unable to read uint32_t: version out/test/spec/bulk-memory-operations/binary.wast:38: assert_malformed passed: 0000004: error: unable to read uint32_t: version out/test/spec/bulk-memory-operations/binary.wast:39: assert_malformed passed: - 0000008: error: bad wasm file version: 0 (expected 0x1) + 0000004: error: unable to read uint32_t: version out/test/spec/bulk-memory-operations/binary.wast:40: assert_malformed passed: - 0000008: error: bad wasm file version: 0xd (expected 0x1) + 0000008: error: bad wasm file version: 0 (expected 0x1) out/test/spec/bulk-memory-operations/binary.wast:41: assert_malformed passed: - 0000008: error: bad wasm file version: 0xe (expected 0x1) + 0000008: error: bad wasm file version: 0xd (expected 0x1) out/test/spec/bulk-memory-operations/binary.wast:42: assert_malformed passed: - 0000008: error: bad wasm file version: 0x100 (expected 0x1) + 0000008: error: bad wasm file version: 0xe (expected 0x1) out/test/spec/bulk-memory-operations/binary.wast:43: assert_malformed passed: - 0000008: error: bad wasm file version: 0x10000 (expected 0x1) + 0000008: error: bad wasm file version: 0x100 (expected 0x1) out/test/spec/bulk-memory-operations/binary.wast:44: assert_malformed passed: + 0000008: error: bad wasm file version: 0x10000 (expected 0x1) +out/test/spec/bulk-memory-operations/binary.wast:45: assert_malformed passed: 0000008: error: bad wasm file version: 0x1000000 (expected 0x1) -out/test/spec/bulk-memory-operations/binary.wast:139: assert_malformed passed: - 000000c: error: unable to read u32 leb128: memory initial page count -out/test/spec/bulk-memory-operations/binary.wast:147: assert_malformed passed: - 0000022: error: unable to read u32 leb128: load offset -out/test/spec/bulk-memory-operations/binary.wast:166: assert_malformed passed: - 0000021: error: unable to read u32 leb128: load alignment -out/test/spec/bulk-memory-operations/binary.wast:185: assert_malformed passed: - 0000023: error: unable to read u32 leb128: store alignment -out/test/spec/bulk-memory-operations/binary.wast:204: assert_malformed passed: - 0000024: error: unable to read u32 leb128: store offset -out/test/spec/bulk-memory-operations/binary.wast:225: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/bulk-memory-operations/binary.wast:235: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/bulk-memory-operations/binary.wast:246: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/bulk-memory-operations/binary.wast:256: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/bulk-memory-operations/binary.wast:268: assert_malformed passed: - 000000c: error: unable to read u32 leb128: memory initial page count -out/test/spec/bulk-memory-operations/binary.wast:276: assert_malformed passed: - 000000c: error: unable to read u32 leb128: memory initial page count -out/test/spec/bulk-memory-operations/binary.wast:284: assert_malformed passed: - 0000022: error: unable to read u32 leb128: load offset -out/test/spec/bulk-memory-operations/binary.wast:303: assert_malformed passed: - 0000022: error: unable to read u32 leb128: load offset -out/test/spec/bulk-memory-operations/binary.wast:322: assert_malformed passed: - 0000021: error: unable to read u32 leb128: load alignment -out/test/spec/bulk-memory-operations/binary.wast:340: assert_malformed passed: - 0000021: error: unable to read u32 leb128: load alignment -out/test/spec/bulk-memory-operations/binary.wast:359: assert_malformed passed: - 0000023: error: unable to read u32 leb128: store alignment -out/test/spec/bulk-memory-operations/binary.wast:378: assert_malformed passed: - 0000023: error: unable to read u32 leb128: store alignment -out/test/spec/bulk-memory-operations/binary.wast:397: assert_malformed passed: - 0000024: error: unable to read u32 leb128: store offset -out/test/spec/bulk-memory-operations/binary.wast:416: assert_malformed passed: - 0000024: error: unable to read u32 leb128: store offset -out/test/spec/bulk-memory-operations/binary.wast:438: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/bulk-memory-operations/binary.wast:448: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/bulk-memory-operations/binary.wast:458: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/bulk-memory-operations/binary.wast:468: assert_malformed passed: - 000000e: error: unable to read i32 leb128: init_expr i32.const value -out/test/spec/bulk-memory-operations/binary.wast:479: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/bulk-memory-operations/binary.wast:489: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/bulk-memory-operations/binary.wast:499: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/bulk-memory-operations/binary.wast:509: assert_malformed passed: - 000000e: error: unable to read i64 leb128: init_expr i64.const value -out/test/spec/bulk-memory-operations/binary.wast:521: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:50: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:540: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:69: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:559: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:88: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:577: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:106: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:595: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:124: assert_malformed passed: 0000022: error: call_indirect reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:614: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:143: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:634: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:163: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:654: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:183: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:673: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:202: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:692: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:221: assert_malformed passed: 0000020: error: memory.grow reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:712: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:241: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:731: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:260: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:750: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:279: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:768: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:297: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:786: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:315: assert_malformed passed: 000001e: error: memory.size reserved value must be 0 -out/test/spec/bulk-memory-operations/binary.wast:805: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:334: assert_malformed passed: 000001c: error: local count must be < 0x10000000 -out/test/spec/bulk-memory-operations/binary.wast:837: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:366: assert_malformed passed: 0000013: error: function signature count != function body count -out/test/spec/bulk-memory-operations/binary.wast:847: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:376: assert_malformed passed: 000000b: error: function signature count != function body count -out/test/spec/bulk-memory-operations/binary.wast:856: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:385: assert_malformed passed: 0000016: error: function signature count != function body count -out/test/spec/bulk-memory-operations/binary.wast:867: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:396: assert_malformed passed: 0000015: error: function signature count != function body count -out/test/spec/bulk-memory-operations/binary.wast:890: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:419: assert_malformed passed: 000000e: error: data section without memory section -out/test/spec/bulk-memory-operations/binary.wast:900: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:429: assert_malformed passed: 000000e: error: data section without memory section -out/test/spec/bulk-memory-operations/binary.wast:910: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:439: assert_malformed passed: error: invalid data_segment_index: 0 (max 0) 0000026: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/binary.wast:932: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:461: assert_malformed passed: error: invalid data_segment_index: 0 (max 0) 000001f: error: OnDataDropExpr callback failed -out/test/spec/bulk-memory-operations/binary.wast:951: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:480: assert_malformed passed: 0000024: error: expected ref.null or ref.func in passive element segment 0000025: error: expected END opcode after element expression -out/test/spec/bulk-memory-operations/binary.wast:977: assert_malformed passed: +out/test/spec/bulk-memory-operations/binary.wast:506: assert_malformed passed: 0000022: error: segment elem type must by funcref or anyref -81/81 tests passed. +54/54 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/bulk-memory-operations/memory_copy.txt b/test/spec/bulk-memory-operations/memory_copy.txt index 82bc3cbc..ead665cf 100644 --- a/test/spec/bulk-memory-operations/memory_copy.txt +++ b/test/spec/bulk-memory-operations/memory_copy.txt @@ -208,5 +208,6 @@ test() => test() => test() => test() => -4545/4545 tests passed. +test() => +4548/4548 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/bulk-memory-operations/memory_fill.txt b/test/spec/bulk-memory-operations/memory_fill.txt index 31a59dd0..5d8817fc 100644 --- a/test/spec/bulk-memory-operations/memory_fill.txt +++ b/test/spec/bulk-memory-operations/memory_fill.txt @@ -7,197 +7,197 @@ test() => test() => test() => test() => -out/test/spec/bulk-memory-operations/memory_fill.wast:156: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:174: assert_invalid passed: error: memory.fill requires an imported or defined memory. 000002f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:162: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:180: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, i32, f32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:169: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:187: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, i32, i64] 0000035: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:176: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:194: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, i32, f64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:183: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:201: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f32, i32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:190: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:208: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f32, f32] 000003b: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:197: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:215: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f32, i64] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:204: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:222: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f32, f64] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:211: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:229: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, i64, i32] 0000035: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:218: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:236: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, i64, f32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:225: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:243: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, i64, i64] 0000035: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:232: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:250: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, i64, f64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:239: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:257: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f64, i32] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:246: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:264: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f64, f32] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:253: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:271: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f64, i64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:260: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:278: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i32, f64, f64] 0000043: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:267: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:285: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i32, i32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:274: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:292: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i32, f32] 000003b: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:281: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:299: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i32, i64] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:288: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:306: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i32, f64] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:295: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:313: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f32, i32] 000003b: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:302: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:320: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f32, f32] 000003e: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:309: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:327: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f32, i64] 000003b: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:316: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:334: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f32, f64] 0000042: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:323: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:341: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i64, i32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:330: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:348: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i64, f32] 000003b: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:337: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:355: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i64, i64] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:344: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:362: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, i64, f64] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:351: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:369: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f64, i32] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:358: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:376: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f64, f32] 0000042: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:365: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:383: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f64, i64] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:372: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:390: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f32, f64, f64] 0000046: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:379: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:397: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i32, i32] 0000035: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:386: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:404: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i32, f32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:393: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:411: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i32, i64] 0000035: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:400: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:418: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i32, f64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:407: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:425: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f32, i32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:414: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:432: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f32, f32] 000003b: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:421: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:439: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f32, i64] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:428: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:446: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f32, f64] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:435: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:453: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i64, i32] 0000035: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:442: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:460: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i64, f32] 0000038: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:449: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:467: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i64, i64] 0000035: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:456: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:474: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, i64, f64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:463: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:481: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f64, i32] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:470: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:488: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f64, f32] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:477: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:495: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f64, i64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:484: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:502: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [i64, f64, f64] 0000043: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:491: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:509: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i32, i32] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:498: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:516: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i32, f32] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:505: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:523: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i32, i64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:512: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:530: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i32, f64] 0000043: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:519: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:537: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f32, i32] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:526: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:544: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f32, f32] 0000042: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:533: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:551: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f32, i64] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:540: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:558: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f32, f64] 0000046: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:547: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:565: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i64, i32] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:554: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:572: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i64, f32] 000003f: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:561: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:579: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i64, i64] 000003c: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:568: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:586: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, i64, f64] 0000043: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:575: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:593: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f64, i32] 0000043: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:582: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:600: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f64, f32] 0000046: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:589: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:607: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f64, i64] 0000043: error: OnMemoryFillExpr callback failed -out/test/spec/bulk-memory-operations/memory_fill.wast:596: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_fill.wast:614: assert_invalid passed: error: type mismatch in memory.fill, expected [i32, i32, i32] but got [f64, f64, f64] 000004a: error: OnMemoryFillExpr callback failed -91/91 tests passed. +92/92 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/bulk-memory-operations/memory_init.txt b/test/spec/bulk-memory-operations/memory_init.txt index 9808a308..3b7eb760 100644 --- a/test/spec/bulk-memory-operations/memory_init.txt +++ b/test/spec/bulk-memory-operations/memory_init.txt @@ -19,194 +19,197 @@ out/test/spec/bulk-memory-operations/memory_init.wast:232: assert_invalid passed error: invalid data_segment_index: 1 (max 1) 0000034: error: OnMemoryInitExpr callback failed test() => -out/test/spec/bulk-memory-operations/memory_init.wast:283: assert_invalid passed: +test() => +test() => +test() => +out/test/spec/bulk-memory-operations/memory_init.wast:304: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, i32, f32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:291: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:312: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, i32, i64] 0000033: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:299: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:320: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, i32, f64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:307: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:328: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f32, i32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:315: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:336: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f32, f32] 0000039: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:323: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:344: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f32, i64] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:331: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:352: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f32, f64] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:339: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:360: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, i64, i32] 0000033: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:347: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:368: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, i64, f32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:355: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:376: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, i64, i64] 0000033: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:363: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:384: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, i64, f64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:371: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:392: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f64, i32] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:379: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:400: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f64, f32] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:387: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:408: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f64, i64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:395: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:416: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i32, f64, f64] 0000041: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:403: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:424: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i32, i32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:411: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:432: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i32, f32] 0000039: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:419: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:440: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i32, i64] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:427: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:448: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i32, f64] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:435: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:456: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f32, i32] 0000039: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:443: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:464: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f32, f32] 000003c: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:451: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:472: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f32, i64] 0000039: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:459: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:480: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f32, f64] 0000040: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:467: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:488: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i64, i32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:475: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:496: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i64, f32] 0000039: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:483: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:504: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i64, i64] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:491: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:512: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, i64, f64] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:499: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:520: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f64, i32] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:507: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:528: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f64, f32] 0000040: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:515: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:536: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f64, i64] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:523: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:544: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f32, f64, f64] 0000044: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:531: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:552: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i32, i32] 0000033: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:539: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:560: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i32, f32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:547: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:568: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i32, i64] 0000033: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:555: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:576: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i32, f64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:563: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:584: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f32, i32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:571: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:592: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f32, f32] 0000039: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:579: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:600: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f32, i64] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:587: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:608: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f32, f64] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:595: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:616: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i64, i32] 0000033: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:603: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:624: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i64, f32] 0000036: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:611: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:632: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i64, i64] 0000033: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:619: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:640: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, i64, f64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:627: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:648: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f64, i32] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:635: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:656: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f64, f32] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:643: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:664: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f64, i64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:651: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:672: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [i64, f64, f64] 0000041: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:659: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:680: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i32, i32] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:667: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:688: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i32, f32] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:675: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:696: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i32, i64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:683: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:704: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i32, f64] 0000041: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:691: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:712: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f32, i32] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:699: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:720: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f32, f32] 0000040: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:707: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:728: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f32, i64] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:715: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:736: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f32, f64] 0000044: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:723: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:744: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i64, i32] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:731: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:752: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i64, f32] 000003d: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:739: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:760: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i64, i64] 000003a: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:747: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:768: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, i64, f64] 0000041: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:755: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:776: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f64, i32] 0000041: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:763: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:784: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f64, f32] 0000044: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:771: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:792: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f64, i64] 0000041: error: OnMemoryInitExpr callback failed -out/test/spec/bulk-memory-operations/memory_init.wast:779: assert_invalid passed: +out/test/spec/bulk-memory-operations/memory_init.wast:800: assert_invalid passed: error: type mismatch in memory.init, expected [i32, i32, i32] but got [f64, f64, f64] 0000048: error: OnMemoryInitExpr callback failed -224/224 tests passed. +227/227 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/bulk-memory-operations/table_copy.txt b/test/spec/bulk-memory-operations/table_copy.txt index c9a4b3e9..9c0c7e84 100644 --- a/test/spec/bulk-memory-operations/table_copy.txt +++ b/test/spec/bulk-memory-operations/table_copy.txt @@ -13,5 +13,6 @@ test() => test() => test() => test() => -810/810 tests passed. +test() => +813/813 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/bulk-memory-operations/table_init.txt b/test/spec/bulk-memory-operations/table_init.txt index 5575b8a7..d6c6691d 100644 --- a/test/spec/bulk-memory-operations/table_init.txt +++ b/test/spec/bulk-memory-operations/table_init.txt @@ -5,207 +5,208 @@ test() => test() => test() => -out/test/spec/bulk-memory-operations/table_init.wast:187: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:193: assert_invalid passed: error: invalid elem_segment_index: 0 (max 0) 0000027: error: OnElemDropExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:193: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:199: assert_invalid passed: error: table.init requires an imported or defined table. 000002e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:199: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:205: assert_invalid passed: 0000024: error: elem section without table section -out/test/spec/bulk-memory-operations/table_init.wast:207: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:213: assert_invalid passed: 0000024: error: elem section without table section test() => test() => test() => -out/test/spec/bulk-memory-operations/table_init.wast:426: assert_invalid passed: +test() => +out/test/spec/bulk-memory-operations/table_init.wast:521: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, i32, f32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:435: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:530: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, i32, i64] 0000047: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:444: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:539: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, i32, f64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:453: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:548: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f32, i32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:462: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:557: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f32, f32] 000004d: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:471: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:566: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f32, i64] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:480: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:575: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f32, f64] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:489: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:584: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, i64, i32] 0000047: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:498: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:593: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, i64, f32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:507: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:602: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, i64, i64] 0000047: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:516: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:611: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, i64, f64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:525: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:620: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f64, i32] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:534: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:629: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f64, f32] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:543: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:638: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f64, i64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:552: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:647: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i32, f64, f64] 0000055: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:561: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:656: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i32, i32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:570: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:665: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i32, f32] 000004d: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:579: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:674: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i32, i64] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:588: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:683: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i32, f64] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:597: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:692: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f32, i32] 000004d: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:606: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:701: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f32, f32] 0000050: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:615: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:710: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f32, i64] 000004d: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:624: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:719: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f32, f64] 0000054: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:633: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:728: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i64, i32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:642: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:737: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i64, f32] 000004d: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:651: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:746: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i64, i64] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:660: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:755: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, i64, f64] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:669: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:764: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f64, i32] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:678: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:773: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f64, f32] 0000054: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:687: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:782: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f64, i64] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:696: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:791: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f32, f64, f64] 0000058: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:705: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:800: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i32, i32] 0000047: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:714: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:809: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i32, f32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:723: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:818: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i32, i64] 0000047: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:732: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:827: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i32, f64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:741: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:836: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f32, i32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:750: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:845: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f32, f32] 000004d: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:759: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:854: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f32, i64] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:768: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:863: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f32, f64] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:777: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:872: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i64, i32] 0000047: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:786: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:881: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i64, f32] 000004a: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:795: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:890: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i64, i64] 0000047: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:804: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:899: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, i64, f64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:813: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:908: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f64, i32] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:822: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:917: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f64, f32] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:831: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:926: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f64, i64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:840: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:935: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [i64, f64, f64] 0000055: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:849: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:944: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i32, i32] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:858: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:953: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i32, f32] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:867: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:962: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i32, i64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:876: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:971: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i32, f64] 0000055: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:885: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:980: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f32, i32] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:894: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:989: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f32, f32] 0000054: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:903: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:998: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f32, i64] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:912: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1007: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f32, f64] 0000058: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:921: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1016: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i64, i32] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:930: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1025: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i64, f32] 0000051: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:939: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1034: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i64, i64] 000004e: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:948: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1043: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, i64, f64] 0000055: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:957: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1052: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f64, i32] 0000055: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:966: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1061: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f64, f32] 0000058: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:975: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1070: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f64, i64] 0000055: error: OnTableInitExpr callback failed -out/test/spec/bulk-memory-operations/table_init.wast:984: assert_invalid passed: +out/test/spec/bulk-memory-operations/table_init.wast:1079: assert_invalid passed: error: type mismatch in table.init, expected [i32, i32, i32] but got [f64, f64, f64] 000005c: error: OnTableInitExpr callback failed -632/632 tests passed. +635/635 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/const.txt b/test/spec/const.txt index 831fdcaa..6e83c627 100644 --- a/test/spec/const.txt +++ b/test/spec/const.txt @@ -33,69 +33,93 @@ out/test/spec/const.wast:45: assert_malformed passed: out/test/spec/const/const.15.wat:1:18: error: invalid literal "-9223372036854775809" (func (i64.const -9223372036854775809) drop) ^^^^^^^^^^^^^^^^^^^^ -out/test/spec/const.wast:56: assert_malformed passed: - out/test/spec/const/const.22.wat:1:18: error: invalid literal "0x1p128" +out/test/spec/const.wast:60: assert_malformed passed: + out/test/spec/const/const.26.wat:1:18: error: invalid literal "0x1p128" (func (f32.const 0x1p128) drop) ^^^^^^^ -out/test/spec/const.wast:60: assert_malformed passed: - out/test/spec/const/const.23.wat:1:18: error: invalid literal "-0x1p128" +out/test/spec/const.wast:64: assert_malformed passed: + out/test/spec/const/const.27.wat:1:18: error: invalid literal "-0x1p128" (func (f32.const -0x1p128) drop) ^^^^^^^^ -out/test/spec/const.wast:64: assert_malformed passed: - out/test/spec/const/const.24.wat:1:18: error: invalid literal "0x1.ffffffp127" +out/test/spec/const.wast:68: assert_malformed passed: + out/test/spec/const/const.28.wat:1:18: error: invalid literal "0x1.ffffffp127" (func (f32.const 0x1.ffffffp127) drop) ^^^^^^^^^^^^^^ -out/test/spec/const.wast:68: assert_malformed passed: - out/test/spec/const/const.25.wat:1:18: error: invalid literal "-0x1.ffffffp127" +out/test/spec/const.wast:72: assert_malformed passed: + out/test/spec/const/const.29.wat:1:18: error: invalid literal "-0x1.ffffffp127" (func (f32.const -0x1.ffffffp127) drop) ^^^^^^^^^^^^^^^ -out/test/spec/const.wast:75: assert_malformed passed: - out/test/spec/const/const.28.wat:1:18: error: invalid literal "1e39" +out/test/spec/const.wast:79: assert_malformed passed: + out/test/spec/const/const.32.wat:1:18: error: invalid literal "1e39" (func (f32.const 1e39) drop) ^^^^ -out/test/spec/const.wast:79: assert_malformed passed: - out/test/spec/const/const.29.wat:1:18: error: invalid literal "-1e39" +out/test/spec/const.wast:83: assert_malformed passed: + out/test/spec/const/const.33.wat:1:18: error: invalid literal "-1e39" (func (f32.const -1e39) drop) ^^^^^ -out/test/spec/const.wast:86: assert_malformed passed: - out/test/spec/const/const.32.wat:1:18: error: invalid literal "340282356779733661637539395458142568448" +out/test/spec/const.wast:90: assert_malformed passed: + out/test/spec/const/const.36.wat:1:18: error: invalid literal "340282356779733661637539395458142568448" (func (f32.const 340282356779733661637539395458142568448) drop) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -out/test/spec/const.wast:90: assert_malformed passed: - out/test/spec/const/const.33.wat:1:18: error: invalid literal "-340282356779733661637539395458142568448" +out/test/spec/const.wast:94: assert_malformed passed: + out/test/spec/const/const.37.wat:1:18: error: invalid literal "-340282356779733661637539395458142568448" (func (f32.const -340282356779733661637539395458142568448) drop) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -out/test/spec/const.wast:101: assert_malformed passed: - out/test/spec/const/const.40.wat:1:18: error: invalid literal "0x1p1024" +out/test/spec/const.wast:107: assert_malformed passed: + out/test/spec/const/const.46.wat:1:18: error: invalid literal "0x1p1024" (func (f64.const 0x1p1024) drop) ^^^^^^^^ -out/test/spec/const.wast:105: assert_malformed passed: - out/test/spec/const/const.41.wat:1:18: error: invalid literal "-0x1p1024" +out/test/spec/const.wast:111: assert_malformed passed: + out/test/spec/const/const.47.wat:1:18: error: invalid literal "-0x1p1024" (func (f64.const -0x1p1024) drop) ^^^^^^^^^ -out/test/spec/const.wast:109: assert_malformed passed: - out/test/spec/const/const.42.wat:1:18: error: invalid literal "0x1.fffffffffffff8p1023" +out/test/spec/const.wast:115: assert_malformed passed: + out/test/spec/const/const.48.wat:1:18: error: invalid literal "0x1.fffffffffffff8p1023" (func (f64.const 0x1.fffffffffffff8p1023) drop) ^^^^^^^^^^^^^^^^^^^^^^^ -out/test/spec/const.wast:113: assert_malformed passed: - out/test/spec/const/const.43.wat:1:18: error: invalid literal "-0x1.fffffffffffff8p1023" +out/test/spec/const.wast:119: assert_malformed passed: + out/test/spec/const/const.49.wat:1:18: error: invalid literal "-0x1.fffffffffffff8p1023" (func (f64.const -0x1.fffffffffffff8p1023) drop) ^^^^^^^^^^^^^^^^^^^^^^^^ -out/test/spec/const.wast:120: assert_malformed passed: - out/test/spec/const/const.46.wat:1:18: error: invalid literal "1e309" +out/test/spec/const.wast:126: assert_malformed passed: + out/test/spec/const/const.52.wat:1:18: error: invalid literal "1e309" (func (f64.const 1e309) drop) ^^^^^ -out/test/spec/const.wast:124: assert_malformed passed: - out/test/spec/const/const.47.wat:1:18: error: invalid literal "-1e309" +out/test/spec/const.wast:130: assert_malformed passed: + out/test/spec/const/const.53.wat:1:18: error: invalid literal "-1e309" (func (f64.const -1e309) drop) ^^^^^^ -out/test/spec/const.wast:131: assert_malformed passed: - out/test/spec/const/const.50.wat:1:18: error: invalid literal "269653970229347356221791135597556535197105851288767494898376215204735891170042808140884337949150317257310688430271573696351481990334196274152701320055306275479074865864826923114368235135583993416113802762682700913456874855354834422248712838998185022412196739306217084753107265771378949821875606039276187287552" +out/test/spec/const.wast:137: assert_malformed passed: + out/test/spec/const/const.56.wat:1:18: error: invalid literal "269653970229347356221791135597556535197105851288767494898376215204735891170042808140884337949150317257310688430271573696351481990334196274152701320055306275479074865864826923114368235135583993416113802762682700913456874855354834422248712838998185022412196739306217084753107265771378949821875606039276187287552" (func (f64.const 269653970229347356221791135597556535197105851288767494898376... ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -out/test/spec/const.wast:135: assert_malformed passed: - out/test/spec/const/const.51.wat:1:18: error: invalid literal "-269653970229347356221791135597556535197105851288767494898376215204735891170042808140884337949150317257310688430271573696351481990334196274152701320055306275479074865864826923114368235135583993416113802762682700913456874855354834422248712838998185022412196739306217084753107265771378949821875606039276187287552" +out/test/spec/const.wast:141: assert_malformed passed: + out/test/spec/const/const.57.wat:1:18: error: invalid literal "-269653970229347356221791135597556535197105851288767494898376215204735891170042808140884337949150317257310688430271573696351481990334196274152701320055306275479074865864826923114368235135583993416113802762682700913456874855354834422248712838998185022412196739306217084753107265771378949821875606039276187287552" (func (f64.const -26965397022934735622179113559755653519710585128876749489837... ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -24/24 tests passed. +out/test/spec/const.wast:151: assert_malformed passed: + out/test/spec/const/const.62.wat:1:18: error: unexpected token "nan:1", expected a numeric literal (e.g. 123, -45, 6.7e8). + (func (f32.const nan:1) drop) + ^^^^^ +out/test/spec/const.wast:155: assert_malformed passed: + out/test/spec/const/const.63.wat:1:18: error: unexpected token "nan:1", expected a numeric literal (e.g. 123, -45, 6.7e8). + (func (f64.const nan:1) drop) + ^^^^^ +out/test/spec/const.wast:160: assert_malformed passed: + out/test/spec/const/const.64.wat:1:18: error: invalid literal "nan:0x0" + (func (f32.const nan:0x0) drop) + ^^^^^^^ +out/test/spec/const.wast:164: assert_malformed passed: + out/test/spec/const/const.65.wat:1:18: error: invalid literal "nan:0x0" + (func (f64.const nan:0x0) drop) + ^^^^^^^ +out/test/spec/const.wast:169: assert_malformed passed: + out/test/spec/const/const.66.wat:1:18: error: invalid literal "nan:0x80_0000" + (func (f32.const nan:0x80_0000) drop) + ^^^^^^^^^^^^^ +out/test/spec/const.wast:173: assert_malformed passed: + out/test/spec/const/const.67.wat:1:18: error: invalid literal "nan:0x10_0000_0000_0000" + (func (f64.const nan:0x10_0000_0000_0000) drop) + ^^^^^^^^^^^^^^^^^^^^^^^ +330/330 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/conversions.txt b/test/spec/conversions.txt index 6eeeea26..190c97f8 100644 --- a/test/spec/conversions.txt +++ b/test/spec/conversions.txt @@ -1,80 +1,80 @@ ;;; TOOL: run-interp-spec ;;; STDIN_FILE: third_party/testsuite/conversions.wast (;; STDOUT ;;; -out/test/spec/conversions.wast:465: assert_invalid passed: +out/test/spec/conversions.wast:475: assert_invalid passed: error: type mismatch in i32.wrap_i64, expected [i64] but got [f32] 000001e: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:466: assert_invalid passed: +out/test/spec/conversions.wast:476: assert_invalid passed: error: type mismatch in i32.trunc_f32_s, expected [f32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:467: assert_invalid passed: +out/test/spec/conversions.wast:477: assert_invalid passed: error: type mismatch in i32.trunc_f32_u, expected [f32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:468: assert_invalid passed: +out/test/spec/conversions.wast:478: assert_invalid passed: error: type mismatch in i32.trunc_f64_s, expected [f64] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:469: assert_invalid passed: +out/test/spec/conversions.wast:479: assert_invalid passed: error: type mismatch in i32.trunc_f64_u, expected [f64] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:470: assert_invalid passed: +out/test/spec/conversions.wast:480: assert_invalid passed: error: type mismatch in i32.reinterpret_f32, expected [f32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:471: assert_invalid passed: +out/test/spec/conversions.wast:481: assert_invalid passed: error: type mismatch in i64.extend_i32_s, expected [i32] but got [f32] 000001e: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:472: assert_invalid passed: +out/test/spec/conversions.wast:482: assert_invalid passed: error: type mismatch in i64.extend_i32_u, expected [i32] but got [f32] 000001e: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:473: assert_invalid passed: +out/test/spec/conversions.wast:483: assert_invalid passed: error: type mismatch in i64.trunc_f32_s, expected [f32] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:474: assert_invalid passed: +out/test/spec/conversions.wast:484: assert_invalid passed: error: type mismatch in i64.trunc_f32_u, expected [f32] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:475: assert_invalid passed: +out/test/spec/conversions.wast:485: assert_invalid passed: error: type mismatch in i64.trunc_f64_s, expected [f64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:476: assert_invalid passed: +out/test/spec/conversions.wast:486: assert_invalid passed: error: type mismatch in i64.trunc_f64_u, expected [f64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:477: assert_invalid passed: +out/test/spec/conversions.wast:487: assert_invalid passed: error: type mismatch in i64.reinterpret_f64, expected [f64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:478: assert_invalid passed: +out/test/spec/conversions.wast:488: assert_invalid passed: error: type mismatch in f32.convert_i32_s, expected [i32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:479: assert_invalid passed: +out/test/spec/conversions.wast:489: assert_invalid passed: error: type mismatch in f32.convert_i32_u, expected [i32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:480: assert_invalid passed: +out/test/spec/conversions.wast:490: assert_invalid passed: error: type mismatch in f32.convert_i64_s, expected [i64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:481: assert_invalid passed: +out/test/spec/conversions.wast:491: assert_invalid passed: error: type mismatch in f32.convert_i64_u, expected [i64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:482: assert_invalid passed: +out/test/spec/conversions.wast:492: assert_invalid passed: error: type mismatch in f32.demote_f64, expected [f64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:483: assert_invalid passed: +out/test/spec/conversions.wast:493: assert_invalid passed: error: type mismatch in f32.reinterpret_i32, expected [i32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:484: assert_invalid passed: +out/test/spec/conversions.wast:494: assert_invalid passed: error: type mismatch in f64.convert_i32_s, expected [i32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:485: assert_invalid passed: +out/test/spec/conversions.wast:495: assert_invalid passed: error: type mismatch in f64.convert_i32_u, expected [i32] but got [i64] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:486: assert_invalid passed: +out/test/spec/conversions.wast:496: assert_invalid passed: error: type mismatch in f64.convert_i64_s, expected [i64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:487: assert_invalid passed: +out/test/spec/conversions.wast:497: assert_invalid passed: error: type mismatch in f64.convert_i64_u, expected [i64] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:488: assert_invalid passed: +out/test/spec/conversions.wast:498: assert_invalid passed: error: type mismatch in f64.promote_f32, expected [f32] but got [i32] 000001b: error: OnConvertExpr callback failed -out/test/spec/conversions.wast:489: assert_invalid passed: +out/test/spec/conversions.wast:499: assert_invalid passed: error: type mismatch in f64.reinterpret_i64, expected [i64] but got [i32] 000001b: error: OnConvertExpr callback failed -426/426 tests passed. +434/434 tests passed. ;;; STDOUT ;;) diff --git a/test/spec/globals.txt b/test/spec/globals.txt index f3753469..28bf5c20 100644 --- a/test/spec/globals.txt +++ b/test/spec/globals.txt @@ -3,7 +3,7 @@ (;; STDOUT ;;; out/test/spec/globals.wast:243: assert_invalid passed: error: can't global.set on immutable global at index 0. - 0000026: error: OnGlobalSetExpr callback failed + 0000029: error: OnGlobalSetExpr callback failed out/test/spec/globals.wast:252: assert_invalid passed: 0000013: error: expected END opcode after initializer expression out/test/spec/globals.wast:257: assert_invalid passed: @@ -29,9 +29,9 @@ out/test/spec/globals.wast:297: assert_invalid passed: error: initializer expression can only reference an imported global 000000f: error: OnInitExprGlobalGetExpr callback failed out/test/spec/globals.wast:305: assert_malformed passed: - 0000019: error: unable to read string: import field name + 0000026: error: global mutability must be 0 or 1 out/test/spec/globals.wast:318: assert_malformed passed: - 0000019: error: unable to read string: import field name + 0000026: error: global mutability must be 0 or 1 out/test/spec/globals.wast:335: assert_malformed passed: 0000011: error: global mutability must be 0 or 1 out/test/spec/globals.wast:347: assert_malformed passed: diff --git a/test/typecheck/bad-bulk-memory-type-mismatch.txt b/test/typecheck/bad-bulk-memory-type-mismatch.txt index 78860482..96fcf19c 100644 --- a/test/typecheck/bad-bulk-memory-type-mismatch.txt +++ b/test/typecheck/bad-bulk-memory-type-mismatch.txt @@ -4,9 +4,9 @@ (module (memory 1) - (data passive "a") + (data "a") (table 1 anyfunc) - (elem passive funcref 0) + (elem funcref 0) (func ;; Mismatch first operand. diff --git a/test/wasm2c/spec/const.txt b/test/wasm2c/spec/const.txt index c5efaceb..7786e131 100644 --- a/test/wasm2c/spec/const.txt +++ b/test/wasm2c/spec/const.txt @@ -1,5 +1,6 @@ ;;; TOOL: run-spec-wasm2c ;;; STDIN_FILE: third_party/testsuite/const.wast +;;; SLOW: (;; STDOUT ;;; -0/0 tests passed. +300/300 tests passed. ;;; STDOUT ;;) diff --git a/test/wasm2c/spec/conversions.txt b/test/wasm2c/spec/conversions.txt index 437bf4dd..3943507c 100644 --- a/test/wasm2c/spec/conversions.txt +++ b/test/wasm2c/spec/conversions.txt @@ -1,5 +1,5 @@ ;;; TOOL: run-spec-wasm2c ;;; STDIN_FILE: third_party/testsuite/conversions.wast (;; STDOUT ;;; -401/401 tests passed. +409/409 tests passed. ;;; STDOUT ;;) diff --git a/third_party/testsuite b/third_party/testsuite -Subproject 2a2099d52103215962707fbe9f44cd51fd14663 +Subproject a4a48e88108d555fed8a0a5e7564814468efe1b |