From 41c63e08b1241b11a9086564578f43984e434da7 Mon Sep 17 00:00:00 2001 From: Zidong Jiang Date: Thu, 30 Mar 2017 21:22:22 +0800 Subject: [PATCH] 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 --- jerry-core/ecma/base/ecma-gc.c | 6 +++--- .../builtin-objects/ecma-builtin-arraybuffer-prototype.c | 4 ++-- jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c | 4 ++-- jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h | 6 ++---- jerry-core/ecma/builtin-objects/ecma-builtins.inc.h | 5 +---- jerry-core/ecma/operations/ecma-arraybuffer-object.c | 4 ++-- jerry-core/ecma/operations/ecma-arraybuffer-object.h | 4 ++-- jerry-core/ecma/operations/ecma-objects.c | 4 +--- jerry-core/profiles/es5.1.profile | 1 - jerry-core/profiles/minimal.profile | 1 - 10 files changed, 15 insertions(+), 24 deletions(-) diff --git a/jerry-core/ecma/base/ecma-gc.c b/jerry-core/ecma/base/ecma-gc.c index 827c0b5a1..14aa50997 100644 --- 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 (); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c index e534d1b69..e9c5b1a68 100644 --- 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 */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c index 961431a02..138c8d6a5 100644 --- 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 */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h index 5deffb714..f4b2e8363 100644 --- 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) */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h index 85114bfb5..4629f881c 100644 --- 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, diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.c b/jerry-core/ecma/operations/ecma-arraybuffer-object.c index fd72bf03e..7fd5dfae8 100644 --- 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 */ diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.h b/jerry-core/ecma/operations/ecma-arraybuffer-object.h index ab5330b43..5c03783b9 100644 --- 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 */ diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c index dfbd071bc..40f4b8e16 100644 --- 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) diff --git a/jerry-core/profiles/es5.1.profile b/jerry-core/profiles/es5.1.profile index 2a554c0e3..af0401815 100644 --- 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 diff --git a/jerry-core/profiles/minimal.profile b/jerry-core/profiles/minimal.profile index 33d518577..c56cc8bb1 100644 --- 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