Akos idea.

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

Author: zherczeg

jerry-core/context/context.c

@@ -28,20 +28,6 @@
  */
 jerry_context_t jerry_global_context;
 
-/**
- * Jerry global heap section attribute.
- */
-#ifndef JERRY_HEAP_SECTION_ATTR
-#define JERRY_GLOBAL_HEAP_SECTION
-#else /* JERRY_HEAP_SECTION_ATTR */
-#define JERRY_GLOBAL_HEAP_SECTION __attribute__ ((section (JERRY_HEAP_SECTION_ATTR)))
-#endif /* !JERRY_HEAP_SECTION_ATTR */
-
-/**
- * Global heap.
- */
-mem_heap_t jerry_global_heap __attribute__ ((aligned (MEM_ALIGNMENT))) JERRY_GLOBAL_HEAP_SECTION;
-
 /**
  * @}
  * @}

jerry-core/context/context.h

@@ -72,18 +72,15 @@ typedef struct
   bool valgrind_freya_mempool_request; /**< Tells whether a pool manager
                                         *   allocator request is in progress */
 #endif /* JERRY_VALGRIND_FREYA */
+
+  mem_heap_t *heap_p;
 } jerry_context_t;
 
 /**
  * Jerry global context.
  */
 extern jerry_context_t jerry_global_context;
 
-/**
- * Jerry global heap.
- */
-extern mem_heap_t jerry_global_heap;
-
 /**
  * Provides a reference to a field in the current context.
  */
@@ -92,7 +89,7 @@ extern mem_heap_t jerry_global_heap;
 /**
  * Provides a reference to the area field of the heap.
  */
-#define MEM_HEAP_CONTEXT(field) (jerry_global_heap.field)
+#define MEM_HEAP_CONTEXT(field) (jerry_global_context.heap_p->field)
 
 /**
  * @}

jerry-core/mem/mem-heap.c

@@ -140,6 +140,20 @@ static void mem_heap_stat_free_iter ();
 #  define MEM_HEAP_STAT_FREE_ITER()
 #endif /* MEM_STATS */
 
+/**
+ * Jerry global heap section attribute.
+ */
+#ifndef JERRY_HEAP_SECTION_ATTR
+#define JERRY_GLOBAL_HEAP_SECTION
+#else /* JERRY_HEAP_SECTION_ATTR */
+#define JERRY_GLOBAL_HEAP_SECTION __attribute__ ((section (JERRY_HEAP_SECTION_ATTR)))
+#endif /* !JERRY_HEAP_SECTION_ATTR */
+
+/**
+ * Global heap.
+ */
+mem_heap_t jerry_global_heap __attribute__ ((aligned (MEM_ALIGNMENT))) JERRY_GLOBAL_HEAP_SECTION;
+
 /**
  * Startup initialization of heap
  */
@@ -155,6 +169,8 @@ mem_heap_init (void)
   JERRY_CONTEXT (mem_heap_limit) = CONFIG_MEM_HEAP_DESIRED_LIMIT;
   JERRY_CONTEXT (mem_try_give_memory_back_callback) = NULL;
 
+  JERRY_CONTEXT (heap_p) = &jerry_global_heap;
+
   MEM_HEAP_CONTEXT (first).size = 0;
   mem_heap_free_t *const region_p = (mem_heap_free_t *) MEM_HEAP_CONTEXT (area);
   MEM_HEAP_CONTEXT (first).next_offset = MEM_HEAP_GET_OFFSET_FROM_ADDR (region_p);
@@ -179,6 +195,8 @@ void mem_heap_finalize (void)
 {
   JERRY_ASSERT (JERRY_CONTEXT (mem_heap_allocated_size) == 0);
   VALGRIND_NOACCESS_SPACE (&MEM_HEAP_CONTEXT (first), sizeof (mem_heap_t));
+
+  JERRY_CONTEXT (heap_p) = NULL;
 } /* mem_heap_finalize */
 
 /**