diff --git a/src/libcoreint/opcodes-helpers-variables.c b/src/libcoreint/opcodes-helpers-variables.c index 0b2d613e9..942def6ad 100644 --- a/src/libcoreint/opcodes-helpers-variables.c +++ b/src/libcoreint/opcodes-helpers-variables.c @@ -105,7 +105,7 @@ get_variable_value (int_data_t *int_data, /**< interpreter context */ JERRY_ASSERT (!do_eval_or_arguments_check || !do_strict_eval_arguments_check (ref)); - ret_value = ecma_op_get_value (ref); + ret_value = ecma_op_get_value_lex_env_base (ref); ecma_deref_ecma_string (var_name_string_p); ecma_free_reference (ref); @@ -153,7 +153,7 @@ set_variable_value (int_data_t *int_data, /**< interpreter context */ /* SyntaxError should be treated as an early error */ JERRY_ASSERT (!do_strict_eval_arguments_check (ref)); - ret_value = ecma_op_put_value (ref, value); + ret_value = ecma_op_put_value_lex_env_base (ref, value); ecma_deref_ecma_string (var_name_string_p); ecma_free_reference (ref); diff --git a/src/libcoreint/opcodes.c b/src/libcoreint/opcodes.c index 10f24df9a..18b8f818a 100644 --- a/src/libcoreint/opcodes.c +++ b/src/libcoreint/opcodes.c @@ -1042,7 +1042,7 @@ opfunc_prop_getter (opcode_t opdata __unused, /**< operation data */ prop_name_string_p, int_data->is_strict); - ECMA_TRY_CATCH (prop_value, ecma_op_get_value (ref), ret_value); + ECMA_TRY_CATCH (prop_value, ecma_op_get_value_object_base (ref), ret_value); ret_value = set_variable_value (int_data, lhs_var_idx, prop_value.u.value); @@ -1090,7 +1090,7 @@ opfunc_prop_setter (opcode_t opdata __unused, /**< operation data */ int_data->is_strict); ECMA_TRY_CATCH (rhs_value, get_variable_value (int_data, rhs_var_idx, false), ret_value); - ret_value = ecma_op_put_value (ref, rhs_value.u.value); + ret_value = ecma_op_put_value_object_base (ref, rhs_value.u.value); ECMA_FINALIZE (rhs_value); ecma_free_reference (ref); @@ -1324,7 +1324,7 @@ evaluate_arg_for_typeof (int_data_t *int_data, /**< interpreter context */ } else { - ret_value = ecma_op_get_value (ref); + ret_value = ecma_op_get_value_lex_env_base (ref); } ecma_free_reference (ref); diff --git a/src/libecmaoperations/ecma-get-put-value.c b/src/libecmaoperations/ecma-get-put-value.c index d8a0fb01d..822d719bc 100644 --- a/src/libecmaoperations/ecma-get-put-value.c +++ b/src/libecmaoperations/ecma-get-put-value.c @@ -36,15 +36,46 @@ */ /** - * GetValue operation. + * GetValue operation part (lexical environment base or unresolvable reference). * - * See also: ECMA-262 v5, 8.7.1 + * See also: ECMA-262 v5, 8.7.1, sections 3 and 5 * * @return completion value * Returned value must be freed with ecma_free_completion_value. */ ecma_completion_value_t -ecma_op_get_value (ecma_reference_t ref) /**< ECMA-reference */ +ecma_op_get_value_lex_env_base (ecma_reference_t ref) /**< ECMA-reference */ +{ + const ecma_value_t base = ref.base; + const bool is_unresolvable_reference = ecma_is_value_undefined (base); + + // 3. + if (unlikely (is_unresolvable_reference)) + { + return ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_REFERENCE)); + } + + // 5. + ecma_object_t *lex_env_p = ECMA_GET_POINTER(base.value); + JERRY_ASSERT(lex_env_p != NULL + && ecma_is_lexical_environment (lex_env_p)); + + // 5.a + return ecma_op_get_binding_value (lex_env_p, + ECMA_GET_POINTER (ref.referenced_name_cp), + ref.is_strict); +} /* ecma_op_get_value_lex_env_base */ + +/** + * GetValue operation part (object base). + * + * See also: ECMA-262 v5, 8.7.1, section 4 + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value. + */ +ecma_completion_value_t +ecma_op_get_value_object_base (ecma_reference_t ref) /**< ECMA-reference */ { const ecma_value_t base = ref.base; const bool is_unresolvable_reference = ecma_is_value_undefined (base); @@ -55,100 +86,56 @@ ecma_op_get_value (ecma_reference_t ref) /**< ECMA-reference */ && !(ecma_is_lexical_environment ((ecma_object_t*)ECMA_GET_POINTER(base.value)))); const bool is_property_reference = has_primitive_base || has_object_base; - // 3. - if (is_unresolvable_reference) + JERRY_ASSERT (!is_unresolvable_reference); + JERRY_ASSERT (is_property_reference); + + // 4.a + if (!has_primitive_base) { - return ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_REFERENCE)); - } + // 4.b case 1 - // 4. - if (is_property_reference) - { - // 4.a - if (!has_primitive_base) - { - // 4.b case 1 + ecma_object_t *obj_p = ECMA_GET_POINTER(base.value); + JERRY_ASSERT(obj_p != NULL + && !ecma_is_lexical_environment (obj_p)); - ecma_object_t *obj_p = ECMA_GET_POINTER(base.value); - JERRY_ASSERT(obj_p != NULL - && !ecma_is_lexical_environment (obj_p)); - - return ecma_op_object_get (obj_p, ECMA_GET_POINTER (ref.referenced_name_cp)); - } - else - { - // 4.b case 2 - ecma_completion_value_t ret_value; - - ECMA_TRY_CATCH (obj_base, ecma_op_to_object (base), ret_value); - - ecma_object_t *obj_p = ECMA_GET_POINTER (obj_base.u.value.value); - JERRY_ASSERT (obj_p != NULL - && !ecma_is_lexical_environment (obj_p)); - - ret_value = ecma_op_object_get (obj_p, ECMA_GET_POINTER (ref.referenced_name_cp)); - - ECMA_FINALIZE (obj_base); - - return ret_value; - } + return ecma_op_object_get (obj_p, ECMA_GET_POINTER (ref.referenced_name_cp)); } else { - // 5 - ecma_object_t *lex_env_p = ECMA_GET_POINTER(base.value); - JERRY_ASSERT(lex_env_p != NULL - && ecma_is_lexical_environment (lex_env_p)); + // 4.b case 2 + ecma_completion_value_t ret_value; - // 5.a - return ecma_op_get_binding_value (lex_env_p, - ECMA_GET_POINTER (ref.referenced_name_cp), - ref.is_strict); + ECMA_TRY_CATCH (obj_base, ecma_op_to_object (base), ret_value); + + ecma_object_t *obj_p = ECMA_GET_POINTER (obj_base.u.value.value); + JERRY_ASSERT (obj_p != NULL + && !ecma_is_lexical_environment (obj_p)); + + ret_value = ecma_op_object_get (obj_p, ECMA_GET_POINTER (ref.referenced_name_cp)); + + ECMA_FINALIZE (obj_base); + + return ret_value; } -} /* ecma_op_get_value */ +} /* ecma_op_get_value_object_base */ /** - * Reject sequence for PutValue + * PutValue operation part (lexical environment base or unresolvable reference). * - * @return completion value - * Returned value must be freed with ecma_free_completion_value - */ -static ecma_completion_value_t -ecma_reject_put (bool is_throw) /**< Throw flag */ -{ - if (is_throw) - { - return ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE)); - } - else - { - return ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_EMPTY); - } -} /* ecma_reject_put */ - -/** - * PutValue operation. + * See also: ECMA-262 v5, 8.7.2, sections 3 and 5 * - * See also: ECMA-262 v5, 8.7.1 - * @return completion value * Returned value must be freed with ecma_free_completion_value. */ ecma_completion_value_t -ecma_op_put_value (ecma_reference_t ref, /**< ECMA-reference */ - ecma_value_t value) /**< ECMA-value */ +ecma_op_put_value_lex_env_base (ecma_reference_t ref, /**< ECMA-reference */ + ecma_value_t value) /**< ECMA-value */ { const ecma_value_t base = ref.base; const bool is_unresolvable_reference = ecma_is_value_undefined (base); - const bool has_primitive_base = (ecma_is_value_boolean (base) - || base.value_type == ECMA_TYPE_NUMBER - || base.value_type == ECMA_TYPE_STRING); - const bool has_object_base = (base.value_type == ECMA_TYPE_OBJECT - && !ecma_is_lexical_environment ((ecma_object_t*)ECMA_GET_POINTER(base.value))); - const bool is_property_reference = has_primitive_base || has_object_base; // 3. - if (is_unresolvable_reference) + if (unlikely (is_unresolvable_reference)) { // 3.a. if (ref.is_strict) @@ -173,104 +160,144 @@ ecma_op_put_value (ecma_reference_t ref, /**< ECMA-reference */ return ecma_make_empty_completion_value (); } } - else if (is_property_reference) + + // 5. + ecma_object_t *lex_env_p = ECMA_GET_POINTER(base.value); + JERRY_ASSERT(lex_env_p != NULL + && ecma_is_lexical_environment (lex_env_p)); + + // 5.a + return ecma_op_set_mutable_binding (lex_env_p, + ECMA_GET_POINTER (ref.referenced_name_cp), + value, + ref.is_strict); +} /* ecma_op_put_value_lex_env_base */ + +/** + * Reject sequence for PutValue + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value + */ +static ecma_completion_value_t +ecma_reject_put (bool is_throw) /**< Throw flag */ +{ + if (is_throw) { - // 4. - if (!has_primitive_base) + return ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE)); + } + else + { + return ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_EMPTY); + } +} /* ecma_reject_put */ + +/** + * PutValue operation part (object base). + * + * See also: ECMA-262 v5, 8.7.2, section 4 + * + * @return completion value + * Returned value must be freed with ecma_free_completion_value. + */ +ecma_completion_value_t +ecma_op_put_value_object_base (ecma_reference_t ref, /**< ECMA-reference */ + ecma_value_t value) /**< ECMA-value */ +{ + const ecma_value_t base = ref.base; + const bool is_unresolvable_reference = ecma_is_value_undefined (base); + const bool has_primitive_base = (ecma_is_value_boolean (base) + || base.value_type == ECMA_TYPE_NUMBER + || base.value_type == ECMA_TYPE_STRING); + const bool has_object_base = (base.value_type == ECMA_TYPE_OBJECT + && !(ecma_is_lexical_environment ((ecma_object_t*)ECMA_GET_POINTER(base.value)))); + const bool is_property_reference = has_primitive_base || has_object_base; + + JERRY_ASSERT (!is_unresolvable_reference); + JERRY_ASSERT (is_property_reference); + + // 4.a + if (!has_primitive_base) + { + // 4.b case 1 + + ecma_object_t *obj_p = ECMA_GET_POINTER(base.value); + JERRY_ASSERT (obj_p != NULL + && !ecma_is_lexical_environment (obj_p)); + + ecma_completion_value_t ret_value; + + ECMA_TRY_CATCH (put_completion, + ecma_op_object_put (obj_p, + ECMA_GET_POINTER (ref.referenced_name_cp), + value, + ref.is_strict), + ret_value); + + ret_value = ecma_make_empty_completion_value (); + + ECMA_FINALIZE (put_completion); + + return ret_value; + } + else + { + // 4.b case 2 + ecma_completion_value_t ret_value; + + // sub_1. + ECMA_TRY_CATCH (obj_base, ecma_op_to_object (base), ret_value); + + ecma_object_t *obj_p = ECMA_GET_POINTER (obj_base.u.value.value); + JERRY_ASSERT (obj_p != NULL + && !ecma_is_lexical_environment (obj_p)); + + ecma_string_t *referenced_name_p = ECMA_GET_POINTER (ref.referenced_name_cp); + + // sub_2. + if (!ecma_op_object_can_put (obj_p, referenced_name_p)) { - // 4.b case 1 - - ecma_object_t *obj_p = ECMA_GET_POINTER(base.value); - JERRY_ASSERT (obj_p != NULL - && !ecma_is_lexical_environment (obj_p)); - - ecma_completion_value_t ret_value; - - ECMA_TRY_CATCH (put_completion, - ecma_op_object_put (obj_p, - ECMA_GET_POINTER (ref.referenced_name_cp), - value, - ref.is_strict), - ret_value); - - ret_value = ecma_make_empty_completion_value (); - - ECMA_FINALIZE (put_completion); - - return ret_value; + ret_value = ecma_reject_put (ref.is_strict); } else { - // 4.b case 2 - ecma_completion_value_t ret_value; + // sub_3. + ecma_property_t *own_prop_p = ecma_op_object_get_own_property (obj_p, referenced_name_p); - // sub_1. - ECMA_TRY_CATCH (obj_base, ecma_op_to_object (base), ret_value); + // sub_5. + ecma_property_t *prop_p = ecma_op_object_get_property (obj_p, referenced_name_p); - ecma_object_t *obj_p = ECMA_GET_POINTER (obj_base.u.value.value); - JERRY_ASSERT (obj_p != NULL - && !ecma_is_lexical_environment (obj_p)); - - ecma_string_t *referenced_name_p = ECMA_GET_POINTER (ref.referenced_name_cp); - - // sub_2. - if (!ecma_op_object_can_put (obj_p, referenced_name_p)) + // sub_4., sub_7 + if ((own_prop_p != NULL + && own_prop_p->type == ECMA_PROPERTY_NAMEDDATA) + || (prop_p == NULL) + || (prop_p->type != ECMA_PROPERTY_NAMEDACCESSOR)) { ret_value = ecma_reject_put (ref.is_strict); } else { - // sub_3. - ecma_property_t *own_prop_p = ecma_op_object_get_own_property (obj_p, referenced_name_p); + // sub_6. + JERRY_ASSERT (prop_p != NULL && prop_p->type == ECMA_PROPERTY_NAMEDACCESSOR); - // sub_5. - ecma_property_t *prop_p = ecma_op_object_get_property (obj_p, referenced_name_p); + ecma_object_t *setter_p = ECMA_GET_POINTER(prop_p->u.named_accessor_property.set_p); + JERRY_ASSERT (setter_p != NULL); - // sub_4., sub_7 - if ((own_prop_p != NULL - && own_prop_p->type == ECMA_PROPERTY_NAMEDDATA) - || (prop_p == NULL) - || (prop_p->type != ECMA_PROPERTY_NAMEDACCESSOR)) - { - ret_value = ecma_reject_put (ref.is_strict); - } - else - { - // sub_6. - JERRY_ASSERT (prop_p != NULL && prop_p->type == ECMA_PROPERTY_NAMEDACCESSOR); + ECMA_TRY_CATCH (call_completion, + ecma_op_function_call (setter_p, base, &value, 1), + ret_value); - ecma_object_t *setter_p = ECMA_GET_POINTER(prop_p->u.named_accessor_property.set_p); - JERRY_ASSERT (setter_p != NULL); + ret_value = ecma_make_empty_completion_value (); - ECMA_TRY_CATCH (call_completion, - ecma_op_function_call (setter_p, base, &value, 1), - ret_value); - - ret_value = ecma_make_empty_completion_value (); - - ECMA_FINALIZE (call_completion); - } + ECMA_FINALIZE (call_completion); } - - ECMA_FINALIZE (obj_base); - - return ret_value; } - } - else - { - // 5. - ecma_object_t *lex_env_p = ECMA_GET_POINTER(base.value); - JERRY_ASSERT(lex_env_p != NULL - && ecma_is_lexical_environment (lex_env_p)); - // 5.a. - return ecma_op_set_mutable_binding (lex_env_p, - ECMA_GET_POINTER (ref.referenced_name_cp), - value, - ref.is_strict); + ECMA_FINALIZE (obj_base); + + return ret_value; } -} /* ecma_op_put_value */ +} /* ecma_op_put_value_object_base */ /** * @} diff --git a/src/libecmaoperations/ecma-lex-env.h b/src/libecmaoperations/ecma-lex-env.h index 9b887e5ff..73e7852d5 100644 --- a/src/libecmaoperations/ecma-lex-env.h +++ b/src/libecmaoperations/ecma-lex-env.h @@ -29,9 +29,12 @@ */ /* ECMA-262 v5, 8.7.1 and 8.7.2 */ -extern ecma_completion_value_t ecma_op_get_value (ecma_reference_t ref); -extern ecma_completion_value_t ecma_op_put_value (ecma_reference_t ref, - ecma_value_t value); +extern ecma_completion_value_t ecma_op_get_value_lex_env_base (ecma_reference_t ref); +extern ecma_completion_value_t ecma_op_get_value_object_base (ecma_reference_t ref); +extern ecma_completion_value_t ecma_op_put_value_lex_env_base (ecma_reference_t ref, + ecma_value_t value); +extern ecma_completion_value_t ecma_op_put_value_object_base (ecma_reference_t ref, + ecma_value_t value); /* ECMA-262 v5, Table 17. Abstract methods of Environment Records */ extern ecma_completion_value_t ecma_op_has_binding (ecma_object_t *lex_env_p,