Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions jerry-main/main-options.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ typedef enum
OPT_HELP,
OPT_VERSION,
OPT_MEM_STATS,
OPT_TEST262_OBJECT,
OPT_PARSE_ONLY,
OPT_SHOW_OP,
OPT_SHOW_RE_OP,
Expand Down Expand Up @@ -60,6 +61,8 @@ static const cli_opt_t main_opts[] =
.help = "print tool and library version and exit"),
CLI_OPT_DEF (.id = OPT_MEM_STATS, .longopt = "mem-stats",
.help = "dump memory statistics"),
CLI_OPT_DEF (.id = OPT_TEST262_OBJECT, .longopt = "test262-object",
.help = "create test262 object"),
CLI_OPT_DEF (.id = OPT_PARSE_ONLY, .longopt = "parse-only",
.help = "don't execute JS input"),
CLI_OPT_DEF (.id = OPT_SHOW_OP, .longopt = "show-opcodes",
Expand Down Expand Up @@ -180,6 +183,11 @@ main_parse_args (int argc, /**< argc */
}
break;
}
case OPT_TEST262_OBJECT:
{
arguments_p->option_flags |= OPT_FLAG_TEST262_OBJECT;
break;
}
case OPT_PARSE_ONLY:
{
arguments_p->option_flags |= OPT_FLAG_PARSE_ONLY;
Expand Down
13 changes: 7 additions & 6 deletions jerry-main/main-options.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
*/
typedef enum
{
OPT_FLAG_EMPTY = 0,
OPT_FLAG_PARSE_ONLY = (1 << 0),
OPT_FLAG_DEBUG_SERVER = (1 << 1),
OPT_FLAG_WAIT_SOURCE = (1 << 2),
OPT_FLAG_NO_PROMPT = (1 << 3),
OPT_FLAG_USE_STDIN = (1 << 4),
OPT_FLAG_EMPTY = 0,
OPT_FLAG_PARSE_ONLY = (1 << 0),
OPT_FLAG_DEBUG_SERVER = (1 << 1),
OPT_FLAG_WAIT_SOURCE = (1 << 2),
OPT_FLAG_NO_PROMPT = (1 << 3),
OPT_FLAG_USE_STDIN = (1 << 4),
OPT_FLAG_TEST262_OBJECT = (1u << 5),
} main_option_flags_t;

/**
Expand Down
125 changes: 124 additions & 1 deletion jerry-main/main-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,126 @@ main_register_global_function (const char *name_p, /**< name of the function */
jerry_release_value (result_val);
} /* main_register_global_function */

/**
* Register a method for the $262 object.
*/
static void
test262_register_function (jerry_value_t test262_obj, /** $262 object */
const char *name_p, /**< name of the function */
jerry_external_handler_t handler_p) /**< function callback */
{
jerry_value_t function_name_val = jerry_create_string ((const jerry_char_t *) name_p);
jerry_value_t function_val = jerry_create_external_function (handler_p);

jerry_value_t result_val = jerry_set_property (test262_obj, function_name_val, function_val);

jerry_release_value (function_val);
jerry_release_value (function_name_val);

assert (!jerry_value_is_error (result_val));
jerry_release_value (result_val);
} /* test262_register_function */

/**
* $262.detachArrayBuffer
*
* A function which implements the DetachArrayBuffer abstract operation
*
* @return null value - if success
* value marked with error flag - otherwise
*/
static jerry_value_t
test262_detach_array_buffer (const jerry_value_t func_obj_val, /**< function object */
const jerry_value_t this_p, /**< this arg */
const jerry_value_t args_p[], /**< function arguments */
const jerry_length_t args_cnt) /**< number of function arguments */
{
(void) func_obj_val; /* unused */
(void) this_p; /* unused */

if (args_cnt < 1 || !jerry_value_is_arraybuffer (args_p[0]))
{
return jerry_create_error (JERRY_ERROR_TYPE, (jerry_char_t *) "Expected an ArrayBuffer object");
}

/* TODO: support the optional 'key' argument */

return jerry_detach_arraybuffer (args_p[0]);
} /* test262_detach_array_buffer */

/**
* $262.evalScript
*
* A function which accepts a string value as its first argument and executes it
*
* @return completion of the script parsing and execution.
*/
static jerry_value_t
test262_eval_script (const jerry_value_t func_obj_val, /**< function object */
const jerry_value_t this_p, /**< this arg */
const jerry_value_t args_p[], /**< function arguments */
const jerry_length_t args_cnt) /**< number of function arguments */
{
(void) func_obj_val; /* unused */
(void) this_p; /* unused */

if (args_cnt < 1 || !jerry_value_is_string (args_p[0]))
{
return jerry_create_error (JERRY_ERROR_TYPE, (jerry_char_t *) "Expected a string");
}

jerry_size_t str_size = jerry_get_utf8_string_size (args_p[0]);
jerry_char_t *str_buf_p = malloc (str_size * sizeof (jerry_char_t));

if (str_buf_p == NULL || jerry_string_to_utf8_char_buffer (args_p[0], str_buf_p, str_size) != str_size)
{
free (str_buf_p);
return jerry_create_error (JERRY_ERROR_RANGE, (jerry_char_t *) "Internal error");
}

jerry_value_t ret_value = jerry_parse (NULL, 0, str_buf_p, str_size, JERRY_PARSE_NO_OPTS);

if (!jerry_value_is_error (ret_value))
{
jerry_value_t func_val = ret_value;
ret_value = jerry_run (func_val);
jerry_release_value (func_val);
}

free (str_buf_p);

return ret_value;
} /* test262_eval_script */

/**
* Init the $262 object
*/
static void
register_test262 (void)
{
jerry_value_t global_obj = jerry_get_global_object ();
jerry_value_t test262_object = jerry_create_object ();

test262_register_function (test262_object, "detachArrayBuffer", test262_detach_array_buffer);
test262_register_function (test262_object, "evalScript", test262_eval_script);
test262_register_function (test262_object, "gc", jerryx_handler_gc);

jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) "global");
jerry_value_t result = jerry_set_property (test262_object, prop_name, global_obj);
assert (!jerry_value_is_error (result));
jerry_release_value (prop_name);
jerry_release_value (result);
prop_name = jerry_create_string ((const jerry_char_t *) "$262");
result = jerry_set_property (global_obj, prop_name, test262_object);

jerry_release_value (prop_name);
assert (!jerry_value_is_error (result));

jerry_release_value (global_obj);
jerry_release_value (test262_object);
jerry_release_value (result);
} /* register_test262 */

/**
* Inits the engine and the debugger
*/
Expand Down Expand Up @@ -76,7 +196,10 @@ main_init_engine (main_args_t *arguments_p) /** main arguments */
jerryx_debugger_after_connect (protocol && jerryx_debugger_ws_create ());
}
}

if (arguments_p->option_flags & OPT_FLAG_TEST262_OBJECT)
{
register_test262 ();
}
main_register_global_function ("assert", jerryx_handler_assert);
main_register_global_function ("gc", jerryx_handler_gc);
main_register_global_function ("print", jerryx_handler_print);
Expand Down
Loading