Move all remaining globals to the global context.

Zero out all globals (and remove unnecessary init() functions).
Move snapshot globals to a temporary stack variable.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com

Author: zherczeg

jerry-core/ecma/base/ecma-gc.c

@@ -160,19 +160,6 @@ ecma_deref_object (ecma_object_t *object_p) /**< object */
   object_p->type_flags_refs = (uint16_t) (object_p->type_flags_refs - ECMA_OBJECT_REF_ONE);
 } /* ecma_deref_object */
 
-/**
- * Initialize garbage collector
- */
-void
-ecma_gc_init (void)
-{
-  JERRY_CONTEXT (ecma_gc_objects_lists) [ECMA_GC_COLOR_WHITE_GRAY] = NULL;
-  JERRY_CONTEXT (ecma_gc_objects_lists) [ECMA_GC_COLOR_BLACK] = NULL;
-  JERRY_CONTEXT (ecma_gc_visited_flip_flag) = false;
-  JERRY_CONTEXT (ecma_gc_objects_number) = 0;
-  JERRY_CONTEXT (ecma_gc_new_objects) = 0;
-} /* ecma_gc_init */
-
 /**
  * Mark referenced object from property
  */

jerry-core/ecma/base/ecma-gc.h

@@ -26,7 +26,6 @@
  * @{
  */
 
-extern void ecma_gc_init (void);
 extern void ecma_init_gc_info (ecma_object_t *);
 extern void ecma_ref_object (ecma_object_t *);
 extern void ecma_deref_object (ecma_object_t *);

jerry-core/ecma/base/ecma-init-finalize.c

@@ -35,10 +35,7 @@
 void
 ecma_init (void)
 {
-  ecma_gc_init ();
-  ecma_init_builtins ();
   ecma_lcache_init ();
-  ecma_init_lit_storage ();
   ecma_init_global_lex_env ();
 
   jmem_register_free_unused_memory_callback (ecma_free_unused_memory);

jerry-core/ecma/base/ecma-literal-storage.c

@@ -28,16 +28,6 @@
 JERRY_STATIC_ASSERT (sizeof (ecma_lit_storage_item_t) <= sizeof (uint64_t),
                      size_of_ecma_lit_storage_item_t_must_be_less_than_or_equal_to_8_bytes);
 
-/**
- * Initialize literal storage
- */
-void
-ecma_init_lit_storage (void)
-{
-  JERRY_CONTEXT (string_list_first_p) = NULL;
-  JERRY_CONTEXT (number_list_first_p) = NULL;
-} /* ecma_init_lit_storage */
-
 /**
  * Free string list
  */

jerry-core/ecma/base/ecma-literal-storage.h

@@ -37,7 +37,6 @@ typedef struct
   jmem_cpointer_t literal_offset; /**< literal offset */
 } lit_mem_to_snapshot_id_map_entry_t;
 
-extern void ecma_init_lit_storage (void);
 extern void ecma_finalize_lit_storage (void);
 
 extern jmem_cpointer_t ecma_find_or_create_literal_string (const lit_utf8_byte_t *, lit_utf8_size_t);

jerry-core/ecma/builtin-objects/ecma-builtins.c

@@ -20,6 +20,7 @@
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
 #include "ecma-objects.h"
+#include "jcontext.h"
 #include "jrt-bit-fields.h"
 
 #define ECMA_BUILTINS_INTERNAL
@@ -32,19 +33,8 @@
  * @{
  */
 
-static ecma_value_t
-ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id,
-                               uint16_t builtin_routine_id,
-                               ecma_value_t this_arg_value,
-                               const ecma_value_t arguments_list[],
-                               ecma_length_t arguments_number);
 static void ecma_instantiate_builtin (ecma_builtin_id_t id);
 
-/**
- * Pointer to instances of built-in objects
- */
-static ecma_object_t *ecma_builtin_objects[ECMA_BUILTIN_ID__COUNT];
-
 /**
  * Check if passed object is the instance of specified built-in.
  */
@@ -55,15 +45,15 @@ ecma_builtin_is (ecma_object_t *obj_p, /**< pointer to an object */
   JERRY_ASSERT (obj_p != NULL && !ecma_is_lexical_environment (obj_p));
   JERRY_ASSERT (builtin_id < ECMA_BUILTIN_ID__COUNT);
 
-  if (ecma_builtin_objects[builtin_id] == NULL)
+  if (JERRY_CONTEXT (ecma_builtin_objects)[builtin_id] == NULL)
   {
     /* If a built-in object is not instantiated,
      * the specified object cannot be the built-in object */
     return false;
   }
   else
   {
-    return (obj_p == ecma_builtin_objects[builtin_id]);
+    return (obj_p == JERRY_CONTEXT (ecma_builtin_objects)[builtin_id]);
   }
 } /* ecma_builtin_is */
 
@@ -77,14 +67,14 @@ ecma_builtin_get (ecma_builtin_id_t builtin_id) /**< id of built-in to check on
 {
   JERRY_ASSERT (builtin_id < ECMA_BUILTIN_ID__COUNT);
 
-  if (unlikely (ecma_builtin_objects[builtin_id] == NULL))
+  if (unlikely (JERRY_CONTEXT (ecma_builtin_objects)[builtin_id] == NULL))
   {
     ecma_instantiate_builtin (builtin_id);
   }
 
-  ecma_ref_object (ecma_builtin_objects[builtin_id]);
+  ecma_ref_object (JERRY_CONTEXT (ecma_builtin_objects)[builtin_id]);
 
-  return ecma_builtin_objects[builtin_id];
+  return JERRY_CONTEXT (ecma_builtin_objects)[builtin_id];
 } /* ecma_builtin_get */
 
 /**
@@ -106,9 +96,6 @@ ecma_builtin_function_is_routine (ecma_object_t *func_obj_p) /**< function objec
 /**
  * Initialize specified built-in object.
  *
- * Warning:
- *         the routine should be called only from ecma_init_builtins
- *
  * @return pointer to the object
  */
 static ecma_object_t *
@@ -219,20 +206,6 @@ ecma_builtin_init_object (ecma_builtin_id_t obj_builtin_id, /**< built-in ID */
   return obj_p;
 } /* ecma_builtin_init_object */
 
-/**
- * Initialize ECMA built-ins components
- */
-void
-ecma_init_builtins (void)
-{
-  for (ecma_builtin_id_t id = (ecma_builtin_id_t) 0;
-       id < ECMA_BUILTIN_ID__COUNT;
-       id = (ecma_builtin_id_t) (id + 1))
-  {
-    ecma_builtin_objects[id] = NULL;
-  }
-} /* ecma_init_builtins */
-
 /**
  * Instantiate specified ECMA built-in object
  */
@@ -249,7 +222,7 @@ ecma_instantiate_builtin (ecma_builtin_id_t id) /**< built-in id */
                 lowercase_name) \
     case builtin_id: \
     { \
-      JERRY_ASSERT (ecma_builtin_objects[builtin_id] == NULL); \
+      JERRY_ASSERT (JERRY_CONTEXT (ecma_builtin_objects)[builtin_id] == NULL); \
       \
       ecma_object_t *prototype_obj_p; \
       if (object_prototype_builtin_id == ECMA_BUILTIN_ID__COUNT) \
@@ -258,19 +231,19 @@ ecma_instantiate_builtin (ecma_builtin_id_t id) /**< built-in id */
       } \
       else \
       { \
-        if (ecma_builtin_objects[object_prototype_builtin_id] == NULL) \
+        if (JERRY_CONTEXT (ecma_builtin_objects)[object_prototype_builtin_id] == NULL) \
         { \
           ecma_instantiate_builtin (object_prototype_builtin_id); \
         } \
-        prototype_obj_p = ecma_builtin_objects[object_prototype_builtin_id]; \
+        prototype_obj_p = JERRY_CONTEXT (ecma_builtin_objects)[object_prototype_builtin_id]; \
         JERRY_ASSERT (prototype_obj_p != NULL); \
       } \
       \
       ecma_object_t *builtin_obj_p = ecma_builtin_init_object (builtin_id, \
                                                                prototype_obj_p, \
                                                                object_type, \
                                                                is_extensible); \
