sim: unify reserved instruction bits settings

Move these options up to the common dir so we only test & export
them once across all ports.

The setting only affects igen based ports, and they were turning
this on by default, so keep the default in place.

diff --git a/sim/ChangeLog b/sim/ChangeLog
index d980f179ddc458f7c26caea811deacaee9a8ce9f..cae9e35c04a11c9d90665789512c12bbbce1f1bd 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,12 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac: Call SIM_AC_OPTION_RESERVED_BITS.
+       (sim_reserved_bits): Delete.
+       * m4/sim_ac_option_reserved_bits.m4: Delete first arg.  Define
+       WITH_RESERVED_BITS.
+       * m4/sim_ac_output.m4 (sim_reserved_bits): Delete.
+       * aclocal.m4, config.h.in, configure, Makefile.in: Regenerate.
+
 2021-07-01  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Remove [true] from m32r SIM_TARGET call.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index c541321e70b9e9f2e0d653df1c912ad959068e1c..bc5c27679a521e42f0ac80cc998862859210b0c4 100644 (file)
--- 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_reserved_bits.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 \
@@ -789,7 +790,6 @@ sim_bitsize = @sim_bitsize@
 sim_float = @sim_float@
 sim_hw_cflags = @sim_hw_cflags@
 sim_hw_sockser = @sim_hw_sockser@
-sim_reserved_bits = @sim_reserved_bits@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@

diff --git a/sim/aclocal.m4 b/sim/aclocal.m4
index 88c71d93e53ab4bc1dd14e579ac27c3a89e3294d..40806b929bf231b6a0bb2b0138b9fa9bcb5fe0d7 100644 (file)
--- 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_reserved_bits.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])

diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index c740860703a2dbe341f85feed90f06c70ac67de7..54110018b20fb29dc4240d7214523325c33d7b4c 100644 (file)
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_SCACHE call.

diff --git a/sim/bpf/configure b/sim/bpf/configure
index 666257b872b8a065bd059fe7ee037a6b99dc5e12..f44ea707755b908b64618917a11969e0019b8ab0 100755 (executable)
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SIM_COMMON_BUILD_FALSE
 SIM_COMMON_BUILD_TRUE
-sim_reserved_bits
 sim_float
 cgen_breaks
 target_alias
@@ -1754,7 +1753,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 37d4dc99e92c2239b108baa29892d2036957fbc5..ad5980cd7d7a977bef839d65a5975f787e1624cc 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * Make-common.in (SIM_RESERVED_BITS): Delete.
+
 2021-07-01  Mike Frysinger  <vapier@gentoo.org>
 
        * Make-common.in (GUILE): New variable.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index a02f529b385092f5ab453e486a1c5d3db0866ca3..8c2cacea1e569a20e666bb73e8bd400d97ed8eb5 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -74,7 +74,6 @@ SHELL = @SHELL@
 
 SIM_BITSIZE = @sim_bitsize@
 SIM_FLOAT = @sim_float@
-SIM_RESERVED_BITS = @sim_reserved_bits@
 SIM_WARN_CFLAGS = $(WARN_CFLAGS)
 SIM_WERROR_CFLAGS = $(WERROR_CFLAGS)
 
@@ -197,7 +196,6 @@ CONFIG_CFLAGS = \
        $(SIM_FLOAT) \
        $(SIM_HW_CFLAGS) \
        $(SIM_INLINE) \
-       $(SIM_RESERVED_BITS) \
        $(SIM_WARN_CFLAGS) \
        $(SIM_WERROR_CFLAGS) \
        $(SIM_HARDWARE)

diff --git a/sim/config.h.in b/sim/config.h.in
index ccd864340cddbdf6a486efd2aa88e4743b2e61a7..8aeac918d4d18c2b9b7e1a974259138db80deda5 100644 (file)
--- a/sim/config.h.in
+++ b/sim/config.h.in
@@ -469,6 +469,9 @@
 /* Sim profile settings */
 #undef WITH_PROFILE
 
+/* Sim reserved bits setting */
+#undef WITH_RESERVED_BITS
+
 /* Sim cache szie */
 #undef WITH_SCACHE
 

diff --git a/sim/configure b/sim/configure
index 168da93202455597bebae383fa8aa60af93799ee..8dec72cf3b40621545bd9f39ed8b59db44c3c550 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -640,7 +640,6 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 SIM_RX_CYCLE_ACCURATE_FLAGS
 SIM_FRV_TRAPDUMP_FLAGS
-sim_reserved_bits
 sim_float
 sim_bitsize
 SIM_INLINE
@@ -840,6 +839,7 @@ enable_sim_environment
 enable_sim_hardware
 enable_sim_inline
 enable_sim_profile
