update packages\jerryscript

Signed-off-by: yangfasheng <yangfasheng@rt-thread.com>

SConscript

@@ -76,7 +76,10 @@ import rtconfig
 if rtconfig.CROSS_TOOL == 'keil':
     LOCAL_CCFLAGS += ' --gnu'
 
-CPPDEFINES = ['JERRY_JS_PARSER', 'JERRY_ENABLE_ERROR_MESSAGES']
+CPPDEFINES = ['JERRY_JS_PARSER', 'JERRY_ENABLE_EXTERNAL_CONTEXT']
+
+if GetDepend('PKG_JERRY_ENABLE_ERROR_MESSAGES'):
+    CPPDEFINES += ['JERRY_ENABLE_ERROR_MESSAGES']
 
 if GetDepend('PKG_JERRY_ENABLE_LOGGING'):
     CPPDEFINES += ['JERRY_ENABLE_LOGGING']
@@ -84,6 +87,9 @@ if GetDepend('PKG_JERRY_ENABLE_LOGGING'):
 if GetDepend('PKG_JMEM_STATS'):
     CPPDEFINES += ['JMEM_STATS']
 
+if GetDepend('PKG_CONFIG_DISABLE_ES2015'):
+    CPPDEFINES += ['CONFIG_DISABLE_ES2015']
+
 group = DefineGroup('JerryScript', src, depend = ['PKG_USING_JERRYSCRIPT'], CPPPATH = path, 
     CPPDEFINES = CPPDEFINES, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
 

rtthread-port/config.h

@@ -16,6 +16,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#include "rtconfig.h"
+
 /**
  * Group of builtin-related features that can be disabled together.
  */
@@ -37,8 +39,10 @@
  */
 #ifdef CONFIG_DISABLE_ES2015
 # define CONFIG_DISABLE_ES2015_ARROW_FUNCTION
-# define CONFIG_DISABLE_ES2015_CLASS
 # define CONFIG_DISABLE_ES2015_BUILTIN
+# define CONFIG_DISABLE_ES2015_CLASS
+# define CONFIG_DISABLE_ES2015_MAP_BUILTIN
+# define CONFIG_DISABLE_ES2015_OBJECT_INITIALIZER
 # define CONFIG_DISABLE_ES2015_PROMISE_BUILTIN
 # define CONFIG_DISABLE_ES2015_TEMPLATE_STRINGS
 # define CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
@@ -48,7 +52,8 @@
  * Size of heap
  */
 #ifndef CONFIG_MEM_HEAP_AREA_SIZE
-# define CONFIG_MEM_HEAP_AREA_SIZE (512 * 1024)
+# define CONFIG_MEM_HEAP_AREA_SIZE PKG_JMEM_HEAP_SIZE
+//# define CONFIG_MEM_HEAP_AREA_SIZE (512 * 1024)
 #endif /* !CONFIG_MEM_HEAP_AREA_SIZE */
 
 /**
@@ -100,9 +105,4 @@
  */
 #define CONFIG_ECMA_GC_NEW_OBJECTS_SHARE_TO_START_GC (16)
 
- /**
- * Jerry instance for external context.
- */
-#define JERRY_ENABLE_EXTERNAL_CONTEXT
-
 #endif /* !CONFIG_H */

rtthread-port/jerry_main.c

@@ -20,7 +20,7 @@ static rt_mq_t _js_mq = NULL;
 
 static void *context_alloc(size_t size, void *cb_data_p)
 {
-    return rt_calloc(1, size);
+    return rt_malloc_align(size, 32);
 }
 
 rt_bool_t js_mq_send(void *parameter)
@@ -158,7 +158,7 @@ static void jerry_thread_entry(void* parameter)
         /* Cleanup engine */
         jerry_cleanup();
 
-        rt_free((void *)jerry_port_get_current_context());
+        rt_free_align((void *)jerry_port_get_current_context());
     }
 }