diff options
author | Péter Gál <pgal.u-szeged@partner.samsung.com> | 2019-06-19 12:28:21 +0200 |
---|---|---|
committer | Dániel Bátyai <dbatyai@inf.u-szeged.hu> | 2019-06-19 12:28:21 +0200 |
commit | 01ecc7bb7bb7dffb1e620ae6e6e929dc6fb73b40 (patch) | |
tree | 7014456178bba13ee364c32dd5366ee77d67ba67 /targets | |
parent | 985de93d04cdbe01c4f28b5b5c31913d9081a516 (diff) |
Rework usages/naming of configuration macros [part 2] (#2903)
There are quite a few configuration macros in the project.
As discussed in the #2520 issue there are a few awkward constructs.
Main changes:
* The following macros are now 0/1 switches:
** Renamed CONFIG_ECMA_LCACHE_DISABLE to JERRY_LCACHE.
** Renamed CONFIG_ECMA_PROPERTY_HASHMAP_DISABLE to JERRY_PROPERTY_HASHMAP.
** Renamed CONFIG_DISABLE_UNICODE_CASE_CONVERSION to JERRY_UNICODE_CASE_CONVERSION.
** Renamed ENABLE_REGEXP_STRICT_MODE to JERRY_REGEXP_STRICT_MODE.
** Renamed JERRY_DISABLE_JS_PARSER to JERRY_PARSER.
** Renamed JERRY_ENABLE_ERROR_MESSAGES to JERRY_ERROR_MESSAGES.
** Renamed JERRY_ENABLE_EXTERNAL_CONTEXT to JERRY_EXTERNAL_CONTEXT.
** Renamed JERRY_ENABLE_LINE_INFO to JERRY_LINE_INFO.
** Renamed JERRY_ENABLE_LOGGING to JERRY_LOGGING.
** Renamed JERRY_ENABLE_SNAPSHOT_EXEC to JERRY_SNAPSHOT_EXEC.
** Renamed JERRY_ENABLE_SNAPSHOT_SAVE to JERRY_SNAPSHOT_SAVE.
** Renamed JERRY_SYSTEM_ALLOCATOR to JERRY_SYSTEM_ALLOCATOR.
** Renamed JERRY_VM_EXEC_STOP to JERRY_VM_EXEC_STOP.
** Renamed JMEM_GC_BEFORE_EACH_ALLOC to JERRY_MEM_GC_BEFORE_EACH_ALLOC.
** Renamed JMEM_STATS to JERRY_MEM_STATS.
** Renamed PARSER_DUMP_BYTE_CODE to JERRY_PARSER_DUMP_BYTE_CODE.
** Renamed REGEXP_DUMP_BYTE_CODE to JERRY_REGEXP_DUMP_BYTE_CODE.
* Recursion check changes:
** Renamed REGEXP_RECURSION_LIMIT to JERRY_REGEXP_RECURSION_LIMIT.
** Renamed VM_RECURSION_LIMIT to JERRY_VM_RECURSION_LIMIT.
* Attribute macro changes:
** Renamed JERRY_CONST_DATA to JERRY_ATTR_CONST_DATA.
** Renamed JERRY_HEAP_SECTION_ATTR to JERRY_ATTR_GLOBAL_HEAP.
Now the macro can specify any attribute for the global heap object.
* Other macro changes:
** Renamed CONFIG_MEM_HEAP_AREA_SIZE to JERRY_GLOBAL_HEAP_SIZE.
Then new macro now specify the global heap size in kilobytes.
* Updated documentations to reflect the new macro names.
For more deatils please see jerry-core/config.h.
JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com
Diffstat (limited to 'targets')
-rwxr-xr-x | targets/curie_bsp/setup.py | 6 | ||||
-rw-r--r-- | targets/esp8266/Makefile.esp8266 | 4 | ||||
-rw-r--r-- | targets/esp8266/readme.md | 4 | ||||
-rw-r--r-- | targets/mbedos5/Makefile | 2 | ||||
-rw-r--r-- | targets/particle/Makefile.particle | 2 | ||||
-rw-r--r-- | targets/riot-stm32f4/Makefile.riot | 2 | ||||
-rw-r--r-- | targets/tizenrt-artik053/Makefile.tizenrt | 2 | ||||
-rw-r--r-- | targets/zephyr/Makefile.zephyr | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/targets/curie_bsp/setup.py b/targets/curie_bsp/setup.py index ecf0c650..8cde3025 100755 --- a/targets/curie_bsp/setup.py +++ b/targets/curie_bsp/setup.py @@ -83,7 +83,7 @@ def build_jerry_data(jerry_path): jerry_dirs.add(os.path.split(path)[0]) jerry_cflags = [ - '-DCONFIG_MEM_HEAP_AREA_SIZE=10*1024', + '-DJERRY_GLOBAL_HEAP_SIZE=10', '-DJERRY_NDEBUG', '-DJERRY_DISABLE_HEAVY_DEBUG', '-DJERRY_BUILTIN_NUMBER=0', @@ -97,8 +97,8 @@ def build_jerry_data(jerry_path): '-DJERRY_BUILTIN_REGEXP=0', '-DJERRY_BUILTIN_ANNEXB=0', '-DJERRY_ES2015=0', - '-DCONFIG_ECMA_LCACHE_DISABLE', - '-DCONFIG_ECMA_PROPERTY_HASHMAP_DISABLE', + '-DJERRY_LCACHE=0', + '-DJERRY_PROPRETY_HASHMAP=0', ] return { diff --git a/targets/esp8266/Makefile.esp8266 b/targets/esp8266/Makefile.esp8266 index 89f86997..b1487ab3 100644 --- a/targets/esp8266/Makefile.esp8266 +++ b/targets/esp8266/Makefile.esp8266 @@ -28,7 +28,7 @@ MFORCE32 = $(shell xtensa-lx106-elf-gcc --help=target | grep mforce-l32) ifneq ($(MFORCE32),) # Your compiler supports the -mforce-l32 flag which means that # constants can be placed in ROM to free additional RAM - ESP_CFLAGS += -DJERRY_CONST_DATA="__attribute__((aligned(4))) __attribute__((section(\".irom.text\")))" + ESP_CFLAGS += -DJERRY_ATTR_CONST_DATA="__attribute__((aligned(4))) __attribute__((section(\".irom.text\")))" ESP_CFLAGS += -mforce-l32 endif @@ -52,7 +52,7 @@ jerry: -DENABLE_ALL_IN_ONE=ON \ -DJERRY_CMDLINE=OFF \ -DEXTERNAL_COMPILE_FLAGS="$(ESP_CFLAGS)" \ - -DMEM_HEAP_SIZE_KB=$(JERRYHEAP) + -DJERRY_GLOBAL_HEAP_SIZE=$(JERRYHEAP) make -C$(BUILD_DIR) jerry-core jerry-libm cp $(BUILD_DIR)/lib/libjerry-core.a $(COPYTARGET)/ diff --git a/targets/esp8266/readme.md b/targets/esp8266/readme.md index 10a18c6e..01497159 100644 --- a/targets/esp8266/readme.md +++ b/targets/esp8266/readme.md @@ -63,7 +63,7 @@ The existing open source gcc compiler with Xtensa support stores const(ants) in the same limited RAM where our code needs to run. It is possible to force the compiler to store a constant into ROM and also read it from there thus saving RAM. -The only requirement is to add `JERRY_CONST_DATA` attribute to your constant. +The only requirement is to add `JERRY_ATTR_CONST_DATA` attribute to your constant. For example: @@ -74,7 +74,7 @@ static const lit_magic_size_t lit_magic_string_sizes[] = can be modified to ```C -static const lit_magic_size_t lit_magic_string_sizes[] JERRY_CONST_DATA = +static const lit_magic_size_t lit_magic_string_sizes[] JERRY_ATTR_CONST_DATA = ``` That is already done to some constants in jerry-core. E.g.: diff --git a/targets/mbedos5/Makefile b/targets/mbedos5/Makefile index faf130c9..825d44f4 100644 --- a/targets/mbedos5/Makefile +++ b/targets/mbedos5/Makefile @@ -48,7 +48,7 @@ else ifeq ($(MBED_VERBOSE), 2) MBED_CLI_FLAGS += -vv endif -MBED_CLI_FLAGS += -D "CONFIG_MEM_HEAP_AREA_SIZE=(1024*$(HEAPSIZE))" +MBED_CLI_FLAGS += -D "JERRY_GLOBAL_HEAP_SIZE=$(HEAPSIZE)" MBED_CLI_FLAGS += -t GCC_ARM .PHONY: all js2c getlibs rebuild library diff --git a/targets/particle/Makefile.particle b/targets/particle/Makefile.particle index 30b1a8e8..6b4cacb2 100644 --- a/targets/particle/Makefile.particle +++ b/targets/particle/Makefile.particle @@ -50,7 +50,7 @@ jerrycore: -DFEATURE_PROFILE=minimal \ -DENABLE_STRIP=OFF \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ - -DMEM_HEAP_SIZE_KB=$(JERRYHEAP) + -DJERRY_GLOBAL_HEAP_SIZE=$(JERRYHEAP) make -C$(BUILD_DIR) jerry-core diff --git a/targets/riot-stm32f4/Makefile.riot b/targets/riot-stm32f4/Makefile.riot index d9cb5cca..ab4dc03e 100644 --- a/targets/riot-stm32f4/Makefile.riot +++ b/targets/riot-stm32f4/Makefile.riot @@ -50,7 +50,7 @@ libjerry: -DJERRY_LIBM=OFF \ -DJERRY_CMDLINE=OFF \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ - -DMEM_HEAP_SIZE_KB=$(JERRYHEAP) + -DJERRY_GLOBAL_HEAP_SIZE=$(JERRYHEAP) make -C$(BUILD_DIR) jerry-core jerry-port-default-minimal jerry-ext mkdir -p $(COPYTARGET) diff --git a/targets/tizenrt-artik053/Makefile.tizenrt b/targets/tizenrt-artik053/Makefile.tizenrt index eaa3406e..dce7d03f 100644 --- a/targets/tizenrt-artik053/Makefile.tizenrt +++ b/targets/tizenrt-artik053/Makefile.tizenrt @@ -27,7 +27,7 @@ libjerry: -DENABLE_ALL_IN_ONE=OFF \ -DJERRY_CMDLINE=OFF \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ - -DMEM_HEAP_SIZE_KB=$(JERRYHEAP) \ + -DJERRY_GLOBAL_HEAP_SIZE=$(JERRYHEAP) \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain_mcu_artik053.cmake diff --git a/targets/zephyr/Makefile.zephyr b/targets/zephyr/Makefile.zephyr index 69b3ab47..3131e4c2 100644 --- a/targets/zephyr/Makefile.zephyr +++ b/targets/zephyr/Makefile.zephyr @@ -88,7 +88,7 @@ endif -DFEATURE_ERROR_MESSAGES=ON \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_VERBOSE_MAKEFILE=$(V) \ - -DMEM_HEAP_SIZE_KB=$(JERRYHEAP) \ + -DJERRY_GLOBAL_HEAP_SIZE=$(JERRYHEAP) \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ $(EXT_JERRY_FLAGS) |