+enable_sim_reserved_bits
 enable_sim_scache
 enable_sim_stdio
 enable_sim_trace
@@ -1523,6 +1523,9 @@ Optional Features:
                           Specify which functions should be inlined
   --enable-sim-profile=opts
                           Enable profiling flags
+  --enable-sim-reserved-bits
+                          Specify whether to check reserved bits in
+                          instruction
   --enable-sim-scache=size
                           Specify simulator execution cache size
   --enable-sim-stdio      Specify whether to use stdio for console
@@ -12179,7 +12182,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12182 "configure"
+#line 12185 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12285,7 +12288,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12288 "configure"
+#line 12291 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14532,6 +14535,31 @@ _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 whether to check reserved bits in instruction" >&5
+$as_echo_n "checking whether to check reserved bits in instruction... " >&6; }
+# Check whether --enable-sim-reserved-bits was given.
+if test "${enable_sim_reserved_bits+set}" = set; then :
+  enableval=$enable_sim_reserved_bits; case "${enableval}" in
+yes|no) ;;
+*) as_fn_error $? "\"--enable-sim-reserved-bits does not take a value\"" "$LINENO" 5;;
+esac
+fi
+
+if test "x${enable_sim_reserved_bits}" != xno; then
+  sim_reserved_bits=1
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  sim_reserved_bits=0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_RESERVED_BITS $sim_reserved_bits
+_ACEOF
+
+
 { $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"
@@ -14710,7 +14738,6 @@ 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.

diff --git a/sim/configure.ac b/sim/configure.ac
index febedfc7a0e813d7e4f2f848df375103e5765b59..098d88bc01ef3ad6979b8cfc16196e4411a6ad71 100644 (file)
--- 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_RESERVED_BITS
 SIM_AC_OPTION_SCACHE
 SIM_AC_OPTION_STDIO
 SIM_AC_OPTION_TRACE
@@ -172,7 +173,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_reserved_bits)
 
 dnl Some arches have unique configure flags.
 m4_include([frv/acinclude.m4])

diff --git a/sim/m4/sim_ac_option_reserved_bits.m4 b/sim/m4/sim_ac_option_reserved_bits.m4
index 8147ed8bfdd0153892d44758912450691e428e7f..c65f87b5acb50f85e8331041b4ef7aeceddd3a0a 100644 (file)
--- a/sim/m4/sim_ac_option_reserved_bits.m4
+++ b/sim/m4/sim_ac_option_reserved_bits.m4
@@ -13,18 +13,21 @@ 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/>.
 AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS],
-[
-default_sim_reserved_bits="ifelse([$1],,1,[$1])"
+[dnl
+AC_MSG_CHECKING([whether to check reserved bits in instruction])
 AC_ARG_ENABLE(sim-reserved-bits,
 [AS_HELP_STRING([--enable-sim-reserved-bits],
                [Specify whether to check reserved bits in instruction])],
 [case "${enableval}" in
-  yes) sim_reserved_bits="-DWITH_RESERVED_BITS=1";;
-  no)  sim_reserved_bits="-DWITH_RESERVED_BITS=0";;
-  *)   AC_MSG_ERROR("--enable-sim-reserved-bits does not take a value"); sim_reserved_bits="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved_bits" != x""; then
-  echo "Setting reserved flags = $sim_reserved_bits" 6>&1
-fi],[sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"])dnl
+yes|no) ;;
+*) AC_MSG_ERROR("--enable-sim-reserved-bits does not take a value");;
+esac])
+if test "x${enable_sim_reserved_bits}" != xno; then
+  sim_reserved_bits=1
+  AC_MSG_RESULT([yes])
+else
+  sim_reserved_bits=0
+  AC_MSG_RESULT([no])
+fi
+AC_DEFINE_UNQUOTED([WITH_RESERVED_BITS], [$sim_reserved_bits], [Sim reserved bits setting])
 ])
-AC_SUBST(sim_reserved_bits)

diff --git a/sim/m4/sim_ac_output.m4 b/sim/m4/sim_ac_output.m4
index 3866213b91fe68d4d8abc3d738f233f3179c32c1..256187dc3baa65b085c2bc47b094e1b9d649d7a4 100644 (file)
--- 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_reserved_bits)
 
 dnl Used by common/Make-common.in to see which configure script created it.
 SIM_COMMON_BUILD_TRUE='#'

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 2db73e54e321214ed0dbabc32f13b074e02dccc2..e463f82172f3573188e6eecfa5689ba3598a191b 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac: Delete SIM_AC_OPTION_RESERVED_BITS call.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index be0d398dfd34ff97e4d5512102c2a7cf30393955..247e9dbf3339c85357bd9c9b003c449a35ddbc16 100644 (file)
--- a/sim/mips/aclocal.m4
+++ b/sim/mips/aclocal.m4
@@ -14,5 +14,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_float.m4])
-m4_include([../m4/sim_ac_option_reserved_bits.m4])
 m4_include([../m4/sim_ac_output.m4])

