Skip to content

Commit f5e3fae

Browse files
ossy-szegeddbatyai
authored andcommitted
Make ecma_number_make_nan more optimal and C99 conform (#3163)
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 [email protected]
1 parent 32962f0 commit f5e3fae

File tree

3 files changed

+50
-59
lines changed

3 files changed

+50
-59
lines changed

jerry-core/ecma/base/ecma-globals.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,15 @@ typedef struct
10241024
*/
10251025
typedef float ecma_number_t;
10261026

1027+
/**
1028+
* It makes possible to read/write an ecma_number_t as uint32_t without strict aliasing rule violation.
1029+
*/
1030+
typedef union
1031+
{
1032+
ecma_number_t as_ecma_number_t;
1033+
uint32_t as_uint32_t;
1034+
} ecma_number_accessor_t;
1035+
10271036
#define DOUBLE_TO_ECMA_NUMBER_T(value) (ecma_number_t) (value)
10281037

10291038
/**
@@ -1060,6 +1069,15 @@ typedef float ecma_number_t;
10601069
*/
10611070
typedef double ecma_number_t;
10621071

1072+
/**
1073+
* It makes possible to read/write an ecma_number_t as uint64_t without strict aliasing rule violation.
1074+
*/
1075+
typedef union
1076+
{
1077+
ecma_number_t as_ecma_number_t;
1078+
uint64_t as_uint64_t;
1079+
} ecma_number_accessor_t;
1080+
10631081
#define DOUBLE_TO_ECMA_NUMBER_T(value) value
10641082

10651083
/**

jerry-core/ecma/base/ecma-helpers-number.c

Lines changed: 28 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,9 @@ ecma_number_pack (bool sign, /**< sign */
5858
(biased_exp << ECMA_NUMBER_FRACTION_WIDTH) |
5959
((uint32_t) fraction));
6060

61-
union
62-
{
63-
uint32_t u32_value;
64-
ecma_number_t float_value;
65-
} u;
66-
67-
u.u32_value = packed_value;
68-
69-
return u.float_value;
61+
ecma_number_accessor_t u;
62+
u.as_uint32_t = packed_value;
63+
return u.as_ecma_number_t;
7064
} /* ecma_number_pack */
7165

7266
/**
@@ -78,15 +72,9 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */
7872
uint32_t *biased_exp_p, /**< [out] biased exponent (optional) */
7973
uint64_t *fraction_p) /**< [out] fraction (optional) */
8074
{
81-
union
82-
{
83-
uint32_t u32_value;
84-
ecma_number_t float_value;
85-
} u;
86-
87-
u.float_value = num;
88-
89-
uint32_t packed_value = u.u32_value;
75+
ecma_number_accessor_t u;
76+
u.as_ecma_number_t = num;
77+
uint32_t packed_value = u.as_uint32_t;
9078

9179
if (sign_p != NULL)
9280
{
@@ -133,15 +121,9 @@ ecma_number_pack (bool sign, /**< sign */
133121
JERRY_ASSERT ((biased_exp & ~((1u << ECMA_NUMBER_BIASED_EXP_WIDTH) - 1)) == 0);
134122
JERRY_ASSERT ((fraction & ~((1ull << ECMA_NUMBER_FRACTION_WIDTH) - 1)) == 0);
135123

136-
union
137-
{
138-
uint64_t u64_value;
139-
ecma_number_t float_value;
140-
} u;
141-
142-
u.u64_value = packed_value;
143-
144-
return u.float_value;
124+
ecma_number_accessor_t u;
125+
u.as_uint64_t = packed_value;
126+
return u.as_ecma_number_t;
145127
} /* ecma_number_pack */
146128

147129
/**
@@ -153,14 +135,9 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */
153135
uint32_t *biased_exp_p, /**< [out] biased exponent (optional) */
154136
uint64_t *fraction_p) /**< [out] fraction (optional) */
155137
{
156-
union
157-
{
158-
uint64_t u64_value;
159-
ecma_number_t float_value;
160-
} u;
161-
u.float_value = num;
162-
163-
uint64_t packed_value = u.u64_value;
138+
ecma_number_accessor_t u;
139+
u.as_ecma_number_t = num;
140+
uint64_t packed_value = u.as_uint64_t;
164141

165142
if (sign_p != NULL)
166143
{
@@ -267,9 +244,14 @@ ecma_number_is_nan (ecma_number_t num) /**< ecma-number */
267244
ecma_number_t
268245
ecma_number_make_nan (void)
269246
{
270-
return ecma_number_pack (false,
271-
(1u << ECMA_NUMBER_BIASED_EXP_WIDTH) - 1u,
272-
1u);
247+
/* IEEE754 QNaN = sign bit: 0, exponent: all 1 bits, fraction: 1....0 */
248+
ecma_number_accessor_t f;
249+
#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64)
250+
f.as_uint64_t = 0x7ff8000000000000ull; /* double QNaN, same as the C99 nan("") returns. */
251+
#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */
252+
f.as_uint32_t = 0x7fc00000u; /* float QNaN, same as the C99 nanf("") returns. */
253+
#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */
254+
return f.as_ecma_number_t;
273255
} /* ecma_number_make_nan */
274256

275257
/**
@@ -282,9 +264,14 @@ ecma_number_t
282264
ecma_number_make_infinity (bool sign) /**< true - for negative Infinity,
283265
false - for positive Infinity */
284266
{
285-
return ecma_number_pack (sign,
286-
(1u << ECMA_NUMBER_BIASED_EXP_WIDTH) - 1u,
287-
0u);
267+
/* IEEE754 INF = sign bit: sign, exponent: all 1 bits, fraction: 0....0 */
268+
ecma_number_accessor_t f;
269+
#if ENABLED (JERRY_NUMBER_TYPE_FLOAT64)
270+
f.as_uint64_t = sign ? 0xfff0000000000000ull : 0x7ff0000000000000ull;
271+
#else /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */
272+
f.as_uint32_t = sign ? 0xff800000u : 0x7f800000u;
273+
#endif /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */
274+
return f.as_ecma_number_t;
288275
} /* ecma_number_make_infinity */
289276

290277
/**

jerry-core/ecma/base/ecma-helpers-value.c

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -477,26 +477,12 @@ ecma_make_nan_value (void)
477477
static inline bool JERRY_ATTR_CONST JERRY_ATTR_ALWAYS_INLINE
478478
ecma_is_number_equal_to_positive_zero (ecma_number_t ecma_number) /**< number */
479479
{
480+
ecma_number_accessor_t u;
481+
u.as_ecma_number_t = ecma_number;
480482
#if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64)
481-
union
482-
{
483-
uint32_t u32_value;
484-
ecma_number_t float_value;
485-
} u;
486-
487-
u.float_value = ecma_number;
488-
489-
return u.u32_value == 0;
483+
return u.as_uint32_t == 0;
490484
#else /* ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */
491-
union
492-
{
493-
uint64_t u64_value;
494-
ecma_number_t float_value;
495-
} u;
496-
497-
u.float_value = ecma_number;
498-
499-
return u.u64_value == 0;
485+
return u.as_uint64_t == 0;
500486
#endif /* !ENABLED (JERRY_NUMBER_TYPE_FLOAT64) */
501487
} /* ecma_is_number_equal_to_positive_zero */
502488

0 commit comments

Comments
 (0)