From d90a545a5829b7cf45be279ca652be0b83d9921f Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sat, 30 Jun 2018 11:14:25 +0200 Subject: [PATCH] Strip "get-jit-size" feature from lightning. * libguile/lightning/Makefile.am: * libguile/lightning/configure.ac: * libguile/lightning/size.c: Remove devel-only "get-jit-size" feature. --- Makefile.am | 21 +--------- configure.ac | 9 +--- size.c | 115 --------------------------------------------------- 3 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 size.c diff --git a/Makefile.am b/Makefile.am index e9114cb85..7903efd61 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2000, 2001, 2002, 2012-2017 Free Software Foundation, Inc. +# Copyright 2000, 2001, 2002, 2012-2018 Free Software Foundation, Inc. # # This file is part of GNU lightning. # @@ -24,22 +24,3 @@ SUBDIRS = \ pkgconfiglibdir = $(libdir)/pkgconfig pkgconfiglib_DATA = lightning.pc - -if get_jit_size -JIT_SIZE_PATH = "$(top_builddir)/jit_$(cpu)-sz.c" -AM_CPPFLAGS=-DGET_JIT_SIZE=1 -DJIT_SIZE_PATH='$(JIT_SIZE_PATH)' -AM_CFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE $(LIGHTNING_CFLAGS) - -noinst_PROGRAMS = size -size_LDADD = $(top_builddir)/lib/liblightning.la -lm $(SHLIB) -size_SOURCES = size.c - -get_jit_size:: $(JIT_SIZE_PATH) - -$(JIT_SIZE_PATH): - make clean - make CFLAGS='-O0 -g3' check - $(top_builddir)/size - -CLEANFILES = $(JIT_SIZE_PATH) -endif diff --git a/configure.ac b/configure.ac index 34dc02f35..cb6b8d535 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright 2000, 2001, 2002, 2012-2017 Free Software Foundation, Inc. +dnl Copyright 2000, 2001, 2002, 2012-2018 Free Software Foundation, Inc. dnl dnl This file is part of GNU lightning. dnl @@ -135,13 +135,6 @@ else DEBUG=no fi -# This option is only useful during development. -AC_ARG_ENABLE(devel-get-jit-size, - AS_HELP_STRING([--enable-devel-get-jit-size], - [Devel mode to regenerate jit size information]), - [GET_JIT_SIZE=$enableval], [GET_JIT_SIZE=no]) -AM_CONDITIONAL(get_jit_size, [test $GET_JIT_SIZE = yes]) - case "$host_os" in *bsd*|osf*) SHLIB="" ;; *hpux*) SHLIB="-ldld" ;; diff --git a/size.c b/size.c deleted file mode 100644 index 1fd45c464..000000000 --- a/size.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2013-2017 Free Software Foundation, Inc. - * - * This file is part of GNU lightning. - * - * GNU lightning 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 3, or (at your option) - * any later version. - * - * GNU lightning 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. - * - * Authors: - * Paulo Cesar Pereira de Andrade - */ - -#include -#include -#include -#include "lib/jit_names.c" - -jit_int16_t _szs[jit_code_last_code]; - -int -main(int argc, char *argv[]) -{ - FILE *fp; - jit_word_t offset; - int code, size, max; - - if ((fp = fopen(JIT_SIZE_PATH, "r")) == NULL) - exit(-1); - while (fscanf(fp, "%d %d\n", &code, &size) == 2) { - if (_szs[code] < size) - _szs[code] = size; - } - fclose(fp); - - max = 0; - for (offset = 0; offset < jit_code_last_code; offset++) - if (max < _szs[offset]) - max = _szs[offset]; - - if ((fp = fopen(JIT_SIZE_PATH, "w")) == NULL) - exit(-1); - - -#if __X64 || __X32 -# if __X64 - fprintf(fp, "#if __X64\n"); -# if __X64_32 - fprintf(fp, "# if __X64_32\n"); -# else - fprintf(fp, "# if !__X64_32\n"); -# endif -# else - fprintf(fp, "#if __X32\n"); -# endif -#else - fprintf(fp, "#if __WORDSIZE == %d\n", __WORDSIZE); -#endif -#if defined(__arm__) -# if defined(__ARM_PCS_VFP) - fprintf(fp, "#if defined(__ARM_PCS_VFP)\n"); -# else - fprintf(fp, "#if !defined(__ARM_PCS_VFP)\n"); -# endif -#elif defined(__mips__) -# if __WORDSIZE == 32 -# if NEW_ABI - fprintf(fp, "#if NEW_ABI\n"); -# else - fprintf(fp, "#if !NEW_ABI\n"); -# endif -# endif -#elif defined(__ppc__) - fprintf(fp, "#if defined(__ppc__)\n"); -#elif defined(__powerpc__) - fprintf(fp, "#if defined(__powerpc__)\n"); - fprintf(fp, "#if __BYTE_ORDER == %s\n", - __BYTE_ORDER == __BIG_ENDIAN ? "__BIG_ENDIAN" : "__LITTLE_ENDIAN"); -#endif - fprintf(fp, "#define JIT_INSTR_MAX %d\n", max); - for (offset = 0; offset < jit_code_last_code; offset++) - fprintf(fp, " %d, /* %s */\n", _szs[offset], code_name[offset]); -#if defined(__arm__) - fprintf(fp, "#endif /* __ARM_PCS_VFP */\n"); -#elif defined(__mips__) -# if __WORDSIZE == 32 - fprintf(fp, "#endif /* NEW_ABI */\n"); -# endif -#elif defined(__ppc__) - fprintf(fp, "#endif /* __ppc__ */\n"); -#elif defined(__powerpc__) - fprintf(fp, "#endif /* __BYTE_ORDER */\n"); - fprintf(fp, "#endif /* __powerpc__ */\n"); -#endif -#if __X64 || __X32 -# if __X64 - fprintf(fp, "# endif /* __X64_32 */\n"); - fprintf(fp, "#endif /* __X64 */\n"); -# else - fprintf(fp, "#endif /* __X32 */\n"); -# endif -#else - fprintf(fp, "#endif /* __WORDSIZE */\n"); -#endif - - fclose(fp); - - return (0); -}