Skip to content

Commit

Permalink
jerry: implement source info and remove function_name feature (#390)
Browse files Browse the repository at this point in the history
  • Loading branch information
@algebrait @yorkie
algebrait authored and yorkie committed Nov 8, 2018
1 parent 22d99f2 commit b2282e9
Show file tree
Hide file tree
Showing 46 changed files with 484 additions and 577 deletions.
8 changes: 0 additions & 8 deletions CMakeLists.txt
View file
Expand Up @@ -60,14 +60,6 @@ endif()

set(FEATURE_PROFILE ${CMAKE_CURRENT_SOURCE_DIR}/profiles/jerry/default.profile)

if(FEATURE_CPU_PROFILER)
set(FEATURE_FUNCTION_NAME ON)
endif()

if(FEATURE_HEAP_PROFILER)
set(FEATURE_FUNCTION_NAME ON)
endif()

macro(iotjs_add_flags VAR)
foreach(_flag ${ARGN})
set(${VAR} "${${VAR}} ${_flag}")
Expand Down
1 change: 0 additions & 1 deletion build.config
View file
Expand Up @@ -14,7 +14,6 @@
"jerry-link-flag": [],
"jerry-lto": false,
"jerry-memstat": false,
"jerry-function-name": false,
"link-flag": [],
"no-check-tidy": false,
"no-check-test": false,
Expand Down
1 change: 0 additions & 1 deletion cmake/iotjs.cmake
View file
Expand Up @@ -390,7 +390,6 @@ message(STATUS "IOTJS_PROFILE ${IOTJS_PROFILE}")
message(STATUS "JERRY_DEBUGGER ${FEATURE_DEBUGGER}")
message(STATUS "JERRY_HEAP_SIZE_KB ${MEM_HEAP_SIZE_KB}")
message(STATUS "JERRY_MEM_STATS ${FEATURE_MEM_STATS}")
message(STATUS "JERRY_FUNCTION_NAME ${FEATURE_FUNCTION_NAME}")
message(STATUS "JERRY_PROFILE ${FEATURE_PROFILE}")
message(STATUS "PLATFORM_DESCRIPTOR ${PLATFORM_DESCRIPTOR}")
message(STATUS "TARGET_ARCH ${TARGET_ARCH}")
Expand Down
2 changes: 0 additions & 2 deletions cmake/jerry.cmake
View file
Expand Up @@ -35,7 +35,6 @@ ExternalProject_Add(hostjerry
-DJERRY_EXT=OFF
-DFEATURE_SNAPSHOT_SAVE=${ENABLE_SNAPSHOT}
-DFEATURE_PROFILE=${FEATURE_PROFILE}
-DFEATURE_FUNCTION_NAME=${FEATURE_FUNCTION_NAME}
)
set(JERRY_HOST_SNAPSHOT
${CMAKE_BINARY_DIR}/${DEPS_HOST_JERRY}/bin/jerry-snapshot)
Expand Down Expand Up @@ -107,7 +106,6 @@ add_cmake_arg(DEPS_LIB_JERRY_ARGS ENABLE_LTO)
add_cmake_arg(DEPS_LIB_JERRY_ARGS FEATURE_MEM_STATS)
add_cmake_arg(DEPS_LIB_JERRY_ARGS FEATURE_CPU_PROFILER)
add_cmake_arg(DEPS_LIB_JERRY_ARGS FEATURE_HEAP_PROFILER)
add_cmake_arg(DEPS_LIB_JERRY_ARGS FEATURE_FUNCTION_NAME)
add_cmake_arg(DEPS_LIB_JERRY_ARGS FEATURE_ERROR_MESSAGES)
add_cmake_arg(DEPS_LIB_JERRY_ARGS FEATURE_DEBUGGER)
add_cmake_arg(DEPS_LIB_JERRY_ARGS MEM_HEAP_SIZE_KB)
Expand Down
36 changes: 25 additions & 11 deletions deps/jerry/docs/02.API-REFERENCE.md
View file
Expand Up @@ -727,7 +727,7 @@ main (void)
const jerry_char_t script[] = "print ('Hello, World!');";
size_t script_size = strlen ((const char *) script);

jerry_value_t parsed_code = jerry_parse (script, script_size, false);
jerry_value_t parsed_code = jerry_parse (NULL, 0, script, script_size, false);
jerry_release_value (parsed_code);

jerry_cleanup ();
Expand Down Expand Up @@ -848,7 +848,7 @@ main (void)
jerry_init (JERRY_INIT_EMPTY);

/* Setup Global scope code */
jerry_value_t parsed_code = jerry_parse (script, script_size, false);
jerry_value_t parsed_code = jerry_parse (NULL, 0, script, script_size, false);

if (!jerry_value_has_error_flag (parsed_code))
{
Expand Down Expand Up @@ -938,7 +938,7 @@ main (void)
const jerry_char_t script[] = "new Promise(function(f,r) { f('Hello, World!'); }).then(function(x) { print(x); });";
size_t script_size = strlen ((const char *) script);

jerry_value_t parsed_code = jerry_parse (script, script_size, false);
jerry_value_t parsed_code = jerry_parse (NULL, 0, script, script_size, false);
jerry_value_t script_value = jerry_run (parsed_code);
jerry_value_t job_value = jerry_run_all_enqueued_jobs ();

Expand Down Expand Up @@ -4720,7 +4720,9 @@ main (void)
static uint32_t global_mode_snapshot_buffer[256];
const jerry_char_t *code_to_snapshot_p = (const jerry_char_t *) "(function () { return 'string from snapshot'; }) ();";

size_t global_mode_snapshot_size = jerry_parse_and_save_snapshot (code_to_snapshot_p,
size_t global_mode_snapshot_size = jerry_parse_and_save_snapshot (NULL,
0,
code_to_snapshot_p,
strlen ((const char *) code_to_snapshot_p),
true,
false,
Expand Down Expand Up @@ -4790,7 +4792,9 @@ main (void)
static uint32_t global_mode_snapshot_buffer[256];
const jerry_char_t *code_to_snapshot_p = (const jerry_char_t *) "(function () { return 'string'; }) ();";

size_t global_mode_snapshot_size = jerry_parse_and_save_static_snapshot (code_to_snapshot_p,
size_t global_mode_snapshot_size = jerry_parse_and_save_static_snapshot (NULL,
0,
code_to_snapshot_p,
strlen ((const char *) code_to_snapshot_p),
true,
false,
Expand Down Expand Up @@ -4862,7 +4866,9 @@ main (void)
const jerry_char_t *args_p = (const jerry_char_t *) "a, b";
const jerry_char_t *src_p = (const jerry_char_t *) "return a + b;";

size_t func_snapshot_size = jerry_parse_and_save_function_snapshot (src_p,
size_t func_snapshot_size = jerry_parse_and_save_function_snapshot (NULL,
0,
src_p,
strlen ((const char *) src_p),
args_p,
strlen ((const char *) args_p),
Expand Down Expand Up @@ -4937,7 +4943,9 @@ main (void)
const jerry_char_t *args_p = (const jerry_char_t *) "string, bind";
const jerry_char_t *src_p = (const jerry_char_t *) "return bind(string)";

size_t func_snapshot_size = jerry_parse_and_save_static_function_snapshot (src_p,
size_t func_snapshot_size = jerry_parse_and_save_static_function_snapshot (NULL,
0,
src_p,
strlen ((const char *) src_p),
args_p,
strlen ((const char *) args_p),
Expand Down Expand Up @@ -5000,7 +5008,9 @@ main (void)
const jerry_char_t *code_to_snapshot_p = (const jerry_char_t *) "(function () { return 'string from snapshot'; }) ();";

jerry_init (JERRY_INIT_EMPTY);
size_t global_mode_snapshot_size = jerry_parse_and_save_snapshot (code_to_snapshot_p,
size_t global_mode_snapshot_size = jerry_parse_and_save_snapshot (NULL,
0,
code_to_snapshot_p,
strlen ((const char *) code_to_snapshot_p),
true,
false,
Expand Down Expand Up @@ -5075,7 +5085,9 @@ main (void)
const jerry_char_t *code_to_snapshot_p = (const jerry_char_t *) "(function () { return 'string from snapshot'; }) ();";

jerry_init (JERRY_INIT_EMPTY);
size_t global_mode_snapshot_size = jerry_parse_and_save_snapshot (code_to_snapshot_p,
size_t global_mode_snapshot_size = jerry_parse_and_save_snapshot (NULL,
0,
code_to_snapshot_p,
strlen ((const char *) code_to_snapshot_p),
true,
false,
Expand Down Expand Up @@ -5153,7 +5165,9 @@ main (void)
const jerry_char_t *src_p = (const jerry_char_t *) "return a + b;";

jerry_init (JERRY_INIT_EMPTY);
size_t snapshot_size = jerry_parse_and_save_function_snapshot (src_p,
size_t snapshot_size = jerry_parse_and_save_function_snapshot (NULL,
0,
src_p,
strlen ((const char *) src_p),
args_p,
strlen ((const char *) args_p),
Expand Down Expand Up @@ -5337,7 +5351,7 @@ main (void)
// Inifinte loop.
const char *src_p = "while(true) {}";

jerry_value_t src = jerry_parse ((jerry_char_t *) src_p, strlen (src_p), false);
jerry_value_t src = jerry_parse (NULL, 0, (jerry_char_t *) src_p, strlen (src_p), false);
jerry_release_value (jerry_run (src));
jerry_release_value (src);
jerry_cleanup ();
Expand Down
2 changes: 1 addition & 1 deletion deps/jerry/docs/03.API-EXAMPLE.md
View file
Expand Up @@ -55,7 +55,7 @@ main (void)
jerryx_handler_print);
/* Setup Global scope code */
jerry_value_t parsed_code = jerry_parse (script, script_size, false);
jerry_value_t parsed_code = jerry_parse (NULL, 0, script, script_size, false);
if (!jerry_value_has_error_flag (parsed_code))
{
Expand Down
10 changes: 5 additions & 5 deletions deps/jerry/jerry-core/CMakeLists.txt
View file
Expand Up @@ -26,7 +26,7 @@ set(FEATURE_MEM_STATS OFF CACHE BOOL "Enable memory statistics?"
set(FEATURE_MEM_STRESS_TEST OFF CACHE BOOL "Enable mem-stress test?")
set(FEATURE_CPU_PROFILER OFF CACHE BOOL "Enable Cpu profiler?")
set(FEATURE_HEAP_PROFILER OFF CACHE BOOL "Enable Heap profiler?")
set(FEATURE_FUNCTION_NAME OFF CACHE BOOL "Enable saving Javascript function name?")
set(FEATURE_SOURCE_INFO ON CACHE BOOL "Enable saving Javascript source info?")
set(FEATURE_PARSER_DUMP OFF CACHE BOOL "Enable parser byte-code dumps?")
set(FEATURE_PROFILE "es5.1" CACHE STRING "Use default or other profile?")
set(FEATURE_REGEXP_STRICT_MODE OFF CACHE BOOL "Enable regexp strict mode?")
Expand Down Expand Up @@ -70,7 +70,7 @@ message(STATUS "FEATURE_MEM_STATS " ${FEATURE_MEM_STATS})
message(STATUS "FEATURE_MEM_STRESS_TEST " ${FEATURE_MEM_STRESS_TEST})
message(STATUS "FEATURE_CPU_PROFILER " ${FEATURE_CPU_PROFILER})
message(STATUS "FEATURE_HEAP_PROFILER " ${FEATURE_HEAP_PROFILER})
message(STATUS "FEATURE_FUNCTION_NAME " ${FEATURE_FUNCTION_NAME})
message(STATUS "FEATURE_SOURCE_INFO " ${FEATURE_SOURCE_INFO})
message(STATUS "FEATURE_PARSER_DUMP " ${FEATURE_PARSER_DUMP} ${FEATURE_PARSER_DUMP_MESSAGE})
message(STATUS "FEATURE_PROFILE " ${FEATURE_PROFILE})
message(STATUS "FEATURE_REGEXP_STRICT_MODE " ${FEATURE_REGEXP_STRICT_MODE})
Expand Down Expand Up @@ -198,9 +198,9 @@ if (FEATURE_HEAP_PROFILER)
set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_HEAP_PROFILER)
endif()

# Save function name
if(FEATURE_FUNCTION_NAME)
set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_FUNCTION_NAME)
# Source info
if(FEATURE_SOURCE_INFO)
set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_SOURCE_INFO)
endif()

# Enable debugger
Expand Down

0 comments on commit b2282e9

Please sign in to comment.