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

Revert "Switching get_variable_value to returning value through ecma-stack (stack convention)."

Browse Source 
This reverts commit 6415130925187a877b83b14db40cade0c336ea44.
This commit is contained in:
Ruben Ayrapetyan
2015-01-15 17:26:08 +03:00
parent e570d18936
commit eef966869a
14 changed files with 360 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcoreint/opcodes-ecma-relational.c
+38 -74
View File
@@ -34,17 +34,11 @@ opfunc_less_than (opcode_t opdata, /**< operation data */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH_STACKED (left_value,
get_variable_value (int_data, left_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH_STACKED (right_value,
get_variable_value (int_data, right_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH (left_value, get_variable_value (int_data, left_var_idx, false), ret_value);
ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value);
ECMA_TRY_CATCH (compare_result,
ecma_op_abstract_relational_compare (left_value,
right_value,
ecma_op_abstract_relational_compare (ecma_get_completion_value_value (left_value),
ecma_get_completion_value_value (right_value),
true),
ret_value);
@@ -64,8 +58,8 @@ opfunc_less_than (opcode_t opdata, /**< operation data */
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE_STACKED (right_value, int_data->stack_frame_p);
ECMA_FINALIZE_STACKED (left_value, int_data->stack_frame_p);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
@@ -90,17 +84,11 @@ opfunc_greater_than (opcode_t opdata, /**< operation data */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH_STACKED (left_value,
get_variable_value (int_data, left_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH_STACKED (right_value,
get_variable_value (int_data, right_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH (left_value, get_variable_value (int_data, left_var_idx, false), ret_value);
ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value);
ECMA_TRY_CATCH (compare_result,
ecma_op_abstract_relational_compare (right_value,
left_value,
ecma_op_abstract_relational_compare (ecma_get_completion_value_value (right_value),
ecma_get_completion_value_value (left_value),
false),
ret_value);
@@ -120,8 +108,8 @@ opfunc_greater_than (opcode_t opdata, /**< operation data */
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE_STACKED (right_value, int_data->stack_frame_p);
ECMA_FINALIZE_STACKED (left_value, int_data->stack_frame_p);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
@@ -146,17 +134,11 @@ opfunc_less_or_equal_than (opcode_t opdata, /**< operation data */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH_STACKED (left_value,
get_variable_value (int_data, left_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH_STACKED (right_value,
get_variable_value (int_data, right_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH (left_value, get_variable_value (int_data, left_var_idx, false), ret_value);
ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value);
ECMA_TRY_CATCH (compare_result,
ecma_op_abstract_relational_compare (right_value,
left_value,
ecma_op_abstract_relational_compare (ecma_get_completion_value_value (right_value),
ecma_get_completion_value_value (left_value),
false),
ret_value);
@@ -183,8 +165,8 @@ opfunc_less_or_equal_than (opcode_t opdata, /**< operation data */
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE_STACKED (right_value, int_data->stack_frame_p);
ECMA_FINALIZE_STACKED (left_value, int_data->stack_frame_p);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
@@ -209,17 +191,11 @@ opfunc_greater_or_equal_than (opcode_t opdata, /**< operation data */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH_STACKED (left_value,
get_variable_value (int_data, left_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH_STACKED (right_value,
get_variable_value (int_data, right_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH (left_value, get_variable_value (int_data, left_var_idx, false), ret_value);
ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value);
ECMA_TRY_CATCH (compare_result,
ecma_op_abstract_relational_compare (left_value,
right_value,
ecma_op_abstract_relational_compare (ecma_get_completion_value_value (left_value),
ecma_get_completion_value_value (right_value),
true),
ret_value);
@@ -246,8 +222,8 @@ opfunc_greater_or_equal_than (opcode_t opdata, /**< operation data */
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE_STACKED (right_value, int_data->stack_frame_p);
ECMA_FINALIZE_STACKED (left_value, int_data->stack_frame_p);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
@@ -272,26 +248,20 @@ opfunc_instanceof (opcode_t opdata __unused, /**< operation data */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH_STACKED (left_value,
get_variable_value (int_data, left_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH_STACKED (right_value,
get_variable_value (int_data, right_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH (left_value, get_variable_value (int_data, left_var_idx, false), ret_value);
ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value);
if (!ecma_is_value_object (right_value))
if (!ecma_is_value_object (ecma_get_completion_value_value (right_value)))
{
ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
}
else
{
ecma_object_t *right_value_obj_p = ecma_get_object_from_value (right_value);
ecma_object_t *right_value_obj_p = ecma_get_object_from_completion_value (right_value);
ECMA_TRY_CATCH (is_instance_of,
ecma_op_object_has_instance (right_value_obj_p,
left_value),
ecma_get_completion_value_value (left_value)),
ret_value);
ret_value = set_variable_value (int_data, int_data->pos, dst_idx, ecma_get_completion_value_value (is_instance_of));
@@ -299,8 +269,8 @@ opfunc_instanceof (opcode_t opdata __unused, /**< operation data */
ECMA_FINALIZE (is_instance_of);
}
ECMA_FINALIZE_STACKED (right_value, int_data->stack_frame_p);
ECMA_FINALIZE_STACKED (left_value, int_data->stack_frame_p);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
@@ -325,26 +295,20 @@ opfunc_in (opcode_t opdata __unused, /**< operation data */
ecma_completion_value_t ret_value;
ECMA_TRY_CATCH_STACKED (left_value,
get_variable_value (int_data, left_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH_STACKED (right_value,
get_variable_value (int_data, right_var_idx, false),
ret_value,
int_data->stack_frame_p);
ECMA_TRY_CATCH (left_value, get_variable_value (int_data, left_var_idx, false), ret_value);
ECMA_TRY_CATCH (right_value, get_variable_value (int_data, right_var_idx, false), ret_value);
if (!ecma_is_value_object (right_value))
if (!ecma_is_value_object (ecma_get_completion_value_value (right_value)))
{
ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
}
else
{
ECMA_TRY_CATCH (str_left_value, ecma_op_to_string (left_value), ret_value);
ECMA_TRY_CATCH (str_left_value, ecma_op_to_string (ecma_get_completion_value_value (left_value)), ret_value);
ecma_simple_value_t is_in = ECMA_SIMPLE_VALUE_UNDEFINED;
ecma_string_t *left_value_prop_name_p = ecma_get_string_from_completion_value (str_left_value);
ecma_object_t *right_value_obj_p = ecma_get_object_from_value (right_value);
ecma_object_t *right_value_obj_p = ecma_get_object_from_completion_value (right_value);
if (ecma_op_object_get_property (right_value_obj_p, left_value_prop_name_p) != NULL)
{
@@ -362,8 +326,8 @@ opfunc_in (opcode_t opdata __unused, /**< operation data */
ECMA_FINALIZE (str_left_value);
}
ECMA_FINALIZE_STACKED (right_value, int_data->stack_frame_p);
ECMA_FINALIZE_STACKED (left_value, int_data->stack_frame_p);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;