renamed _ -> -

Makefile

@@ -20,22 +20,26 @@ SOURCES = \
 	$(sort \
 	$(wildcard ./src/*.c))
 
-INCLUDES = -I src
+INCLUDES = \
+	-I src \
+	-I src/libperipherals \
+	-I src/libcoreint
 
-OBJS = $(sort \
+OBJS = \
+	$(sort \
 	$(patsubst %.c,./$(OBJ_DIR)/%.o,$(notdir $(SOURCES))))
 
-CC  = $(CROSS_COMPILE)gcc-4.8
+CC  = $(CROSS_COMPILE)gcc-4.9
 LD  = $(CROSS_COMPILE)ld
 OBJDUMP	= $(CROSS_COMPILE)objdump
 OBJCOPY	= $(CROSS_COMPILE)objcopy
 SIZE	= $(CROSS_COMPILE)size
 
 # General flags
-CFLAGS ?= $(INCLUDES) -Wall -std=c99 -m32# -fdiagnostics-color=always
-#CFLAGS += -Wextra -Wpedantic -Wformat-security -Wlogical-op
+CFLAGS ?= $(INCLUDES) -std=c99 -m32 -fdiagnostics-color=always
+#CFLAGS += -Wall -Wextra -Wpedantic -Wlogical-op -Winline
 #CFLAGS += -Wformat-nonliteral -Winit-self -Wstack-protector
-#CFLAGS += -Wconversion -Wsign-conversion -Winline
+#CFLAGS += -Wconversion -Wsign-conversion -Wformat-security
 #CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
 
 # Flags for MCU

src/ctx-manager.c

@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-#include "ctx_manager.h"
+#include "ctx-manager.h"
 #include "ctx-reference.h"
-#include "defs.h"
-#include "ecma_alloc.h"
-#include "ecma_defs.h"
-#include "ecma_conversion.h"
-#include "ecma_gc.h"
-#include "ecma_helpers.h"
-#include "jerry_libc.h"
-#include "mem_poolman.h"
+#include "globals.h"
+#include "ecma-alloc.h"
+#include "ecma-defs.h"
+#include "ecma-conversion.h"
+#include "ecma-gc.h"
+#include "ecma-helpers.h"
+#include "jerry-libc.h"
+#include "mem-poolman.h"
 
 /** \addtogroup ctxman Context manager
  * @{

src/ctx-manager.h

@@ -17,8 +17,8 @@
 #define JERRY_CTX_MANAGER_H
 
 #include "ctx-reference.h"
-#include "defs.h"
-#include "ecma_defs.h"
+#include "globals.h"
+#include "ecma-defs.h"
 
 /** \addtogroup ctxman Context manager
  * @{

src/ctx-reference.c

@@ -24,9 +24,9 @@
  * Implementation of Reference's operations
  */
 
-#include "defs.h"
-#include "ecma_defs.h"
-#include "ecma_helpers.h"
+#include "globals.h"
+#include "ecma-defs.h"
+#include "ecma-helpers.h"
 #include "ctx-reference.h"
 
 /**

src/ctx-reference.h

@@ -17,8 +17,8 @@
 #define CTX_REFERENCE_H
 
 #include "ctx-reference.h"
-#include "defs.h"
-#include "ecma_defs.h"
+#include "globals.h"
+#include "ecma-defs.h"
 
 /** \addtogroup ctxman Context manager
  * @{

src/ecma-alloc.c

@@ -32,11 +32,11 @@
  *     else - shutdown engine.
  */
 
-#include "defs.h"
-#include "ecma_alloc.h"
-#include "ecma_defs.h"
-#include "ecma_gc.h"
-#include "mem_poolman.h"
+#include "globals.h"
+#include "ecma-alloc.h"
+#include "ecma-defs.h"
+#include "ecma-gc.h"
+#include "mem-poolman.h"
 
 /**
  * Template of an allocation routine.

src/ecma-alloc.h

@@ -23,7 +23,7 @@
 #ifndef JERRY_ECMA_ALLOC_H
 #define	JERRY_ECMA_ALLOC_H
 
-#include "ecma_defs.h"
+#include "ecma-defs.h"
 
 /**
  * Allocate memory for ecma-object

src/ecma-conversion.h

@@ -23,8 +23,8 @@
 #ifndef JERRY_ECMA_CONVERSION_H
 #define JERRY_ECMA_CONVERSION_H
 
-#include "ecma_defs.h"
-#include "ecma_helpers.h"
+#include "ecma-defs.h"
+#include "ecma-helpers.h"
 
 extern ecma_Object_t* ecma_ToObject( ecma_Value_t value);
 

src/ecma-defs.h

@@ -23,8 +23,8 @@
 #ifndef JERRY_ECMA_DEFS_H
 #define	JERRY_ECMA_DEFS_H
 
-#include "defs.h"
-#include "mem_allocator.h"
+#include "globals.h"
+#include "mem-allocator.h"
 
 /** \addtogroup compressedpointer Compressed pointer
  * @{

src/ecma-gc.c

@@ -24,11 +24,11 @@
  * Garbage collector implementation
  */
 
-#include "defs.h"
-#include "ecma_alloc.h"
-#include "ecma_defs.h"
-#include "ecma_gc.h"
-#include "ecma_helpers.h"
+#include "globals.h"
+#include "ecma-alloc.h"
+#include "ecma-defs.h"
+#include "ecma-gc.h"
+#include "ecma-helpers.h"
 
 /**
  * Queue of objects, awaiting for GC

src/ecma-gc.h

@@ -27,7 +27,7 @@
  * Garbage collector interface
  */
 
-#include "ecma_defs.h"
+#include "ecma-defs.h"
 
 extern void ecma_GCInit( void);
 extern void ecma_RefObject(ecma_Object_t *pObject);

src/ecma-helpers.c

@@ -24,10 +24,10 @@
  * Implementation of helpers for operations with ECMA data types
  */
 
-#include "ecma_alloc.h"
-#include "ecma_defs.h"
-#include "ecma_helpers.h"
-#include "jerry_libc.h"
+#include "ecma-alloc.h"
+#include "ecma-defs.h"
+#include "ecma-helpers.h"
+#include "jerry-libc.h"
 
 /**
  * Compress pointer.

src/ecma-helpers.h

@@ -23,7 +23,7 @@
 #ifndef JERRY_ECMA_HELPERS_H
 #define JERRY_ECMA_HELPERS_H
 
-#include "ecma_defs.h"
+#include "ecma-defs.h"
 
 extern uintptr_t ecma_CompressPointer(void *pointer);
 extern void* ecma_DecompressPointer(uintptr_t compressedPointer);

src/jerry-libc.c

@@ -17,7 +17,7 @@
  * Jerry libc implementation
  */
 
-#include "jerry_libc.h"
+#include "jerry-libc.h"
 
 #include <stdarg.h>
 

src/jerry-libc.h

@@ -19,7 +19,7 @@
 #ifndef JERRY_LIBC_H
 #define JERRY_LIBC_H
 
-#include "defs.h"
+#include "globals.h"
 
 extern void *libc_memset(void *s, int c, size_t n);
 extern int libc_memcmp(const void *s1, const void *s2, size_t n);

src/main.c

@@ -22,8 +22,8 @@
 #include "parser.h"
 #include "pretty-printer.h"
 
-#include "ctx_manager.h"
-#include "mem_allocator.h"
+#include "ctx-manager.h"
+#include "mem-allocator.h"
 
 int
 main (int argc, char **argv)

src/mem-allocator.c

@@ -17,11 +17,11 @@
  * Allocator implementation
  */
 
-#include "defs.h"
-#include "mem_allocator.h"
-#include "mem_heap.h"
-#include "mem_poolman.h"
-#include "ctx_manager.h"
+#include "globals.h"
+#include "mem-allocator.h"
+#include "mem-heap.h"
+#include "mem-poolman.h"
+#include "ctx-manager.h"
 
 /**
  * Area for heap

src/mem-allocator.h

@@ -23,8 +23,8 @@
 #ifndef JERRY_MEM_ALLOCATOR_H
 #define JERRY_MEM_ALLOCATOR_H
 
-#include "defs.h"
-#include "mem_heap.h"
+#include "globals.h"
+#include "mem-heap.h"
 
 /**
  * Logarithm of required alignment for allocated units/blocks

src/mem-heap.c

@@ -24,10 +24,10 @@
  * Heap implementation
  */
 
-#include "defs.h"
-#include "jerry_libc.h"
-#include "mem_allocator.h"
-#include "mem_heap.h"
+#include "globals.h"
+#include "jerry-libc.h"
+#include "mem-allocator.h"
+#include "mem-heap.h"
 
 /**
  * Magic numbers for heap memory blocks

src/mem-heap.h

@@ -26,7 +26,7 @@
 #ifndef JERRY_MEM_HEAP_H
 #define JERRY_MEM_HEAP_H
 
-#include "defs.h"
+#include "globals.h"
 
 /**
  * Type of allocation (argument of mem_Alloc)

src/mem-pool.c

@@ -26,10 +26,10 @@
 
 #define JERRY_MEM_POOL_INTERNAL
 
-#include "defs.h"
-#include "jerry_libc.h"
-#include "mem_allocator.h"
-#include "mem_pool.h"
+#include "globals.h"
+#include "jerry-libc.h"
+#include "mem-allocator.h"
+#include "mem-pool.h"
 
 /**
  * Magic number to fill free chunks in debug version

src/mem-poolman.c

@@ -26,11 +26,11 @@
 
 #define JERRY_MEM_POOL_INTERNAL
 
-#include "defs.h"
-#include "mem_allocator.h"
-#include "mem_heap.h"
-#include "mem_pool.h"
-#include "mem_poolman.h"
+#include "globals.h"
+#include "mem-allocator.h"
+#include "mem-heap.h"
+#include "mem-pool.h"
+#include "mem-poolman.h"
 
 /**
  * Lists of pools for possible chunk sizes

src/mem-poolman.h

@@ -27,7 +27,7 @@
 #ifndef JERRY_MEM_POOLMAN_H
 #define JERRY_MEM_POOLMAN_H
 
-#include "defs.h"
+#include "globals.h"
 
 /**
  * Pool chunks's possible sizes