YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #625 from lemmaa/master

Browse Source 
Fix MEM_STATS build configuration.
This commit is contained in:
Sung-Jae Lee
2015-09-16 19:38:35 +09:00
parent 311cc65b33 86e690ce72
commit da8ae6523b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/jerry.cpp
+7 -9
View File
@@ -1330,7 +1330,7 @@ jerry_init (jerry_flag_t flags) /**< combination of Jerry flags */
#endif /* !JERRY_ENABLE_LOG */
}
if (flags & (JERRY_FLAG_MEM_STATS))
if (flags & (JERRY_FLAG_MEM_STATS | JERRY_FLAG_MEM_STATS_PER_OPCODE | JERRY_FLAG_MEM_STATS_SEPARATE))
{
#ifndef MEM_STATS
flags &= ~(JERRY_FLAG_MEM_STATS
@@ -1338,14 +1338,12 @@ jerry_init (jerry_flag_t flags) /**< combination of Jerry flags */
| JERRY_FLAG_MEM_STATS_SEPARATE);
JERRY_WARNING_MSG ("Ignoring memory statistics option because of '!MEM_STATS' build configuration.\n");
#endif /* !MEM_STATS */
}
else if (flags & (JERRY_FLAG_MEM_STATS_PER_OPCODE | JERRY_FLAG_MEM_STATS_SEPARATE))
{
flags &= ~(JERRY_FLAG_MEM_STATS_PER_OPCODE | JERRY_FLAG_MEM_STATS_SEPARATE);
JERRY_WARNING_MSG (
"Ignoring detailed memory statistics options because memory statistics dump mode is not enabled.\n");
#else /* !MEM_STATS */
if (flags & (JERRY_FLAG_MEM_STATS_PER_OPCODE | JERRY_FLAG_MEM_STATS_SEPARATE))
{
flags |= JERRY_FLAG_MEM_STATS;
}
#endif /* MEM_STATS */
}
jerry_flags = flags;