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.

5 files changed, 7 insertions, 40 deletions

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 1166d92..68f6189 100644
--- 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 964d667..3a5d43c 100644
--- 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 54b9ba2..0bab1af 100755
--- 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
@@ -4315,7 +4297,6 @@ fi
 
 
 
-
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_commands="$ac_config_commands default"
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index a7d226d..42ccda3 100644
--- 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 75aaa58..0619d1d 100644
--- 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