Skip to content

Commit af65a9e

Browse files
robertsipkarobertsipka
committed
Store aligned pointers directly in ecma_value_t if it is possible.
This change affects only those internal properties which have a primitive value field. JerryScript-DCO-1.0-Signed-off-by: Robert Sipka [email protected]
1 parent 33a1203 commit af65a9e

9 files changed

+32
-30
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -816,17 +816,15 @@ ecma_free_internal_property (ecma_property_t *property_p) /**< the property */
816816

817817
case ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE: /* compressed pointer to a ecma_string_t */
818818
{
819-
ecma_string_t *str_p = ECMA_GET_NON_NULL_POINTER (ecma_string_t,
820-
property_value);
819+
ecma_string_t *str_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_string_t, property_value);
821820
ecma_deref_ecma_string (str_p);
822821

823822
break;
824823
}
825824

826825
case ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE: /* pointer to a ecma_number_t */
827826
{
828-
ecma_number_t *num_p = ECMA_GET_NON_NULL_POINTER (ecma_number_t,
829-
property_value);
827+
ecma_number_t *num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t, property_value);
830828
ecma_dealloc_number (num_p);
831829

832830
break;

‎jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ ecma_builtin_date_prototype_to_date_string (ecma_value_t this_arg) /**< this arg
107107
ecma_object_t *obj_p = ecma_get_object_from_value (obj_this);
108108
ecma_property_t *prim_prop_p = ecma_get_internal_property (obj_p,
109109
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
110-
ecma_number_t *prim_value_num_p = ECMA_GET_NON_NULL_POINTER (ecma_number_t,
111-
ecma_get_internal_property_value (prim_prop_p));
110+
ecma_number_t *prim_value_num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
111+
ecma_get_internal_property_value (prim_prop_p));
112112

113113
if (ecma_number_is_nan (*prim_value_num_p))
114114
{
@@ -154,8 +154,8 @@ ecma_builtin_date_prototype_to_time_string (ecma_value_t this_arg) /**< this arg
154154
ecma_object_t *obj_p = ecma_get_object_from_value (obj_this);
155155
ecma_property_t *prim_prop_p = ecma_get_internal_property (obj_p,
156156
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
157-
ecma_number_t *prim_value_num_p = ECMA_GET_NON_NULL_POINTER (ecma_number_t,
158-
ecma_get_internal_property_value (prim_prop_p));
157+
ecma_number_t *prim_value_num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
158+
ecma_get_internal_property_value (prim_prop_p));
159159

160160
if (ecma_number_is_nan (*prim_value_num_p))
161161
{
@@ -253,8 +253,9 @@ ecma_builtin_date_prototype_get_time (ecma_value_t this_arg) /**< this argument
253253
ecma_property_t *prim_prop_p = ecma_get_internal_property (obj_p,
254254
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
255255

256-
ecma_number_t *prim_value_num_p = ECMA_GET_NON_NULL_POINTER (ecma_number_t,
257-
ecma_get_internal_property_value (prim_prop_p));
256+
ecma_number_t *prim_value_num_p;
257+
prim_value_num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
258+
ecma_get_internal_property_value (prim_prop_p));
258259

259260
ecma_number_t *ret_num_p = ecma_alloc_number ();
260261
*ret_num_p = *prim_value_num_p;
@@ -366,8 +367,8 @@ ecma_builtin_date_prototype_set_time (ecma_value_t this_arg, /**< this argument
366367
ecma_property_t *prim_prop_p = ecma_get_internal_property (obj_p,
367368
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
368369

369-
ecma_number_t *prim_value_num_p = ECMA_GET_NON_NULL_POINTER (ecma_number_t,
370-
ecma_get_internal_property_value (prim_prop_p));
370+
ecma_number_t *prim_value_num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
371+
ecma_get_internal_property_value (prim_prop_p));
371372
*prim_value_num_p = *value_p;
372373

373374
/* 3. */

‎jerry-core/ecma/builtin-objects/ecma-builtin-date.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**<
569569

570570
ecma_property_t *prim_value_prop_p = ecma_create_internal_property (obj_p,
571571
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
572-
ECMA_SET_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_value_num_p);
572+
ECMA_SET_INTERNAL_VALUE_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_value_num_p);
573573

574574
ret_value = ecma_make_object_value (obj_p);
575575
}

‎jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,9 @@ ecma_date_set_internal_property (ecma_value_t this_arg, /**< this argument */
902902
ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
903903
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
904904

905-
ecma_number_t *prim_value_num_p = ECMA_GET_NON_NULL_POINTER (ecma_number_t,
906-
ecma_get_internal_property_value (prim_value_prop_p));
905+
ecma_number_t *prim_value_num_p;
906+
prim_value_num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
907+
ecma_get_internal_property_value (prim_value_prop_p));
907908
*prim_value_num_p = *value_p;
908909

909910
return ecma_make_number_value (value_p);
@@ -1306,8 +1307,8 @@ ecma_date_get_primitive_value (ecma_value_t this_arg) /**< this argument */
13061307
JERRY_ASSERT (prim_value_prop_p != NULL);
13071308

