Rework the CONFIG_ECMA_NUMBER_TYPE macro usage

The new approach defines a single JERRY_NUMBER_TYPE_FLOAT64 macro
for which the allowed values are:
* 1: use 64-bit floating point numbers
* 0: use 32-bit floating point number

By default the 64-bit floating point number mode is enabled.

JerryScript-DCO-1.0-Signed-off-by: Peter Gal [email protected]

Author: galpeter

jerry-core/api/jerry-snapshot.c

@@ -120,11 +120,11 @@ snapshot_write_to_buffer_by_offset (uint8_t *buffer_p, /**< buffer */
 /**
  * Maximum snapshot write buffer offset.
  */
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
 #define JERRY_SNAPSHOT_MAXIMUM_WRITE_OFFSET (0x7fffff >> 1)
-#else
+#else /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 #define JERRY_SNAPSHOT_MAXIMUM_WRITE_OFFSET (UINT32_MAX >> 1)
-#endif
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 
 /**
  * Save snapshot helper.

jerry-core/api/jerry.c

@@ -3255,9 +3255,9 @@ static jerry_typedarray_mapping_t jerry_typedarray_mappings[] =
   TYPEDARRAY_ENTRY (UINT32, UINT32, 2),
   TYPEDARRAY_ENTRY (INT32, INT32, 2),
   TYPEDARRAY_ENTRY (FLOAT32, FLOAT32, 2),
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#if JERRY_NUMBER_TYPE_FLOAT64 == 1
   TYPEDARRAY_ENTRY (FLOAT64, FLOAT64, 3),
-#endif
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 
 #undef TYPEDARRAY_ENTRY
 };

jerry-core/config.h

@@ -119,8 +119,8 @@
 #endif /* !defined(JERRY_ES2015_TEMPLATE_STRINGS) */
 
 /**
- * Enables/disables the unicode case conversion in the engine
- * By default Unicode case conversion is enabled
+ * Enables/disables the unicode case conversion in the engine.
+ * By default Unicode case conversion is enabled.
  */
 #ifndef JERRY_UNICODE_CASE_CONVERSION
 # define JERRY_UNICODE_CASE_CONVERSION 1
@@ -145,22 +145,20 @@
 
 /**
  * Use 32-bit/64-bit float for ecma-numbers
+ * This option is for expert use only!
+ *
+ * Allowed values:
+ *  1: use 64-bit floating point number mode
+ *  0: use 32-bit floating point number mode
+ *
+ * Default value: 1
  */
-#define CONFIG_ECMA_NUMBER_FLOAT32 (1u) /* 32-bit float */
-#define CONFIG_ECMA_NUMBER_FLOAT64 (2u) /* 64-bit float */
-
-#ifndef CONFIG_ECMA_NUMBER_TYPE
-# define CONFIG_ECMA_NUMBER_TYPE CONFIG_ECMA_NUMBER_FLOAT64
-#else /* CONFIG_ECMA_NUMBER_TYPE */
-# if (CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT32 \
-      && CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT64)
-#  error "ECMA-number storage is configured incorrectly"
-# endif /* CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT32
-           && CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT64 */
-#endif /* !CONFIG_ECMA_NUMBER_TYPE */
+#ifndef JERRY_NUMBER_TYPE_FLOAT64
+# define JERRY_NUMBER_TYPE_FLOAT64 1
+#endif
 
 #if ((defined (JERRY_BUILTIN_DATE) && (JERRY_BUILTIN_DATE == 1)) \
-     && (CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32))
+     && (JERRY_NUMBER_TYPE_FLOAT64 != 1))
 #  error "Date does not support float32"
 #endif
 
@@ -313,4 +311,10 @@
 # error "Invalid value for JERRY_UNICODE_CASE_CONVERSION macro."
 #endif
 
+#if !defined(JERRY_NUMBER_TYPE_FLOAT64) \
+    || ((JERRY_NUMBER_TYPE_FLOAT64 != 0) \
+        && (JERRY_NUMBER_TYPE_FLOAT64 != 1))
+# error "Invalid value for JERRY_NUMBER_TYPE_FLOAT64 macro."
+#endif
+
 #endif /* !CONFIG_H */

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

@@ -190,7 +190,7 @@ enum
   ECMA_VALUE_IMPLICIT_CONSTRUCTOR = ECMA_MAKE_VALUE (9), /**< special value for bound class constructors */
 };
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
 /**
  * Maximum integer number for an ecma value
  */
@@ -199,7 +199,7 @@ enum
  * Maximum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT)
  */
 #define ECMA_INTEGER_NUMBER_MAX_SHIFTED 0x7fffff0
