Merge branch 'master' into objfreecb_dev

Author: seanshpark

.gitignore

@@ -2,6 +2,7 @@
 
 build/bin
 build/obj-*
+build/prerequisites
 build/tests
 
 # IDE related files
@@ -25,3 +26,11 @@ cscope.*
 # ctags and ID database
 tags
 ID
+
+# Prerequisites
+.prerequisites
+third-party/STM32F3-Discovery_FW_V1.1.0
+third-party/STM32F4-Discovery_FW_V1.1.0
+third-party/nuttx
+third-party/vera++
+third-party/cppcheck

CMakeLists.txt

@@ -15,16 +15,16 @@
 cmake_minimum_required (VERSION 2.8.12)
 project (Jerry CXX C ASM)
 
-# Require g++ of version >= 4.8.0
+# Require g++ of version >= 4.7.0
  if(NOT CMAKE_COMPILER_IS_GNUCXX)
   message(FATAL_ERROR "g++ compiler is required")
  else()
   execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
                   OUTPUT_VARIABLE GNU_CXX_VERSION
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  if(${GNU_CXX_VERSION} VERSION_LESS 4.8.0)
-   message(FATAL_ERROR "g++ compiler version 4.8.0 or higher required")
+  if(${GNU_CXX_VERSION} VERSION_LESS 4.7.0)
+   message(FATAL_ERROR "g++ compiler version 4.7.0 or higher required")
   endif()
  endif()
 
@@ -97,6 +97,10 @@ project (Jerry CXX C ASM)
    message(FATAL_ERROR "Currently, external build with Jerry's libc is not supported")
   endif()
  else()
+  if (NOT EXISTS "${EXTERNAL_LIBC_INTERFACE}")
+   message(FATAL_ERROR "External libc interface directory doesn't exist: ${EXTERNAL_LIBC_INTERFACE}")
+  endif()
+
   set(USE_EXTERNAL_LIBC TRUE)
  endif()
 
@@ -115,6 +119,7 @@ project (Jerry CXX C ASM)
      COMPACT_PROFILE
      COMPACT_PROFILE_MINIMAL
      FULL_PROFILE
+     MINIMAL_FOOTPRINT
      MEMORY_STATISTICS)
 
  # Profiles
@@ -127,6 +132,9 @@ project (Jerry CXX C ASM)
   # Minimal compact profile
    set(MODIFIER_SUFFIX_COMPACT_PROFILE_MINIMAL -cp_minimal)
 
+  # Minimal footprint
+   set(MODIFIER_SUFFIX_MINIMAL_FOOTPRINT -mfp)
+
  # Memory statistics
   set(MODIFIER_SUFFIX_MEMORY_STATISTICS -mem_stats)
 
@@ -136,7 +144,10 @@ project (Jerry CXX C ASM)
      "FULL_PROFILE"
      "COMPACT_PROFILE"
      "COMPACT_PROFILE_MINIMAL"
+     "FULL_PROFILE MINIMAL_FOOTPRINT"
+     "FULL_PROFILE MINIMAL_FOOTPRINT MEMORY_STATISTICS"
      "FULL_PROFILE MEMORY_STATISTICS"
+     "COMPACT_PROFILE_MINIMAL MINIMAL_FOOTPRINT"
      "COMPACT_PROFILE_MINIMAL MEMORY_STATISTICS")
 
  # MCU
@@ -158,7 +169,7 @@ project (Jerry CXX C ASM)
 
 # Compiler / Linker flags
  set(COMPILE_FLAGS_JERRY "-fno-builtin")
- set(LINKER_FLAGS_COMMON "")
+ set(LINKER_FLAGS_COMMON "-Wl,-z,noexecstack")
 
  # LTO
   if("${ENABLE_LTO}" STREQUAL "ON")
@@ -173,7 +184,7 @@ project (Jerry CXX C ASM)
   set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} -g -gdwarf-4")
 
  # Warnings
