Merge pull request jerryscript-project#38 from ruben-ayrapetyan/experiments-dev

Experiments dev

Author: ruben-ayrapetyan

jerry-core/parser/js/bc/bytecode-data.cpp

@@ -19,12 +19,6 @@
 
 static bytecode_data_header_t *first_bytecode_header_p = NULL;
 
-bytecode_data_header_t *
-bc_get_first_bytecode_data_header ()
-{
-  return first_bytecode_header_p;
-} /* bc_get_first_bytecode_header */
-
 static void
 bc_add_bytecode_data (bytecode_data_header_t *bc_header_p,
                       lit_id_hash_table *lit_id_hash_table_p,
@@ -45,16 +39,50 @@ bc_add_bytecode_data (bytecode_data_header_t *bc_header_p,
   MEM_CP_SET_POINTER (bc_header_p->declarations_cp, declarations_p);
   bc_header_p->func_scopes_count = func_scopes_count;
   bc_header_p->var_decls_count = var_decls_count;
-  MEM_CP_SET_POINTER (bc_header_p->next_header_cp, first_bytecode_header_p);
+  bc_header_p->next_header_cp = MEM_CP_NULL;
 
   bc_header_p->is_strict = is_strict;
   bc_header_p->is_ref_arguments_identifier = is_ref_arguments_identifier;
   bc_header_p->is_ref_eval_identifier = is_ref_eval_identifier;
   bc_header_p->is_args_moved_to_regs = is_arguments_moved_to_regs;
   bc_header_p->is_no_lex_env = is_no_lex_env;
+} /* bc_add_bytecode_data */
 
-  first_bytecode_header_p = bc_header_p;
-} /* bc_add_bytecode */
+static void
+bc_free_bytecode_data (bytecode_data_header_t *bytecode_data_p)
+{
+  bytecode_data_header_t* next_to_handle_list_p = bytecode_data_p;
+
+  while (next_to_handle_list_p != NULL)
+  {
+    bytecode_data_header_t *bc_header_list_iter_p = next_to_handle_list_p;
+    next_to_handle_list_p = NULL;
+
+    while (bc_header_list_iter_p != NULL)
+    {
+      bytecode_data_header_t *header_p = bc_header_list_iter_p;
+
+      bc_header_list_iter_p = MEM_CP_GET_POINTER (bytecode_data_header_t, header_p->next_header_cp);
+
+      mem_cpointer_t *declarations_p = MEM_CP_GET_POINTER (mem_cpointer_t, header_p->declarations_cp);
+
+      for (uint32_t index = 0; index < header_p->func_scopes_count; index++)
+      {
+        bytecode_data_header_t *child_scope_header_p = MEM_CP_GET_NON_NULL_POINTER (bytecode_data_header_t,
+                                                                                    declarations_p[index]);
+        JERRY_ASSERT (child_scope_header_p->next_header_cp == MEM_CP_NULL);
+
+        MEM_CP_SET_POINTER (child_scope_header_p->next_header_cp, next_to_handle_list_p);
+
+        next_to_handle_list_p = child_scope_header_p;
+      }
+
+      mem_heap_free_block (header_p);
+    }
+
+    JERRY_ASSERT (bc_header_list_iter_p == NULL);
+  }
+} /* bc_free_bytecode_data */
 
 /**
  * Deletes bytecode and associated hash table
@@ -77,7 +105,11 @@ bc_remove_bytecode_data (const bytecode_data_header_t *bytecode_data_p)
       {
         first_bytecode_header_p = MEM_CP_GET_POINTER (bytecode_data_header_t, cur_header_p->next_header_cp);
       }
-      mem_heap_free_block (cur_header_p);
+
+      cur_header_p->next_header_cp = MEM_CP_NULL;
+
+      bc_free_bytecode_data (cur_header_p);
+
       break;
     }
 
@@ -126,7 +158,7 @@ bc_dump_single_scope (scopes_tree scope_p,
   const size_t entries_count = scope_p->max_uniq_literals_num;
   const vm_instr_counter_t instrs_count = scopes_tree_count_instructions_in_single_scope (scope_p);
   const size_t blocks_count = JERRY_ALIGNUP (instrs_count, BLOCK_SIZE) / BLOCK_SIZE;
-  const uint16_t func_scopes_count = scope_p->t.children ? linked_list_get_length (scope_p->t.children) : 0;
+  const size_t func_scopes_count = scopes_tree_child_scopes_num (scope_p);
   const uint16_t var_decls_count = linked_list_get_length (scope_p->var_decls);
   const size_t bytecode_size = JERRY_ALIGNUP (instrs_count * sizeof (vm_instr_t), MEM_ALIGNMENT);
   const size_t hash_table_size = lit_id_hash_table_get_size_for_table (entries_count, blocks_count);
@@ -158,11 +190,16 @@ bc_dump_single_scope (scopes_tree scope_p,
 
   bytecode_data_header_t *header_p = (bytecode_data_header_t *) buffer_p;
 
+  if ((uint16_t) func_scopes_count != func_scopes_count)
+  {
+    jerry_fatal (ERR_OUT_OF_MEMORY);
+  }
+
   bc_add_bytecode_data (header_p,
                         lit_id_hash, bytecode_p,
                         instrs_count,
                         declarations_p,
-                        func_scopes_count,
+                        (uint16_t) func_scopes_count,
                         var_decls_count,
                         scope_p->strict_mode,
                         scope_p->ref_arguments,
@@ -179,41 +216,99 @@ bc_dump_single_scope (scopes_tree scope_p,
   return header_p;
 } /* bc_dump_single_scope */
 
