From d327bf56826ef22e48f63a9f645d9908cb347afb Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Thu, 31 Jul 2014 17:49:16 +0400 Subject: [PATCH 1/4] Fixing ecma_compare_zt_string_to_ecma_string routine. --- src/libecmaobjects/ecma-globals.h | 2 +- src/libecmaobjects/ecma-helpers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libecmaobjects/ecma-globals.h b/src/libecmaobjects/ecma-globals.h index 3b6cf5e4e..7646eee17 100644 --- a/src/libecmaobjects/ecma-globals.h +++ b/src/libecmaobjects/ecma-globals.h @@ -457,7 +457,7 @@ typedef struct { /** * Size of a chunk, containing a String's part, in bytes */ -#define ECMA_ARRAY_CHUNK_SIZE_IN_BYTES 32 +#define ECMA_ARRAY_CHUNK_SIZE_IN_BYTES 8 /** * Description of first chunk in a chain of chunks that contains an Array. diff --git a/src/libecmaobjects/ecma-helpers.c b/src/libecmaobjects/ecma-helpers.c index 65c5352ce..0721149c8 100644 --- a/src/libecmaobjects/ecma-helpers.c +++ b/src/libecmaobjects/ecma-helpers.c @@ -732,7 +732,7 @@ ecma_compare_zt_string_to_ecma_string(const ecma_char_t *string_p, /**< zero-ter JERRY_ASSERT( next_chunk_p != NULL ); - current_chunk_chars_cur = (const ecma_char_t*) ecma_string_p->data; + current_chunk_chars_cur = (const ecma_char_t*) next_chunk_p->data; current_chunk_chars_end = (const ecma_char_t*) (next_chunk_p->data + sizeof(next_chunk_p->data)); next_chunk_compressed_pointer_p = &next_chunk_p->next_chunk_p; From 9fd708eabebf4a6679fe7def702c685e950b85c8 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Thu, 31 Jul 2014 17:51:40 +0400 Subject: [PATCH 2/4] Revert "Fixing ecma_compare_zt_string_to_ecma_string routine." This reverts commit c6e955aa2b231076b3ec70c55b38084afb4d01d2. --- src/libecmaobjects/ecma-globals.h | 2 +- src/libecmaobjects/ecma-helpers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libecmaobjects/ecma-globals.h b/src/libecmaobjects/ecma-globals.h index 7646eee17..3b6cf5e4e 100644 --- a/src/libecmaobjects/ecma-globals.h +++ b/src/libecmaobjects/ecma-globals.h @@ -457,7 +457,7 @@ typedef struct { /** * Size of a chunk, containing a String's part, in bytes */ -#define ECMA_ARRAY_CHUNK_SIZE_IN_BYTES 8 +#define ECMA_ARRAY_CHUNK_SIZE_IN_BYTES 32 /** * Description of first chunk in a chain of chunks that contains an Array. diff --git a/src/libecmaobjects/ecma-helpers.c b/src/libecmaobjects/ecma-helpers.c index 0721149c8..65c5352ce 100644 --- a/src/libecmaobjects/ecma-helpers.c +++ b/src/libecmaobjects/ecma-helpers.c @@ -732,7 +732,7 @@ ecma_compare_zt_string_to_ecma_string(const ecma_char_t *string_p, /**< zero-ter JERRY_ASSERT( next_chunk_p != NULL ); - current_chunk_chars_cur = (const ecma_char_t*) next_chunk_p->data; + current_chunk_chars_cur = (const ecma_char_t*) ecma_string_p->data; current_chunk_chars_end = (const ecma_char_t*) (next_chunk_p->data + sizeof(next_chunk_p->data)); next_chunk_compressed_pointer_p = &next_chunk_p->next_chunk_p; From 4d7f14d059acb2b00d125739166fdd07112933c1 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Thu, 31 Jul 2014 17:52:10 +0400 Subject: [PATCH 3/4] Fixing ecma_compare_zt_string_to_ecma_string routine. --- src/libecmaobjects/ecma-helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libecmaobjects/ecma-helpers.c b/src/libecmaobjects/ecma-helpers.c index 65c5352ce..0721149c8 100644 --- a/src/libecmaobjects/ecma-helpers.c +++ b/src/libecmaobjects/ecma-helpers.c @@ -732,7 +732,7 @@ ecma_compare_zt_string_to_ecma_string(const ecma_char_t *string_p, /**< zero-ter JERRY_ASSERT( next_chunk_p != NULL ); - current_chunk_chars_cur = (const ecma_char_t*) ecma_string_p->data; + current_chunk_chars_cur = (const ecma_char_t*) next_chunk_p->data; current_chunk_chars_end = (const ecma_char_t*) (next_chunk_p->data + sizeof(next_chunk_p->data)); next_chunk_compressed_pointer_p = &next_chunk_p->next_chunk_p; From f17763362232c0678e2123a8c12fa27636a33a65 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Thu, 31 Jul 2014 17:53:07 +0400 Subject: [PATCH 4/4] Decreasing array chunk size to 8 bytes. --- src/libecmaobjects/ecma-globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libecmaobjects/ecma-globals.h b/src/libecmaobjects/ecma-globals.h index 3b6cf5e4e..7646eee17 100644 --- a/src/libecmaobjects/ecma-globals.h +++ b/src/libecmaobjects/ecma-globals.h @@ -457,7 +457,7 @@ typedef struct { /** * Size of a chunk, containing a String's part, in bytes */ -#define ECMA_ARRAY_CHUNK_SIZE_IN_BYTES 32 +#define ECMA_ARRAY_CHUNK_SIZE_IN_BYTES 8 /** * Description of first chunk in a chain of chunks that contains an Array.