-#else /* CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT32 */
+#else /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 /**
  * Maximum integer number for an ecma value
  */
@@ -208,9 +208,9 @@ enum
  * Maximum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT)
  */
 #define ECMA_INTEGER_NUMBER_MAX_SHIFTED 0x7ffffff0
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
 /**
  * Minimum integer number for an ecma value
  */
@@ -219,7 +219,7 @@ enum
  * Minimum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT)
  */
 #define ECMA_INTEGER_NUMBER_MIN_SHIFTED -0x7fffff0
-#else /* CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT32 */
+#else /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 /**
  * Minimum integer number for an ecma value
  */
@@ -228,7 +228,7 @@ enum
  * Minimum integer number for an ecma value (shifted left with ECMA_DIRECT_SHIFT)
  */
 #define ECMA_INTEGER_NUMBER_MIN_SHIFTED (-0x7fffffff - 1) /* -0x80000000 */
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 
 #if ECMA_DIRECT_SHIFT != 4
 #error "Please update ECMA_INTEGER_NUMBER_MIN/MAX_SHIFTED according to the new value of ECMA_DIRECT_SHIFT."
@@ -243,11 +243,11 @@ enum
 /**
  * Maximum integer number, which if squared, still fits in ecma_integer_value_t
  */
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
 #define ECMA_INTEGER_MULTIPLY_MAX 0xb50
-#else /* CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT32 */
+#else /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 #define ECMA_INTEGER_MULTIPLY_MAX 0x2d41
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 
 /**
  * Checks whether the error flag is set.
@@ -1030,7 +1030,7 @@ typedef struct
   ecma_object_t *set_p;
 } ecma_property_descriptor_t;
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
 /**
  * Description of an ecma-number
  */
@@ -1066,7 +1066,7 @@ typedef float ecma_number_t;
  *          IEEE-754 2008, 3.6, Table 3.5
  */
 #define ECMA_NUMBER_FRACTION_WIDTH   (23)
-#elif CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#elif JERRY_NUMBER_TYPE_FLOAT64 == 1
 /**
  * Description of an ecma-number
  */
@@ -1102,7 +1102,7 @@ typedef double ecma_number_t;
  *          IEEE-754 2008, 3.6, Table 3.5
  */
 #define ECMA_NUMBER_FRACTION_WIDTH   (52)
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 
 /**
  * Value '0' of ecma_number_t
@@ -1129,7 +1129,7 @@ typedef double ecma_number_t;
  */
 #define ECMA_NUMBER_MINUS_ONE ((ecma_number_t) -1)
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
 /**
  * Number.MIN_VALUE (i.e., the smallest positive value of ecma-number)
  *
@@ -1142,7 +1142,7 @@ typedef double ecma_number_t;
  * See also: ECMA_262 v5, 15.7.3.2
  */
 # define ECMA_NUMBER_MAX_VALUE (FLT_MAX)
-#elif CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#elif JERRY_NUMBER_TYPE_FLOAT64 == 1
 /**
  * Number.MAX_VALUE (i.e., the maximum value of ecma-number)
  *
@@ -1155,7 +1155,7 @@ typedef double ecma_number_t;
  * See also: ECMA_262 v5, 15.7.3.3
  */
 # define ECMA_NUMBER_MIN_VALUE ((ecma_number_t) 5e-324)
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 
 /**
  * Euler number

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

@@ -28,7 +28,7 @@
  * @{
  */
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#if JERRY_NUMBER_TYPE_FLOAT64 == 1
 
 /**
  * \addtogroup ecmahelpersbigintegers Helpers for operations intermediate 128-bit integers
@@ -249,7 +249,7 @@ static const uint8_t ecma_uint4_clz[] = { 4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0,
  */
 #define NUMBER_MIN_DECIMAL_EXPONENT -324
 
-#elif CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#elif JERRY_NUMBER_TYPE_FLOAT64 == 0
 
 /**
  * Number.MAX_VALUE exponent part when using 32 bit float representation.
@@ -260,7 +260,7 @@ static const uint8_t ecma_uint4_clz[] = { 4, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0,
  */
 #define NUMBER_MIN_DECIMAL_EXPONENT -45
 
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 
 /**
  * Value of epsilon
@@ -568,7 +568,7 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */
     return sign ? -ECMA_NUMBER_ZERO : ECMA_NUMBER_ZERO;
   }
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#if JERRY_NUMBER_TYPE_FLOAT64 == 1
   /*
    * 128-bit mantissa storage
    *
@@ -653,7 +653,7 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */
   fraction_uint64 = ECMA_UINT128_ROUND_HIGH_TO_UINT64 (fraction_uint128);
 
   return ecma_number_make_from_sign_mantissa_and_exponent (sign, fraction_uint64, binary_exponent);
