Skip to content

Commit

Permalink
Rework VM dispatch
Browse files Browse the repository at this point in the history 
JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik robert.fancsik@h-lab.eu
  • Loading branch information
Robert Fancsik committed Jan 19, 2022
1 parent 79fd540 commit 12af4cc
Show file tree
Hide file tree
Showing 10 changed files with 2,086 additions and 1,897 deletions.
1 change: 0 additions & 1 deletion docs/05.PORT-API.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ typedef enum
{
ERR_OUT_OF_MEMORY = 10,
ERR_REF_COUNT_LIMIT = 12,
ERR_DISABLED_BYTE_CODE = 13,
ERR_FAILED_INTERNAL_ASSERTION = 120
} jerry_fatal_code_t;
```
Expand Down
1 change: 0 additions & 1 deletion jerry-core/include/jerryscript-port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ typedef enum
{
ERR_OUT_OF_MEMORY = 10,
ERR_REF_COUNT_LIMIT = 12,
ERR_DISABLED_BYTE_CODE = 13,
ERR_UNTERMINATED_GC_LOOPS = 14,
ERR_FAILED_INTERNAL_ASSERTION = 120
} jerry_fatal_code_t;
Expand Down
5 changes: 0 additions & 5 deletions jerry-core/jrt/jrt-fatals.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ jerry_fatal (jerry_fatal_code_t code) /**< status code */
JERRY_ERROR_MSG ("Error: ERR_UNTERMINATED_GC_LOOPS\n");
break;
}
case ERR_DISABLED_BYTE_CODE:
{
JERRY_ERROR_MSG ("Error: ERR_DISABLED_BYTE_CODE\n");
break;
}
case ERR_FAILED_INTERNAL_ASSERTION:
{
JERRY_ERROR_MSG ("Error: ERR_FAILED_INTERNAL_ASSERTION\n");
Expand Down
4 changes: 2 additions & 2 deletions jerry-core/parser/js/byte-code.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ JERRY_STATIC_ASSERT (CBC_EXT_END == 167, number_of_cbc_ext_opcodes_changed);
/**
* Compact bytecode definition
*/
#define CBC_OPCODE(arg1, arg2, arg3, arg4) ((arg2) | (((arg3) + CBC_STACK_ADJUST_BASE) << CBC_STACK_ADJUST_SHIFT)),
#define CBC_OPCODE(arg1, arg2, arg3) ((arg2) | (((arg3) + CBC_STACK_ADJUST_BASE) << CBC_STACK_ADJUST_SHIFT)),

/**
* Flags of the opcodes.
Expand All @@ -63,7 +63,7 @@ const uint8_t cbc_ext_flags[] = { CBC_EXT_OPCODE_LIST };

#if JERRY_PARSER_DUMP_BYTE_CODE

#define CBC_OPCODE(arg1, arg2, arg3, arg4) #arg1,
#define CBC_OPCODE(arg1, arg2, arg3) #arg1,

/**
* Names of the opcodes.
Expand Down
935 changes: 360 additions & 575 deletions jerry-core/parser/js/byte-code.h
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions jerry-core/parser/js/js-parser-expr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@ parser_parse_object_literal (parser_context_t *context_p) /**< context */
uint16_t function_literal_index = lexer_construct_function_object (context_p, status_flags);

#if JERRY_ESNEXT
if (opcode >= CBC_EXT_SET_COMPUTED_GETTER)
if (is_computed)
{
literal_index = function_literal_index;
}
Expand Down Expand Up @@ -3487,7 +3487,7 @@ parser_process_binary_assignment_token (parser_context_t *context_p, /**< contex

if (opcode == CBC_ASSIGN_PROP_THIS_LITERAL && (context_p->stack_depth >= context_p->stack_limit))
{
/* Stack limit is increased for VM_OC_ASSIGN_PROP_THIS. Needed by vm.c. */
/* Needed by vm.c. */
JERRY_ASSERT (context_p->stack_depth == context_p->stack_limit);

context_p->stack_limit++;
Expand Down
226 changes: 90 additions & 136 deletions jerry-core/vm/opcodes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ opfunc_typeof (ecma_value_t left_value) /**< left value */
/**
* Update data property for object literals.
*/
void
opfunc_set_data_property (ecma_object_t *object_p, /**< object */
ecma_string_t *prop_name_p, /**< data property name */
ecma_value_t value) /**< new value */
static void
opfunc_assing_data_property (ecma_object_t *object_p, /**< object */
ecma_string_t *prop_name_p, /**< data property name */
ecma_value_t value) /**< new value */
{
JERRY_ASSERT (!ecma_op_object_is_fast_array (object_p));

Expand Down Expand Up @@ -96,7 +96,7 @@ opfunc_set_data_property (ecma_object_t *object_p, /**< object */
}

ecma_named_data_property_assign_value (object_p, prop_value_p, value);
} /* opfunc_set_data_property */
} /* opfunc_assing_data_property */

/**
* Update getter or setter for object literals.
Expand Down Expand Up @@ -320,17 +320,15 @@ opfunc_for_in (ecma_value_t iterable_value, /**< ideally an iterable value */
#if JERRY_ESNEXT

/**
* 'VM_OC_APPEND_ARRAY' opcode handler specialized for spread objects
* 'CBC_EXT_SPREAD_ARRAY_APPEND' opcode handler specialized for spread objects
*
* @return ECMA_VALUE_ERROR - if the operation failed
* ECMA_VALUE_EMPTY, otherwise
*/
static ecma_value_t JERRY_ATTR_NOINLINE
ecma_value_t JERRY_ATTR_NOINLINE
opfunc_append_to_spread_array (ecma_value_t *stack_top_p, /**< current stack top */
uint16_t values_length) /**< number of elements to set */
{
JERRY_ASSERT (!(values_length & OPFUNC_HAS_SPREAD_ELEMENT));

ecma_object_t *array_obj_p = ecma_get_object_from_value (stack_top_p[-1]);
JERRY_ASSERT (ecma_get_object_type (array_obj_p) == ECMA_OBJECT_TYPE_ARRAY);

Expand Down Expand Up @@ -501,23 +499,15 @@ opfunc_spread_arguments (ecma_value_t *stack_top_p, /**< pointer to the current
#endif /* JERRY_ESNEXT */

/**
* 'VM_OC_APPEND_ARRAY' opcode handler, for setting array object properties
* 'CBC_ARRAY_APPEND' opcode handler, for setting array object properties
*
* @return ECMA_VALUE_ERROR - if the operation failed
* ECMA_VALUE_EMPTY, otherwise
*/
ecma_value_t JERRY_ATTR_NOINLINE
opfunc_append_array (ecma_value_t *stack_top_p, /**< current stack top */
uint16_t values_length) /**< number of elements to set
* with potential OPFUNC_HAS_SPREAD_ELEMENT flag */
uint16_t values_length) /**< number of elements to set */
{
#if JERRY_ESNEXT
if (values_length >= OPFUNC_HAS_SPREAD_ELEMENT)
{
return opfunc_append_to_spread_array (stack_top_p, (uint16_t) (values_length & ~OPFUNC_HAS_SPREAD_ELEMENT));
}
#endif /* JERRY_ESNEXT */

ecma_object_t *array_obj_p = ecma_get_object_from_value (stack_top_p[-1]);
JERRY_ASSERT (ecma_get_object_type (array_obj_p) == ECMA_OBJECT_TYPE_ARRAY);

Expand Down Expand Up @@ -1158,8 +1148,8 @@ opfunc_add_computed_field (ecma_value_t class_object, /**< class object */
* @return - new external function ecma-object
*/
ecma_value_t
opfunc_create_implicit_class_constructor (uint8_t opcode, /**< current cbc opcode */
const ecma_compiled_code_t *bytecode_p) /**< current byte code */
opfunc_create_implicit_class_constructor (const ecma_compiled_code_t *bytecode_p, /**< current byte code */
bool is_herigate) /* true -if class heritage is present */
{
/* 8. */
ecma_value_t script_value = ((cbc_uint8_arguments_t *) bytecode_p)->script_value;
Expand All @@ -1181,7 +1171,7 @@ opfunc_create_implicit_class_constructor (uint8_t opcode, /**< current cbc opcod
constructor_object_p->u.constructor_function.flags = 0;

/* 10.a.i */
if (opcode == CBC_EXT_PUSH_IMPLICIT_CONSTRUCTOR_HERITAGE)
if (is_herigate)
{
constructor_object_p->u.constructor_function.flags |= ECMA_CONSTRUCTOR_FUNCTION_HAS_HERITAGE;
}
Expand Down Expand Up @@ -1574,9 +1564,6 @@ opfunc_collect_private_properties (ecma_value_t constructor, ecma_value_t prop_n

if (opcode == CBC_EXT_COLLECT_PRIVATE_METHOD)
{
prop_name ^= value;
value ^= prop_name;
prop_name ^= value;
kind = ECMA_PRIVATE_METHOD;
}
else if (opcode == CBC_EXT_COLLECT_PRIVATE_GETTER)
Expand Down Expand Up @@ -1977,10 +1964,7 @@ opfunc_finalize_class (vm_frame_ctx_t *frame_ctx_p, /**< frame context */
* ECMA_VALUE_EMPTY - otherwise
*/
ecma_value_t
opfunc_form_super_reference (ecma_value_t **vm_stack_top_p, /**< current vm stack top */
vm_frame_ctx_t *frame_ctx_p, /**< frame context */
ecma_value_t prop_name, /**< property name to resolve */
uint8_t opcode) /**< current cbc opcode */
opfunc_resolve_super (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
{
ecma_environment_record_t *environment_record_p = ecma_op_get_environment_record (frame_ctx_p->lex_env_p);

Expand All @@ -2001,112 +1985,8 @@ opfunc_form_super_reference (ecma_value_t **vm_stack_top_p, /**< current vm stac
return ECMA_VALUE_ERROR;
}

ecma_value_t *stack_top_p = *vm_stack_top_p;

if (opcode >= CBC_EXT_SUPER_PROP_ASSIGNMENT_REFERENCE)
{
JERRY_ASSERT (opcode == CBC_EXT_SUPER_PROP_ASSIGNMENT_REFERENCE
|| opcode == CBC_EXT_SUPER_PROP_LITERAL_ASSIGNMENT_REFERENCE);
*stack_top_p++ = parent;
*stack_top_p++ = ecma_copy_value (prop_name);
*vm_stack_top_p = stack_top_p;

return ECMA_VALUE_EMPTY;
}

ecma_object_t *parent_p = ecma_get_object_from_value (parent);
ecma_string_t *prop_name_p = ecma_op_to_property_key (prop_name);

if (prop_name_p == NULL)
{
ecma_deref_object (parent_p);
return ECMA_VALUE_ERROR;
}

ecma_value_t result = ecma_op_object_get_with_receiver (parent_p, prop_name_p, frame_ctx_p->this_binding);
ecma_deref_ecma_string (prop_name_p);
ecma_deref_object (parent_p);

if (ECMA_IS_VALUE_ERROR (result))
{
return result;
}

if (opcode == CBC_EXT_SUPER_PROP_LITERAL_REFERENCE || opcode == CBC_EXT_SUPER_PROP_REFERENCE)
{
*stack_top_p++ = ecma_copy_value (frame_ctx_p->this_binding);
*stack_top_p++ = ECMA_VALUE_UNDEFINED;
}

*stack_top_p++ = result;
*vm_stack_top_p = stack_top_p;

return ECMA_VALUE_EMPTY;
} /* opfunc_form_super_reference */

/**
* Assignment operation for SuperRefence base
*
* @return ECMA_VALUE_ERROR - if the operation fails
* ECMA_VALUE_EMPTY - otherwise
*/
ecma_value_t
opfunc_assign_super_reference (ecma_value_t **vm_stack_top_p, /**< vm stack top */
vm_frame_ctx_t *frame_ctx_p, /**< frame context */
uint32_t opcode_data) /**< opcode data to store the result */
{
ecma_value_t *stack_top_p = *vm_stack_top_p;

ecma_value_t base_obj = ecma_op_to_object (stack_top_p[-3]);

if (ECMA_IS_VALUE_ERROR (base_obj))
{
return base_obj;
}

ecma_object_t *base_obj_p = ecma_get_object_from_value (base_obj);
ecma_string_t *prop_name_p = ecma_op_to_property_key (stack_top_p[-2]);

if (prop_name_p == NULL)
{
ecma_deref_object (base_obj_p);
return ECMA_VALUE_ERROR;
}

bool is_strict = (frame_ctx_p->status_flags & VM_FRAME_CTX_IS_STRICT) != 0;

ecma_value_t result =
ecma_op_object_put_with_receiver (base_obj_p, prop_name_p, stack_top_p[-1], frame_ctx_p->this_binding, is_strict);

ecma_deref_ecma_string (prop_name_p);
ecma_deref_object (base_obj_p);

if (ECMA_IS_VALUE_ERROR (result))
{
return result;
}

for (int32_t i = 1; i <= 3; i++)
{
ecma_free_value (stack_top_p[-i]);
}

stack_top_p -= 3;

if (opcode_data & VM_OC_PUT_STACK)
{
*stack_top_p++ = result;
}
else if (opcode_data & VM_OC_PUT_BLOCK)
{
ecma_fast_free_value (VM_GET_REGISTER (frame_ctx_p, 0));
VM_GET_REGISTERS (frame_ctx_p)[0] = result;
}

*vm_stack_top_p = stack_top_p;

return result;
} /* opfunc_assign_super_reference */
return parent;
} /* opfunc_resolve_super */

/**
* Copy data properties of an object
Expand Down Expand Up @@ -2222,7 +2102,7 @@ opfunc_copy_data_properties (ecma_value_t target_object, /**< target object */
}
}

opfunc_set_data_property (target_object_p, property_name_p, result);
opfunc_assing_data_property (target_object_p, property_name_p, result);
ecma_free_value (result);

result = ECMA_VALUE_EMPTY;
Expand Down Expand Up @@ -2303,8 +2183,82 @@ opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *frame_ctx_p, /**< f
&& !ecma_is_property_configurable (property));
} /* opfunc_lexical_scope_has_restricted_binding */

/**
* Create function name property to the given function object
*/
void
opfunc_set_function_name (ecma_value_t function_object, /**< function object */
ecma_value_t function_name, /**< function name */
char *prefix_p, /**< function name prefix */
lit_utf8_size_t prefix_size) /**< function name prefix's length */
{
ecma_object_t *func_obj_p = ecma_get_object_from_value (function_object);

if (ecma_find_named_property (func_obj_p, ecma_get_magic_string (LIT_MAGIC_STRING_NAME)) != NULL)
{
return;
}

ecma_property_value_t *value_p;
value_p = ecma_create_named_data_property (func_obj_p,
ecma_get_magic_string (LIT_MAGIC_STRING_NAME),
ECMA_PROPERTY_FLAG_CONFIGURABLE,
NULL);

if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION)
{
ECMA_SET_SECOND_BIT_TO_POINTER_TAG (((ecma_extended_object_t *) func_obj_p)->u.function.scope_cp);
}

value_p->value = ecma_op_function_form_name (ecma_get_prop_name_from_value (function_name), prefix_p, prefix_size);
} /* opfunc_set_function_name */

#endif /* JERRY_ESNEXT */

/**
* Set data property to an object/class
*
* @return ECMA_VALUE_ERROR - if the operation fails
* ECMA_VALUE_EMPTY - otherwise
*/
ecma_value_t
opfunc_set_data_property (ecma_value_t *stack_top_p, /**< vm stack */
ecma_value_t prop_name, /**< property name to set */
ecma_value_t value, /**< value to set */
bool is_static) /**< true - if set class property
false - otherwise */
{
ecma_string_t *prop_name_p = ecma_op_to_property_key (prop_name);

if (JERRY_UNLIKELY (prop_name_p == NULL))
{
return ECMA_VALUE_ERROR;
}

int index = -1;

#if JERRY_ESNEXT
if (JERRY_UNLIKELY (is_static))
{
if (ecma_compare_ecma_string_to_magic_id (prop_name_p, LIT_MAGIC_STRING_PROTOTYPE))
{
return ecma_raise_type_error (ECMA_ERR_CLASS_IS_NON_CONFIGURABLE);
}

index--;
}
#else /* !JERRY_ESNEXT */
JERRY_UNUSED (is_static);
#endif /* JERRY_ESNEXT */

ecma_object_t *object_p = ecma_get_object_from_value (stack_top_p[index]);

opfunc_assing_data_property (object_p, prop_name_p, value);
ecma_deref_ecma_string (prop_name_p);

return ECMA_VALUE_EMPTY;
} /* opfunc_set_data_property */

/**
* @}
* @}
Expand Down

0 comments on commit 12af4cc

Please sign in to comment.