diff --git a/sim/mips/configure b/sim/mips/configure
index 03cf399dfe7f851d06cd1c24250ae7044c2930e2..7627d73fe669422cf799404fa75a806b0cbd0374 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -635,13 +635,11 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-sim_reserved_bits
 sim_float
 sim_bitsize'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_sim_reserved_bits
 enable_sim_bitsize
 enable_sim_float
 '
@@ -1255,9 +1253,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-reserved-bits
-                          Specify whether to check reserved bits in
-                          instruction
   --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
   --enable-sim-float      Specify that the target processor has floating point
                           hardware
@@ -1692,23 +1687,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-default_sim_reserved_bits="1"
-# Check whether --enable-sim-reserved-bits was given.
-if test "${enable_sim_reserved_bits+set}" = set; then :
-  enableval=$enable_sim_reserved_bits; case "${enableval}" in
-  yes) sim_reserved_bits="-DWITH_RESERVED_BITS=1";;
-  no)  sim_reserved_bits="-DWITH_RESERVED_BITS=0";;
-  *)   as_fn_error $? "\"--enable-sim-reserved-bits does not take a value\"" "$LINENO" 5; sim_reserved_bits="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved_bits" != x""; then
-  echo "Setting reserved flags = $sim_reserved_bits" 6>&1
-fi
-else
-  sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"
-fi
-
-
 # DEPRECATED
 #
 # Instead of defining a `subtarget' macro, code should be checking
@@ -2208,7 +2186,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index e3a44a0055fa2ebe53ef007fde779ed8688bcfc3..9430923d89a1e61b8a266d3d86e0ca40195cfdb6 100644 (file)
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -2,9 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-dnl Options available in this module
-SIM_AC_OPTION_RESERVED_BITS(1)
-
 # DEPRECATED
 #
 # Instead of defining a `subtarget' macro, code should be checking

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index b983278d10f2a8b47e705baf0ee0e80afd69581d..a4ff98a300016b1d10d7c4e83da7a81d5e785574 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac: Delete SIM_AC_OPTION_RESERVED_BITS call.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index f4393afec658c1b1af654357eda559b9a6c34787..3b7f0c1f4a443eb3a8752dd8cd3b199b9f8a0e6d 100644 (file)
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/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_reserved_bits.m4])
 m4_include([../m4/sim_ac_output.m4])

diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index e6f39fcf77d3461d8fa65ab0e8ae27cd712b0b0e..46e30c1cff06c07a66fcc4ec643abb4a4cfc7369 100755 (executable)
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -626,12 +626,10 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-sim_reserved_bits
 sim_bitsize'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_sim_reserved_bits
 enable_sim_bitsize
 '
       ac_precious_vars='build_alias
@@ -1244,9 +1242,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-reserved-bits
-                          Specify whether to check reserved bits in
-                          instruction
   --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
 
 Report bugs to the package provider.
@@ -1679,22 +1674,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-default_sim_reserved_bits="1"
-# Check whether --enable-sim-reserved-bits was given.
-if test "${enable_sim_reserved_bits+set}" = set; then :
-  enableval=$enable_sim_reserved_bits; case "${enableval}" in
-  yes) sim_reserved_bits="-DWITH_RESERVED_BITS=1";;
-  no)  sim_reserved_bits="-DWITH_RESERVED_BITS=0";;
-  *)   as_fn_error $? "\"--enable-sim-reserved-bits does not take a value\"" "$LINENO" 5; sim_reserved_bits="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved_bits" != x""; then
-  echo "Setting reserved flags = $sim_reserved_bits" 6>&1
-fi
-else
-  sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"
-fi
-
 wire_word_bitsize="32"
 wire_word_msb="31"
 wire_address_bitsize=""
@@ -1774,7 +1753,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index 74eb1fa54685fd6ab519a7fa0f7df626558a3b40..1fa7c0ef7c9f65a67fef424a99abaad541485175 100644 (file)
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -2,7 +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_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 
 SIM_AC_OUTPUT

diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index b2270082596ce98d05724fe2526613b495e92642..10d300634698beca16d79abf547e4bab2aa5e5e9 100644 (file)
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_SCACHE call.

