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

Refactoring of the ESP8266 target code to match the latest API.

Browse Source 
Fixes issue #1211.

JerryScript-DCO-1.0-Signed-off-by: Slavey Karadzhov slaff@attachix.com
This commit is contained in:
Slavey Karadzhov
2016-07-17 12:47:15 +02:00
parent 76d42b5e8e
commit 23db8b5544
5 changed files with 111 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/esp8266/source/jerry_run.c
+47 -51
View File
@@ -16,39 +16,33 @@
#include <stdlib.h>
#include <stdio.h>
#include "jerry-core/jerry.h"
#include "jerry-core/jerry-api.h"
#include "jerry_extapi.h"
#include "jerry_run.h"
static const char* fn_sys_loop_name = "sysloop";
jerry_value_t parsed_res;
/*---------------------------------------------------------------------------*/
int js_entry (const char *source_p, const size_t source_size)
{
const jerry_api_char_t *jerry_src = (const jerry_api_char_t *) source_p;
jerry_completion_code_t ret_code = JERRY_COMPLETION_CODE_OK;
jerry_flag_t flags = JERRY_FLAG_EMPTY;
jerry_api_object_t *err_obj_p = NULL;
const jerry_char_t *jerry_src = (const jerry_char_t *) source_p;
int ret_code = 0; /* JERRY_COMPLETION_CODE_OK */
jerry_init_flag_t flags = JERRY_INIT_EMPTY;
jerry_init (flags);
js_register_functions ();
if (!jerry_parse ((jerry_api_char_t *)jerry_src, source_size, &err_obj_p))
parsed_res = jerry_parse ((jerry_char_t *) jerry_src, source_size, false);
if (jerry_value_has_error_flag (parsed_res))
{
printf ("Error: jerry_parse failed\r\n");
ret_code = JERRY_COMPLETION_CODE_UNHANDLED_EXCEPTION;
}
else
{
if ((flags & JERRY_FLAG_PARSE_ONLY) == 0)
{
jerry_api_value_t err_value = jerry_api_create_void_value ();
ret_code = jerry_run (&err_value);
}
ret_code = JERRY_ERROR_SYNTAX;
}
return ret_code;
@@ -56,65 +50,67 @@ int js_entry (const char *source_p, const size_t source_size)
int js_eval (const char *source_p, const size_t source_size)
{
jerry_completion_code_t status;
jerry_api_value_t res;
int status = 0;
jerry_value_t res;
status = jerry_api_eval ((jerry_api_char_t *) source_p,
res = jerry_eval ((jerry_char_t *) source_p,
source_size,
false,
false,
&res);
false);
if (jerry_value_has_error_flag (res)) {
status = -1;
}
jerry_api_release_value (&res);
jerry_release_value (res);
return status;
}
int js_loop (uint32_t ticknow)
{
jerry_api_object_t *global_obj_p;
jerry_api_value_t sysloop_func;
jerry_api_value_t* val_args;
jerry_value_t global_obj_val;
jerry_value_t sysloop_func;
jerry_value_t val_args[1];
uint16_t val_argv;
jerry_api_value_t res;
bool is_ok;
jerry_value_t res;
jerry_value_t prop_name_val;
int ret_code = 0;
global_obj_p = jerry_api_get_global ();
is_ok = jerry_api_get_object_field_value (global_obj_p,
(const jerry_api_char_t*)fn_sys_loop_name,
&sysloop_func);
if (!is_ok)
{
global_obj_val = jerry_get_global_object ();
prop_name_val = jerry_create_string ((const jerry_char_t *) fn_sys_loop_name);
sysloop_func = jerry_get_property (global_obj_val, prop_name_val);
jerry_release_value (prop_name_val);
if (jerry_value_has_error_flag (sysloop_func)) {
printf ("Error: '%s' not defined!!!\r\n", fn_sys_loop_name);
jerry_api_release_object (global_obj_p);
jerry_release_value (sysloop_func);
jerry_release_value (global_obj_val);
return -1;
}
if (!API_DATA_IS_FUNCTION (&sysloop_func))
{
if (!jerry_value_is_function (sysloop_func)) {
printf ("Error: '%s' is not a function!!!\r\n", fn_sys_loop_name);
jerry_api_release_value (&sysloop_func);
jerry_api_release_object (global_obj_p);
jerry_release_value (sysloop_func);
jerry_release_value (global_obj_val);
return -2;
}
val_argv = 1;
val_args = (jerry_api_value_t*)malloc (sizeof (jerry_api_value_t) * val_argv);
val_args[0].type = JERRY_API_DATA_TYPE_UINT32;
val_args[0].u.v_uint32 = ticknow;
val_args[0] = jerry_create_number (ticknow);
is_ok = jerry_api_call_function (sysloop_func.u.v_object,
global_obj_p,
&res,
val_args,
val_argv);
jerry_api_release_value (&res);
free (val_args);
res = jerry_call_function (sysloop_func,
global_obj_val,
val_args,
val_argv);
jerry_api_release_value (&sysloop_func);
jerry_api_release_object (global_obj_p);
if (jerry_value_has_error_flag (res)) {
ret_code = -3;
}
return 0;
jerry_release_value (res);
jerry_release_value (sysloop_func);
jerry_release_value (global_obj_val);
return ret_code;
}
void js_exit (void)