Make target provide jerry-port.c

JerryScript-DCO-1.0-Signed-off-by: François Baldassari francois@pebble.com

Author: François Baldassari

CMakeLists.txt

@@ -132,6 +132,15 @@ project (Jerry C ASM)
   set(INCLUDE_LIBC_INTERFACE ${EXTERNAL_LIBC_INTERFACE})
  endif()
 
+
+ # Should we use external jerry-port.c?
+ if(DEFINED EXTERNAL_PORT_FILE AND NOT EXTERNAL_PORT_FILE STREQUAL "UNDEFINED")
+   set(SOURCE_PORT_IMPLEMENTATION ${EXTERNAL_PORT_FILE})
+   set(USE_DEFAULT_PORT FALSE)
+ else()
+   set(USE_DEFAULT_PORT TRUE)
+ endif()
+
 # Are there any interfaces for external libraries, other than libc, that should be registered?
  if(DEFINED EXTERNAL_LIBS_INTERFACE AND NOT EXTERNAL_LIBS_INTERFACE STREQUAL "UNDEFINED")
   set(INCLUDE_EXTERNAL_LIBS_INTERFACE )

build/configs/toolchain_external.cmake

@@ -17,4 +17,4 @@ include(CMakeForceCompiler)
 set(CMAKE_SYSTEM_NAME EXTERNAL)
 set(CMAKE_SYSTEM_PROCESSOR "${EXTERNAL_CMAKE_SYSTEM_PROCESSOR}")
 
-CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU)
+CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} ${EXTERNAL_CMAKE_C_COMPILER_FAMILY})

jerry-core/CMakeLists.txt

@@ -147,6 +147,13 @@ project (JerryCore C ASM)
       ${SOURCE_CORE_PARSER_REGEXP}
       ${SOURCE_CORE_JRT})
 
+ # Jerry port
+ if(USE_DEFAULT_PORT)
+   file(GLOB SOURCE_PORT_FILES ${CMAKE_SOURCE_DIR}/targets/default/*.c)
+ else()
+   set(SOURCE_PORT_FILES ${SOURCE_PORT_IMPLEMENTATION})
+ endif()
+
  # All-in-one build
  if("${ENABLE_ALL_IN_ONE}" STREQUAL "ON")
   set(ALL_IN_FILE "${CMAKE_BINARY_DIR}/jerry-all-in.c")
@@ -157,9 +164,13 @@ project (JerryCore C ASM)
    file(APPEND ${ALL_IN_FILE} "#include \"${FILE}\"\n")
   endforeach()
 
+  foreach(FILE ${SOURCE_PORT_FILES})
+   file(APPEND ${ALL_IN_FILE} "#include \"${FILE}\"\n")
+  endforeach()
+
   set(SOURCE_CORE ${ALL_IN_FILE})
  else()
-  set(SOURCE_CORE ${SOURCE_CORE_FILES})
+  set(SOURCE_CORE ${SOURCE_CORE_FILES} ${SOURCE_PORT_FILES})
  endif()
 
 # Per-option configuration

jerry-core/jerry-port.c renamed to targets/default/jerry-port.c

@@ -0,0 +1,62 @@
+CURDIR     = `pwd`
+SRCPATH    = ${CURDIR}/targets/pebble/source
+TYPE       = release
+MODIFIER   ?=
+BUILD_DIR  ?= build
+INTERM     = $(BUILD_DIR)/obj-pebble
+OUTPUT     = $(BUILD_DIR)/bin/$(TYPE).pebble
+COPYTARGET = $(BUILD_DIR)/lib
+JERRYHEAP  ?= 8
+PORT_FILE = $(SRCPATH)/jerry_port.c
+
+CFLAGS += -Wno-error=format
+CFLAGS += -Wno-error=unused-parameter
+CFLAGS += -Wno-error=unused-variable
+CFLAGS += -Wno-strict-aliasing
+CFLAGS += -Wno-pedantic
+
+CMAKE_FLAGS = \
+	 -DENABLE_LTO=OFF \
+	 -DCMAKE_RULE_MESSAGES=OFF \
+	 -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
+	 -DEXTERNAL_CMAKE_C_COMPILER=$(CC) \
+	 -DEXTERNAL_COMPILE_FLAGS="$(CFLAGS)" \
+	 -DEXTERNAL_PORT_FILE="$(PORT_FILE)" \
+	 -DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP)
+
+
+ifdef PBLTEST
+$(warning RUNNING PBLTEST)
+CFLAGS += -Wno-conversion
+CFLAGS += -Wno-unknown-warning-option
+CMAKE_FLAGS += -DUSE_COMPILER_DEFAULT_LIBC=YES
+CMAKE_FLAGS += -DEXTERNAL_CMAKE_C_COMPILER_FAMILY=CLANG
+else
+# Building firmware -> use pblibc
+CMAKE_FLAGS += -DUSE_COMPILER_DEFAULT_LIBC=NO
+CMAKE_FLAGS += -DEXTERNAL_LIBC_INTERFACE=$(CURDIR)/../../../libc/include/
+CMAKE_FLAGS += -DEXTERNAL_CMAKE_C_COMPILER_FAMILY=GNU
+endif
+
+
+.PHONY: jerry clean
+
+
+all: jerry
+
+
+jerry:
+	mkdir -p $(INTERM)
+	mkdir -p $(OUTPUT)
+	mkdir -p $(COPYTARGET)
+	cmake -B$(INTERM) -H./ $(CMAKE_FLAGS)
+	make -s -C $(INTERM) $(TYPE).external$(MODIFIER)
+	cp `cat $(INTERM)/$(TYPE).external$(MODIFIER)/list` $(OUTPUT)/.
+	cp $(OUTPUT)/lib$(TYPE)$(MODIFIER).jerry-core.a $(COPYTARGET)/libjerrycore.a
+	cp $(OUTPUT)/lib$(TYPE)$(MODIFIER).jerry-fdlibm.third_party.lib.a $(COPYTARGET)/libfdlibm.a
+
+
+clean:
+	rm -rf $(INTERM)
+	rm -rf $(OUTPUT)
+	

targets/pebble/Makefile.pebble

@@ -0,0 +1,56 @@
+#include "jerry-port.h"
+#include <stdarg.h>
+#include <stdint.h>
+
+void pbl_log(uint8_t log_level, const char* src_filename, int src_line_number, const char* fmt, ...);
+
+#define LOG_LEVEL_DEBUG 200
+#define LOG_LEVEL_ERROR 1
+
+/**
+ * Provide log message to filestream implementation for the engine.
+ */
+int jerry_port_logmsg (FILE* stream, const char* format, ...)
+{
+  va_list args;
+  va_start(args, format);
+
+  pbl_log(LOG_LEVEL_DEBUG, "JERRY-LOG", 0, format, args);
+
+  va_end(args);
+
+  return 0;
+}
+
+/**
+ * Provide error message to console implementation for the engine.
+ */
+int jerry_port_errormsg (const char* format, ...)
+{
+  va_list args;
+  va_start(args, format);
+
+  pbl_log(LOG_LEVEL_ERROR, "JERRY-ERROR", 0, format, args);
+
+  va_end(args);
+
+  return 0;
+}
+
+void dbgserial_putchar(uint8_t c);
+
+/**
+ * Provide output character to console implementation for the engine.
+ */
+int jerry_port_putchar (int c)
+{
+  dbgserial_putchar((uint8_t)c);
+  return c;
+}
+
+void wtf(void);
+
+void jerry_port_abort () {
+  wtf();
+}
+