-  set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} -Wall -Wextra -Wpedantic -Wlogical-op")
+  set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} -Wall -Wextra -pedantic -Wlogical-op")
   set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} -Wformat-nonliteral -Winit-self -Wno-stack-protector")
   set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} -Wconversion -Wsign-conversion -Wformat-security")
   set(COMPILE_FLAGS_JERRY "${COMPILE_FLAGS_JERRY} -Wmissing-declarations -Wno-attributes")
@@ -194,9 +205,9 @@ project (Jerry CXX C ASM)
  # Platform-specific
   # MCU
    # stm32f3
-    set(LINKER_FLAGS_COMMON_MCU_STM32F3 "-T${CMAKE_SOURCE_DIR}/third-party/stm32f3.ld")
+    set(LINKER_FLAGS_COMMON_MCU_STM32F3 "-T${CMAKE_SOURCE_DIR}/third-party/STM32F3-Discovery_FW_V1.1.0/Project/Peripheral_Examples/FLASH_Program/TrueSTUDIO/FLASH_Program/STM32_FLASH.ld")
    # stm32f4
-    set(LINKER_FLAGS_COMMON_MCU_STM32F4 "-T${CMAKE_SOURCE_DIR}/third-party/stm32f4.ld")
+    set(LINKER_FLAGS_COMMON_MCU_STM32F4 "-T${CMAKE_SOURCE_DIR}/third-party/STM32F4-Discovery_FW_V1.1.0/Project/Peripheral_Examples/FLASH_Program/TrueSTUDIO/FLASH_Program/stm32_flash.ld")
 
  # Debug
   set(FLAGS_COMMON_DEBUG "-nostdlib")
@@ -246,6 +257,19 @@ project (Jerry CXX C ASM)
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
   set_property(TARGET ${PREFIX_IMPORTED_LIB}libgcc
                PROPERTY IMPORTED_LOCATION ${IMPORTED_LIBGCC_LOCATION})
+ # libgcc_eh
+  add_library(${PREFIX_IMPORTED_LIB}libgcc_eh STATIC IMPORTED)
+  execute_process(COMMAND ${CMAKE_C_COMPILER} ${FLAGS_COMMON_ARCH} -print-file-name=libgcc_eh.a
+                  OUTPUT_VARIABLE IMPORTED_LIBGCC_EH_LOCATION
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(EXISTS "${IMPORTED_LIBGCC_EH_LOCATION}")
+   set_property(TARGET ${PREFIX_IMPORTED_LIB}libgcc_eh
+                PROPERTY IMPORTED_LOCATION ${IMPORTED_LIBGCC_EH_LOCATION})
+  else()
+   # If libgcc_eh not found, reference libgcc instead
+   set_property(TARGET ${PREFIX_IMPORTED_LIB}libgcc_eh
+                PROPERTY IMPORTED_LOCATION ${IMPORTED_LIBGCC_LOCATION})
+  endif()
 
 # Platform-specific configuration
  set(MODIFIERS_LISTS ${MODIFIERS_LISTS_${PLATFORM_EXT}})
@@ -303,7 +327,8 @@ project (Jerry CXX C ASM)
     target_compile_definitions(${TARGET_NAME} PRIVATE ${DEFINES_JERRY})
     target_include_directories(${TARGET_NAME} PRIVATE ${INCLUDE_CORE_INTERFACE})
     target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE})
