archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Improve the dumping of literals

Browse Source 
* Guard `lit_dump_literals` with `JERRY_ENABLE_LOG` (both in source
  and in header).
* Change `printf`s to `JERRY_DLOG`.
* Make `lit_dump_literals` be called in `lit_finalize` (it was dead
  code).
* Remove its duplicate declaration from lit-literal.h

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
Akos Kiss 2016-03-10 18:54:40 +01:00
parent c82caa7f3c
commit a9c77b49ee
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jerry-core/lit/lit-literal-storage.c
View File

@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd. /* Copyright 2015-2016 Samsung Electronics Co., Ltd.
* Copyright 2015-2016 University of Szeged * Copyright 2015-2016 University of Szeged
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -178,6 +178,7 @@ lit_count_literals ()
return num; return num;
} /* lit_count_literals */ } /* lit_count_literals */
#ifdef JERRY_ENABLE_LOG
/** /**
* Dump the contents of the literal storage. * Dump the contents of the literal storage.
*/ */
@ -187,14 +188,14 @@ lit_dump_literals ()
lit_record_t *rec_p; lit_record_t *rec_p;
size_t i; size_t i;
printf ("LITERALS:\n"); JERRY_DLOG ("LITERALS:\n");
for (rec_p = lit_storage; for (rec_p = lit_storage;
rec_p != NULL; rec_p != NULL;
rec_p = lit_cpointer_decompress (rec_p->next)) rec_p = lit_cpointer_decompress (rec_p->next))
{ {
printf ("%p ", rec_p); JERRY_DLOG ("%p ", rec_p);
printf ("[%3zu] ", lit_get_literal_size (rec_p)); JERRY_DLOG ("[%3zu] ", lit_get_literal_size (rec_p));
switch (rec_p->type) switch (rec_p->type)
{ {
@ -206,26 +207,26 @@ lit_dump_literals ()
{ {
FIXME ("Support proper printing of characters which occupy more than one byte.") 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; break;
} }
case LIT_RECORD_TYPE_MAGIC_STR: 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; 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)); JERRY_DLOG ("%s : MAGIC STRING", lit_get_magic_string_utf8 (id));
printf (" [id=%d] ", id); JERRY_DLOG (" [id=%d] ", id);
break; break;
} }
case LIT_RECORD_TYPE_MAGIC_STR_EX: case LIT_RECORD_TYPE_MAGIC_STR_EX:
{ {
lit_magic_string_ex_id_t id = ((lit_magic_record_t *) rec_p)->magic_id; 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)); JERRY_DLOG ("%s : EXT MAGIC STRING", lit_get_magic_string_ex_utf8 (id));
printf (" [id=%d] ", id); JERRY_DLOG (" [id=%d] ", id);
break; break;
} }
@ -237,7 +238,7 @@ lit_dump_literals ()
if (ecma_number_is_nan (value)) if (ecma_number_is_nan (value))
{ {
printf ("%s : NUMBER", "NaN"); JERRY_DLOG ("%s : NUMBER", "NaN");
} }
else else
{ {
@ -247,7 +248,7 @@ lit_dump_literals ()
lit_utf8_size_t sz = ecma_number_to_utf8_string (value, buff, sizeof (buff)); lit_utf8_size_t sz = ecma_number_to_utf8_string (value, buff, sizeof (buff));
JERRY_ASSERT (sz <= ECMA_MAX_CHARS_IN_STRINGIFIED_NUMBER); JERRY_ASSERT (sz <= ECMA_MAX_CHARS_IN_STRINGIFIED_NUMBER);
printf ("%s : NUMBER", buff); JERRY_DLOG ("%s : NUMBER", buff);
} }
break; break;
@ -258,6 +259,7 @@ lit_dump_literals ()
} }
} }
printf ("\n"); JERRY_DLOG ("\n");
} }
} /* lit_dump_literals */ } /* lit_dump_literals */
#endif /* JERRY_ENABLE_LOG */

5
jerry-core/lit/lit-literal-storage.h
View File

@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd. /* Copyright 2015-2016 Samsung Electronics Co., Ltd.
* Copyright 2015-2016 University of Szeged * Copyright 2015-2016 University of Szeged
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -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 size_t lit_get_literal_size (const lit_record_t *);
extern uint32_t lit_count_literals (); extern uint32_t lit_count_literals ();
#ifdef JERRY_ENABLE_LOG
extern void lit_dump_literals (); 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_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) #define LIT_RECORD_IS_MAGIC_STR(lit) (((lit_record_t *) lit)->type == LIT_RECORD_TYPE_MAGIC_STR)

6
jerry-core/lit/lit-literal.c
View File

@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd. /* Copyright 2015-2016 Samsung Electronics Co., Ltd.
* Copyright 2016 University of Szeged. * Copyright 2016 University of Szeged.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -37,6 +37,10 @@ lit_init (void)
void void
lit_finalize (void) lit_finalize (void)
{ {
#ifdef JERRY_ENABLE_LOG
lit_dump_literals ();
#endif /* JERRY_ENABLE_LOG */
while (lit_storage) while (lit_storage)
{ {
lit_storage = lit_free_literal (lit_storage); lit_storage = lit_free_literal (lit_storage);

1
jerry-core/lit/lit-literal.h
View File

@ -29,7 +29,6 @@
extern void lit_init (); extern void lit_init ();
extern void lit_finalize (); 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_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); extern lit_literal_t lit_find_literal_by_utf8_string (const lit_utf8_byte_t *, lit_utf8_size_t);