-      ecma_builtin_objects[builtin_id] = builtin_obj_p; \
+      JERRY_CONTEXT (ecma_builtin_objects)[builtin_id] = builtin_obj_p; \
       \
       break; \
     }
@@ -295,10 +268,10 @@ ecma_finalize_builtins (void)
        id < ECMA_BUILTIN_ID__COUNT;
        id = (ecma_builtin_id_t) (id + 1))
   {
-    if (ecma_builtin_objects[id] != NULL)
+    if (JERRY_CONTEXT (ecma_builtin_objects)[id] != NULL)
     {
-      ecma_deref_object (ecma_builtin_objects[id]);
-      ecma_builtin_objects[id] = NULL;
+      ecma_deref_object (JERRY_CONTEXT (ecma_builtin_objects)[id]);
+      JERRY_CONTEXT (ecma_builtin_objects)[id] = NULL;
     }
   }
 } /* ecma_finalize_builtins */
@@ -671,6 +644,56 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in
   }
 } /* ecma_builtin_list_lazy_property_names */
 
+/**
+ * Dispatcher of built-in routines
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value.
+ */
+static ecma_value_t
+ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id, /**< built-in object' identifier */
+                               uint16_t builtin_routine_id, /**< builtin-wide identifier
+                                                             *   of the built-in object's
+                                                             *   routine property */
+                               ecma_value_t this_arg_value, /**< 'this' argument value */
+                               const ecma_value_t arguments_list[], /**< list of arguments passed to routine */
+                               ecma_length_t arguments_number) /**< length of arguments' list */
+{
+  switch (builtin_object_id)
+  {
+#define BUILTIN(builtin_id, \
+                object_type, \
+                object_prototype_builtin_id, \
+                is_extensible, \
+                is_static, \
+                lowercase_name) \
+    case builtin_id: \
+      { \
+        return ecma_builtin_ ## lowercase_name ## _dispatch_routine (builtin_routine_id, \
+                                                                     this_arg_value, \
+                                                                     arguments_list, \
+                                                                     arguments_number); \
+      }
+#include "ecma-builtins.inc.h"
+
+    case ECMA_BUILTIN_ID__COUNT:
+    {
+      JERRY_UNREACHABLE ();
+    }
+
+    default:
+    {
+#ifdef CONFIG_ECMA_COMPACT_PROFILE
+      JERRY_UNREACHABLE ();
+#else /* !CONFIG_ECMA_COMPACT_PROFILE */
+      JERRY_UNIMPLEMENTED ("The built-in is not implemented.");
+#endif /* CONFIG_ECMA_COMPACT_PROFILE */
+    }
+  }
+
+  JERRY_UNREACHABLE ();
+} /* ecma_builtin_dispatch_routine */
+
 /**
  * Handle calling [[Call]] of built-in object
  *
@@ -797,56 +820,6 @@ ecma_builtin_dispatch_construct (ecma_object_t *obj_p, /**< built-in object */
   return ret_value;
 } /* ecma_builtin_dispatch_construct */
 
