Skip to content

Improve the dumping of literals #959

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
Mar 11, 2016
Merged

Improve the dumping of literals #959

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
28 changes: 15 additions & 13 deletions jerry-core/lit/lit-literal-storage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd.
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
* Copyright 2015-2016 University of Szeged
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -178,6 +178,7 @@ lit_count_literals ()
return num;
} /* lit_count_literals */

#ifdef JERRY_ENABLE_LOG
/**
* Dump the contents of the literal storage.
*/
Expand All @@ -187,14 +188,14 @@ lit_dump_literals ()
lit_record_t *rec_p;
size_t i;

printf ("LITERALS:\n");
JERRY_DLOG ("LITERALS:\n");

for (rec_p = lit_storage;
rec_p != NULL;
rec_p = lit_cpointer_decompress (rec_p->next))
{
printf ("%p ", rec_p);
printf ("[%3zu] ", lit_get_literal_size (rec_p));
JERRY_DLOG ("%p ", rec_p);
JERRY_DLOG ("[%3zu] ", lit_get_literal_size (rec_p));

switch (rec_p->type)
{
Expand All @@ -206,26 +207,26 @@ lit_dump_literals ()
{
FIXME ("Support proper printing of characters which occupy more than one byte.")

printf ("%c", *str);
JERRY_DLOG ("%c", *str);
}

printf (" : STRING");
JERRY_DLOG (" : STRING");

break;
}
case LIT_RECORD_TYPE_MAGIC_STR:
{
lit_magic_string_id_t id = (lit_magic_string_id_t) ((lit_magic_record_t *) rec_p)->magic_id;
printf ("%s : MAGIC STRING", lit_get_magic_string_utf8 (id));
printf (" [id=%d] ", id);
JERRY_DLOG ("%s : MAGIC STRING", lit_get_magic_string_utf8 (id));
JERRY_DLOG (" [id=%d] ", id);

break;
}
case LIT_RECORD_TYPE_MAGIC_STR_EX:
{
lit_magic_string_ex_id_t id = ((lit_magic_record_t *) rec_p)->magic_id;
printf ("%s : EXT MAGIC STRING", lit_get_magic_string_ex_utf8 (id));
printf (" [id=%d] ", id);
JERRY_DLOG ("%s : EXT MAGIC STRING", lit_get_magic_string_ex_utf8 (id));
JERRY_DLOG (" [id=%d] ", id);

break;
}
Expand All @@ -237,7 +238,7 @@ lit_dump_literals ()

if (ecma_number_is_nan (value))
{
printf ("%s : NUMBER", "NaN");
JERRY_DLOG ("%s : NUMBER", "NaN");
}
else
{
Expand All @@ -247,7 +248,7 @@ lit_dump_literals ()
lit_utf8_size_t sz = ecma_number_to_utf8_string (value, buff, sizeof (buff));
JERRY_ASSERT (sz <= ECMA_MAX_CHARS_IN_STRINGIFIED_NUMBER);

printf ("%s : NUMBER", buff);
JERRY_DLOG ("%s : NUMBER", buff);
}

break;
Expand All @@ -258,6 +259,7 @@ lit_dump_literals ()
}
}

printf ("\n");
JERRY_DLOG ("\n");
}
} /* lit_dump_literals */
#endif /* JERRY_ENABLE_LOG */
5 changes: 4 additions & 1 deletion jerry-core/lit/lit-literal-storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd.
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
* Copyright 2015-2016 University of Szeged
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -93,7 +93,10 @@ extern lit_record_t *lit_free_literal (lit_record_t *);
extern size_t lit_get_literal_size (const lit_record_t *);

extern uint32_t lit_count_literals ();

#ifdef JERRY_ENABLE_LOG
extern void lit_dump_literals ();
#endif /* JERRY_ENABLE_LOG */

#define LIT_RECORD_IS_CHARSET(lit) (((lit_record_t *) lit)->type == LIT_RECORD_TYPE_CHARSET)
#define LIT_RECORD_IS_MAGIC_STR(lit) (((lit_record_t *) lit)->type == LIT_RECORD_TYPE_MAGIC_STR)
Expand Down
6 changes: 5 additions & 1 deletion jerry-core/lit/lit-literal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd.
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
* Copyright 2016 University of Szeged.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -37,6 +37,10 @@ lit_init (void)
void
lit_finalize (void)
{
#ifdef JERRY_ENABLE_LOG
lit_dump_literals ();
#endif /* JERRY_ENABLE_LOG */

while (lit_storage)
{
lit_storage = lit_free_literal (lit_storage);
Expand Down
1 change: 0 additions & 1 deletion jerry-core/lit/lit-literal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

extern void lit_init ();
extern void lit_finalize ();
extern void lit_dump_literals ();

extern lit_literal_t lit_create_literal_from_utf8_string (const lit_utf8_byte_t *, lit_utf8_size_t);
extern lit_literal_t lit_find_literal_by_utf8_string (const lit_utf8_byte_t *, lit_utf8_size_t);
Expand Down