Update the API changes in mbed targets #1175
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| /* Copyright 2014-2015 Samsung Electronics Co., Ltd. | ||
| * Copyright 2016 University of Szeged. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
|
|
@@ -16,9 +17,9 @@ | |
| #include <stdlib.h> | ||
| #include <stdio.h> | ||
|
|
||
| #include "jerry-core/jerry-api.h" | ||
| #include "jerry_extapi.h" | ||
|
|
||
| #include "native_mbed.h" | ||
|
|
||
| #ifndef MIN | ||
|
|
@@ -30,12 +31,11 @@ | |
| #define __UNSED__ __attribute__((unused)) | ||
|
|
||
| #define DECLARE_HANDLER(NAME) \ | ||
| static jerry_value_t \ | ||
| NAME ## _handler (const jerry_value_t func_value __UNSED__, \ | ||
| const jerry_value_t this_value __UNSED__, \ | ||
| const jerry_value_t args[], \ | ||
| const jerry_length_t args_cnt ) | ||
|
|
||
| #define REGISTER_HANDLER(NAME) \ | ||
| register_native_function ( # NAME, NAME ## _handler) | ||
|
|
@@ -45,39 +45,50 @@ NAME ## _handler (const jerry_api_object_t * function_obj_p __UNSED__, \ | |
| DECLARE_HANDLER(assert) | ||
| { | ||
| if (args_cnt == 1 | ||
| && jerry_value_is_boolean (args[0]) | ||
| && jerry_get_boolean_value (args[0])) | ||
|
There was a problem hiding this comment. I think this is a double check, jerry_get_boolean_value will call this jerry_value_is_boolean function, and return with false if it isn't a boolean value. There was a problem hiding this comment. I think its okey, jerry_value_is_boolean returns wheter the given argument is a boolean value and the jerry_get_boolean_value gets the raw value for it. Same like in the main-unix.c source file 80 in line. There was a problem hiding this comment. I agree with @polaroi8d. This would exploit a case, which was designed to avoid crashes when the API is misused. So this would promote a wrong API use. |
||
| { | ||
| printf (">> Jerry assert true\r\n"); | ||
| return jerry_create_boolean (true); | ||
| } | ||
| printf ("ERROR: Script assertion failed\n"); | ||
| exit (JERRY_STANDALONE_EXIT_CODE_FAIL); | ||
| return jerry_create_boolean (false); | ||
| } | ||
|
|
||
| DECLARE_HANDLER(led) | ||
| { | ||
| jerry_value_t ret_val; | ||
|
|
||
| if (args_cnt < 2) | ||
| { | ||
| ret_val = jerry_create_boolean (false); | ||
| printf ("Error: invalid arguments number!\r\n"); | ||
|
There was a problem hiding this comment. You should add a return after this. |
||
| return ret_val; | ||
| } | ||
|
|
||
| if (!(jerry_value_is_number (args[0]) | ||
| && jerry_value_is_number (args[1]))) | ||
| { | ||
| ret_val = jerry_create_boolean (false); | ||
| printf ("Error: arguments must be numbers!\r\n"); | ||
| return ret_val; | ||
| } | ||
|
|
||
| int port, value; | ||
| port = (int) jerry_get_number_value (args[0]); | ||
| value = (int) jerry_get_number_value (args[1]); | ||
|
There was a problem hiding this comment. Is it ensured that the arguments are numbers? There was a problem hiding this comment. No, thanks for the hint. |
||
|
|
||
| if (port >= 0 && port <= 3) | ||
| { | ||
| native_led (port, value); | ||
| ret_val = jerry_create_boolean (true); | ||
| } | ||
| else | ||
| { | ||
| ret_val = jerry_create_boolean (false); | ||
| } | ||
| return ret_val; | ||
| } | ||
|
|
||
| //----------------------------------------------------------------------------- | ||
|
|
@@ -86,41 +97,49 @@ static bool | |
| register_native_function (const char* name, | ||
| jerry_external_handler_t handler) | ||
| { | ||
| jerry_value_t global_object_val = jerry_get_global_object (); | ||
| jerry_value_t reg_function = jerry_create_external_function (handler); | ||
|
|
||
| bool is_ok = true; | ||
|
There was a problem hiding this comment. The problem is the same here, you continue the execution while is_ok is false. Why do you remove this return? The general rule is cleaning up and return when an error occures. |
||
|
|
||
| if (!(jerry_value_is_function (reg_function) | ||
| && jerry_value_is_constructor (reg_function))) | ||
|
There was a problem hiding this comment. I think the error flag should be checked. The returned value can be an object, which can also be a constructor. |
||
| { | ||
| is_ok = false; | ||
| printf ("Error: create_external_function failed !!!\r\n"); | ||
| jerry_release_value (global_object_val); | ||
|
There was a problem hiding this comment.
|
||
| jerry_release_value (reg_function); | ||
| return is_ok; | ||
| } | ||
|
|
||
| if (jerry_value_has_error_flag (reg_function)) | ||
| { | ||
| is_ok = false; | ||
| printf ("Error: create_external_function has error flag! \n\r"); | ||
| jerry_release_value (global_object_val); | ||
| jerry_release_value (reg_function); | ||
| return is_ok; | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Do you release this value somewhere? There was a problem hiding this comment. Yes, returned value must be freed with jerry_release_object, when it is no longer needed. There was a problem hiding this comment. Okey, thanks. FYI: There is no longer jerry_release_object after the api update. |
||
| jerry_value_t jerry_name = jerry_create_string ((jerry_char_t *) name); | ||
|
|
||
| jerry_value_t set_result = jerry_set_property (global_object_val, | ||
| jerry_name, | ||
| reg_function); | ||
|
|
||
|
|
||
| if (jerry_value_has_error_flag (set_result)) | ||
|
|
||
| { | ||
| is_ok = false; | ||
| printf ("Error: register_native_function failed: [%s]\r\n", name); | ||
|
There was a problem hiding this comment. false should be returned if failed. There was a problem hiding this comment. set_result should be released in this case too. You should do something like this: bool is_ok = true;
if (jerry_value_has_error_flag (set_result))
{
is_ok = false;
printf ("Error: register_native_function failed: [%s]\r\n", name);
}
jerry_release_value (set_result);
return is_ok;There was a problem hiding this comment. returned with false if failed, added and released the set_result value |
||
| } | ||
|
|
||
| jerry_release_value (jerry_name); | ||
| jerry_release_value (global_object_val); | ||
| jerry_release_value (reg_function); | ||
| jerry_release_value (set_result); | ||
|
|
||
| return is_ok; | ||
| } | ||
|
|
||
| void js_register_functions (void) | ||
|
|
||
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.
These indentations are shifted wrongly.
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.
Thanks for the observation.