-/**
- * Dispatcher of built-in routines
- *
- * @return ecma value
- *         Returned value must be freed with ecma_free_value.
- */
-static ecma_value_t
-ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id, /**< built-in object' identifier */
-                               uint16_t builtin_routine_id, /**< builtin-wide identifier
-                                                             *   of the built-in object's
-                                                             *   routine property */
-                               ecma_value_t this_arg_value, /**< 'this' argument value */
-                               const ecma_value_t arguments_list[], /**< list of arguments passed to routine */
-                               ecma_length_t arguments_number) /**< length of arguments' list */
-{
-  switch (builtin_object_id)
-  {
-#define BUILTIN(builtin_id, \
-                object_type, \
-                object_prototype_builtin_id, \
-                is_extensible, \
-                is_static, \
-                lowercase_name) \
-    case builtin_id: \
-      { \
-        return ecma_builtin_ ## lowercase_name ## _dispatch_routine (builtin_routine_id, \
-                                                                     this_arg_value, \
-                                                                     arguments_list, \
-                                                                     arguments_number); \
-      }
-#include "ecma-builtins.inc.h"
-
-    case ECMA_BUILTIN_ID__COUNT:
-    {
-      JERRY_UNREACHABLE ();
-    }
-
-    default:
-    {
-#ifdef CONFIG_ECMA_COMPACT_PROFILE
-      JERRY_UNREACHABLE ();
-#else /* !CONFIG_ECMA_COMPACT_PROFILE */
-      JERRY_UNIMPLEMENTED ("The built-in is not implemented.");
-#endif /* CONFIG_ECMA_COMPACT_PROFILE */
-    }
-  }
-
-  JERRY_UNREACHABLE ();
-} /* ecma_builtin_dispatch_routine */
-
 /**
  * @}
  * @}

jerry-core/ecma/builtin-objects/ecma-builtins.h

@@ -50,7 +50,6 @@ typedef enum
 #define ECMA_GET_ROUTINE_ID(value) ((uint16_t) ((value) >> 4))
 
 /* ecma-builtins.c */
