Skip to content

Commit c4b0cd2

Browse files
sand1ksand1k
committed
Change ecma_length_t and jerry_api_length_t from uint16_t to uint32_t.
JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov [email protected]
1 parent a0c5974 commit c4b0cd2

23 files changed

+73
-80
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -696,12 +696,12 @@ typedef double ecma_number_t;
696696
*/
697697
typedef struct
698698
{
699-
/** Compressed pointer to next chunk with collection's data */
700-
mem_cpointer_t next_chunk_cp;
701-
702699
/** Number of elements in the collection */
703700
ecma_length_t unit_number;
704701

702+
/** Compressed pointer to next chunk with collection's data */
703+
mem_cpointer_t next_chunk_cp;
704+
705705
/** Place for the collection's data */
706706
uint8_t data[ sizeof (uint64_t) - sizeof (mem_cpointer_t) - sizeof (ecma_length_t) ];
707707
} ecma_collection_header_t;

‎jerry-core/ecma/base/ecma-helpers-string.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ ecma_new_ecma_string_from_uint32 (uint32_t uint32_number) /**< UInt32-represente
467467
ssize_t chars_copied = ecma_uint32_to_string (uint32_number,
468468
char_buf,
469469
ECMA_MAX_CHARS_IN_STRINGIFIED_UINT32);
470-
JERRY_ASSERT ((ecma_length_t) chars_copied == chars_copied);
470+
JERRY_ASSERT ((ssize_t) ((ecma_length_t) chars_copied) == chars_copied);
471471

472472
JERRY_ASSERT (string_desc_p->hash == ecma_chars_buffer_calc_hash_last_chars (char_buf,
473473
ecma_zt_string_length (char_buf)));
@@ -906,7 +906,7 @@ ecma_string_to_number (const ecma_string_t *str_p) /**< ecma-string */
906906
case ECMA_STRING_CONTAINER_MAGIC_STRING:
907907
case ECMA_STRING_CONTAINER_MAGIC_STRING_EX:
908908
{
909-
const int32_t string_len = ecma_string_get_length (str_p);
909+
const ecma_length_t string_len = ecma_string_get_length (str_p);
910910
const size_t string_buf_size = (size_t) (string_len + 1) * sizeof (ecma_char_t);
911911

912912
ecma_char_t *str_buffer_p = (ecma_char_t*) mem_heap_alloc_block (string_buf_size, MEM_HEAP_ALLOC_SHORT_TERM);
@@ -948,7 +948,7 @@ ecma_string_to_zt_string (const ecma_string_t *string_desc_p, /**< ecma-string d
948948
JERRY_ASSERT (buffer_p != NULL || buffer_size == 0);
949949
JERRY_ASSERT (buffer_size >= 0);
950950

951-
ssize_t required_buffer_size = ((ecma_string_get_length (string_desc_p) + 1) * ((ssize_t) sizeof (ecma_char_t)));
951+
ssize_t required_buffer_size = (ssize_t) ((ecma_string_get_length (string_desc_p) + 1) * sizeof (ecma_char_t));
952952

953953
if (required_buffer_size > buffer_size
954954
|| buffer_size == 0)
@@ -990,7 +990,7 @@ ecma_string_to_zt_string (const ecma_string_t *string_desc_p, /**< ecma-string d
990990

991991
ecma_length_t length = ecma_number_to_zt_string (*num_p, buffer_p, buffer_size);
992992

993-
JERRY_ASSERT (required_buffer_size == (length + 1) * ((ssize_t) sizeof (ecma_char_t)));
993+
JERRY_ASSERT (required_buffer_size == (ssize_t) ((length + 1) * sizeof (ecma_char_t)));
994994

995995
break;
996996
}
@@ -1093,15 +1093,15 @@ ecma_compare_ecma_strings_longpath (const ecma_string_t *string1_p, /* ecma-stri
10931093
}
10941094
}
10951095

1096-
const int32_t string1_len = ecma_string_get_length (string1_p);
1097-
const int32_t string2_len = ecma_string_get_length (string2_p);
1096+
const ecma_length_t string1_len = ecma_string_get_length (string1_p);
1097+
const ecma_length_t string2_len = ecma_string_get_length (string2_p);
10981098

10991099
if (string1_len != string2_len)
11001100
{
11011101
return false;
11021102
}
11031103

1104-
const int32_t strings_len = string1_len;
1104+
const ecma_length_t strings_len = string1_len;
11051105

11061106
if (strings_len == 0)
11071107
{
@@ -1348,7 +1348,7 @@ ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p, /**< ecma-
13481348
*
13491349
* @return number of characters in the string
13501350
*/
1351-
int32_t
1351+
ecma_length_t
13521352
ecma_string_get_length (const ecma_string_t *string_p) /**< ecma-string */
13531353
{
13541354
ecma_string_container_t container = (ecma_string_container_t) string_p->container;
@@ -1385,7 +1385,7 @@ ecma_string_get_length (const ecma_string_t *string_p) /**< ecma-string */
13851385
1000000000u
13861386
};
13871387

1388-
int32_t length = 1;
1388+
ecma_length_t length = 1;
13891389

13901390
while (length < max_uint32_len
13911391
&& uint32_number >= nums_with_ascending_length[length])

‎jerry-core/ecma/base/ecma-helpers-values-collection.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,19 +191,19 @@ ecma_collection_iterator_next (ecma_collection_iterator_t *iterator_p) /**< cont
191191
{
192192
JERRY_ASSERT (iterator_p->current_index == 0);
193193
iterator_p->current_value_p = (ecma_value_t*) iterator_p->header_p->data;
194-
195-
return true;
196194
}
197-
198-
if (iterator_p->current_index + 1 == iterator_p->header_p->unit_number)
195+
else
199196
{
200-
return false;
201-
}
197+
if (iterator_p->current_index + 1 == iterator_p->header_p->unit_number)
198+
{
199+
return false;
200+
}
202201

203-
JERRY_ASSERT (iterator_p->current_index + 1 < iterator_p->header_p->unit_number);
202+
JERRY_ASSERT (iterator_p->current_index + 1 < iterator_p->header_p->unit_number);
204203

205-
iterator_p->current_index++;
206-
iterator_p->current_value_p++;
204+
iterator_p->current_index++;
205+
iterator_p->current_value_p++;
206+
}
207207

208208
if (iterator_p->current_value_p == iterator_p->current_chunk_end_p)
209209
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ extern bool ecma_compare_ecma_strings (const ecma_string_t *string1_p,
133133
const ecma_string_t *string2_p);
134134
extern bool ecma_compare_ecma_strings_relational (const ecma_string_t *string1_p,
135135
const ecma_string_t *string2_p);
136-
extern int32_t ecma_string_get_length (const ecma_string_t *string_p);
136+
extern ecma_length_t ecma_string_get_length (const ecma_string_t *string_p);
137137
extern ecma_char_t ecma_string_get_char_at_pos (const ecma_string_t *string_p, uint32_t index);
138138
extern bool ecma_compare_zt_strings (const ecma_char_t *string1_p, const ecma_char_t *string2_p);
139139
extern bool ecma_compare_zt_strings_relational (const ecma_char_t *string1_p, const ecma_char_t *string2_p);

‎jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ ecma_builtin_error_prototype_object_to_string (ecma_value_t this_arg) /**< this
134134
const ecma_char_t *colon_zt_magic_string_p = lit_get_magic_string_zt (LIT_MAGIC_STRING_COLON_CHAR);
135135
const ecma_char_t *space_zt_magic_string_p = lit_get_magic_string_zt (LIT_MAGIC_STRING_SPACE_CHAR);
136136

137-
const int32_t len = (ecma_string_get_length (name_string_p) +
138-
ecma_string_get_length (msg_string_p) +
139-
ecma_zt_string_length (colon_zt_magic_string_p) +
140-
ecma_zt_string_length (space_zt_magic_string_p));
137+
const ecma_length_t len = (ecma_string_get_length (name_string_p) +
138+
ecma_string_get_length (msg_string_p) +
139+
ecma_zt_string_length (colon_zt_magic_string_p) +
140+
ecma_zt_string_length (space_zt_magic_string_p));
141141

142-
const ssize_t buffer_size = (len + 1) * (ssize_t) sizeof (ecma_char_t);
142+
const ssize_t buffer_size = (ssize_t) ((len + 1) * sizeof (ecma_char_t));
143143
ssize_t buffer_size_left = buffer_size;
144144

145145
MEM_DEFINE_LOCAL_ARRAY (ret_str_buffer, buffer_size, ecma_char_t);

‎jerry-core/ecma/builtin-objects/ecma-builtin-global.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
108108
ECMA_TRY_CATCH (string_var, ecma_op_to_string (string), ret_value);
109109

110110
ecma_string_t *number_str_p = ecma_get_string_from_value (string_var);
111-
int32_t string_len = ecma_string_get_length (number_str_p);
111+
ecma_length_t string_len = ecma_string_get_length (number_str_p);
112112

113113
MEM_DEFINE_LOCAL_ARRAY (zt_string_buff, string_len + 1, ecma_char_t);
114114

@@ -119,9 +119,9 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
119119
JERRY_ASSERT (bytes_copied > 0);
120120

121121
/* 2. Remove leading whitespace. */
122-
int32_t start = string_len;
123-
int32_t end = string_len;
124-
for (int i = 0; i < end; i++)
122+
ecma_length_t start = string_len;
123+
ecma_length_t end = string_len;
124+
for (ecma_length_t i = 0; i < end; i++)
125125
{
126126
if (!(isspace (zt_string_buff[i])))
127127
{
@@ -190,7 +190,7 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
190190
}
191191

192192
/* 11. Check if characters are in [0, Radix - 1]. We also convert them to number values in the process. */
193-
for (int i = start; i < end; i++)
193+
for (ecma_length_t i = start; i < end; i++)
194194
{
195195
if ((zt_string_buff[i]) >= 'a' && zt_string_buff[i] <= 'z')
196196
{
@@ -233,7 +233,7 @@ ecma_builtin_global_object_parse_int (ecma_value_t this_arg __attr_unused___, /*
233233
ecma_number_t multiplier = 1.0f;
234234

235235
/* 13. and 14. */
236-
for (int i = end - 1; i >= start; i--)
236+
for (int32_t i = (int32_t) end - 1; i >= (int32_t) start; i--)
237237
{
238238
*value_p += (ecma_number_t) zt_string_buff[i] * multiplier;
239239
multiplier *= (ecma_number_t) rad;
@@ -273,7 +273,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
273273
ECMA_TRY_CATCH (string_var, ecma_op_to_string (string), ret_value);
274274

275275
ecma_string_t *number_str_p = ecma_get_string_from_value (string_var);
276-
int32_t string_len = ecma_string_get_length (number_str_p);
276+
ecma_length_t string_len = ecma_string_get_length (number_str_p);
277277

278278
MEM_DEFINE_LOCAL_ARRAY (zt_string_buff, string_len + 1, ecma_char_t);
279279

@@ -284,8 +284,8 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
284284
JERRY_ASSERT (bytes_copied > 0);
285285

286286
/* 2. Find first non whitespace char. */
287-
int32_t start = 0;
288-
for (int i = 0; i < string_len; i++)
287+
ecma_length_t start = 0;
288+
for (ecma_length_t i = 0; i < string_len; i++)
289289
{
290290
if (!isspace (zt_string_buff[i]))
291291
{
@@ -312,7 +312,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
312312
/* Check if string is equal to "Infinity". */
313313
const ecma_char_t *infinity_zt_str_p = lit_get_magic_string_zt (LIT_MAGIC_STRING_INFINITY_UL);
314314

315-
for (int i = 0; infinity_zt_str_p[i] == zt_string_buff[start + i]; i++)
315+
for (ecma_length_t i = 0; infinity_zt_str_p[i] == zt_string_buff[start + i]; i++)
316316
{
317317
if (infinity_zt_str_p[i + 1] == 0)
318318
{
@@ -324,8 +324,8 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
324324

325325
if (ecma_is_completion_value_empty (ret_value))
326326
{
327-
int32_t current = start;
328-
int32_t end = string_len;
327+
ecma_length_t current = start;
328+
ecma_length_t end = string_len;
329329
bool has_whole_part = false;
330330
bool has_fraction_part = false;
331331

@@ -334,7 +334,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
334334
has_whole_part = true;
335335

336336
/* Check digits of whole part. */
337-
for (int i = current; i < string_len; i++, current++)
337+
for (ecma_length_t i = current; i < string_len; i++, current++)
338338
{
339339
if (!isdigit (zt_string_buff[current]))
340340
{
@@ -355,7 +355,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
355355
has_fraction_part = true;
356356

357357
/* Check digits of fractional part. */
358-
for (int i = current; i < string_len; i++, current++)
358+
for (ecma_length_t i = current; i < string_len; i++, current++)
359359
{
360360
if (!isdigit (zt_string_buff[current]))
361361
{
@@ -383,7 +383,7 @@ ecma_builtin_global_object_parse_float (ecma_value_t this_arg __attr_unused___,
383383
{
384384

385385
/* Check digits of exponent part. */
386-
for (int i = current; i < string_len; i++, current++)
386+
for (ecma_length_t i = current; i < string_len; i++, current++)
387387
{
388388
if (!isdigit (zt_string_buff[current]))
389389
{

‎jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ ecma_builtin_regexp_prototype_exec (ecma_value_t this_arg, /**< this argument */
7777
ecma_string_t *input_str_p = ecma_get_string_from_value (input_str_value);
7878

7979
/* Convert ecma_String_t *to regexp_bytecode_t* */
80-
int32_t input_str_len = ecma_string_get_length (input_str_p);
80+
ecma_length_t input_str_len = ecma_string_get_length (input_str_p);
8181

8282
MEM_DEFINE_LOCAL_ARRAY (input_zt_str_p, input_str_len + 1, ecma_char_t);
8383

84-
ssize_t zt_str_size = (ssize_t) sizeof (ecma_char_t) * (input_str_len + 1);
84+
ssize_t zt_str_size = (ssize_t) (sizeof (ecma_char_t) * (input_str_len + 1));
8585
ecma_string_to_zt_string (input_str_p, input_zt_str_p, zt_str_size);
8686

8787
ret_value = ecma_regexp_exec_helper (obj_p, bytecode_p, input_zt_str_p);

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ ecma_builtin_string_prototype_object_concat (ecma_value_t this_arg, /**< this ar
163163
/* 4 */
164164
ecma_string_t *string_to_return = ecma_copy_or_ref_ecma_string (ecma_get_string_from_value (to_string_val));
165165

166-
JERRY_ASSERT (ecma_string_get_length (string_to_return) >= 0);
167-
168166
/* 5 */
169167
for (uint32_t arg_index = 0;
170168
arg_index < arguments_number && ecma_is_completion_value_empty (ret_value);
@@ -329,8 +327,6 @@ ecma_builtin_string_prototype_object_slice (ecma_value_t this_arg, /**< this arg
329327
/* 3. */
330328
ecma_string_t *get_string_val = ecma_get_string_from_value (to_string_val);
331329

332-
JERRY_ASSERT (ecma_string_get_length (get_string_val) >= 0);
333-
334330
const uint32_t len = (uint32_t) ecma_string_get_length (get_string_val);
335331

336332
/* 4. 6. */
@@ -509,7 +505,6 @@ ecma_builtin_string_prototype_object_trim (ecma_value_t this_arg) /**< this argu
509505
ret_value);
510506

511507
ecma_string_t *original_string_p = ecma_get_string_from_value (to_string_val);
512-
JERRY_ASSERT (ecma_string_get_length (original_string_p) >= 0);
513508

514509
/* 3 */
515510
const uint32_t len = (uint32_t) ecma_string_get_length (original_string_p);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ ecma_builtin_bin_search_for_magic_string_id_in_array (const lit_magic_string_id_
601601
#endif /* !JERRY_NDEBUG */
602602

603603
int32_t min = 0;
604-
int32_t max = array_length - 1;
604+
int32_t max = (int32_t) array_length - 1;
605605

606606
while (min <= max)
607607
{

‎jerry-core/ecma/operations/ecma-eval.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ ecma_op_eval (ecma_string_t *code_p, /**< code string */
4646
{
4747
ecma_completion_value_t ret_value;
4848

49-
int32_t chars_num = ecma_string_get_length (code_p);
49+
ecma_length_t chars_num = ecma_string_get_length (code_p);
5050
MEM_DEFINE_LOCAL_ARRAY (code_zt_buffer_p,
5151
chars_num + 1,
5252
ecma_char_t);
5353

54-
const ssize_t buf_size = (ssize_t) sizeof (ecma_char_t) * (chars_num + 1);
54+
const ssize_t buf_size = (ssize_t) (sizeof (ecma_char_t) * (chars_num + 1));
5555
ssize_t buffer_size_req = ecma_string_to_zt_string (code_p,
5656
code_zt_buffer_p,
5757
buf_size);

0 commit comments

Comments
 (0)