Combine ARRAYBUFFER and TYPEDARRAY macros together (#1699)

Change CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN to CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN Because typedarray depends on arraybuffer and it doesn't make sense to enable arraybuffer only. JerryScript-DCO-1.0-Signed-off-by: Zidong Jiang zidong.jiang@intel.com
2025-12-15 16:29:21 +00:00 · 2017-03-30 21:22:22 +08:00 · 2017-03-30 21:22:22 +08:00 · 41c63e08b1
commit 41c63e08b1
parent 3ff9a7de8a
10 changed files with 15 additions and 24 deletions
--- a/jerry-core/ecma/base/ecma-gc.c
+++ b/jerry-core/ecma/base/ecma-gc.c
@ -31,7 +31,7 @@
 #include "vm-defines.h"
 #include "vm-stack.h"

-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
 #include "ecma-typedarray-object.h"
 #endif

@ -487,7 +487,7 @@ ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
          }
          break;
        }
-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
        case LIT_MAGIC_STRING_ARRAY_BUFFER_UL:
        {
          ecma_length_t arraybuffer_length = ext_object_p->u.class_prop.u.length;
@ -495,7 +495,7 @@ ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
          ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, size);
          return;
        }
-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
        default:
        {
          JERRY_UNREACHABLE ();
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c
@ -24,7 +24,7 @@
 #include "jrt.h"
 #include "jrt-libc-includes.h"

-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN

 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@ -138,4 +138,4 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
 * @}
 */

-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c
@ -22,7 +22,7 @@
 #include "ecma-try-catch-macro.h"
 #include "jrt.h"

-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN

 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@ -100,4 +100,4 @@ ecma_builtin_arraybuffer_dispatch_construct (const ecma_value_t *arguments_list_
 * @}
 */

-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
@ -147,13 +147,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U,
              ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 #endif /* !CONFIG_DISABLE_JSON_BUILTIN */

-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
 OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL,
              ECMA_BUILTIN_ID_ARRAYBUFFER,
              ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */

-#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
 OBJECT_VALUE (LIT_MAGIC_STRING_INT8_ARRAY_UL,
              ECMA_BUILTIN_ID_INT8ARRAY,
              ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
@ -192,7 +190,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL,
              ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY,
              ECMA_PROPERTY_CONFIGURABLE_WRITABLE)

-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
 /* Routine properties:
 *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */

--- a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
@ -298,7 +298,7 @@ BUILTIN (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER,
         true,
         type_error_thrower)

-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN

 /* The ArrayBuffer.prototype object (ES2015 24.1.4) */
 BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE,
@ -315,9 +315,6 @@ BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER,
         true,
         true,
         arraybuffer)
-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
-
-#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN

 /* The %TypedArrayPrototype% object (ES2015 24.2.3) */
 BUILTIN (ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE,
--- a/jerry-core/ecma/operations/ecma-arraybuffer-object.c
+++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.c
@ -23,7 +23,7 @@
 #include "ecma-helpers.h"
 #include "jmem.h"

-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN

 /** \addtogroup ecma ECMA
 * @{
@ -186,4 +186,4 @@ ecma_arraybuffer_get_buffer (ecma_object_t *object_p) /**< pointer to the ArrayB
 * @}
 * @}
 */
-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
--- a/jerry-core/ecma/operations/ecma-arraybuffer-object.h
+++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.h
@ -16,7 +16,7 @@
 #ifndef ECMA_ARRAYBUFFER_OBJECT_H
 #define ECMA_ARRAYBUFFER_OBJECT_H

-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
 #include "ecma-globals.h"

 /** \addtogroup ecma ECMA
@ -48,5 +48,5 @@ ecma_is_arraybuffer (ecma_value_t val);
 * @}
 */

-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
 #endif /* !ECMA_ARRAYBUFFER_OBJECT_H */
--- a/jerry-core/ecma/operations/ecma-objects.c
+++ b/jerry-core/ecma/operations/ecma-objects.c
@ -1682,10 +1682,8 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */
 {
 #ifndef JERRY_NDEBUG
  return (ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_GLOBAL)
-#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
-          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE)
-#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
 #ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
+          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE)
          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE)
          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE)
          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_UINT8ARRAY_PROTOTYPE)
--- a/jerry-core/profiles/es5.1.profile
+++ b/jerry-core/profiles/es5.1.profile
@ -1,4 +1,3 @@
-CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 CONFIG_DISABLE_ES2015_BUILTIN
 CONFIG_DISABLE_ES2015_PROMISE_BUILTIN
 CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
--- a/jerry-core/profiles/minimal.profile
+++ b/jerry-core/profiles/minimal.profile
@ -3,7 +3,6 @@ CONFIG_DISABLE_ARRAY_BUILTIN
 CONFIG_DISABLE_BOOLEAN_BUILTIN
 CONFIG_DISABLE_DATE_BUILTIN
 CONFIG_DISABLE_ERROR_BUILTINS
-CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 CONFIG_DISABLE_ES2015_BUILTIN
 CONFIG_DISABLE_ES2015_PROMISE_BUILTIN
 CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN