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/include/jerry_extapi.h
-14
View File
@@ -19,20 +19,6 @@
#define JERRY_STANDALONE_EXIT_CODE_OK (0) #define JERRY_STANDALONE_EXIT_CODE_OK (0)
#define JERRY_STANDALONE_EXIT_CODE_FAIL (1) #define JERRY_STANDALONE_EXIT_CODE_FAIL (1)
#define API_DATA_IS_OBJECT(val_p) \
((val_p)->type == JERRY_API_DATA_TYPE_OBJECT)
#define API_DATA_IS_FUNCTION(val_p) \
(API_DATA_IS_OBJECT(val_p) && \
jerry_api_is_function((val_p)->u.v_object))
#define JS_VALUE_TO_NUMBER(val_p) \
((val_p)->type == JERRY_API_DATA_TYPE_FLOAT32 ? \
(double) ((val_p)->u.v_float32) : \
(val_p)->type == JERRY_API_DATA_TYPE_FLOAT64 ? \
(double) ((val_p)->u.v_float64) : \
(double) ((val_p)->u.v_uint32))
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
targets/esp8266/source/jerry_extapi.c
+61 -54
View File
@@ -16,7 +16,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "jerry-core/jerry.h" #include "jerry-core/jerry-api.h"
#include "jerry_extapi.h" #include "jerry_extapi.h"
#include "native_esp8266.h" #include "native_esp8266.h"
@@ -31,12 +31,11 @@
#define __UNSED__ __attribute__((unused)) #define __UNSED__ __attribute__((unused))
#define DELCARE_HANDLER(NAME) \ #define DELCARE_HANDLER(NAME) \
static bool \ static jerry_value_t \
NAME ## _handler (const jerry_api_object_t * function_obj_p __UNSED__, \ NAME ## _handler (const jerry_value_t function_obj_val __UNSED__, \
const jerry_api_value_t * this_p __UNSED__, \ const jerry_value_t this_val __UNSED__, \
jerry_api_value_t * ret_val_p __UNSED__, \ const jerry_value_t args_p[], \
const jerry_api_value_t args_p[], \ const jerry_length_t args_cnt)
const jerry_api_length_t args_cnt)
#define REGISTER_HANDLER(NAME) \ #define REGISTER_HANDLER(NAME) \
register_native_function ( # NAME, NAME ## _handler) register_native_function ( # NAME, NAME ## _handler)
@@ -45,46 +44,54 @@ NAME ## _handler (const jerry_api_object_t * function_obj_p __UNSED__, \
DELCARE_HANDLER(assert) { DELCARE_HANDLER(assert) {
if (args_cnt == 1 if (args_cnt == 1
&& args_p[0].type == JERRY_API_DATA_TYPE_BOOLEAN && jerry_value_is_boolean (args_p[0])
&& args_p[0].u.v_bool == true) && jerry_get_boolean_value (args_p[0]))
{ {
printf (">> Jerry assert true\r\n"); printf (">> Jerry assert true\r\n");
return true; return jerry_create_boolean (true);
} }
printf ("Script assertion failed\n"); printf ("Script assertion failed\n");
exit (JERRY_STANDALONE_EXIT_CODE_FAIL); exit (JERRY_STANDALONE_EXIT_CODE_FAIL);
return false; return jerry_create_boolean (false);
} }
DELCARE_HANDLER(print) { DELCARE_HANDLER(print) {
jerry_api_length_t cc; jerry_length_t cc;
if (args_cnt) if (args_cnt)
{ {
printf(">> print(%d) :", (int)args_cnt); printf(">> print(%d) :", (int) args_cnt);
for (cc=0; cc<args_cnt; cc++) for (cc=0; cc<args_cnt; cc++)
{ {
if (args_p[cc].type == JERRY_API_DATA_TYPE_STRING && args_p[cc].u.v_string) if (jerry_value_is_string (args_p[cc]))
{ {
static char buffer[128]; char *buffer;
jerry_api_size_t length, maxlength; jerry_size_t size = jerry_get_string_size (args_p[0]);
length = -jerry_api_string_to_char_buffer (args_p[0].u.v_string, NULL, 0); buffer = (char *) malloc(size + 1);
maxlength = MIN(length, 126);
jerry_api_string_to_char_buffer (args_p[cc].u.v_string, if(!buffer)
(jerry_api_char_t *) buffer, {
maxlength); // not enough memory for this string.
*(buffer + length) = 0; printf("[<too-long-string>]");
continue;
}
jerry_string_to_char_buffer (args_p[cc],
(jerry_char_t *) buffer,
size);
*(buffer + size) = 0;
printf("[%s] ", buffer); printf("[%s] ", buffer);
free (buffer);
} }
else else
{ {
printf ("(%d) ", args_p[cc].type); printf ("(%d) ", args_p[cc]);
} }
} }
printf ("\r\n"); printf ("\r\n");
} }
return true; return jerry_create_boolean (true);
} }
@@ -97,27 +104,27 @@ DELCARE_HANDLER(gpio_dir) {
return false; return false;
} }
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]); port = (int) jerry_get_number_value (args_p[0]);
value = (int)JS_VALUE_TO_NUMBER (&args_p[1]); value = (int) jerry_get_number_value (args_p[1]);
native_gpio_dir (port, value); native_gpio_dir (port, value);
return true; return jerry_create_boolean (true);
} /* gpio_dir_handler */ } /* gpio_dir_handler */
DELCARE_HANDLER(gpio_set) { DELCARE_HANDLER(gpio_set) {
int port, value; int port, value;
if (args_cnt < 2) if (args_cnt < 2)
{ {
return false; return jerry_create_boolean (false);
} }
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]); port = (int) jerry_get_number_value (args_p[0]);
value = (int)JS_VALUE_TO_NUMBER (&args_p[1]); value = (int) jerry_get_number_value (args_p[1]);
native_gpio_set (port, value); native_gpio_set (port, value);
return true; return jerry_create_boolean (true);
} /* gpio_dir_handler */ } /* gpio_dir_handler */
@@ -128,14 +135,11 @@ DELCARE_HANDLER(gpio_get) {
return false; return false;
} }
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]); port = (int) jerry_get_number_value (args_p[0]);
value = native_gpio_get (port) ? 1 : 0; value = native_gpio_get (port) ? 1 : 0;
ret_val_p->type = JERRY_API_DATA_TYPE_FLOAT64; return jerry_create_number ((double) value);
ret_val_p->u.v_float64 = (double)value;
return true;
} /* gpio_dir_handler */ } /* gpio_dir_handler */
@@ -145,34 +149,37 @@ static bool
register_native_function (const char* name, register_native_function (const char* name,
jerry_external_handler_t handler) jerry_external_handler_t handler)
{ {
jerry_api_object_t *global_obj_p; jerry_value_t global_obj_val;
jerry_api_object_t *reg_func_p; jerry_value_t reg_func_val;
jerry_api_value_t reg_value; jerry_value_t prop_name_val;
jerry_value_t res;
bool bok; bool bok;
global_obj_p = jerry_api_get_global (); global_obj_val = jerry_get_global_object ();
reg_func_p = jerry_api_create_external_function (handler); reg_func_val = jerry_create_external_function (handler);
bok = true;
if (!(reg_func_p != NULL if (!(jerry_value_is_function (reg_func_val)
&& jerry_api_is_function (reg_func_p) && jerry_value_is_constructor (reg_func_val)))
&& jerry_api_is_constructor (reg_func_p)))
{ {
printf ("!!! create_external_function failed !!!\r\n"); printf ("!!! create_external_function failed !!!\r\n");
jerry_api_release_object (global_obj_p); jerry_release_value (reg_func_val);
jerry_release_value (global_obj_val);
return false; return false;
} }
jerry_api_acquire_object (reg_func_p); prop_name_val = jerry_create_string ((const jerry_char_t *) name);
reg_value.type = JERRY_API_DATA_TYPE_OBJECT; res = jerry_set_property (global_obj_val, prop_name_val, reg_func_val);
reg_value.u.v_object = reg_func_p;
bok = jerry_api_set_object_field_value (global_obj_p, if (jerry_value_has_error_flag (res))
(jerry_api_char_t *)name, {
&reg_value); bok = false;
}
jerry_api_release_value (&reg_value); jerry_release_value (res);
jerry_api_release_object (reg_func_p); jerry_release_value (prop_name_val);
jerry_api_release_object (global_obj_p); jerry_release_value (reg_func_val);
jerry_release_value (global_obj_val);
if (!bok) if (!bok)
{ {
targets/esp8266/source/jerry_run.c
+47 -51
View File
@@ -16,39 +16,33 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "jerry-core/jerry.h" #include "jerry-core/jerry-api.h"
#include "jerry_extapi.h" #include "jerry_extapi.h"
#include "jerry_run.h" #include "jerry_run.h"
static const char* fn_sys_loop_name = "sysloop"; 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) 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; const jerry_char_t *jerry_src = (const jerry_char_t *) source_p;
jerry_completion_code_t ret_code = JERRY_COMPLETION_CODE_OK; int ret_code = 0; /* JERRY_COMPLETION_CODE_OK */
jerry_flag_t flags = JERRY_FLAG_EMPTY; jerry_init_flag_t flags = JERRY_INIT_EMPTY;
jerry_api_object_t *err_obj_p = NULL;
jerry_init (flags); jerry_init (flags);
js_register_functions (); 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"); printf ("Error: jerry_parse failed\r\n");
ret_code = JERRY_COMPLETION_CODE_UNHANDLED_EXCEPTION; ret_code = JERRY_ERROR_SYNTAX;
}
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);
}
} }
return ret_code; 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) int js_eval (const char *source_p, const size_t source_size)
{ {
jerry_completion_code_t status; int status = 0;
jerry_api_value_t res; jerry_value_t res;
status = jerry_api_eval ((jerry_api_char_t *) source_p, res = jerry_eval ((jerry_char_t *) source_p,
source_size, source_size,
false, false);
false, if (jerry_value_has_error_flag (res)) {
&res); status = -1;
}
jerry_api_release_value (&res); jerry_release_value (res);
return status; return status;
} }
int js_loop (uint32_t ticknow) int js_loop (uint32_t ticknow)
{ {
jerry_api_object_t *global_obj_p; jerry_value_t global_obj_val;
jerry_api_value_t sysloop_func; jerry_value_t sysloop_func;
jerry_api_value_t* val_args; jerry_value_t val_args[1];
uint16_t val_argv; uint16_t val_argv;
jerry_api_value_t res; jerry_value_t res;
bool is_ok; jerry_value_t prop_name_val;
int ret_code = 0;
global_obj_p = jerry_api_get_global (); global_obj_val = jerry_get_global_object ();
is_ok = jerry_api_get_object_field_value (global_obj_p, prop_name_val = jerry_create_string ((const jerry_char_t *) fn_sys_loop_name);
(const jerry_api_char_t*)fn_sys_loop_name, sysloop_func = jerry_get_property (global_obj_val, prop_name_val);
&sysloop_func); jerry_release_value (prop_name_val);
if (!is_ok)
{ if (jerry_value_has_error_flag (sysloop_func)) {
printf ("Error: '%s' not defined!!!\r\n", fn_sys_loop_name); 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; 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); printf ("Error: '%s' is not a function!!!\r\n", fn_sys_loop_name);
jerry_api_release_value (&sysloop_func); jerry_release_value (sysloop_func);
jerry_api_release_object (global_obj_p); jerry_release_value (global_obj_val);
return -2; return -2;
} }
val_argv = 1; val_argv = 1;
val_args = (jerry_api_value_t*)malloc (sizeof (jerry_api_value_t) * val_argv); val_args[0] = jerry_create_number (ticknow);
val_args[0].type = JERRY_API_DATA_TYPE_UINT32;
val_args[0].u.v_uint32 = ticknow;
is_ok = jerry_api_call_function (sysloop_func.u.v_object, res = jerry_call_function (sysloop_func,
global_obj_p, global_obj_val,
&res, val_args,
val_args, val_argv);
val_argv);
jerry_api_release_value (&res);
free (val_args);
jerry_api_release_value (&sysloop_func); if (jerry_value_has_error_flag (res)) {
jerry_api_release_object (global_obj_p); 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) void js_exit (void)
targets/esp8266/user/Makefile
+1 -2
View File
@@ -38,7 +38,6 @@ endif
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./ -I ../include INCLUDES += -I ./ -I ../include -I../../../
PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile
targets/esp8266/user/jerry_port.c
+2
View File
@@ -17,6 +17,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "jerry-core/jerry-port.h"
/** /**
* Provide console message implementation for the engine. * Provide console message implementation for the engine.
*/ */