From 03f5435e23283dc84c061ed3a72361538fd75b58 Mon Sep 17 00:00:00 2001 From: Aleksey Demakov Date: Fri, 12 Oct 2012 22:19:18 +0400 Subject: [PATCH] Remove jit/jit-memory.h --- ChangeLog | 4 +++ jit/Makefile.am | 1 - jit/jit-apply.c | 1 - jit/jit-block.c | 1 - jit/jit-compile.c | 1 - jit/jit-elf-read.c | 1 - jit/jit-elf-write.c | 1 - jit/jit-internal.h | 36 +++++++++++++++++++++ jit/jit-interp.c | 1 - jit/jit-memory.c | 4 +-- jit/jit-memory.h | 78 --------------------------------------------- jit/jit-pool.c | 1 - 12 files changed, 42 insertions(+), 88 deletions(-) delete mode 100644 jit/jit-memory.h diff --git a/ChangeLog b/ChangeLog index 90fa0bb..fc82e38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-10-12 Aleksey Demakov + + * jit/jit-memory.h: remove file. + 2012-10-08 Aleksey Demakov * jit/jit-cache.c, jit/jit-cache.c(_jit_cache_alloc_trampoline) diff --git a/jit/Makefile.am b/jit/Makefile.am index df7b0ab..f0ee3f6 100644 --- a/jit/Makefile.am +++ b/jit/Makefile.am @@ -46,7 +46,6 @@ libjit_la_SOURCES = \ jit-intrinsic.c \ jit-live.c \ jit-memory.c \ - jit-memory.h \ jit-meta.c \ jit-opcode-apply.c \ jit-objmodel.c \ diff --git a/jit/jit-apply.c b/jit/jit-apply.c index 4ace866..4d5331c 100644 --- a/jit/jit-apply.c +++ b/jit/jit-apply.c @@ -21,7 +21,6 @@ */ #include "jit-internal.h" -#include "jit-memory.h" #include "jit-apply-rules.h" #include "jit-apply-func.h" #include "jit-cache.h" diff --git a/jit/jit-block.c b/jit/jit-block.c index f5c363a..939e969 100644 --- a/jit/jit-block.c +++ b/jit/jit-block.c @@ -21,7 +21,6 @@ */ #include "jit-internal.h" -#include "jit-memory.h" /*@ diff --git a/jit/jit-compile.c b/jit/jit-compile.c index 3c648c9..40860f3 100644 --- a/jit/jit-compile.c +++ b/jit/jit-compile.c @@ -21,7 +21,6 @@ */ #include "jit-internal.h" -#include "jit-memory.h" #include "jit-rules.h" #include "jit-reg-alloc.h" #include "jit-setjmp.h" diff --git a/jit/jit-elf-read.c b/jit/jit-elf-read.c index cb1cf40..a2bca7d 100644 --- a/jit/jit-elf-read.c +++ b/jit/jit-elf-read.c @@ -23,7 +23,6 @@ #include "jit-internal.h" #include "jit-rules.h" #include "jit-elf-defs.h" -#include "jit-memory.h" #ifdef JIT_WIN32_PLATFORM #ifdef HAVE_SYS_TYPES_H #include diff --git a/jit/jit-elf-write.c b/jit/jit-elf-write.c index 9876dfc..7b9c94e 100644 --- a/jit/jit-elf-write.c +++ b/jit/jit-elf-write.c @@ -22,7 +22,6 @@ #include "jit-internal.h" #include "jit-elf-defs.h" -#include "jit-memory.h" #include "jit-rules.h" /*@ diff --git a/jit/jit-internal.h b/jit/jit-internal.h index da59e4c..1b52dd8 100644 --- a/jit/jit-internal.h +++ b/jit/jit-internal.h @@ -26,6 +26,42 @@ #include #include "jit-config.h" +#if defined(HAVE_STRING_H) +# include +#elif defined(HAVE_STRINGS_H) +# include +#endif +#if defined(HAVE_MEMORY_H) +# include +#endif + +/* + * Macros that replace the routines in + * with direct calls on the underlying library functions. + */ +#if defined(HAVE_MEMSET) +# define jit_memset(s, c, len) (memset((s), (c), (len))) +# define jit_memzero(s, len) (memset((s), 0, (len))) +#elif defined(HAVE_BZERO) +# define jit_memzero(s, len) (bzero((char *)(s), (len))) +#else +# define jit_memzero(s, len) (jit_memset((char *)(s), 0, (len))) +#endif +#if defined(HAVE_MEMCPY) +# define jit_memcpy(s1, s2, len) (memcpy((s1), (s2), (len))) +#endif +#if defined(HAVE_MEMMOVE) +# define jit_memmove(s1, s2, len) (memmove((s1), (s2), (len))) +#endif +#if defined(HAVE_MEMCMP) +# define jit_memcmp(s1, s2, len) (memcmp((s1), (s2), (len))) +#elif defined(HAVE_BCMP) +# define jit_memcmp(s1, s2, len) (bcmp((char *)(s1), (char *)(s2), (len))) +#endif +#if defined(HAVE_MEMCHR) +# define jit_memchr(s, c, len) (memchr((s), (c), (len))) +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/jit/jit-interp.c b/jit/jit-interp.c index 0e11df4..99904d9 100644 --- a/jit/jit-interp.c +++ b/jit/jit-interp.c @@ -30,7 +30,6 @@ straight vanilla ANSI C. #include "jit-interp.h" #include "jit-rules.h" -#include "jit-memory.h" #if HAVE_STDLIB_H #include #endif diff --git a/jit/jit-memory.c b/jit/jit-memory.c index be6692b..662ea2b 100644 --- a/jit/jit-memory.c +++ b/jit/jit-memory.c @@ -20,10 +20,10 @@ * . */ -#include "jit-memory.h" +#include "jit-internal.h" /* - * Undefine the macros in "jit-memory.h" so that we + * Undefine the macros in "jit-internal.h" so that we * can define the real function forms. */ #undef jit_memset diff --git a/jit/jit-memory.h b/jit/jit-memory.h deleted file mode 100644 index 6773b21..0000000 --- a/jit/jit-memory.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * jit-memory.h - Memory copy/set/compare routines. - * - * Copyright (C) 2004 Southern Storm Software, Pty Ltd. - * - * This file is part of the libjit library. - * - * The libjit library is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation, either version 2.1 of - * the License, or (at your option) any later version. - * - * The libjit library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the libjit library. If not, see - * . - */ - -#ifndef _JIT_MEMORY_H -#define _JIT_MEMORY_H - -#include -#ifdef HAVE_STRING_H - #include -#else - #ifdef HAVE_STRINGS_H - #include - #endif -#endif -#ifdef HAVE_MEMORY_H - #include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Macros that replace the routines in - * with direct calls on the underlying library functions. - */ -#ifdef HAVE_MEMSET - #define jit_memset(dest,ch,len) (memset((dest), (ch), (len))) - #define jit_memzero(dest,len) (memset((dest), 0, (len))) -#else - #ifdef HAVE_BZERO - #define jit_memzero(dest,len) (bzero((char *)(dest), (len))) - #else - #define jit_memzero(dest,len) (jit_memset((char *)(dest), 0, (len))) - #endif -#endif -#ifdef HAVE_MEMCPY - #define jit_memcpy(dest,src,len) (memcpy((dest), (src), (len))) -#endif -#ifdef HAVE_MEMMOVE - #define jit_memmove(dest,src,len) (memmove((dest), (src), (len))) -#endif -#ifdef HAVE_MEMCMP - #define jit_memcmp(s1,s2,len) (memcmp((s1), (s2), (len))) -#else - #ifdef HAVE_BCMP - #define jit_memcmp(s1,s2,len) \ - (bcmp((char *)(s1), (char *)(s2), (len))) - #endif -#endif -#ifdef HAVE_MEMCHR - #define jit_memchr(str,ch,len) (memchr((str), (ch), (len))) -#endif - -#ifdef __cplusplus -}; -#endif - -#endif /* _JIT_MEMORY_H */ diff --git a/jit/jit-pool.c b/jit/jit-pool.c index af09794..acadcca 100644 --- a/jit/jit-pool.c +++ b/jit/jit-pool.c @@ -21,7 +21,6 @@ */ #include "jit-internal.h" -#include "jit-memory.h" void _jit_memory_pool_init(jit_memory_pool *pool, unsigned int elem_size) { -- 2.47.3