diff --git a/sim/or1k/configure b/sim/or1k/configure
index acfcd639c02e256e12d58ce260c902916b296016..8dc888458f3a276b6f9186e3a3e37ff2891c9f73 100755 (executable)
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SIM_COMMON_BUILD_FALSE
 SIM_COMMON_BUILD_TRUE
-sim_reserved_bits
 sim_float
 cgen_breaks
 target_alias
@@ -1754,7 +1753,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 1166d9223cfcb8cd1e502535be79c83d57147549..68f61894c966fdd93b6a316850d817cf064f80ec 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,10 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (RESERVED_CFLAGS): Delete.
+       * configure.ac: Delete sim-reserved-bits.
+       * std-config.h (WITH_RESERVED_BITS): Delete.
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Add -W flags from ../m4/sim_ac_option_warnings.m4.

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 964d667d99d5cf0ab499f0c7e83783fdcb1cd629..3a5d43cad6ca1fd7f003f17ab19d478121771206 100644 (file)
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -65,7 +65,6 @@ BITSIZE_CFLAGS = @sim_bitsize@
 HOSTBITSIZE_CFLAGS = @sim_hostbitsize@
 TIMEBASE_CFLAGS = @sim_timebase@
 FLOAT_CFLAGS = @sim_float@
-RESERVED_CFLAGS = @sim_reserved@
 MONITOR_CFLAGS = @sim_monitor@
 MODEL_CFLAGS = @sim_model@ @sim_default_model@ @sim_model_issue@
 TERMIO_CFLAGS = @sim_termio@
@@ -78,7 +77,6 @@ CONFIG_CFLAGS = \
   $(HOSTBITSIZE_CFLAGS) \
   $(TIMEBASE_CFLAGS) \
   $(FLOAT_CFLAGS) \
-  $(RESERVED_CFLAGS) \
   $(MONITOR_CFLAGS) \
   $(MODEL_CFLAGS) \
   $(TERMIO_CFLAGS) \

diff --git a/sim/ppc/configure b/sim/ppc/configure
index 54b9ba2d094b1a2e53ed0cb1e3d6c46f7ac011ad..0bab1af813987a1a74dd4a096790fd2b55e96351 100755 (executable)
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -631,7 +631,6 @@ sim_model_issue
 sim_default_model
 sim_model
 sim_monitor
-sim_reserved
 sim_float
 sim_timebase
 sim_hostbitsize
@@ -724,7 +723,6 @@ enable_sim_model_issue
 enable_sim_monitor
 enable_sim_opcode
 enable_sim_packages
-enable_sim_reserved_bits
 enable_sim_smp
 enable_sim_switch
 enable_sim_timebase
@@ -1364,7 +1362,6 @@ Optional Features:
   --enable-sim-monitor=mon             Specify whether to enable monitoring events.
   --enable-sim-opcode=which            Override default opcode lookup.
   --enable-sim-packages=list           Specify the packages to be included in the build.
-  --enable-sim-reserved-bits           Specify whether to check reserved bits in instruction.
   --enable-sim-smp=n                   Specify number of processors to configure for.
   --enable-sim-switch                  Use a switch instead of a table for instruction call.
   --enable-sim-timebase                        Specify whether the PPC timebase is supported.
@@ -3430,21 +3427,6 @@ fi
 fi
 
 
-# Check whether --enable-sim-reserved-bits was given.
-if test "${enable_sim_reserved_bits+set}" = set; then :
-  enableval=$enable_sim_reserved_bits; case "${enableval}" in
-  yes) sim_reserved="-DWITH_RESERVED_BITS=1";;
-  no)  sim_reserved="-DWITH_RESERVED_BITS=0";;
-  *)   as_fn_error $? "\"--enable-sim-reserved-bits does not take a value\"" "$LINENO" 5; sim_reserved="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved" != x""; then
-  echo "Setting reserved flags = $sim_reserved" 6>&1
-fi
-else
-  sim_reserved=""
-fi
-
-
 # Check whether --enable-sim-smp was given.
 if test "${enable_sim_smp+set}" = set; then :
   enableval=$enable_sim_smp; case "${enableval}" in
@@ -4313,7 +4295,6 @@ fi
 
 
 
-
 
 
 ac_config_files="$ac_config_files Makefile"

diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index a7d226df5cf62d546e36c9b41eb9c00d272c0ad8..42ccda3811a5d1d599fc5bf8ddf3dafc8ad85113 100644 (file)
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -376,18 +376,6 @@ if test x"$silent" != x"yes"; then
 fi])dnl
 
 