-#elif CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#elif JERRY_NUMBER_TYPE_FLOAT64 == 0
   /* Less precise conversion */
   ecma_number_t num = (ecma_number_t) (uint32_t) fraction_uint64;
 
@@ -671,7 +671,7 @@ ecma_utf8_string_to_number (const lit_utf8_byte_t *str_p, /**< utf-8 string */
   }
 
   return num;
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 } /* ecma_utf8_string_to_number */
 
 /**

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

@@ -37,7 +37,7 @@ JERRY_STATIC_ASSERT (((1 << (ECMA_DIRECT_SHIFT - 1)) | ECMA_TYPE_DIRECT) == ECMA
 #define ECMA_NUMBER_SIGN_POS (ECMA_NUMBER_FRACTION_WIDTH + \
                               ECMA_NUMBER_BIASED_EXP_WIDTH)
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
 JERRY_STATIC_ASSERT (sizeof (ecma_number_t) == sizeof (uint32_t),
                      size_of_ecma_number_t_must_be_equal_to_4_bytes);
 
@@ -112,7 +112,7 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */
  */
 const int32_t ecma_number_exponent_bias = 127;
 
-#elif CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#elif JERRY_NUMBER_TYPE_FLOAT64 == 1
 JERRY_STATIC_ASSERT (sizeof (ecma_number_t) == sizeof (uint64_t),
                      size_of_ecma_number_t_must_be_equal_to_8_bytes);
 
@@ -186,7 +186,7 @@ ecma_number_unpack (ecma_number_t num, /**< ecma-number */
  */
 const int32_t ecma_number_exponent_bias = 1023;
 
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 
 /**
  * Get fraction of number

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

@@ -478,7 +478,7 @@ 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 */
 {
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32
+#if JERRY_NUMBER_TYPE_FLOAT64 == 0
   union
   {
     uint32_t u32_value;
@@ -488,7 +488,7 @@ ecma_is_number_equal_to_positive_zero (ecma_number_t ecma_number) /**< number */
   u.float_value = ecma_number;
 
   return u.u32_value == 0;
-#else /* CONFIG_ECMA_NUMBER_TYPE != CONFIG_ECMA_NUMBER_FLOAT32 */
+#else /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
   union
   {
     uint64_t u64_value;
@@ -498,7 +498,7 @@ ecma_is_number_equal_to_positive_zero (ecma_number_t ecma_number) /**< number */
   u.float_value = ecma_number;
 
   return u.u64_value == 0;
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT32 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 0 */
 } /* ecma_is_number_equal_to_positive_zero */
 
 /**

jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h

@@ -180,11 +180,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT32_ARRAY_UL,
               ECMA_BUILTIN_ID_FLOAT32ARRAY,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#if JERRY_NUMBER_TYPE_FLOAT64 == 1
 OBJECT_VALUE (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL,
               ECMA_BUILTIN_ID_FLOAT64ARRAY,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 
 OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL,
               ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY,

jerry-core/ecma/builtin-objects/ecma-builtins.inc.h

@@ -379,7 +379,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_FLOAT32ARRAY,
                  true,
                  float32array)
 
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#if JERRY_NUMBER_TYPE_FLOAT64 == 1
 BUILTIN (ECMA_BUILTIN_ID_FLOAT64ARRAY_PROTOTYPE,
          ECMA_OBJECT_TYPE_GENERAL,
          ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE,
@@ -391,7 +391,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_FLOAT64ARRAY,
                  ECMA_BUILTIN_ID_TYPEDARRAY,
                  true,
                  float64array)
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 
 BUILTIN (ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY_PROTOTYPE,
          ECMA_OBJECT_TYPE_GENERAL,

jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-float64array-prototype.c

@@ -16,7 +16,7 @@
 #include "ecma-builtins.h"
 
 #if defined(JERRY_ES2015_BUILTIN_TYPEDARRAY) && (JERRY_ES2015_BUILTIN_TYPEDARRAY == 1)
-#if CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64
+#if JERRY_NUMBER_TYPE_FLOAT64 == 1
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -41,5 +41,5 @@
  * @}
  */
 
-#endif /* CONFIG_ECMA_NUMBER_TYPE == CONFIG_ECMA_NUMBER_FLOAT64 */
+#endif /* JERRY_NUMBER_TYPE_FLOAT64 == 1 */
 #endif /* defined(JERRY_ES2015_BUILTIN_TYPEDARRAY) && (JERRY_ES2015_BUILTIN_TYPEDARRAY == 1) */