Skip to content

Commit 11e23aa

Browse files
lygstatelygstate
committed
Refactoring ecma_extended_object_t::cls:: to ease the coding about builtin object class
Currently all builtin class are sharing same union u1 u2 u3 in ecma_extended_object_t::cls::, that's complicated the things Now we split general object class into ecma_object_cls_general_t and can only access with ecma_object_cls_general, for others split it into separate struct, so when new builtin object class, bug-fixing, feature improving will be easier. JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo [email protected]
1 parent e34c025 commit 11e23aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+708
-499
lines changed

‎jerry-core/api/jerry-snapshot.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,8 @@ jerry_generate_snapshot (jerry_value_t compiled_code, /**< parsed script or func
751751
{
752752
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
753753

754-
bytecode_data_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ext_object_p->u.cls.u3.value);
754+
bytecode_data_p =
755+
ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ecma_object_cls_general (ext_object_p)->value);
755756
}
756757
else if (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_FUNCTION)
757758
{

‎jerry-core/api/jerryscript.c

+39-35
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,8 @@ jerry_parse_common (void *source_p, /**< script source */
453453
ecma_object_t *object_p = ecma_create_object (NULL, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS);
454454

455455
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
456-
ext_object_p->u.cls.type = ECMA_OBJECT_CLASS_SCRIPT;
457-
ECMA_SET_INTERNAL_VALUE_POINTER (ext_object_p->u.cls.u3.value, bytecode_data_p);
456+
ext_object_p->u.cls.head.type = ECMA_OBJECT_CLASS_SCRIPT;
457+
ECMA_SET_INTERNAL_VALUE_POINTER (ecma_object_cls_general (ext_object_p)->value, bytecode_data_p);
458458

459459
return ecma_make_object_value (object_p);
460460
} /* jerry_parse_common */
@@ -541,7 +541,8 @@ jerry_run (const jerry_value_t script) /**< script or module to run */
541541
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
542542

543543
const ecma_compiled_code_t *bytecode_data_p;
544-
bytecode_data_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ext_object_p->u.cls.u3.value);
544+
bytecode_data_p =
545+
ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ecma_object_cls_general (ext_object_p)->value);
545546

546547
JERRY_ASSERT (CBC_FUNCTION_GET_TYPE (bytecode_data_p->status_flags) == CBC_FUNCTION_SCRIPT);
547548

@@ -638,7 +639,7 @@ jerry_module_evaluate (const jerry_value_t module) /**< root module */
638639
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_NOT_MODULE));
639640
}
640641

641-
if (module_p->header.u.cls.u1.module_state != JERRY_MODULE_STATE_LINKED)
642+
if (module_p->header.u.cls.module.state != JERRY_MODULE_STATE_LINKED)
642643
{
643644
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_MODULE_MUST_BE_IN_LINKED_STATE));
644645
}
@@ -670,7 +671,7 @@ jerry_module_state (const jerry_value_t module) /**< module object */
670671
return JERRY_MODULE_STATE_INVALID;
671672
}
672673

673-
return (jerry_module_state_t) module_p->header.u.cls.u1.module_state;
674+
return (jerry_module_state_t) module_p->header.u.cls.module.state;
674675
#else /* !JERRY_MODULE_SYSTEM */
675676
JERRY_UNUSED (module);
676677

@@ -818,8 +819,8 @@ jerry_module_namespace (const jerry_value_t module) /**< module */
818819
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_NOT_MODULE));
819820
}
820821