-AC_ARG_ENABLE(sim-reserved-bits,
-[  --enable-sim-reserved-bits          Specify whether to check reserved bits in instruction.],
-[case "${enableval}" in
-  yes) sim_reserved="-DWITH_RESERVED_BITS=1";;
-  no)  sim_reserved="-DWITH_RESERVED_BITS=0";;
-  *)   AC_MSG_ERROR("--enable-sim-reserved-bits does not take a value"); sim_reserved="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved" != x""; then
-  echo "Setting reserved flags = $sim_reserved" 6>&1
-fi],[sim_reserved=""])dnl
-
-
 AC_ARG_ENABLE(sim-smp,
 [  --enable-sim-smp=n                  Specify number of processors to configure for.],
 [case "${enableval}" in
@@ -690,7 +678,6 @@ AC_SUBST(sim_bitsize)
 AC_SUBST(sim_hostbitsize)
 AC_SUBST(sim_timebase)
 AC_SUBST(sim_float)
-AC_SUBST(sim_reserved)
 AC_SUBST(sim_monitor)
 AC_SUBST(sim_model)
 AC_SUBST(sim_default_model)

diff --git a/sim/ppc/std-config.h b/sim/ppc/std-config.h
index 75aaa58815666048f75673a2871020a6897c546d..0619d1dff191f3d444a853dd16e91bbbbca9b153 100644 (file)
--- a/sim/ppc/std-config.h
+++ b/sim/ppc/std-config.h
@@ -220,12 +220,6 @@ extern int current_floating_point;
 
    Control the inclusion of debugging code. */
 
-/* Whether to check instructions for reserved bits being set */
-
-#ifndef WITH_RESERVED_BITS
-#define WITH_RESERVED_BITS             1
-#endif
-
 /* include monitoring code */
 
 #define MONITOR_INSTRUCTION_ISSUE      1

diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index ee7246aa4b1d3b166ffc671e24615ef23a5175e8..e9aa74490f121e533a6a1ad2503ae0a4795026ef 100644 (file)
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/riscv/configure b/sim/riscv/configure
index e366d095bbe71b9f5809a8ea6930b0c699801c4f..577d4cd32e739930d988b147d0f233ac28e565c9 100755 (executable)
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SIM_COMMON_BUILD_FALSE
 SIM_COMMON_BUILD_TRUE
-sim_reserved_bits
 sim_float
 cgen_breaks
 target_alias
@@ -1760,7 +1759,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index b68aff037848fefe8a242c4ce04dc5d69edb208e..aaa686606e117dd9360c4b98df366db29034aad7 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac: Delete SIM_AC_OPTION_RESERVED_BITS call.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4
index f4393afec658c1b1af654357eda559b9a6c34787..3b7f0c1f4a443eb3a8752dd8cd3b199b9f8a0e6d 100644 (file)
--- a/sim/v850/aclocal.m4
+++ b/sim/v850/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_reserved_bits.m4])
 m4_include([../m4/sim_ac_output.m4])

diff --git a/sim/v850/configure b/sim/v850/configure
index e6f39fcf77d3461d8fa65ab0e8ae27cd712b0b0e..46e30c1cff06c07a66fcc4ec643abb4a4cfc7369 100755 (executable)
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -626,12 +626,10 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-sim_reserved_bits
 sim_bitsize'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_sim_reserved_bits
 enable_sim_bitsize
 '
       ac_precious_vars='build_alias
@@ -1244,9 +1242,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-reserved-bits
-                          Specify whether to check reserved bits in
-                          instruction
   --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
 
 Report bugs to the package provider.
@@ -1679,22 +1674,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-default_sim_reserved_bits="1"
-# Check whether --enable-sim-reserved-bits was given.
-if test "${enable_sim_reserved_bits+set}" = set; then :
-  enableval=$enable_sim_reserved_bits; case "${enableval}" in
-  yes) sim_reserved_bits="-DWITH_RESERVED_BITS=1";;
-  no)  sim_reserved_bits="-DWITH_RESERVED_BITS=0";;
-  *)   as_fn_error $? "\"--enable-sim-reserved-bits does not take a value\"" "$LINENO" 5; sim_reserved_bits="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved_bits" != x""; then
-  echo "Setting reserved flags = $sim_reserved_bits" 6>&1
-fi
-else
-  sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"
-fi
-
 wire_word_bitsize="32"
 wire_word_msb="31"
 wire_address_bitsize=""
@@ -1774,7 +1753,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac
index 74eb1fa54685fd6ab519a7fa0f7df626558a3b40..1fa7c0ef7c9f65a67fef424a99abaad541485175 100644 (file)
--- a/sim/v850/configure.ac
+++ b/sim/v850/configure.ac
@@ -2,7 +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_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 
 SIM_AC_OUTPUT