13081309
ecma_number_t *prim_value_num_p = ecma_alloc_number ();
1309-
*prim_value_num_p = *ECMA_GET_NON_NULL_POINTER (ecma_number_t,
1310-
ecma_get_internal_property_value (prim_value_prop_p));
1310+
*prim_value_num_p = *ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
1311+
ecma_get_internal_property_value (prim_value_prop_p));
13111312
ret_value = ecma_make_number_value (prim_value_num_p);
13121313
}
13131314

‎jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ ecma_builtin_number_prototype_object_value_of (ecma_value_t this_arg) /**< this
359359
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
360360

361361
ecma_number_t *prim_value_num_p;
362-
prim_value_num_p = ECMA_GET_NON_NULL_POINTER (ecma_number_t,
363-
ecma_get_internal_property_value (prim_value_prop_p));
362+
prim_value_num_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_number_t,
363+
ecma_get_internal_property_value (prim_value_prop_p));
364364

365365
ecma_number_t *ret_num_p = ecma_alloc_number ();
366366
*ret_num_p = *prim_value_num_p;

‎jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ ecma_builtin_string_prototype_object_to_string (ecma_value_t this_arg) /**< this
8080
ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE);
8181

8282
ecma_string_t *prim_value_str_p;
83-
prim_value_str_p = ECMA_GET_NON_NULL_POINTER (ecma_string_t,
84-
ecma_get_internal_property_value (prim_value_prop_p));
83+
prim_value_str_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_string_t,
84+
ecma_get_internal_property_value (prim_value_prop_p));
8585

8686
prim_value_str_p = ecma_copy_or_ref_ecma_string (prim_value_str_p);
8787

‎jerry-core/ecma/builtin-objects/ecma-builtins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ecma_builtin_init_object (ecma_builtin_id_t obj_builtin_id, /**< built-in ID */
126126
ecma_property_t *prim_value_prop_p;
127127
prim_value_prop_p = ecma_create_internal_property (object_obj_p,
128128
ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE);
129-
ECMA_SET_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_str_value_p);
129+
ECMA_SET_INTERNAL_VALUE_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_str_value_p);
130130
break;
131131
}
132132
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_STRING_BUILTIN */
@@ -140,7 +140,7 @@ ecma_builtin_init_object (ecma_builtin_id_t obj_builtin_id, /**< built-in ID */
140140
ecma_property_t *prim_value_prop_p;
141141
prim_value_prop_p = ecma_create_internal_property (object_obj_p,
142142
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
143-
ECMA_SET_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_num_value_p);
143+
ECMA_SET_INTERNAL_VALUE_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_num_value_p);
144144
break;
145145
}
146146
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_NUMBER_BUILTIN */
@@ -165,7 +165,7 @@ ecma_builtin_init_object (ecma_builtin_id_t obj_builtin_id, /**< built-in ID */
165165
ecma_property_t *prim_value_prop_p;
166166
prim_value_prop_p = ecma_create_internal_property (object_obj_p,
167167
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
168-
ECMA_SET_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_num_value_p);
168+
ECMA_SET_INTERNAL_VALUE_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_num_value_p);
169169
break;
170170
}
171171
#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_DATE_BUILTIN */

‎jerry-core/ecma/operations/ecma-number-object.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ecma_op_create_number_object (ecma_value_t arg) /**< argument passed to the Numb
6666

6767
ecma_property_t *prim_value_prop_p = ecma_create_internal_property (obj_p,
6868
ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
69-
ECMA_SET_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_value_p);
69+
ECMA_SET_INTERNAL_VALUE_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_value_p);
7070

7171
return ecma_make_object_value (obj_p);
7272
} /* ecma_op_create_number_object */

‎jerry-core/ecma/operations/ecma-string-object.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ecma_op_create_string_object (const ecma_value_t *arguments_list_p, /**< list of
9595

9696
ecma_property_t *prim_value_prop_p = ecma_create_internal_property (obj_p,
9797
ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE);
98-
ECMA_SET_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_str_value_p);
98+
ECMA_SET_INTERNAL_VALUE_POINTER (ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value, prim_prop_str_value_p);
9999

100100
// 15.5.5.1
101101
ecma_string_t *length_magic_string_p = ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH);
@@ -169,8 +169,9 @@ ecma_op_string_object_get_own_property (ecma_object_t *obj_p, /**< a String obje
169169
// 4.
170170
ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
171171
ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE);
172-
ecma_string_t *prim_value_str_p = ECMA_GET_NON_NULL_POINTER (ecma_string_t,
173-
ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value);
172+
ecma_string_t *prim_value_str_p;
173+
prim_value_str_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_string_t,
174+
ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value);
174175

175176
// 6.
176177
ecma_length_t length = ecma_string_get_length (prim_value_str_p);
@@ -236,8 +237,9 @@ ecma_op_string_list_lazy_property_names (ecma_object_t *obj_p, /**< a String obj
236237

237238
ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
238239
ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE);
239-
ecma_string_t *prim_value_str_p = ECMA_GET_NON_NULL_POINTER (ecma_string_t,
240-
ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value);
240+
ecma_string_t *prim_value_str_p;
241+
prim_value_str_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_string_t,
242+
ECMA_PROPERTY_VALUE_PTR (prim_value_prop_p)->value);
241243

242244
ecma_length_t length = ecma_string_get_length (prim_value_str_p);
243245

0 commit comments

Comments
 (0)