From f5e3faeaff1dd318a5b5e6c7e9b158fac5d5052f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Csaba=20Osztrogon=C3=A1c?= Date: Wed, 2 Oct 2019 12:17:27 +0200 Subject: [PATCH] Make ecma_number_make_nan more optimal and C99 conform (#3163) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes ecma_number_make_nan and ecma_number_make_infinity always return constant value without any function call. Previously we relied on compiler optimizations. The ecma_number_t_accessor union is introduced to be able to access float values as float and uint32_t (and doubles as double and uint64_t) properly, without violating strict aliasing rules. There were many copies of it, all of them were replaced to this new union. Additionally ecma_number_make_nan should return QNaN instead of SNaN, same value as C99 nan(""). Unfortunately calling nan("") here isn't always optimal, because compilers sometimes generate constant returns, sometimes function calls. Before this change ecma_number_make_nan returned SNaN: - double: 0x7FF0 0000 0000 0001 (sign:0, exponent: all 1 bits, fraction: 0...01) - float: 0x7F8 00001 (sign:0, exponent: all 1 bits, fraction: 0...01) After this change ecma_number_make_nan returns QNaN: - double: 0x7FF8 0000 0000 0000 (sign:0, exponent: all 1 bits, fraction: 10..0) - float: 0x7FC0 0000 (sign:0, exponent: all 1 bits, fraction: 10...0) JerryScript-DCO-1.0-Signed-off-by: Csaba Osztrogonác oszi@inf.u-szeged.hu --- jerry-core/ecma/base/ecma-globals.h | 18 ++++++ jerry-core/ecma/base/ecma-helpers-number.c | 69 +++++++++------------- jerry-core/ecma/base/ecma-helpers-value.c | 22 ++----- 3 files changed, 50 insertions(+), 59 deletions(-) diff --git a/jerry-core/ecma/base/ecma-globals.h b/jerry-core/ecma/base/ecma-globals.h index 50ccaabb6..f321958fe 100644 --- a/jerry-core/ecma/base/ecma-globals.h +++ b/jerry-core/ecma/base/ecma-globals.h @@ -1024,6 +1024,15 @@ typedef struct */ typedef float ecma_number_t; +/** + * It makes possible to read/write an ecma_number_t as uint32_t without strict aliasing rule violation. + */ +typedef union +{ + ecma_number_t as_ecma_number_t; + uint32_t as_uint32_t; +} ecma_number_accessor_t; + #define DOUBLE_TO_ECMA_NUMBER_T(value) (ecma_number_t) (value) /** @@ -1060,6 +1069,15 @@ typedef float ecma_number_t; */ typedef double ecma_number_t; +/** + * It makes possible to read/write an ecma_number_t as uint64_t without strict aliasing rule violation. + */ +typedef union +{ + ecma_number_t as_ecma_number_t; + uint64_t as_uint64_t; +} ecma_number_accessor_t; + #define DOUBLE_TO_ECMA_NUMBER_T(value) value /** diff --git a/jerry-core/ecma/base/ecma-helpers-number.c b/jerry-core/ecma/base/ecma-helpers-number.c index f905c3c08..ca0d5d527 100644 --- a/jerry-core/ecma/base/ecma-helpers-number.c +++ b/jerry-core/ecma/base/ecma-helpers-number.c @@ -58,15 +58,9 @@ ecma_number_pack (bool sign, /**< sign */ (biased_exp << ECMA_NUMBER_FRACTION_WIDTH) | ((uint32_t) fraction)); - union - { - uint32_t u32_value; - ecma_number_t float_value; - } u; - - u.u32_value = packed_value; - - return u.float_value; + ecma_number_accessor_t u; + u.as_uint32_t = packed_value; + return u.as_ecma_number_t; } /* ecma_number_pack */ /** @@ -78,15 +72,9 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */ uint32_t *biased_exp_p, /**< [out] biased exponent (optional) */ uint64_t *fraction_p) /**< [out] fraction (optional) */ { - union - { - uint32_t u32_value; - ecma_number_t float_value; - } u; - - u.float_value = num; - - uint32_t packed_value = u.u32_value; + ecma_number_accessor_t u; + u.as_ecma_number_t = num; + uint32_t packed_value = u.as_uint32_t; if (sign_p != NULL) { @@ -133,15 +121,9 @@ ecma_number_pack (bool sign, /**< sign */ JERRY_ASSERT ((biased_exp & ~((1u << ECMA_NUMBER_BIASED_EXP_WIDTH) - 1)) == 0); JERRY_ASSERT ((fraction & ~((1ull << ECMA_NUMBER_FRACTION_WIDTH) - 1)) == 0); - union - { - uint64_t u64_value; - ecma_number_t float_value; - } u; - - u.u64_value = packed_value; - - return u.float_value; + ecma_number_accessor_t u; + u.as_uint64_t = packed_value; + return u.as_ecma_number_t; } /* ecma_number_pack */ /** @@ -153,14 +135,9 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */ uint32_t *biased_exp_p, /**< [out] biased exponent (optional) */ uint64_t *fraction_p) /**< [out] fraction (optional) */ { - union - { - uint64_t u64_value; - ecma_number_t float_value; - } u; - u.float_value = num; - - uint64_t packed_value = u.u64_value; + ecma_number_accessor_t u; + u.as_ecma_number_t = num; + uint64_t packed_value = u.as_uint64_t; if (sign_p != NULL) { @@ -267,9 +244,14 @@ ecma_number_is_nan (ecma_number_t num) /**< ecma-number */ ecma_number_t ecma_number_make_nan (void) { - return ecma_number_pack (false, - (1u << ECMA_NUMBER_BIASED_EXP_WIDTH) - 1u, - 1u); + /* IEEE754 QNaN = sign bit: 0, exponent: all 1 bits, fraction: 1....0 */ + ecma_number_accessor_t f; +#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) + f.as_uint64_t = 0x7ff8000000000000ull; /* double QNaN, same as the C99 nan("") returns. */ +#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ + f.as_uint32_t = 0x7fc00000u; /* float QNaN, same as the C99 nanf("") returns. */ +#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ + return f.as_ecma_number_t; } /* ecma_number_make_nan */ /** @@ -282,9 +264,14 @@ ecma_number_t ecma_number_make_infinity (bool sign) /**< true - for negative Infinity, false - for positive Infinity */ { - return ecma_number_pack (sign, - (1u << ECMA_NUMBER_BIASED_EXP_WIDTH) - 1u, - 0u); + /* IEEE754 INF = sign bit: sign, exponent: all 1 bits, fraction: 0....0 */ + ecma_number_accessor_t f; +#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64) + f.as_uint64_t = sign ? 0xfff0000000000000ull : 0x7ff0000000000000ull; +#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ + f.as_uint32_t = sign ? 0xff800000u : 0x7f800000u; +#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ + return f.as_ecma_number_t; } /* ecma_number_make_infinity */ /** diff --git a/jerry-core/ecma/base/ecma-helpers-value.c b/jerry-core/ecma/base/ecma-helpers-value.c index 8180f424b..7e0a7f855 100644 --- a/jerry-core/ecma/base/ecma-helpers-value.c +++ b/jerry-core/ecma/base/ecma-helpers-value.c @@ -477,26 +477,12 @@ ecma_make_nan_value (void) static inline bool JERRY_ATTR_CONST JERRY_ATTR_ALWAYS_INLINE ecma_is_number_equal_to_positive_zero (ecma_number_t ecma_number) /**< number */ { + ecma_number_accessor_t u; + u.as_ecma_number_t = ecma_number; #if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) - union - { - uint32_t u32_value; - ecma_number_t float_value; - } u; - - u.float_value = ecma_number; - - return u.u32_value == 0; + return u.as_uint32_t == 0; #else /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ - union - { - uint64_t u64_value; - ecma_number_t float_value; - } u; - - u.float_value = ecma_number; - - return u.u64_value == 0; + return u.as_uint64_t == 0; #endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */ } /* ecma_is_number_equal_to_positive_zero */