821-
if (module_p->header.u.cls.u1.module_state < JERRY_MODULE_STATE_LINKED
822-
|| module_p->header.u.cls.u1.module_state > JERRY_MODULE_STATE_EVALUATED)
822+
if (module_p->header.u.cls.module.state < JERRY_MODULE_STATE_LINKED
823+
|| module_p->header.u.cls.module.state > JERRY_MODULE_STATE_EVALUATED)
823824
{
824825
return jerry_throw_sz (JERRY_ERROR_RANGE, ecma_get_error_msg (ECMA_ERR_NAMESPACE_OBJECT_IS_NOT_AVAILABLE));
825826
}
@@ -952,7 +953,7 @@ jerry_native_module (jerry_native_module_evaluate_cb_t callback, /**< evaluation
952953

953954
ecma_module_t *module_p = ecma_module_create ();
954955

955-
module_p->header.u.cls.u2.module_flags |= ECMA_MODULE_IS_NATIVE;
956+
module_p->header.u.cls.module.flags |= ECMA_MODULE_IS_NATIVE;
956957
module_p->scope_p = scope_p;
957958
module_p->local_exports_p = local_exports_p;
958959
module_p->u.callback = callback;
@@ -993,7 +994,7 @@ jerry_native_module_get (const jerry_value_t native_module, /**< a native module
993994
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_NOT_MODULE));
994995
}
995996

996-
if (!(module_p->header.u.cls.u2.module_flags & ECMA_MODULE_IS_NATIVE) || !ecma_is_value_string (export_name))
997+
if (!(module_p->header.u.cls.module.flags & ECMA_MODULE_IS_NATIVE) || !ecma_is_value_string (export_name))
997998
{
998999
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_WRONG_ARGS_MSG));
9991000
}
@@ -1038,7 +1039,7 @@ jerry_native_module_set (jerry_value_t native_module, /**< a native module objec
10381039
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_NOT_MODULE));
10391040
}
10401041

1041-
if (!(module_p->header.u.cls.u2.module_flags & ECMA_MODULE_IS_NATIVE) || !ecma_is_value_string (export_name)
1042+
if (!(module_p->header.u.cls.module.flags & ECMA_MODULE_IS_NATIVE) || !ecma_is_value_string (export_name)
10421043
|| ecma_is_value_exception (value))
10431044
{
10441045
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_WRONG_ARGS_MSG));
@@ -1534,8 +1535,8 @@ jerry_object_type (const jerry_value_t value) /**< input value to check */
15341535
case ECMA_OBJECT_TYPE_CLASS:
15351536
case ECMA_OBJECT_TYPE_BUILT_IN_CLASS:
15361537
{
1537-
JERRY_ASSERT (ext_obj_p->u.cls.type < ECMA_OBJECT_CLASS__MAX);
1538-
return jerry_class_object_type[ext_obj_p->u.cls.type];
1538+
JERRY_ASSERT (ext_obj_p->u.cls.head.type < ECMA_OBJECT_CLASS__MAX);
1539+
return jerry_class_object_type[ext_obj_p->u.cls.head.type];
15391540
}
15401541
case ECMA_OBJECT_TYPE_ARRAY:
15411542
case ECMA_OBJECT_TYPE_BUILT_IN_ARRAY:
@@ -1644,7 +1645,7 @@ jerry_iterator_type (const jerry_value_t value) /**< input value to check */
16441645

16451646
if (ecma_get_object_type (obj_p) == ECMA_OBJECT_TYPE_CLASS)
16461647
{
1647-
switch (ext_obj_p->u.cls.type)
1648+
switch (ext_obj_p->u.cls.head.type)
16481649
{
16491650
case ECMA_OBJECT_CLASS_ARRAY_ITERATOR:
16501651
{
@@ -3610,7 +3611,7 @@ jerry_object_set_internal (jerry_value_t object, /**< object value */
36103611
internal_object_p = ecma_create_object (NULL, sizeof (ecma_extended_object_t), ECMA_OBJECT_TYPE_CLASS);
36113612
{
36123613
ecma_extended_object_t *container_p = (ecma_extended_object_t *) internal_object_p;
3613-
container_p->u.cls.type = ECMA_OBJECT_CLASS_INTERNAL_OBJECT;
3614+
container_p->u.cls.head.type = ECMA_OBJECT_CLASS_INTERNAL_OBJECT;
36143615
}
36153616

36163617
value_p->value = ecma_make_object_value (internal_object_p);
@@ -4141,7 +4142,7 @@ jerry_object_is_valid_foreach (ecma_object_t *object_p) /**< object to test */
41414142
if (object_type == ECMA_OBJECT_TYPE_CLASS)
41424143
{
41434144
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
4144-
switch (ext_object_p->u.cls.type)
4145+
switch (ext_object_p->u.cls.head.type)
41454146
{
41464147
/* An object's internal property object should not be iterable by foreach. */
41474148
case ECMA_OBJECT_CLASS_INTERNAL_OBJECT:
@@ -5647,16 +5648,17 @@ jerry_source_info (const jerry_value_t value) /**< jerry api value */
56475648
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
56485649
const ecma_compiled_code_t *bytecode_p = NULL;
56495650

5650-
if (ext_object_p->u.cls.type == ECMA_OBJECT_CLASS_SCRIPT)
5651+
if (ext_object_p->u.cls.head.type == ECMA_OBJECT_CLASS_SCRIPT)
56515652
{
5652-
bytecode_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ext_object_p->u.cls.u3.value);
5653+
bytecode_p =
5654+
ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t, ecma_object_cls_general (ext_object_p)->value);
56535655
}
56545656
#if JERRY_MODULE_SYSTEM
5655-
else if (ext_object_p->u.cls.type == ECMA_OBJECT_CLASS_MODULE)
5657+
else if (ext_object_p->u.cls.head.type == ECMA_OBJECT_CLASS_MODULE)
56565658
{
56575659
ecma_module_t *module_p = (ecma_module_t *) object_p;
56585660

5659-
if (!(module_p->header.u.cls.u2.module_flags & ECMA_MODULE_IS_NATIVE))
5661+
if (!(module_p->header.u.cls.module.flags & ECMA_MODULE_IS_NATIVE))
56605662
{
56615663
bytecode_p = module_p->u.compiled_code_p;
56625664
}
@@ -5987,7 +5989,7 @@ jerry_arraybuffer_external (uint8_t *buffer_p, /**< the backing store used by th
59875989

59885990
if (buffer_p != NULL)
59895991
{
5990-
arraybuffer_pointer_p->extended_object.u.cls.u1.array_buffer_flags |= ECMA_ARRAYBUFFER_ALLOCATED;
5992+
arraybuffer_pointer_p->extended_object.u.cls.arraybuffer.flags |= ECMA_ARRAYBUFFER_ALLOCATED;
59915993
arraybuffer_pointer_p->buffer_p = buffer_p;
59925994
}
59935995
}
@@ -6075,7 +6077,7 @@ jerry_shared_arraybuffer_external (uint8_t *buffer_p, /**< the backing store use
60756077

60766078
if (buffer_p != NULL)
60776079
{
6078-
shared_arraybuffer_pointer_p->extended_object.u.cls.u1.array_buffer_flags |= ECMA_ARRAYBUFFER_ALLOCATED;
6080+
shared_arraybuffer_pointer_p->extended_object.u.cls.arraybuffer.flags |= ECMA_ARRAYBUFFER_ALLOCATED;
60796081
shared_arraybuffer_pointer_p->buffer_p = buffer_p;
60806082
}
60816083
}
@@ -6523,7 +6525,7 @@ jerry_dataview_buffer (const jerry_value_t value, /**< DataView to get the array
65236525

65246526
if (byte_length != NULL)
65256527
{
6526-
*byte_length = dataview_p->header.u.cls.u3.length;
6528+
*byte_length = dataview_p->header.u.cls.dataview.length;
65276529
}
65286530

65296531
ecma_object_t *arraybuffer_p = dataview_p->buffer_p;
@@ -7024,7 +7026,7 @@ jerry_container_type (const jerry_value_t value) /**< the container object */
70247026

70257027
if (ecma_object_class_is (obj_p, ECMA_OBJECT_CLASS_CONTAINER))
70267028
{
7027-
switch (((ecma_extended_object_t *) obj_p)->u.cls.u2.container_id)
7029+
switch (((ecma_extended_object_t *) obj_p)->u.cls.container.id)
70287030
{
70297031
case LIT_MAGIC_STRING_MAP_UL:
70307032
{
@@ -7095,10 +7097,10 @@ jerry_container_to_array (const jerry_value_t value, /**< the container or itera
70957097

70967098
*is_key_value_p = false;
70977099

7098-
if (ext_obj_p->u.cls.type == ECMA_OBJECT_CLASS_MAP_ITERATOR
7099-
|| ext_obj_p->u.cls.type == ECMA_OBJECT_CLASS_SET_ITERATOR)
7100+
if (ext_obj_p->u.cls.head.type == ECMA_OBJECT_CLASS_MAP_ITERATOR
7101+
|| ext_obj_p->u.cls.head.type == ECMA_OBJECT_CLASS_SET_ITERATOR)
71007102
{
7101-
ecma_value_t iterated_value = ext_obj_p->u.cls.u3.iterated_value;
7103+
ecma_value_t iterated_value = ext_obj_p->u.cls.iterator.value;
71027104

71037105
if (ecma_is_value_empty (iterated_value))
71047106
{
@@ -7107,27 +7109,29 @@ jerry_container_to_array (const jerry_value_t value, /**< the container or itera
71077109

71087110
ecma_extended_object_t *map_object_p = (ecma_extended_object_t *) (ecma_get_object_from_value (iterated_value));
71097111

7110-
ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.cls.u3.value);
7112+
ecma_collection_t *container_p =
7113+
ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, map_object_p->u.cls.container.value);
71117114
entry_count = ECMA_CONTAINER_ENTRY_COUNT (container_p);
7112-
index = ext_obj_p->u.cls.u2.iterator_index;
7115+
index = ext_obj_p->u.cls.iterator.index;
71137116

7114-
entry_size = ecma_op_container_entry_size (map_object_p->u.cls.u2.container_id);
7117+
entry_size = ecma_op_container_entry_size (map_object_p->u.cls.container.id);
71157118
start_p = ECMA_CONTAINER_START (container_p);
71167119

7117-
iterator_kind = ext_obj_p->u.cls.u1.iterator_kind;
7120+
iterator_kind = ext_obj_p->u.cls.iterator.kind;
71187121
}
71197122
else if (jerry_container_type (value) != JERRY_CONTAINER_TYPE_INVALID)
71207123
{
7121-
ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, ext_obj_p->u.cls.u3.value);
7124+
ecma_collection_t *container_p =
7125+
ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, ext_obj_p->u.cls.container.value);
71227126
entry_count = ECMA_CONTAINER_ENTRY_COUNT (container_p);
7123-
entry_size = ecma_op_container_entry_size (ext_obj_p->u.cls.u2.container_id);
7127+
entry_size = ecma_op_container_entry_size (ext_obj_p->u.cls.container.id);
71247128

71257129
index = 0;
71267130
iterator_kind = ECMA_ITERATOR_KEYS;
71277131
start_p = ECMA_CONTAINER_START (container_p);
71287132

7129-
if (ext_obj_p->u.cls.u2.container_id == LIT_MAGIC_STRING_MAP_UL
7130-
|| ext_obj_p->u.cls.u2.container_id == LIT_MAGIC_STRING_WEAKMAP_UL)
7133+
if (ext_obj_p->u.cls.container.id == LIT_MAGIC_STRING_MAP_UL
7134+
|| ext_obj_p->u.cls.container.id == LIT_MAGIC_STRING_WEAKMAP_UL)
71317135
{
71327136
iterator_kind = ECMA_ITERATOR_ENTRIES;
71337137
}
@@ -7192,7 +7196,7 @@ jerry_container_op (jerry_container_op_t operation, /**< container operation */
71927196
{
71937197
return jerry_throw_sz (JERRY_ERROR_TYPE, ecma_get_error_msg (ECMA_ERR_CONTAINER_IS_NOT_A_CONTAINER_OBJECT));
71947198
}
7195-
uint16_t type = ((ecma_extended_object_t *) obj_p)->u.cls.u2.container_id;
7199+
uint16_t type = ((ecma_extended_object_t *) obj_p)->u.cls.container.id;
71967200
ecma_extended_object_t *container_object_p = ecma_op_container_get_object (container, type);
71977201

71987202
if (container_object_p == NULL)

‎jerry-core/ecma/base/ecma-alloc.c

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ JERRY_STATIC_ASSERT (((sizeof (ecma_property_value_t) - 1) & sizeof (ecma_proper
2929
JERRY_STATIC_ASSERT (sizeof (ecma_extended_object_t) - sizeof (ecma_object_t) <= sizeof (uint64_t),
3030
size_of_ecma_extended_object_part_must_be_less_than_or_equal_to_8_bytes);
3131

32+
JERRY_STATIC_ASSERT (sizeof (ecma_object_cls_t) == 8, size_of_ecma_object_cls_t_should_be_8_bytes);
33+
3234
/** \addtogroup ecma ECMA
3335
* @{
3436
*

0 commit comments

Comments
 (0)