Initial refactoring of the code to match the latest API. #1212
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |
| #include <stdlib.h> | ||
| #include <stdio.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 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 | ||
| && jerry_value_is_boolean (args_p[0]) | ||
| && jerry_get_boolean_value (args_p[0])) | ||
| { | ||
| printf (">> Jerry assert true\r\n"); | ||
| return jerry_create_boolean (true); | ||
| } | ||
| printf ("Script assertion failed\n"); | ||
| exit (JERRY_STANDALONE_EXIT_CODE_FAIL); | ||
| return jerry_create_boolean (false); | ||
| } | ||
|
|
||
|
|
||
| DELCARE_HANDLER(print) { | ||
| jerry_length_t cc; | ||
|
|
||
| if (args_cnt) | ||
| { | ||
| printf(">> print(%d) :", (int) args_cnt); | ||
| for (cc=0; cc<args_cnt; cc++) | ||
| { | ||
| if (jerry_value_is_string (args_p[cc])) | ||
| { | ||
| 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], | ||
|
There was a problem hiding this comment. I hope you are aware that if the buffer is too small, no bytes are copied. There was a problem hiding this comment. the line above should do the trick :) There was a problem hiding this comment. Do the trick? I mean if string length > 126, than MIN() returns with 126, and no bytes will be copied since buffer is too small. There was a problem hiding this comment. I guess the initial code was to allow the native "print" function to print string(s) with max length of 128 characters. What do you suggest to be changed here? There was a problem hiding this comment. You can allocate a large enough buffer with malloc, or you can just print that string is too long. There was a problem hiding this comment. @zherczeg, the current code will load maximum 126 bytes into a 128 bytes buffer. How could it be too small? There was a problem hiding this comment. BTW, I agree that it would look nicer, if we always allocate the buffer with the appropriate size. I'm just trying to say here the current code is valid and should work. :) |
||
| (jerry_char_t *) buffer, | ||
| size); | ||
| *(buffer + size) = 0; | ||
|
There was a problem hiding this comment. No the code is unfortunately not correct. This expression can be a buffer overrun, and a byte on the stack will be replaced with 0. But even if we change size to maxsize, a random character sequence will be printed for strings > 126 bytes. |
||
| printf("[%s] ", buffer); | ||
| free (buffer); | ||
| } | ||
| else | ||
| { | ||
| printf ("(%d) ", args_p[cc]); | ||
| } | ||
| } | ||
| printf ("\r\n"); | ||
| } | ||
| return jerry_create_boolean (true); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -97,27 +104,27 @@ DELCARE_HANDLER(gpio_dir) { | |
| return false; | ||
| } | ||
|
|
||
| port = (int) jerry_get_number_value (args_p[0]); | ||
| value = (int) jerry_get_number_value (args_p[1]); | ||
|
|
||
| native_gpio_dir (port, value); | ||
|
|
||
| return jerry_create_boolean (true); | ||
| } /* gpio_dir_handler */ | ||
|
|
||
| DELCARE_HANDLER(gpio_set) { | ||
| int port, value; | ||
| if (args_cnt < 2) | ||
| { | ||
| return jerry_create_boolean (false); | ||
| } | ||
|
|
||
| port = (int) jerry_get_number_value (args_p[0]); | ||
| value = (int) jerry_get_number_value (args_p[1]); | ||
|
|
||
| native_gpio_set (port, value); | ||
|
|
||
| return jerry_create_boolean (true); | ||
| } /* gpio_dir_handler */ | ||
|
|
||
|
|
||
|
|
@@ -128,14 +135,11 @@ DELCARE_HANDLER(gpio_get) { | |
| return false; | ||
| } | ||
|
|
||
| port = (int) jerry_get_number_value (args_p[0]); | ||
|
|
||
| value = native_gpio_get (port) ? 1 : 0; | ||
|
|
||
| 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_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_val = jerry_get_global_object (); | ||
| reg_func_val = jerry_create_external_function (handler); | ||
| bok = true; | ||
|
|
||
| if (!(jerry_value_is_function (reg_func_val) | ||
| && jerry_value_is_constructor (reg_func_val))) | ||
| { | ||
|
There was a problem hiding this comment. if (!(jerry_value_is_function (reg_func_val)
&& jerry_value_is_constructor (reg_func_val))) { |
||
| printf ("!!! create_external_function failed !!!\r\n"); | ||
| jerry_release_value (reg_func_val); | ||
| jerry_release_value (global_obj_val); | ||
| return false; | ||
| } | ||
|
|
||
| prop_name_val = jerry_create_string ((const jerry_char_t *) name); | ||
| res = jerry_set_property (global_obj_val, prop_name_val, reg_func_val); | ||
|
|
||
| if (jerry_value_has_error_flag (res)) | ||
| { | ||
| bok = false; | ||
| } | ||
|
|
||
| jerry_release_value (res); | ||
| jerry_release_value (prop_name_val); | ||
| jerry_release_value (reg_func_val); | ||
| jerry_release_value (global_obj_val); | ||
|
|
||
| if (!bok) | ||
|
There was a problem hiding this comment.
|
||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,105 +16,101 @@ | |
| #include <stdlib.h> | ||
| #include <stdio.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_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 (); | ||
|
|
||
| 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_ERROR_SYNTAX; | ||
| } | ||
|
|
||
| return ret_code; | ||
| } | ||
|
|
||
| int js_eval (const char *source_p, const size_t source_size) | ||
| { | ||
| int status = 0; | ||
| jerry_value_t res; | ||
|
|
||
| res = jerry_eval ((jerry_char_t *) source_p, | ||
| source_size, | ||
| false); | ||
| if (jerry_value_has_error_flag (res)) { | ||
| status = -1; | ||
| } | ||
|
|
||
| jerry_release_value (res); | ||
|
|
||
| return status; | ||
| } | ||
|
|
||
| int js_loop (uint32_t ticknow) | ||
| { | ||
| jerry_value_t global_obj_val; | ||
| jerry_value_t sysloop_func; | ||
| jerry_value_t val_args[1]; | ||
| uint16_t val_argv; | ||
| jerry_value_t res; | ||
| jerry_value_t prop_name_val; | ||
| int ret_code = 0; | ||
|
|
||
| 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_release_value (sysloop_func); | ||
| jerry_release_value (global_obj_val); | ||
| return -1; | ||
| } | ||
|
|
||
| if (!jerry_value_is_function (sysloop_func)) { | ||
| printf ("Error: '%s' is not a function!!!\r\n", fn_sys_loop_name); | ||
| jerry_release_value (sysloop_func); | ||
| jerry_release_value (global_obj_val); | ||
| return -2; | ||
| } | ||
|
|
||
| val_argv = 1; | ||
| val_args[0] = jerry_create_number (ticknow); | ||
|
There was a problem hiding this comment. You could use a stack allocated array here: There was a problem hiding this comment. @zherczeg you mean |
||
|
|
||
| res = jerry_call_function (sysloop_func, | ||
| global_obj_val, | ||
| val_args, | ||
| val_argv); | ||
|
|
||
| if (jerry_value_has_error_flag (res)) { | ||
| ret_code = -3; | ||
| } | ||
|
|
||
| jerry_release_value (res); | ||
| jerry_release_value (sysloop_func); | ||
| jerry_release_value (global_obj_val); | ||
|
|
||
| return ret_code; | ||
| } | ||
|
|
||
| void js_exit (void) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto