New Allocator and improved String handling.

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu

Author: dbatyai

CMakeLists.txt

@@ -213,6 +213,9 @@ project (Jerry C ASM)
 
 # Compiler / Linker flags
  set(COMPILE_FLAGS_JERRY "-fno-builtin")
+ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+   set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} -DMEM_HEAP_PTR_64")
+ endif()
  if(NOT ("${PLATFORM}" STREQUAL "DARWIN"))
   set(LINKER_FLAGS_COMMON "-Wl,-z,noexecstack")
  endif()

jerry-core/config.h

@@ -1,4 +1,5 @@
 /* Copyright 2014-2015 Samsung Electronics Co., Ltd.
+ * Copyright 2016 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,10 +48,15 @@
 # error "Currently, maximum 256 kilobytes heap size is supported"
 #endif /* !CONFIG_MEM_HEAP_AREA_SIZE */
 
+/**
+ * Max heap usage limit
+ */
+#define CONFIG_MEM_HEAP_MAX_LIMIT 8192
+
 /**
  * Desired limit of heap usage
  */
-#define CONFIG_MEM_HEAP_DESIRED_LIMIT (CONFIG_MEM_HEAP_AREA_SIZE / 32)
+#define CONFIG_MEM_HEAP_DESIRED_LIMIT (JERRY_MIN (CONFIG_MEM_HEAP_AREA_SIZE / 32, CONFIG_MEM_HEAP_MAX_LIMIT))
 
 /**
  * Log2 of maximum possible offset in the heap
@@ -80,7 +86,7 @@
  * Also the option affects size of ECMA Object Model's data types.
  * In any case size of any of the types should not exceed CONFIG_MEM_POOL_CHUNK_SIZE.
  */
-#define CONFIG_ECMA_REFERENCE_COUNTER_WIDTH (10)
+#define CONFIG_ECMA_REFERENCE_COUNTER_WIDTH (12)
 
 #define CONFIG_ECMA_REFERENCE_COUNTER_LIMIT ((1u << CONFIG_ECMA_REFERENCE_COUNTER_WIDTH) - 1u)
 

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

@@ -25,7 +25,6 @@
 
 #include "config.h"
 #include "jrt.h"
-#include "lit-globals.h"
 #include "lit-magic-strings.h"
 #include "mem-allocator.h"
 
@@ -384,7 +383,7 @@ typedef struct ecma_object_t
  */
 #define ECMA_OBJECT_OBJ_TYPE_POS (ECMA_OBJECT_OBJ_EXTENSIBLE_POS + \
                                   ECMA_OBJECT_OBJ_EXTENSIBLE_WIDTH)
-#define ECMA_OBJECT_OBJ_TYPE_WIDTH (4)
+#define ECMA_OBJECT_OBJ_TYPE_WIDTH (3)
 
 /**
  * Compressed pointer to prototype object (ecma_object_t)
@@ -721,7 +720,7 @@ typedef struct ecma_string_t
   union
   {
     /** Index of string in literal table */
-    lit_cpointer_t lit_cp;
+    mem_cpointer_t lit_cp;
 
     /** Compressed pointer to an ecma_collection_header_t */
     __extension__ mem_cpointer_t collection_cp : ECMA_POINTER_FIELD_WIDTH;