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_extapi.c
+61 -54
View File
@@ -16,7 +16,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "jerry-core/jerry.h"
#include "jerry-core/jerry-api.h"
#include "jerry_extapi.h"
#include "native_esp8266.h"
@@ -31,12 +31,11 @@
#define __UNSED__ __attribute__((unused))
#define DELCARE_HANDLER(NAME) \
static bool \
NAME ## _handler (const jerry_api_object_t * function_obj_p __UNSED__, \
const jerry_api_value_t * this_p __UNSED__, \
jerry_api_value_t * ret_val_p __UNSED__, \
const jerry_api_value_t args_p[], \
const jerry_api_length_t args_cnt)
static jerry_value_t \
NAME ## _handler (const jerry_value_t function_obj_val __UNSED__, \
const jerry_value_t this_val __UNSED__, \
const jerry_value_t args_p[], \
const jerry_length_t args_cnt)
#define REGISTER_HANDLER(NAME) \
register_native_function ( # NAME, NAME ## _handler)
@@ -45,46 +44,54 @@ NAME ## _handler (const jerry_api_object_t * function_obj_p __UNSED__, \
DELCARE_HANDLER(assert) {
if (args_cnt == 1
&& args_p[0].type == JERRY_API_DATA_TYPE_BOOLEAN
&& args_p[0].u.v_bool == true)
&& jerry_value_is_boolean (args_p[0])
&& jerry_get_boolean_value (args_p[0]))
{
printf (">> Jerry assert true\r\n");
return true;
return jerry_create_boolean (true);
}
printf ("Script assertion failed\n");
exit (JERRY_STANDALONE_EXIT_CODE_FAIL);
return false;
return jerry_create_boolean (false);
}
DELCARE_HANDLER(print) {
jerry_api_length_t cc;
jerry_length_t cc;
if (args_cnt)
{
printf(">> print(%d) :", (int)args_cnt);
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].u.v_string)
if (jerry_value_is_string (args_p[cc]))
{
static char buffer[128];
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].u.v_string,
(jerry_api_char_t *) buffer,
maxlength);
*(buffer + length) = 0;
char *buffer;
jerry_size_t size = jerry_get_string_size (args_p[0]);
buffer = (char *) malloc(size + 1);
if(!buffer)
{
// not enough memory for this string.
printf("[<too-long-string>]");
continue;
}
jerry_string_to_char_buffer (args_p[cc],
(jerry_char_t *) buffer,
size);
*(buffer + size) = 0;
printf("[%s] ", buffer);
free (buffer);
}
else
{
printf ("(%d) ", args_p[cc].type);
printf ("(%d) ", args_p[cc]);
}
}
printf ("\r\n");
}
return true;
return jerry_create_boolean (true);
}
@@ -97,27 +104,27 @@ DELCARE_HANDLER(gpio_dir) {
return false;
}
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]);
value = (int)JS_VALUE_TO_NUMBER (&args_p[1]);
port = (int) jerry_get_number_value (args_p[0]);
value = (int) jerry_get_number_value (args_p[1]);
native_gpio_dir (port, value);
return true;
return jerry_create_boolean (true);
} /* gpio_dir_handler */
DELCARE_HANDLER(gpio_set) {
int port, value;
if (args_cnt < 2)
{
return false;
return jerry_create_boolean (false);
}
port = (int)JS_VALUE_TO_NUMBER (&args_p[0]);
value = (int)JS_VALUE_TO_NUMBER (&args_p[1]);
port = (int) jerry_get_number_value (args_p[0]);
value = (int) jerry_get_number_value (args_p[1]);
native_gpio_set (port, value);
return true;
return jerry_create_boolean (true);
} /* gpio_dir_handler */
@@ -128,14 +135,11 @@ DELCARE_HANDLER(gpio_get) {
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;
ret_val_p->type = JERRY_API_DATA_TYPE_FLOAT64;
ret_val_p->u.v_float64 = (double)value;
return true;
return jerry_create_number ((double) value);
} /* gpio_dir_handler */
@@ -145,34 +149,37 @@ static bool
register_native_function (const char* name,
jerry_external_handler_t handler)
{
jerry_api_object_t *global_obj_p;
jerry_api_object_t *reg_func_p;
jerry_api_value_t reg_value;
jerry_value_t global_obj_val;
jerry_value_t reg_func_val;
jerry_value_t prop_name_val;
jerry_value_t res;
bool bok;
global_obj_p = jerry_api_get_global ();
reg_func_p = jerry_api_create_external_function (handler);
global_obj_val = jerry_get_global_object ();
reg_func_val = jerry_create_external_function (handler);
bok = true;
if (!(reg_func_p != NULL
&& jerry_api_is_function (reg_func_p)
&& jerry_api_is_constructor (reg_func_p)))
if (!(jerry_value_is_function (reg_func_val)
&& jerry_value_is_constructor (reg_func_val)))
{
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;
}
jerry_api_acquire_object (reg_func_p);
reg_value.type = JERRY_API_DATA_TYPE_OBJECT;
reg_value.u.v_object = reg_func_p;
prop_name_val = jerry_create_string ((const jerry_char_t *) name);
res = jerry_set_property (global_obj_val, prop_name_val, reg_func_val);
bok = jerry_api_set_object_field_value (global_obj_p,
(jerry_api_char_t *)name,
&reg_value);
if (jerry_value_has_error_flag (res))
{
bok = false;
}
jerry_api_release_value (&reg_value);
jerry_api_release_object (reg_func_p);
jerry_api_release_object (global_obj_p);
jerry_release_value (res);
jerry_release_value (prop_name_val);
jerry_release_value (reg_func_val);
jerry_release_value (global_obj_val);
if (!bok)
{