-
-static void
-bc_data_header_set_child (bytecode_data_header_t *header_p,
-                          bytecode_data_header_t *child_p,
-                          uint32_t i)
+static bytecode_data_header_t*
+bc_dump_scope_and_prepare_header (scopes_tree scope_p,
+                                  bool is_show_instrs)
 {
-  JERRY_ASSERT (i < header_p->func_scopes_count);
+  JERRY_ASSERT (scope_p->next_scope_cp == MEM_CP_NULL);
+
+  bytecode_data_header_t *header_p = bc_dump_single_scope (scope_p, is_show_instrs);
+  JERRY_ASSERT (header_p->next_header_cp == MEM_CP_NULL);
 
   mem_cpointer_t *declarations_p = MEM_CP_GET_POINTER (mem_cpointer_t, header_p->declarations_cp);
-  MEM_CP_SET_POINTER (declarations_p[i], child_p);
-} /* bc_data_header_set_child */
+
+  uint32_t index = 0;
+  scopes_tree child_scopes_iter_p = MEM_CP_GET_POINTER (scopes_tree_int, scope_p->children_list_cp);
+
+  while (child_scopes_iter_p != NULL)
+  {
+    JERRY_ASSERT (index < header_p->func_scopes_count);
+
+    MEM_CP_SET_POINTER (declarations_p[index], child_scopes_iter_p);
+
+    index++;
+
+    scopes_tree next_child_scope_p = MEM_CP_GET_POINTER (scopes_tree_int, child_scopes_iter_p->next_scope_cp);
+
+    child_scopes_iter_p->next_scope_cp = MEM_CP_NULL;
+
+    child_scopes_iter_p = next_child_scope_p;
+  }
+
+  JERRY_ASSERT (index == header_p->func_scopes_count);
+
+  return header_p;
+} /* bc_dump_scope_and_prepare_header */
 
 /**
  * Dump scopes tree into bytecode
  *
+ * See also:
+ *          Note to declarations_cp field of bytecode_data_header_t
+ *
  * @return pointer to bytecode header of the outer most scope
  */
 bytecode_data_header_t *
