From 5923418e6965be6fdc1dc67a86e92f11f6c88542 Mon Sep 17 00:00:00 2001 From: "e.gavrin" Date: Wed, 2 Jul 2014 13:54:22 +0400 Subject: [PATCH] renamed _ -> - --- Makefile | 16 ++++++++++------ src/{ctx_manager.c => ctx-manager.c} | 18 +++++++++--------- src/{ctx_manager.h => ctx-manager.h} | 4 ++-- src/ctx-reference.c | 6 +++--- src/ctx-reference.h | 4 ++-- src/{ecma_alloc.c => ecma-alloc.c} | 10 +++++----- src/{ecma_alloc.h => ecma-alloc.h} | 2 +- src/{ecma_conversion.h => ecma-conversion.h} | 4 ++-- src/{ecma_defs.h => ecma-defs.h} | 4 ++-- src/{ecma_gc.c => ecma-gc.c} | 10 +++++----- src/{ecma_gc.h => ecma-gc.h} | 2 +- src/{ecma_helpers.c => ecma-helpers.c} | 8 ++++---- src/{ecma_helpers.h => ecma-helpers.h} | 2 +- src/{defs.h => globals.h} | 0 src/{jerry_libc.c => jerry-libc.c} | 2 +- src/{jerry_libc.h => jerry-libc.h} | 2 +- src/main.c | 4 ++-- src/{mem_allocator.c => mem-allocator.c} | 10 +++++----- src/{mem_allocator.h => mem-allocator.h} | 4 ++-- src/{mem_heap.c => mem-heap.c} | 8 ++++---- src/{mem_heap.h => mem-heap.h} | 2 +- src/{mem_pool.c => mem-pool.c} | 8 ++++---- src/{mem_pool.h => mem-pool.h} | 0 src/{mem_poolman.c => mem-poolman.c} | 10 +++++----- src/{mem_poolman.h => mem-poolman.h} | 2 +- 25 files changed, 73 insertions(+), 69 deletions(-) rename src/{ctx_manager.c => ctx-manager.c} (98%) rename src/{ctx_manager.h => ctx-manager.h} (98%) rename src/{ecma_alloc.c => ecma-alloc.c} (95%) rename src/{ecma_alloc.h => ecma-alloc.h} (98%) rename src/{ecma_conversion.h => ecma-conversion.h} (96%) rename src/{ecma_defs.h => ecma-defs.h} (99%) rename src/{ecma_gc.c => ecma-gc.c} (98%) rename src/{ecma_gc.h => ecma-gc.h} (97%) rename src/{ecma_helpers.c => ecma-helpers.c} (99%) rename src/{ecma_helpers.h => ecma-helpers.h} (99%) rename src/{defs.h => globals.h} (100%) rename src/{jerry_libc.c => jerry-libc.c} (99%) rename src/{jerry_libc.h => jerry-libc.h} (97%) rename src/{mem_allocator.c => mem-allocator.c} (90%) rename src/{mem_allocator.h => mem-allocator.h} (96%) rename src/{mem_heap.c => mem-heap.c} (99%) rename src/{mem_heap.h => mem-heap.h} (98%) rename src/{mem_pool.c => mem-pool.c} (98%) rename src/{mem_pool.h => mem-pool.h} (100%) rename src/{mem_poolman.c => mem-poolman.c} (98%) rename src/{mem_poolman.h => mem-poolman.h} (98%) diff --git a/Makefile b/Makefile index 20657979a..375c7c02f 100644 --- a/Makefile +++ b/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 diff --git a/src/ctx_manager.c b/src/ctx-manager.c similarity index 98% rename from src/ctx_manager.c rename to src/ctx-manager.c index 80a4277d9..a4097aaac 100644 --- a/src/ctx_manager.c +++ b/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 * @{ diff --git a/src/ctx_manager.h b/src/ctx-manager.h similarity index 98% rename from src/ctx_manager.h rename to src/ctx-manager.h index a0c791c25..ddf482724 100644 --- a/src/ctx_manager.h +++ b/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 * @{ diff --git a/src/ctx-reference.c b/src/ctx-reference.c index 43f839bb2..65decddcd 100644 --- a/src/ctx-reference.c +++ b/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" /** diff --git a/src/ctx-reference.h b/src/ctx-reference.h index 8380075ef..4d18c2d47 100644 --- a/src/ctx-reference.h +++ b/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 * @{ diff --git a/src/ecma_alloc.c b/src/ecma-alloc.c similarity index 95% rename from src/ecma_alloc.c rename to src/ecma-alloc.c index 9ac4f5bbe..23a25e5c3 100644 --- a/src/ecma_alloc.c +++ b/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. diff --git a/src/ecma_alloc.h b/src/ecma-alloc.h similarity index 98% rename from src/ecma_alloc.h rename to src/ecma-alloc.h index 8c5db5a42..43978c863 100644 --- a/src/ecma_alloc.h +++ b/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 diff --git a/src/ecma_conversion.h b/src/ecma-conversion.h similarity index 96% rename from src/ecma_conversion.h rename to src/ecma-conversion.h index 3d890cf2d..a02120c87 100644 --- a/src/ecma_conversion.h +++ b/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); diff --git a/src/ecma_defs.h b/src/ecma-defs.h similarity index 99% rename from src/ecma_defs.h rename to src/ecma-defs.h index 2a7644e93..c73c5484d 100644 --- a/src/ecma_defs.h +++ b/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 * @{ diff --git a/src/ecma_gc.c b/src/ecma-gc.c similarity index 98% rename from src/ecma_gc.c rename to src/ecma-gc.c index 6075fb61c..7cdcb7f07 100644 --- a/src/ecma_gc.c +++ b/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 diff --git a/src/ecma_gc.h b/src/ecma-gc.h similarity index 97% rename from src/ecma_gc.h rename to src/ecma-gc.h index c1fe03e98..3c7afb512 100644 --- a/src/ecma_gc.h +++ b/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); diff --git a/src/ecma_helpers.c b/src/ecma-helpers.c similarity index 99% rename from src/ecma_helpers.c rename to src/ecma-helpers.c index dbe84249d..7a08b4232 100644 --- a/src/ecma_helpers.c +++ b/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. diff --git a/src/ecma_helpers.h b/src/ecma-helpers.h similarity index 99% rename from src/ecma_helpers.h rename to src/ecma-helpers.h index 83f15ed12..4c8b096d2 100644 --- a/src/ecma_helpers.h +++ b/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); diff --git a/src/defs.h b/src/globals.h similarity index 100% rename from src/defs.h rename to src/globals.h diff --git a/src/jerry_libc.c b/src/jerry-libc.c similarity index 99% rename from src/jerry_libc.c rename to src/jerry-libc.c index d07b181b7..7924b1d5d 100644 --- a/src/jerry_libc.c +++ b/src/jerry-libc.c @@ -17,7 +17,7 @@ * Jerry libc implementation */ -#include "jerry_libc.h" +#include "jerry-libc.h" #include diff --git a/src/jerry_libc.h b/src/jerry-libc.h similarity index 97% rename from src/jerry_libc.h rename to src/jerry-libc.h index 74ddac1f1..32a791406 100644 --- a/src/jerry_libc.h +++ b/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); diff --git a/src/main.c b/src/main.c index 393210465..a88a0d491 100644 --- a/src/main.c +++ b/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) diff --git a/src/mem_allocator.c b/src/mem-allocator.c similarity index 90% rename from src/mem_allocator.c rename to src/mem-allocator.c index a7ae7b703..50c38c4f7 100644 --- a/src/mem_allocator.c +++ b/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 diff --git a/src/mem_allocator.h b/src/mem-allocator.h similarity index 96% rename from src/mem_allocator.h rename to src/mem-allocator.h index 45cdceb1b..1feaed2d6 100644 --- a/src/mem_allocator.h +++ b/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 diff --git a/src/mem_heap.c b/src/mem-heap.c similarity index 99% rename from src/mem_heap.c rename to src/mem-heap.c index 06b5701fd..252307e0c 100644 --- a/src/mem_heap.c +++ b/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 diff --git a/src/mem_heap.h b/src/mem-heap.h similarity index 98% rename from src/mem_heap.h rename to src/mem-heap.h index 01407a32f..4718c0986 100644 --- a/src/mem_heap.h +++ b/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) diff --git a/src/mem_pool.c b/src/mem-pool.c similarity index 98% rename from src/mem_pool.c rename to src/mem-pool.c index 5480cc6c2..50ff836c9 100644 --- a/src/mem_pool.c +++ b/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 diff --git a/src/mem_pool.h b/src/mem-pool.h similarity index 100% rename from src/mem_pool.h rename to src/mem-pool.h diff --git a/src/mem_poolman.c b/src/mem-poolman.c similarity index 98% rename from src/mem_poolman.c rename to src/mem-poolman.c index b97e40e7e..c516d6179 100644 --- a/src/mem_poolman.c +++ b/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 diff --git a/src/mem_poolman.h b/src/mem-poolman.h similarity index 98% rename from src/mem_poolman.h rename to src/mem-poolman.h index fec6a3b2e..2e6acdc3f 100644 --- a/src/mem_poolman.h +++ b/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