-    target_link_libraries(${TARGET_NAME} ${PLUGINS_TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libgcc)
+    target_link_libraries(${TARGET_NAME} ${PLUGINS_TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME}
+                          ${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
 
     add_cppcheck_target(${TARGET_NAME})
 
@@ -383,7 +408,8 @@ project (Jerry CXX C ASM)
     set_property(TARGET ${TARGET_NAME}
                  PROPERTY LINK_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_UNITTESTS} ${LINKER_FLAGS_COMMON}")
     target_include_directories(${TARGET_NAME} PRIVATE ${INCLUDE_CORE_INTERFACE})
-    target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libc ${PREFIX_IMPORTED_LIB}libgcc)
+    target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libc
+                          ${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
 
     add_cppcheck_target(${TARGET_NAME})
 

Makefile

@@ -73,7 +73,7 @@ export TARGET_RELEASE_MODES = release
 export TARGET_PC_SYSTEMS = linux
 export TARGET_NUTTX_SYSTEMS = nuttx
 
-export TARGET_PC_MODS = cp cp_minimal mem_stats
+export TARGET_PC_MODS = cp cp_minimal mem_stats mfp cp_minimal-mfp mfp-mem_stats
 export TARGET_NUTTX_MODS = $(TARGET_PC_MODS)
 
 export TARGET_MCU_MODS = cp cp_minimal
@@ -102,6 +102,7 @@ export CHECK_TARGETS = $(foreach __TARGET,$(JERRY_LINUX_TARGETS),$(__TARGET).che
 export FLASH_TARGETS = $(foreach __TARGET,$(JERRY_STM32F3_TARGETS) $(JERRY_STM32F4_TARGETS),$(__TARGET).flash)
 
 export OUT_DIR = ./build/bin
+export PREREQUISITES_STATE_DIR = ./build/prerequisites
 
 export SHELL=/bin/bash
 
@@ -138,7 +139,7 @@ export SHELL=/bin/bash
 
 all: precommit
 
-$(BUILD_DIRS_NATIVE):
+$(BUILD_DIRS_NATIVE): prerequisites
 	@ arch=`uname -m`; \
           if [ "$$arch" == "armv7l" ]; \
           then \
@@ -149,7 +150,7 @@ $(BUILD_DIRS_NATIVE):
           cmake -DENABLE_VALGRIND=$(VALGRIND) -DENABLE_LTO=$(LTO) -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_linux_$$arch.cmake ../../.. &>cmake.log || \
           (echo "CMake run failed. See "`pwd`"/cmake.log for details."; exit 1;)
 
-$(BUILD_DIRS_NUTTX):
+$(BUILD_DIRS_NUTTX): prerequisites
 	@ [ "$(EXTERNAL_LIBS_INTERFACE)" != "" ] && [ -x `which $(EXTERNAL_C_COMPILER)` ] && [ -x `which $(EXTERNAL_CXX_COMPILER)` ] || \
           (echo "Wrong external arguments."; \
            echo "EXTERNAL_LIBS_INTERFACE='$(EXTERNAL_LIBS_INTERFACE)'"; \
@@ -167,13 +168,13 @@ $(BUILD_DIRS_NUTTX):
           ../../.. &>cmake.log || \
           (echo "CMake run failed. See "`pwd`"/cmake.log for details."; exit 1;)
 
-$(BUILD_DIRS_STM32F3):
+$(BUILD_DIRS_STM32F3): prerequisites
 	@ mkdir -p $@ && \
           cd $@ && \
           cmake -DENABLE_VALGRIND=$(VALGRIND) -DENABLE_LTO=$(LTO) -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_mcu_stm32f3.cmake ../../.. &>cmake.log || \
           (echo "CMake run failed. See "`pwd`"/cmake.log for details."; exit 1;)
 
-$(BUILD_DIRS_STM32F4):
+$(BUILD_DIRS_STM32F4): prerequisites
 	@ mkdir -p $@ && \
           cd $@ && \
           cmake -DENABLE_VALGRIND=$(VALGRIND) -DENABLE_LTO=$(LTO) -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_mcu_stm32f4.cmake ../../.. &>cmake.log || \
@@ -279,7 +280,7 @@ pull: ./tools/git-scripts/pull.sh
 log: ./tools/git-scripts/log.sh
 	@ ./tools/git-scripts/log.sh
 
-precommit: clean
+precommit: clean prerequisites
 	@ ./tools/precommit.sh "$(MAKE)" "$(OUT_DIR)" "$(PRECOMMIT_CHECK_TARGETS_LIST)"
 
 unittests_run: unittests
@@ -291,4 +292,17 @@ unittests_run: unittests
 clean:
 	@ rm -rf $(BUILD_DIR_PREFIX)* $(OUT_DIR)
 
-.PHONY: clean build unittests_run $(BUILD_DIRS_ALL) $(JERRY_TARGETS) $(FLASH_TARGETS)
+prerequisites: $(PREREQUISITES_STATE_DIR)/.prerequisites
+
+$(PREREQUISITES_STATE_DIR)/.prerequisites:
+	@ echo "Setting up prerequisites... (log file: $(PREREQUISITES_STATE_DIR)/prerequisites.log)"
+	@ mkdir -p $(PREREQUISITES_STATE_DIR)
+	@ ./tools/prerequisites.sh $(PREREQUISITES_STATE_DIR)/.prerequisites >&$(PREREQUISITES_STATE_DIR)/prerequisites.log || \
+          (echo "Prerequisites setup failed. See $(PREREQUISITES_STATE_DIR)/prerequisites.log for details."; exit 1;)
+	@ echo "Prerequisites setup succeeded"
+
+prerequisites_clean:
+	@ ./tools/prerequisites.sh $(PREREQUISITES_STATE_DIR)/.prerequisites clean
+	@ rm -rf $(PREREQUISITES_STATE_DIR)
+
+.PHONY: prerequisites_clean prerequisites clean build unittests_run $(BUILD_DIRS_ALL) $(JERRY_TARGETS) $(FLASH_TARGETS)

build/static-checkers/add_cppcheck_for_target.cmake

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Cppcheck launcher
- set(CMAKE_CPPCHECK ${CMAKE_SOURCE_DIR}/tools/cppcheck.sh)
+ set(CMAKE_CPPCHECK ${CMAKE_SOURCE_DIR}/tools/cppcheck/cppcheck.sh)
 
 # Definition of cppcheck targets
  add_custom_target(cppcheck)

jerry-core/CMakeLists.txt

@@ -66,6 +66,11 @@ project (JerryCore CXX C ASM)
        CONFIG_ECMA_COMPACT_PROFILE_DISABLE_JSON_BUILTIN
        CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN)
 
+  # Minimal footprint
+   set(DEFINES_MINIMAL_FOOTPRINT
+       CONFIG_ECMA_LCACHE_DISABLE
+       CONFIG_VM_RUN_GC_AFTER_EACH_OPCODE)
+
  # Memory statistics
   set(DEFINES_MEMORY_STATISTICS MEM_STATS)
 

jerry-core/config.h

@@ -55,6 +55,11 @@
 # define CONFIG_MEM_HEAP_AREA_SIZE (256 * 1024)
 #endif /* !CONFIG_MEM_HEAP_AREA_SIZE */
 
+/**
+ * Desired limit of heap usage
+ */
+#define CONFIG_MEM_HEAP_DESIRED_LIMIT (CONFIG_MEM_HEAP_AREA_SIZE / 32)
+
 /**
  * Log2 of maximum possible offset in the heap
  *
@@ -127,6 +132,11 @@
  */
 #define CONFIG_ECMA_STACK_FRAME_INLINED_VALUES_NUMBER (16)
 
+/**
+ * Disable ECMA lookup cache
+ */
+// #define CONFIG_ECMA_LCACHE_DISABLE
+
 /**
  * Link Global Environment to an empty declarative lexical environment
  * instead of lexical environment bound to Global Object.
@@ -170,4 +180,9 @@
  */
 #define CONFIG_EXTENSION_MAX_ARGUMENTS_IN_FUNCTION 16
 
+/**
+ * Run GC after execution of each opcode
+ */
+// #define CONFIG_VM_RUN_GC_AFTER_EACH_OPCODE
+
 #endif /* !CONFIG_H */