-extern void ecma_init_builtins (void);
 extern void ecma_finalize_builtins (void);
 
 extern ecma_value_t

jerry-core/jcontext/jcontext.h

@@ -20,10 +20,12 @@
 #ifndef JCONTEXT_H
 #define JCONTEXT_H
 
-#include "jrt.h"
-#include "ecma-globals.h"
+#include "ecma-builtins.h"
 #include "jmem-allocator.h"
 #include "jmem-config.h"
+#include "jrt.h"
+#include "re-bytecode.h"
+#include "vm-defines.h"
 
 /** \addtogroup context Jerry context
  * @{
@@ -32,6 +34,11 @@
  * @{
  */
 
+/**
+ * First member of the jerry context
+ */
+#define JERRY_CONTEXT_FIRST_MEMBER jmem_heap_allocated_size
+
 /**
  * JerryScript context
  *
@@ -60,17 +67,38 @@ typedef struct
                                         *   allocator request is in progress */
 #endif /* JERRY_VALGRIND_FREYA */
 
+  /**
+   * Literal part.
+   */
+  const lit_utf8_byte_t **lit_magic_string_ex_array; /**< array of external magic strings */
+  uint32_t lit_magic_string_ex_count; /**< external magic strings count */
+  const lit_utf8_size_t *lit_magic_string_ex_sizes; /**< external magic string lengths */
+
   /**
    * Ecma part.
    */
+  ecma_object_t *ecma_builtin_objects[ECMA_BUILTIN_ID__COUNT]; /**< pointer to instances of built-in objects */
   ecma_object_t *ecma_gc_objects_lists[ECMA_GC_COLOR__COUNT]; /**< List of marked (visited during
                                                                *   current GC session) and umarked objects */
+#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN
+  const re_compiled_code_t *re_cache[RE_CACHE_SIZE]; /**< regex cache */
+  uint8_t re_cache_idx; /**< evicted item index when regex cache is full (round-robin) */
+#endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN */
+
   bool ecma_gc_visited_flip_flag; /**< current state of an object's visited flag */
+  bool is_direct_eval_form_call; /**< direct call from eval */
   size_t ecma_gc_objects_number; /**< number of currently allocated objects */
   size_t ecma_gc_new_objects; /**< number of newly allocated objects since last GC session */
   ecma_lit_storage_item_t *string_list_first_p; /**< first item of the literal string list */
   ecma_lit_storage_item_t *number_list_first_p; /**< first item of the literal number list */
   ecma_object_t *ecma_global_lex_env_p; /**< global lexical environment */
+  vm_frame_ctx_t *vm_top_context_p; /**< top (current) interpreter context */
+
+  /**
+   * API part.
+   */
+  jerry_init_flag_t jerry_init_flags; /**< run-time configuration flags */
+  bool jerry_api_available; /**< API availability flag */
 } jerry_context_t;
 
 /**