diff options
Diffstat (limited to 'sim')
45 files changed, 109 insertions, 254 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index a2c90fa..3c652d4 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,13 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Call SIM_AC_OPTION_SCACHE. + (sim_scache): Delete. + * m4/sim_ac_option_scache.m4: Delete first arg. Define WITH_SCACHE. + * m4/sim_ac_output.m4 (sim_scache): Delete. + * aclocal.m4, config.h.in, configure, Makefile.in: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Remove [true] from bfin SIM_TARGET call. * configure, Makefile.in: Regenerate. diff --git a/sim/Makefile.in b/sim/Makefile.in index 929975f..c672c5e 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -213,6 +213,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/m4/sim_ac_option_hardware.m4 \ $(top_srcdir)/m4/sim_ac_option_inline.m4 \ $(top_srcdir)/m4/sim_ac_option_profile.m4 \ + $(top_srcdir)/m4/sim_ac_option_scache.m4 \ $(top_srcdir)/m4/sim_ac_option_stdio.m4 \ $(top_srcdir)/m4/sim_ac_option_trace.m4 \ $(top_srcdir)/m4/sim_ac_option_warnings.m4 \ @@ -785,7 +786,6 @@ sim_float = @sim_float@ sim_hw_cflags = @sim_hw_cflags@ sim_hw_sockser = @sim_hw_sockser@ sim_reserved_bits = @sim_reserved_bits@ -sim_scache = @sim_scache@ srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 index a2b2bae..88c71d9 100644 --- a/sim/aclocal.m4 +++ b/sim/aclocal.m4 @@ -1189,6 +1189,7 @@ m4_include([m4/sim_ac_option_environment.m4]) m4_include([m4/sim_ac_option_hardware.m4]) m4_include([m4/sim_ac_option_inline.m4]) m4_include([m4/sim_ac_option_profile.m4]) +m4_include([m4/sim_ac_option_scache.m4]) m4_include([m4/sim_ac_option_stdio.m4]) m4_include([m4/sim_ac_option_trace.m4]) m4_include([m4/sim_ac_option_warnings.m4]) diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog index 63037fd..c740860 100644 --- a/sim/bpf/ChangeLog +++ b/sim/bpf/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. * sim-if.c (sim_open): Set STATE_MODEL_NAME. * aclocal.m4: Regenerate. diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4 index 90a839c..3b7f0c1 100644 --- a/sim/bpf/aclocal.m4 +++ b/sim/bpf/aclocal.m4 @@ -13,5 +13,4 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) -m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/bpf/configure b/sim/bpf/configure index de2798c..666257b 100755 --- a/sim/bpf/configure +++ b/sim/bpf/configure @@ -627,13 +627,11 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR SHELL -sim_scache sim_bitsize' ac_subst_files='' ac_user_opts=' enable_option_checking enable_sim_bitsize -enable_sim_scache ' ac_precious_vars='build_alias host_alias @@ -1246,8 +1244,6 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-sim-bitsize=N Specify target bitsize (32 or 64) - --enable-sim-scache=size - Specify simulator execution cache size Report bugs to the package provider. _ACEOF @@ -1739,25 +1735,6 @@ fi fi -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; @@ -1778,7 +1755,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac index 9cbd202..87654ec 100644 --- a/sim/bpf/configure.ac +++ b/sim/bpf/configure.ac @@ -3,6 +3,5 @@ AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_OPTION_BITSIZE([64]) -SIM_AC_OPTION_SCACHE(16384) SIM_AC_OUTPUT diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index c6fa33c..5b167eb 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * Make-common.in (SIM_SCACHE): Delete. + * cgen-scache.h (WITH_SCACHE): Delete. + * sim-profile.c (profile_info): Check CGEN_ARCH. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * cgen-scache.c (scache_install): Rename to ... (sim_install_scache): ... this. New prototype. * cgen-scache.h (scache_install): Delete. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 992fd7f..e7c1cce 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -75,7 +75,6 @@ SHELL = @SHELL@ SIM_BITSIZE = @sim_bitsize@ SIM_FLOAT = @sim_float@ SIM_RESERVED_BITS = @sim_reserved_bits@ -SIM_SCACHE = @sim_scache@ SIM_WARN_CFLAGS = $(WARN_CFLAGS) SIM_WERROR_CFLAGS = $(WERROR_CFLAGS) @@ -199,7 +198,6 @@ CONFIG_CFLAGS = \ $(SIM_HW_CFLAGS) \ $(SIM_INLINE) \ $(SIM_RESERVED_BITS) \ - $(SIM_SCACHE) \ $(SIM_WARN_CFLAGS) \ $(SIM_WERROR_CFLAGS) \ $(SIM_HARDWARE) diff --git a/sim/common/cgen-scache.h b/sim/common/cgen-scache.h index b435281..70ea090 100644 --- a/sim/common/cgen-scache.h +++ b/sim/common/cgen-scache.h @@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef CGEN_SCACHE_H #define CGEN_SCACHE_H -#ifndef WITH_SCACHE -#define WITH_SCACHE 0 -#endif - /* When caching bb's, instructions are extracted into "chains". SCACHE_MAP is a hash table into these chains. */ diff --git a/sim/common/sim-profile.c b/sim/common/sim-profile.c index 3a8ed1f..1459ae7 100644 --- a/sim/common/sim-profile.c +++ b/sim/common/sim-profile.c @@ -1152,7 +1152,7 @@ profile_info (SIM_DESC sd, int verbose) #if WITH_PROFILE_MODEL_P || PROFILE_FLAGS (data) [PROFILE_MODEL_IDX] #endif -#if WITH_PROFILE_SCACHE_P && WITH_SCACHE +#if WITH_PROFILE_SCACHE_P && WITH_SCACHE && defined(CGEN_ARCH) || PROFILE_FLAGS (data) [PROFILE_SCACHE_IDX] #endif #if WITH_PROFILE_PC_P @@ -1190,7 +1190,7 @@ profile_info (SIM_DESC sd, int verbose) profile_print_model (cpu, verbose); #endif -#if WITH_PROFILE_SCACHE_P && WITH_SCACHE +#if WITH_PROFILE_SCACHE_P && WITH_SCACHE && defined(CGEN_ARCH) if (PROFILE_FLAGS (data) [PROFILE_SCACHE_IDX]) scache_print_profile (cpu, verbose); #endif diff --git a/sim/config.h.in b/sim/config.h.in index 8d926f3..ccd8643 100644 --- a/sim/config.h.in +++ b/sim/config.h.in @@ -469,6 +469,9 @@ /* Sim profile settings */ #undef WITH_PROFILE +/* Sim cache szie */ +#undef WITH_SCACHE + /* How to route I/O */ #undef WITH_STDIO diff --git a/sim/configure b/sim/configure index eb38cda..4a0b87f 100755 --- a/sim/configure +++ b/sim/configure @@ -640,7 +640,6 @@ am__EXEEXT_TRUE LTLIBOBJS SIM_RX_CYCLE_ACCURATE_FLAGS sim_reserved_bits -sim_scache sim_float sim_bitsize SIM_INLINE @@ -840,6 +839,7 @@ enable_sim_environment enable_sim_hardware enable_sim_inline enable_sim_profile +enable_sim_scache enable_sim_stdio enable_sim_trace enable_werror @@ -1526,6 +1526,8 @@ Optional Features: Specify which functions should be inlined --enable-sim-profile=opts Enable profiling flags + --enable-sim-scache=size + Specify simulator execution cache size --enable-sim-stdio Specify whether to use stdio for console input/output --enable-sim-trace=opts Enable tracing of simulated programs @@ -12178,7 +12180,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12181 "configure" +#line 12183 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12284,7 +12286,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12287 "configure" +#line 12289 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14516,6 +14518,27 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 $as_echo "$sim_profile" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim cache size" >&5 +$as_echo_n "checking for sim cache size... " >&6; } +sim_scache="16384" +# Check whether --enable-sim-scache was given. +if test "${enable_sim_scache+set}" = set; then : + enableval=$enable_sim_scache; case "${enableval}" in + yes) ;; + no) sim_scache="0";; + [0-9]*) sim_scache="${enableval}";; + *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5;; +esac +fi + + +cat >>confdefs.h <<_ACEOF +#define WITH_SCACHE $sim_scache +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_scache" >&5 +$as_echo "$sim_scache" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 $as_echo_n "checking for sim stdio debug behavior... " >&6; } sim_stdio="0" @@ -14674,7 +14697,6 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sim rx should be cycle accurate" >&5 $as_echo_n "checking whether sim rx should be cycle accurate... " >&6; } # Check whether --enable-sim-rx-cycle-accurate was given. diff --git a/sim/configure.ac b/sim/configure.ac index c2a724b..7e6d013 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -161,6 +161,7 @@ SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_HARDWARE SIM_AC_OPTION_INLINE SIM_AC_OPTION_PROFILE +SIM_AC_OPTION_SCACHE SIM_AC_OPTION_STDIO SIM_AC_OPTION_TRACE SIM_AC_OPTION_WARNINGS @@ -171,7 +172,6 @@ dnl when the rest of the code is in the respective macros. Once we merge the dnl respective SIM_AC_OPTION_xxx call above, we can drop these. AC_SUBST(sim_bitsize) AC_SUBST(sim_float) -AC_SUBST(sim_scache) AC_SUBST(sim_reserved_bits) dnl Some arches have unique configure flags. diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 9cdc488..fa1e6b6 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. * sim-if.c (sim_open): Set STATE_MODEL_NAME. * aclocal.m4: Regenerate. diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4 index ca624a7..c9414d4 100644 --- a/sim/cris/aclocal.m4 +++ b/sim/cris/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/cris/configure b/sim/cris/configure index 1f18282..38fa43d 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -627,12 +627,10 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -sim_scache' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_scache ' ac_precious_vars='build_alias host_alias @@ -1240,13 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sim-scache=size - Specify simulator execution cache size - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1677,26 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; @@ -1717,7 +1688,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac index d203722..99370b3 100644 --- a/sim/cris/configure.ac +++ b/sim/cris/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_OPTION_SCACHE(16384) - SIM_AC_OUTPUT diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index c2c5354..883c6ba 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * Makefile.in (SIM_EXTRA_CFLAGS): Change to SIM_FRV_TRAPDUMP_FLAGS. * configure.ac: Change sim-trapdump to sim-frv-trapdump. * configure: Regenerate. diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index ca624a7..c9414d4 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/frv/configure b/sim/frv/configure index 23fc608..2d93667 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -628,12 +628,10 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -sim_scache' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_scache enable_sim_frv_trapdump ' ac_precious_vars='build_alias @@ -1246,8 +1244,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sim-scache=size - Specify simulator execution cache size --enable-sim-frv-trapdump Make unknown traps dump the registers @@ -1681,26 +1677,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sim frv should dump cpu state on unknown traps" >&5 $as_echo_n "checking whether sim frv should dump cpu state on unknown traps... " >&6; } # Check whether --enable-sim-frv-trapdump was given. @@ -1742,7 +1718,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index 7430641..7e237151 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_OPTION_SCACHE(16384) - dnl Enable making unknown traps dump out registers AC_MSG_CHECKING([whether sim frv should dump cpu state on unknown traps]) AC_ARG_ENABLE(sim-frv-trapdump, diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 60aa966..7ea55ea 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. * sim-if.c (sim_open): Set STATE_MODEL_NAME. * aclocal.m4: Regenerate. diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4 index ca624a7..c9414d4 100644 --- a/sim/iq2000/aclocal.m4 +++ b/sim/iq2000/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 1f18282..38fa43d 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -627,12 +627,10 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -sim_scache' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_scache ' ac_precious_vars='build_alias host_alias @@ -1240,13 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sim-scache=size - Specify simulator execution cache size - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1677,26 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; @@ -1717,7 +1688,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac index d203722..99370b3 100644 --- a/sim/iq2000/configure.ac +++ b/sim/iq2000/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_OPTION_SCACHE(16384) - SIM_AC_OUTPUT diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index f9092a9..fbb122f 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. * sim-if.c (sim_open): Set STATE_MODEL_NAME. * aclocal.m4: Regenerate. diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4 index ca624a7..c9414d4 100644 --- a/sim/lm32/aclocal.m4 +++ b/sim/lm32/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/lm32/configure b/sim/lm32/configure index 1f18282..38fa43d 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -627,12 +627,10 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -sim_scache' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_scache ' ac_precious_vars='build_alias host_alias @@ -1240,13 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sim-scache=size - Specify simulator execution cache size - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1677,26 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; @@ -1717,7 +1688,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac index d203722..99370b3 100644 --- a/sim/lm32/configure.ac +++ b/sim/lm32/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_OPTION_SCACHE(16384) - SIM_AC_OUTPUT diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index d738f5d..af8339a 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. * sim-if.c (sim_open): Set STATE_MODEL_NAME. * aclocal.m4: Regenerate. diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4 index ca624a7..c9414d4 100644 --- a/sim/m32r/aclocal.m4 +++ b/sim/m32r/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/m32r/configure b/sim/m32r/configure index 25077dd..d3dbc72 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -629,12 +629,10 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -sim_scache' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_scache ' ac_precious_vars='build_alias host_alias @@ -1242,13 +1240,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sim-scache=size - Specify simulator execution cache size - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,26 +1670,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - case "${target_alias}" in m32r*-linux*) traps_obj=traps-linux.o @@ -1732,7 +1703,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac index eed2e91..d805403 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_OPTION_SCACHE(16384) - case "${target_alias}" in m32r*-linux*) traps_obj=traps-linux.o diff --git a/sim/m4/sim_ac_option_scache.m4 b/sim/m4/sim_ac_option_scache.m4 index 20e3615..7ae883f 100644 --- a/sim/m4/sim_ac_option_scache.m4 +++ b/sim/m4/sim_ac_option_scache.m4 @@ -12,23 +12,19 @@ dnl GNU General Public License for more details. dnl dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see <http://www.gnu.org/licenses/>. -dnl -dnl The argument is the default cache size if none is specified. AC_DEFUN([SIM_AC_OPTION_SCACHE], -[ -default_sim_scache="ifelse([$1],,0,[$1])" +[dnl +AC_MSG_CHECKING([for sim cache size]) +sim_scache="16384" AC_ARG_ENABLE(sim-scache, [AS_HELP_STRING([--enable-sim-scache=size], [Specify simulator execution cache size])], [case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [[0-9]]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) AC_MSG_ERROR("Bad value $enableval passed to --enable-sim-scache"); - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi],[sim_scache="-DWITH_SCACHE=${default_sim_scache}"]) + yes) ;; + no) sim_scache="0";; + [[0-9]]*) sim_scache="${enableval}";; + *) AC_MSG_ERROR("Bad value $enableval passed to --enable-sim-scache");; +esac]) +AC_DEFINE_UNQUOTED([WITH_SCACHE], [$sim_scache], [Sim cache szie]) +AC_MSG_RESULT($sim_scache) ]) -AC_SUBST(sim_scache) diff --git a/sim/m4/sim_ac_output.m4 b/sim/m4/sim_ac_output.m4 index 100e2f9..3866213 100644 --- a/sim/m4/sim_ac_output.m4 +++ b/sim/m4/sim_ac_output.m4 @@ -47,7 +47,6 @@ dnl but always used by common/Make-common.in. So we have to subst here even dnl when the rest of the code is in the respective macros. AC_SUBST(sim_bitsize) AC_SUBST(sim_float) -AC_SUBST(sim_scache) AC_SUBST(sim_reserved_bits) dnl Used by common/Make-common.in to see which configure script created it. diff --git a/sim/mips/configure b/sim/mips/configure index 2cc8d31..03cf399 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS SIM_COMMON_BUILD_FALSE SIM_COMMON_BUILD_TRUE -sim_scache cgen_breaks sim_multi_obj sim_multi_src @@ -2210,7 +2209,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/mn10300/configure b/sim/mn10300/configure index 91c58e5..e6f39fc 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS SIM_COMMON_BUILD_FALSE SIM_COMMON_BUILD_TRUE -sim_scache sim_float cgen_breaks target_alias @@ -1776,7 +1775,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index 9cd2f22..b227008 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. * sim-if.c (sim_open): Set STATE_MODEL_NAME. * aclocal.m4: Regenerate. diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4 index 90a839c..3b7f0c1 100644 --- a/sim/or1k/aclocal.m4 +++ b/sim/or1k/aclocal.m4 @@ -13,5 +13,4 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../m4/sim_ac_option_bitsize.m4]) -m4_include([../m4/sim_ac_option_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/or1k/configure b/sim/or1k/configure index 3677607..acfcd63 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -627,13 +627,11 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR SHELL -sim_scache sim_bitsize' ac_subst_files='' ac_user_opts=' enable_option_checking enable_sim_bitsize -enable_sim_scache ' ac_precious_vars='build_alias host_alias @@ -1246,8 +1244,6 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-sim-bitsize=N Specify target bitsize (32 or 64) - --enable-sim-scache=size - Specify simulator execution cache size Report bugs to the package provider. _ACEOF @@ -1739,25 +1735,6 @@ fi fi -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; @@ -1778,7 +1755,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac index aaeb121..4a989e3 100644 --- a/sim/or1k/configure.ac +++ b/sim/or1k/configure.ac @@ -3,6 +3,5 @@ AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_OPTION_BITSIZE([32], [31], [32]) -SIM_AC_OPTION_SCACHE(16384) SIM_AC_OUTPUT diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog index ec4f69a..ee7246a 100644 --- a/sim/riscv/ChangeLog +++ b/sim/riscv/ChangeLog @@ -1,5 +1,9 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. * interp.c (sim_open): Set STATE_MODEL_NAME. * aclocal.m4: Regenerate. diff --git a/sim/riscv/configure b/sim/riscv/configure index c2e53cc..e366d09 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -587,7 +587,6 @@ LIBOBJS SIM_COMMON_BUILD_FALSE SIM_COMMON_BUILD_TRUE sim_reserved_bits -sim_scache sim_float cgen_breaks target_alias @@ -1762,7 +1761,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/v850/configure b/sim/v850/configure index 91c58e5..e6f39fc 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS SIM_COMMON_BUILD_FALSE SIM_COMMON_BUILD_TRUE -sim_scache sim_float cgen_breaks target_alias @@ -1776,7 +1775,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= |