diff options
| -rw-r--r-- | src/support/safe_integer.cpp | 4 | ||||
| -rw-r--r-- | test/spec/conversions.wast | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/support/safe_integer.cpp b/src/support/safe_integer.cpp index d43f7a6aa..9b6b56be0 100644 --- a/src/support/safe_integer.cpp +++ b/src/support/safe_integer.cpp @@ -124,7 +124,7 @@ bool wasm::isInRangeI64TruncU(int32_t i) { * 3 21098765432 1098...432109...210 * --------------------------------- * 0 00000000000 0000...000000...000 0x0000000000000000 => 0 - * 0 10000011101 1111...111000...000 0x41dfffffffc00000 => 2147483647 (INT32_MAX) + * 0 10000011101 1111...111000...111 0x41dfffffffffffff => 2147483647.9999998 (rounds down to INT32_MAX) * 0 10000011110 1111...111100...000 0x41efffffffe00000 => 4294967295 (UINT32_MAX) * 0 10000111101 1111...111111...111 0x43dfffffffffffff => 9223372036854774784 (~INT64_MAX) * 0 10000111110 0000...000000...000 0x43e0000000000000 => 9223372036854775808 @@ -146,7 +146,7 @@ bool wasm::isInRangeI64TruncU(int32_t i) { bool wasm::isInRangeI32TruncS(int64_t i) { uint64_t u = i; - return (u <= 0x41dfffffffc00000ULL) || + return (u <= 0x41dfffffffffffffULL) || (u >= 0x8000000000000000ULL && u <= 0xc1e0000000000000ULL); } diff --git a/test/spec/conversions.wast b/test/spec/conversions.wast index c0ae54a53..2b3e30498 100644 --- a/test/spec/conversions.wast +++ b/test/spec/conversions.wast @@ -67,6 +67,8 @@ (assert_return (invoke "i32.trunc_f32_s" (f32.const -2.0)) (i32.const -2)) (assert_return (invoke "i32.trunc_f32_s" (f32.const 2147483520.0)) (i32.const 2147483520)) (assert_return (invoke "i32.trunc_f32_s" (f32.const -2147483648.0)) (i32.const -2147483648)) +(assert_return (invoke "i32.trunc_f64_s" (f64.const 2147483647.9999998)) (i32.const 2147483647)) +(assert_trap (invoke "i32.trunc_f64_s" (f64.const 2147483647.9999999)) "integer overflow") (assert_trap (invoke "i32.trunc_f32_s" (f32.const 2147483648.0)) "integer overflow") (assert_trap (invoke "i32.trunc_f32_s" (f32.const -2147483904.0)) "integer overflow") (assert_trap (invoke "i32.trunc_f32_s" (f32.const inf)) "integer overflow") |