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

Fix ESP8266 build

Browse Source 
This change is to fix build for ESP8266 board with jerry_api_value_t changes.

JerryScript-DCO-1.0-Signed-off-by: SaeHie Park saehie.park@samsung.com
This commit is contained in:
SaeHie Park
2016-05-26 21:57:56 +09:00
parent 36c7440c40
commit ed2a3602f4
7 changed files with 75 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/esp8266/source/jerry_extapi.c
+15 -14
View File
@@ -41,12 +41,12 @@ NAME ## _handler (const jerry_api_object_t * function_obj_p __UNSED__, \
#define REGISTER_HANDLER(NAME) \
register_native_function ( # NAME, NAME ## _handler)
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
DELCARE_HANDLER(assert) {
if (args_cnt == 1
&& args_p[0].type == JERRY_API_DATA_TYPE_BOOLEAN
&& args_p[0].v_bool == true)
&& args_p[0].u.v_bool == true)
{
printf (">> Jerry assert true\r\n");
return true;
@@ -65,13 +65,13 @@ DELCARE_HANDLER(print) {
printf(">> print(%d) :", (int)args_cnt);
for (cc=0; cc<args_cnt; cc++)
{
if (args_p[cc].type == JERRY_API_DATA_TYPE_STRING && args_p[cc].v_string)
if (args_p[cc].type == JERRY_API_DATA_TYPE_STRING && args_p[cc].u.v_string)
{
static char buffer[128];
int length, maxlength;
length = -jerry_api_string_to_char_buffer (args_p[0].v_string, NULL, 0);
jerry_api_size_t length, maxlength;
length = -jerry_api_string_to_char_buffer (args_p[0].u.v_string, NULL, 0);
maxlength = MIN(length, 126);
jerry_api_string_to_char_buffer (args_p[cc].v_string,
jerry_api_string_to_char_buffer (args_p[cc].u.v_string,
(jerry_api_char_t *) buffer,
maxlength);
*(buffer + length) = 0;
@@ -88,15 +88,15 @@ DELCARE_HANDLER(print) {
}
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
DELCARE_HANDLER(gpio_dir) {
int port, value;
if (args_cnt < 2)
{
return false;
}
int port, value;
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]);
value = (int)JS_VALUE_TO_NUMBER (&args_p[1]);
@@ -106,12 +106,12 @@ DELCARE_HANDLER(gpio_dir) {
} /* gpio_dir_handler */
DELCARE_HANDLER(gpio_set) {
int port, value;
if (args_cnt < 2)
{
return false;
}
int port, value;
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]);
value = (int)JS_VALUE_TO_NUMBER (&args_p[1]);
@@ -122,24 +122,25 @@ DELCARE_HANDLER(gpio_set) {
DELCARE_HANDLER(gpio_get) {
int port, value;
if (args_cnt < 1)
{
return false;
}
int port, value;
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]);
value = native_gpio_get (port) ? 1 : 0;
ret_val_p->type = JERRY_API_DATA_TYPE_FLOAT64;
ret_val_p->v_float64 = (double)value;
ret_val_p->u.v_float64 = (double)value;
return true;
} /* gpio_dir_handler */
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
static bool
register_native_function (const char* name,
jerry_external_handler_t handler)
@@ -163,7 +164,7 @@ register_native_function (const char* name,
jerry_api_acquire_object (reg_func_p);
reg_value.type = JERRY_API_DATA_TYPE_OBJECT;
reg_value.v_object = reg_func_p;
reg_value.u.v_object = reg_func_p;
bok = jerry_api_set_object_field_value (global_obj_p,
(jerry_api_char_t *)name,
@@ -182,7 +183,7 @@ register_native_function (const char* name,
}
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
void js_register_functions (void)
{
targets/esp8266/source/jerry_run.c
+10 -9
View File
@@ -24,19 +24,20 @@
static const char* fn_sys_loop_name = "sysloop";
//-----------------------------------------------------------------------------
/*---------------------------------------------------------------------------*/
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;
jerry_init (flags);
js_register_functions ();
if (!jerry_parse (jerry_src, source_size))
if (!jerry_parse ((jerry_api_char_t *)jerry_src, source_size, &err_obj_p))
{
printf ("Error: jerry_parse failed\r\n");
ret_code = JERRY_COMPLETION_CODE_UNHANDLED_EXCEPTION;
@@ -45,7 +46,8 @@ int js_entry (const char *source_p, const size_t source_size)
{
if ((flags & JERRY_FLAG_PARSE_ONLY) == 0)
{
ret_code = jerry_run ();
jerry_api_value_t err_value = jerry_api_create_void_value ();
ret_code = jerry_run (&err_value);
}
}
@@ -72,6 +74,9 @@ 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;
uint16_t val_argv;
jerry_api_value_t res;
bool is_ok;
global_obj_p = jerry_api_get_global ();
@@ -93,16 +98,12 @@ int js_loop (uint32_t ticknow)
return -2;
}
jerry_api_value_t* val_args;
uint16_t val_argv;
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].v_uint32 = ticknow;
val_args[0].u.v_uint32 = ticknow;
jerry_api_value_t res;
is_ok = jerry_api_call_function (sysloop_func.v_object,
is_ok = jerry_api_call_function (sysloop_func.u.v_object,
global_obj_p,
&res,
val_args,