-bc_dump_scopes (scopes_tree scope_p,
-                bool is_show_instrs)
+bc_dump_and_free_scopes_tree (scopes_tree scope_p,
+                              bool is_show_instrs)
 {
-  bytecode_data_header_t *header_p = bc_dump_single_scope (scope_p, is_show_instrs);
+  bytecode_data_header_t *bc_header_p = bc_dump_scope_and_prepare_header (scope_p, is_show_instrs);
+  scopes_tree_free (scope_p);
+
+  bytecode_data_header_t* next_to_handle_list_p = bc_header_p;
 
-  if (scope_p->t.children != null_list)
+  while (next_to_handle_list_p != NULL)
   {
-    for (uint32_t i = 0; i < linked_list_get_length (scope_p->t.children); ++i)
+    bytecode_data_header_t *bc_header_list_iter_p = next_to_handle_list_p;
+
+    next_to_handle_list_p = NULL;
+
+    while (bc_header_list_iter_p != NULL)
     {
-      bytecode_data_header_t *child_p;
-      child_p = bc_dump_scopes (*(scopes_tree *) linked_list_element (scope_p->t.children, i), is_show_instrs);
-      bc_data_header_set_child (header_p, child_p, i);
+      mem_cpointer_t *declarations_p = MEM_CP_GET_POINTER (mem_cpointer_t, bc_header_list_iter_p->declarations_cp);
+
+      for (uint32_t index = 0; index < bc_header_list_iter_p->func_scopes_count; index++)
+      {
+        scopes_tree next_tree_p = MEM_CP_GET_NON_NULL_POINTER (scopes_tree_int, declarations_p[index]);
+
+        bytecode_data_header_t *next_header_p = bc_dump_scope_and_prepare_header (next_tree_p, is_show_instrs);
+
+        scopes_tree_free (next_tree_p);
+
+        MEM_CP_SET_NON_NULL_POINTER (declarations_p [index], next_header_p);
+
+        JERRY_ASSERT (next_header_p->next_header_cp == MEM_CP_NULL);
+
+        MEM_CP_SET_POINTER (next_header_p->next_header_cp, next_to_handle_list_p);
+        next_to_handle_list_p = next_header_p;
+      }
+
+      bytecode_data_header_t *next_bc_header_list_iter_p = MEM_CP_GET_POINTER (bytecode_data_header_t,
+                                                                               bc_header_list_iter_p->next_header_cp);
+      bc_header_list_iter_p->next_header_cp = MEM_CP_NULL;
+
+      bc_header_list_iter_p = next_bc_header_list_iter_p;
     }
+
+    JERRY_ASSERT (bc_header_list_iter_p == NULL);
+    bc_header_list_iter_p = next_to_handle_list_p;
   }
 
-  return header_p;
-} /* bc_dump_scopes */
+  MEM_CP_SET_POINTER (bc_header_p->next_header_cp, first_bytecode_header_p);
+  first_bytecode_header_p = bc_header_p;
+
+  return bc_header_p;
+} /* bc_dump_and_free_scopes_tree */
 
 void
 bc_finalize ()
@@ -223,7 +318,9 @@ bc_finalize ()
     bytecode_data_header_t *header_p = first_bytecode_header_p;
     first_bytecode_header_p = MEM_CP_GET_POINTER (bytecode_data_header_t, header_p->next_header_cp);
 
-    mem_heap_free_block (header_p);
+    header_p->next_header_cp = MEM_CP_NULL;
+
+    bc_free_bytecode_data (header_p);
   }
 } /* bc_finalize */
 

jerry-core/parser/js/bc/bytecode-data.h

@@ -46,7 +46,12 @@ typedef struct __attribute__ ((aligned (MEM_ALIGNMENT))) bytecode_data_header_t
   mem_cpointer_t lit_id_hash_cp; /**< pointer to literal identifiers hash table
                                   *   See also: lit_id_hash_table_init */
 
-  mem_cpointer_t declarations_cp; /**< function scopes and variable declarations inside current scope */
+  mem_cpointer_t declarations_cp; /**< function scopes and variable declarations inside current scope
+                                   *
+                                   *   Note:
+                                   *        During bc_dump_and_free_scopes_tree the function scopes links point to
+                                   *        scopes_tree, and after - to bytecode_data_header_t.
+                                   */
   uint16_t func_scopes_count; /**< count of function scopes inside current scope */
   uint16_t var_decls_count; /**< count of variable declrations inside current scope */
 
@@ -62,16 +67,14 @@ typedef struct __attribute__ ((aligned (MEM_ALIGNMENT))) bytecode_data_header_t
 } bytecode_data_header_t;
 
 
-bytecode_data_header_t * bc_get_first_bytecode_data_header ();
-
 void bc_remove_bytecode_data (const bytecode_data_header_t *);
 
 vm_instr_t bc_get_instr (const bytecode_data_header_t *,
                          vm_instr_counter_t);
 
 void bc_print_instrs (const bytecode_data_header_t *bytecode_data_p);
 
-bytecode_data_header_t *bc_dump_scopes (scopes_tree, bool);
+bytecode_data_header_t *bc_dump_and_free_scopes_tree (scopes_tree, bool);
 
 void bc_finalize ();
 

jerry-core/parser/js/jsp-mm.cpp

@@ -28,12 +28,19 @@
 /**
  * Header of a managed block, allocated by parser
  */
-typedef struct __attribute__ ((alignment (MEM_ALIGNMENT)))
+typedef struct
 {
   mem_cpointer_t prev_block_cp; /**< previous managed block */
   mem_cpointer_t next_block_cp; /**< next managed block */
+
+  uint32_t padding; /**< padding for alignment */
 } jsp_mm_header_t;
 
+/**
+ * Check that alignment of jsp_mm_header_t is MEM_ALIGNMENT
+ */
+JERRY_STATIC_ASSERT ((sizeof (jsp_mm_header_t) % MEM_ALIGNMENT) == 0);
+
 /**
  * List used for tracking memory blocks
  */