Skip to content

Optimize 'lit_get_magic_string_size' calls #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2016
Merged

Optimize 'lit_get_magic_string_size' calls #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion jerry-core/lit/lit-literal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ lit_init (void)

rcs_chunked_list_init (&rcs_lit_storage);

lit_magic_strings_init ();
lit_magic_strings_ex_init ();
} /* lit_init */

Expand Down
53 changes: 11 additions & 42 deletions jerry-core/lit/lit-magic-strings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,51 +17,13 @@

#include "lit-strings.h"

/**
* Lengths of magic strings
*/
static lit_magic_size_t lit_magic_string_sizes[LIT_MAGIC_STRING__COUNT];

/**
* External magic strings data array, count and lengths
*/
static const lit_utf8_byte_t **lit_magic_string_ex_array = NULL;
static uint32_t lit_magic_string_ex_count = 0;
static const lit_utf8_size_t *lit_magic_string_ex_sizes = NULL;

#ifndef JERRY_NDEBUG
/**
* Maximum length among lengths of magic strings
*/
static ecma_length_t ecma_magic_string_max_length;
#endif /* JERRY_NDEBUG */

/**
* Initialize data for string helpers
*/
void
lit_magic_strings_init (void)
{
/* Initializing magic strings information */

#ifndef JERRY_NDEBUG
ecma_magic_string_max_length = 0;
#endif /* !JERRY_NDEBUG */

for (lit_magic_string_id_t id = (lit_magic_string_id_t) 0;
id < LIT_MAGIC_STRING__COUNT;
id = (lit_magic_string_id_t) (id + 1))
{
lit_magic_string_sizes[id] = (lit_magic_size_t) lit_zt_utf8_string_size (lit_get_magic_string_utf8 (id));

#ifndef JERRY_NDEBUG
ecma_magic_string_max_length = JERRY_MAX (ecma_magic_string_max_length, lit_magic_string_sizes[id]);

JERRY_ASSERT (ecma_magic_string_max_length <= LIT_MAGIC_STRING_LENGTH_LIMIT);
#endif /* !JERRY_NDEBUG */
}
} /* lit_magic_strings_init */

/**
* Initialize external magic strings
*/
Expand Down Expand Up @@ -114,6 +76,16 @@ lit_get_magic_string_utf8 (lit_magic_string_id_t id) /**< magic string id */
lit_utf8_size_t
lit_get_magic_string_size (lit_magic_string_id_t id) /**< magic string id */
{
static const lit_magic_size_t lit_magic_string_sizes[] =
{
#define LIT_MAGIC_STRING_DEF(id, utf8_string) \
sizeof(utf8_string) - 1,
#include "lit-magic-strings.inc.h"
#undef LIT_MAGIC_STRING_DEF
};

JERRY_ASSERT (id < LIT_MAGIC_STRING__COUNT);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removed lit_magic_strings_init initialized the ecma_magic_string_max_length global variable (in debug build; and the var is only declared in debug builds). However, this replacement leaves that variable uninitialized. I guess that it would not be that simple to calculate the max length at compile time, but then the var should be removed and all the code that depends on it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't notice that global variable. All the tests passed, so I think we should remove that variable.

return lit_magic_string_sizes[id];
} /* lit_get_magic_string_size */

Expand Down Expand Up @@ -172,10 +144,7 @@ lit_magic_strings_ex_set (const lit_utf8_byte_t **ex_str_items, /**< character a
id = (lit_magic_string_ex_id_t) (id + 1))
{
JERRY_ASSERT (lit_magic_string_ex_sizes[id] == lit_zt_utf8_string_size (lit_get_magic_string_ex_utf8 (id)));

ecma_magic_string_max_length = JERRY_MAX (ecma_magic_string_max_length, lit_magic_string_ex_sizes[id]);

JERRY_ASSERT (ecma_magic_string_max_length <= LIT_MAGIC_STRING_LENGTH_LIMIT);
JERRY_ASSERT (lit_magic_string_ex_sizes[id] <= LIT_MAGIC_STRING_LENGTH_LIMIT);
}
#endif /* !JERRY_NDEBUG */
} /* lit_magic_strings_ex_set */
Expand Down
1 change: 0 additions & 1 deletion jerry-core/lit/lit-magic-strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ typedef enum
*/
typedef uint32_t lit_magic_string_ex_id_t;

extern void lit_magic_strings_init (void);
extern void lit_magic_strings_ex_init (void);

extern uint32_t lit_get_magic_string_ex_count (void);
Expand Down