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

Support external context in the snapshot tool (#2870)

Browse Source 
This patch fixes #2869.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2019-05-13 16:07:39 +02:00
committed by László Langó
parent 4331e39b9a
commit 76a1fc5674
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-main/main-unix-snapshot.c
+29
View File
@@ -46,6 +46,20 @@ static const char *output_file_name_p = "js.snapshot";
static jerry_length_t magic_string_lengths[JERRY_LITERAL_LENGTH];
static const jerry_char_t *magic_string_items[JERRY_LITERAL_LENGTH];
#ifdef JERRY_ENABLE_EXTERNAL_CONTEXT
/**
* The alloc function passed to jerry_create_context
*/
static void *
context_alloc (size_t size,
void *cb_data_p)
{
(void) cb_data_p; /* unused */
return malloc (size);
} /* context_alloc */
#endif /* JERRY_ENABLE_EXTERNAL_CONTEXT */
/**
* Check whether JerryScript has a requested feature enabled or not. If not,
* print a warning message.
@@ -294,6 +308,11 @@ process_generate (cli_state_t *cli_state_p, /**< cli state */
return JERRY_STANDALONE_EXIT_CODE_FAIL;
}
#ifdef JERRY_ENABLE_EXTERNAL_CONTEXT
jerry_context_t *context_p = jerry_create_context (CONFIG_MEM_HEAP_AREA_SIZE, context_alloc, NULL);
jerry_port_default_set_current_context (context_p);
#endif /* JERRY_ENABLE_EXTERNAL_CONTEXT */
jerry_init (flags);
if (!jerry_is_valid_utf8_string (source_p, (jerry_size_t) source_length))
@@ -497,6 +516,11 @@ process_literal_dump (cli_state_t *cli_state_p, /**< cli state */
return JERRY_STANDALONE_EXIT_CODE_FAIL;
}
#ifdef JERRY_ENABLE_EXTERNAL_CONTEXT
jerry_context_t *context_p = jerry_create_context (CONFIG_MEM_HEAP_AREA_SIZE, context_alloc, NULL);
jerry_port_default_set_current_context (context_p);
#endif /* JERRY_ENABLE_EXTERNAL_CONTEXT */
jerry_init (JERRY_INIT_EMPTY);
size_t lit_buf_sz = 0;
@@ -661,6 +685,11 @@ process_merge (cli_state_t *cli_state_p, /**< cli state */
return JERRY_STANDALONE_EXIT_CODE_FAIL;
}
#ifdef JERRY_ENABLE_EXTERNAL_CONTEXT
jerry_context_t *context_p = jerry_create_context (CONFIG_MEM_HEAP_AREA_SIZE, context_alloc, NULL);
jerry_port_default_set_current_context (context_p);
#endif /* JERRY_ENABLE_EXTERNAL_CONTEXT */
jerry_init (JERRY_INIT_EMPTY);
const char *error_p = NULL;
jerry-main/main-unix.c
+1 -1
View File
@@ -668,7 +668,7 @@ main (int argc,
#ifdef JERRY_ENABLE_EXTERNAL_CONTEXT
jerry_context_t *context_p = jerry_create_context (512*1024, context_alloc, NULL);
jerry_context_t *context_p = jerry_create_context (CONFIG_MEM_HEAP_AREA_SIZE, context_alloc, NULL);
jerry_port_default_set_current_context (context_p);
#endif /* JERRY_ENABLE_EXTERNAL_CONTEXT */