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

Reverting changes related to on-stack GC-root introduction (except of passing ecma_value_t by const reference).

Browse Source 
This reverts commits:
     31e1405f39d72f8b885e92256b0dc29ecab1a99,
     7cb43840b59c539d9b043990ed658ae15a9defc3,
     1ab57a4493689806035a9853b0030cc6fea65590,
     c24b511ca60587e0db12d46a7e7567c86c3649bc,
     b2caf3e8b31b4b6b16499108ee3aabdcb94f0717,
     44f9c307fb6204bfd2181b19a9d94cabddf04de9.
This commit is contained in:
Ruben Ayrapetyan
2015-02-09 17:06:34 +03:00
parent 35aa8238c2
commit ba348831ca
114 changed files with 4226 additions and 4916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcoreint/opcodes-ecma-relational.c
+76 -53
View File
@@ -24,18 +24,21 @@
* @return completion value
* Returned value must be freed with ecma_free_completion_value
*/
void
opfunc_less_than (ecma_completion_value_t &ret_value, /**< out: completion value */
opcode_t opdata, /**< operation data */
ecma_completion_value_t
opfunc_less_than (opcode_t opdata, /**< operation data */
int_data_t *int_data) /**< interpreter context */
{
const idx_t dst_var_idx = opdata.data.less_than.dst;
const idx_t left_var_idx = opdata.data.less_than.var_left;
const idx_t right_var_idx = opdata.data.less_than.var_right;
ECMA_TRY_CATCH (ret_value, get_variable_value, left_value, int_data, left_var_idx, false);
ECMA_TRY_CATCH (ret_value, get_variable_value, right_value, int_data, right_var_idx, false);
ECMA_TRY_CATCH (ret_value, ecma_op_abstract_relational_compare, compare_result, left_value, right_value, true);
ecma_completion_value_t ret_value;
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, true),
ret_value);
ecma_simple_value_t res;
@@ -50,13 +53,15 @@ opfunc_less_than (ecma_completion_value_t &ret_value, /**< out: completion value
res = (ecma_is_value_true (compare_result) ? ECMA_SIMPLE_VALUE_TRUE : ECMA_SIMPLE_VALUE_FALSE);
}
set_variable_value (ret_value, int_data, int_data->pos, dst_var_idx, ecma_value_t (res));
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
return ret_value;
} /* opfunc_less_than */
/**
@@ -67,18 +72,21 @@ opfunc_less_than (ecma_completion_value_t &ret_value, /**< out: completion value
* @return completion value
* Returned value must be freed with ecma_free_completion_value
*/
void
opfunc_greater_than (ecma_completion_value_t &ret_value, /**< out: completion value */
opcode_t opdata, /**< operation data */
ecma_completion_value_t
opfunc_greater_than (opcode_t opdata, /**< operation data */
int_data_t *int_data) /**< interpreter context */
{
const idx_t dst_var_idx = opdata.data.greater_than.dst;
const idx_t left_var_idx = opdata.data.greater_than.var_left;
const idx_t right_var_idx = opdata.data.greater_than.var_right;
ECMA_TRY_CATCH (ret_value, get_variable_value, left_value, int_data, left_var_idx, false);
ECMA_TRY_CATCH (ret_value, get_variable_value, right_value, int_data, right_var_idx, false);
ECMA_TRY_CATCH (ret_value, ecma_op_abstract_relational_compare, compare_result, right_value, left_value, false);
ecma_completion_value_t ret_value;
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, false),
ret_value);
ecma_simple_value_t res;
@@ -93,13 +101,15 @@ opfunc_greater_than (ecma_completion_value_t &ret_value, /**< out: completion va
res = (ecma_is_value_true (compare_result) ? ECMA_SIMPLE_VALUE_TRUE : ECMA_SIMPLE_VALUE_FALSE);
}
set_variable_value (ret_value, int_data, int_data->pos, dst_var_idx, ecma_value_t (res));
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
return ret_value;
} /* opfunc_greater_than */
/**
@@ -110,18 +120,21 @@ opfunc_greater_than (ecma_completion_value_t &ret_value, /**< out: completion va
* @return completion value
* Returned value must be freed with ecma_free_completion_value
*/
void
opfunc_less_or_equal_than (ecma_completion_value_t &ret_value, /**< out: completion value */
opcode_t opdata, /**< operation data */
ecma_completion_value_t
opfunc_less_or_equal_than (opcode_t opdata, /**< operation data */
int_data_t *int_data) /**< interpreter context */
{
const idx_t dst_var_idx = opdata.data.less_or_equal_than.dst;
const idx_t left_var_idx = opdata.data.less_or_equal_than.var_left;
const idx_t right_var_idx = opdata.data.less_or_equal_than.var_right;
ECMA_TRY_CATCH (ret_value, get_variable_value, left_value, int_data, left_var_idx, false);
ECMA_TRY_CATCH (ret_value, get_variable_value, right_value, int_data, right_var_idx, false);
ECMA_TRY_CATCH (ret_value, ecma_op_abstract_relational_compare, compare_result, right_value, left_value, false);
ecma_completion_value_t ret_value;
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, false),
ret_value);
ecma_simple_value_t res;
@@ -143,13 +156,15 @@ opfunc_less_or_equal_than (ecma_completion_value_t &ret_value, /**< out: complet
}
}
set_variable_value (ret_value, int_data, int_data->pos, dst_var_idx, ecma_value_t (res));
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
return ret_value;
} /* opfunc_less_or_equal_than */
/**
@@ -160,18 +175,21 @@ opfunc_less_or_equal_than (ecma_completion_value_t &ret_value, /**< out: complet
* @return completion value
* Returned value must be freed with ecma_free_completion_value
*/
void
opfunc_greater_or_equal_than (ecma_completion_value_t &ret_value, /**< out: completion value */
opcode_t opdata, /**< operation data */
ecma_completion_value_t
opfunc_greater_or_equal_than (opcode_t opdata, /**< operation data */
int_data_t *int_data) /**< interpreter context */
{
const idx_t dst_var_idx = opdata.data.greater_or_equal_than.dst;
const idx_t left_var_idx = opdata.data.greater_or_equal_than.var_left;
const idx_t right_var_idx = opdata.data.greater_or_equal_than.var_right;
ECMA_TRY_CATCH (ret_value, get_variable_value, left_value, int_data, left_var_idx, false);
ECMA_TRY_CATCH (ret_value, get_variable_value, right_value, int_data, right_var_idx, false);
ECMA_TRY_CATCH (ret_value, ecma_op_abstract_relational_compare, compare_result, left_value, right_value, true);
ecma_completion_value_t ret_value;
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, true),
ret_value);
ecma_simple_value_t res;
@@ -193,13 +211,15 @@ opfunc_greater_or_equal_than (ecma_completion_value_t &ret_value, /**< out: comp
}
}
set_variable_value (ret_value, int_data, int_data->pos, dst_var_idx, ecma_value_t (res));
ret_value = set_variable_value (int_data, int_data->pos, dst_var_idx, ecma_make_simple_value (res));
ECMA_FINALIZE (compare_result);
ECMA_FINALIZE (right_value);
ECMA_FINALIZE (left_value);
int_data->pos++;
return ret_value;
} /* opfunc_greater_or_equal_than */
/**
@@ -210,32 +230,32 @@ opfunc_greater_or_equal_than (ecma_completion_value_t &ret_value, /**< out: comp
* @return completion value
* returned value must be freed with ecma_free_completion_value.
*/
void
opfunc_instanceof (ecma_completion_value_t &ret_value, /**< out: completion value */
opcode_t opdata __unused, /**< operation data */
ecma_completion_value_t
opfunc_instanceof (opcode_t opdata __unused, /**< operation data */
int_data_t *int_data __unused) /**< interpreter context */
{
const idx_t dst_idx = opdata.data.instanceof.dst;
const idx_t left_var_idx = opdata.data.instanceof.var_left;
const idx_t right_var_idx = opdata.data.instanceof.var_right;
ECMA_TRY_CATCH (ret_value, get_variable_value, left_value, int_data, left_var_idx, false);
ECMA_TRY_CATCH (ret_value, get_variable_value, right_value, int_data, right_var_idx, false);
ecma_completion_value_t ret_value;
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))
{
ecma_object_ptr_t exception_obj_p;
ecma_new_standard_error (exception_obj_p, ECMA_ERROR_TYPE);
ecma_make_throw_obj_completion_value (ret_value, exception_obj_p);
ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
}
else
{
ecma_object_ptr_t right_value_obj_p;
ecma_get_object_from_value (right_value_obj_p, right_value);
ecma_object_t *right_value_obj_p = ecma_get_object_from_value (right_value);
ECMA_TRY_CATCH (ret_value, ecma_op_object_has_instance, is_instance_of, right_value_obj_p, left_value);
ECMA_TRY_CATCH (is_instance_of,
ecma_op_object_has_instance (right_value_obj_p, left_value),
ret_value);
set_variable_value (ret_value, int_data, int_data->pos, dst_idx, is_instance_of);
ret_value = set_variable_value (int_data, int_data->pos, dst_idx, is_instance_of);
ECMA_FINALIZE (is_instance_of);
}
@@ -244,6 +264,8 @@ opfunc_instanceof (ecma_completion_value_t &ret_value, /**< out: completion valu
ECMA_FINALIZE (left_value);
int_data->pos++;
return ret_value;
} /* opfunc_instanceof */
/**
@@ -254,32 +276,30 @@ opfunc_instanceof (ecma_completion_value_t &ret_value, /**< out: completion valu
* @return completion value
* returned value must be freed with ecma_free_completion_value.
*/
void
opfunc_in (ecma_completion_value_t &ret_value, /**< out: completion value */
opcode_t opdata __unused, /**< operation data */
ecma_completion_value_t
opfunc_in (opcode_t opdata __unused, /**< operation data */
int_data_t *int_data __unused) /**< interpreter context */
{
const idx_t dst_idx = opdata.data.in.dst;
const idx_t left_var_idx = opdata.data.in.var_left;
const idx_t right_var_idx = opdata.data.in.var_right;
ECMA_TRY_CATCH (ret_value, get_variable_value, left_value, int_data, left_var_idx, false);
ECMA_TRY_CATCH (ret_value, get_variable_value, right_value, int_data, right_var_idx, false);
ecma_completion_value_t ret_value;
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))
{
ecma_object_ptr_t exception_obj_p;
ecma_new_standard_error (exception_obj_p, ECMA_ERROR_TYPE);
ecma_make_throw_obj_completion_value (ret_value, exception_obj_p);
ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
}
else
{
ECMA_TRY_CATCH (ret_value, ecma_op_to_string, str_left_value, left_value);
ECMA_TRY_CATCH (str_left_value, ecma_op_to_string (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_value (str_left_value);
ecma_object_ptr_t right_value_obj_p;
ecma_get_object_from_value (right_value_obj_p, right_value);
ecma_object_t *right_value_obj_p = ecma_get_object_from_value (right_value);
if (ecma_op_object_get_property (right_value_obj_p, left_value_prop_name_p) != NULL)
{
@@ -290,8 +310,9 @@ opfunc_in (ecma_completion_value_t &ret_value, /**< out: completion value */
is_in = ECMA_SIMPLE_VALUE_FALSE;
}
set_variable_value (ret_value, int_data, int_data->pos,
dst_idx, ecma_value_t (is_in));
ret_value = set_variable_value (int_data, int_data->pos,
dst_idx,
ecma_make_simple_value (is_in));
ECMA_FINALIZE (str_left_value);
}
@@ -300,4 +321,6 @@ opfunc_in (ecma_completion_value_t &ret_value, /**< out: completion value */
ECMA_FINALIZE (left_value);
int_data->pos++;
return ret_value;
} /* opfunc_in */