sim: hw: rework configure option & device selection

The sim-hardware configure option allows builders to select a set of
device models to enable.  But this seems like unnecessary overkill:
the existence of individual device models doesn't affect performance
at all as they are only enabled at runtime if the config uses them,
and individually these are all <5KB a piece.  Stripping off a total
of ~50KB from a ~1MB binary doesn't seem useful, and it's extremely
unlikely anyone will ever bother.

So let's simplify the configure/make logic by turning sim-hardware
into a boolean option like many of the other sim options.  Any ports
that have unique device models will declare them in their Makefile
instead of at configure time.  This will allow us to (eventually)
unify the setting into the common dir.

4 files changed, 32 insertions, 39 deletions

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 688ff01..87d6a42 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_EXTRA_HW_DEVICES): Define.
+	* configure.ac (SIM_AC_OPTION_HARDWARE): Delete call.
+	* configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_COMMON): Delete.
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index f8ccb97..eb9641e 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -34,6 +34,8 @@ SIM_OBJS = \
 	$(M32R2_OBJS) \
 	$(TRAPS_OBJ)
 
+SIM_EXTRA_HW_DEVICES = m32r_cache m32r_uart
+
 # Extra headers included by sim-main.h.
 SIM_EXTRA_DEPS = \
 	$(CGEN_INCLUDE_DEPS) \
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 79ce485..b115b95 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -588,6 +588,10 @@ sim_reserved_bits
 sim_float
 sim_bitsize
 cgen_breaks
+sim_hw_sockser
+sim_hw_cflags
+SIM_ENABLE_HW_FALSE
+SIM_ENABLE_HW_TRUE
 sim_extra_cflags
 traps_obj
 target_alias
@@ -629,9 +633,6 @@ PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
 sim_scache
-sim_hw
-sim_hw_objs
-sim_hw_cflags
 sim_default_model'
 ac_subst_files=''
 ac_user_opts='
@@ -1254,8 +1255,7 @@ Optional Features:
                           Specify simulator execution cache size
   --enable-sim-default-model=model
                           Specify default model to simulate
-  --enable-sim-hardware=LIST
-                          Specify the hardware to be included in the build.
+  --enable-sim-hardware   Whether to enable hardware/device simulation
 
 Report bugs to the package provider.
 _ACEOF
@@ -1736,12 +1736,8 @@ fi
 
 
 
-
-hardware="cfi core pal glue m32r_cache m32r_uart"
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`"
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5
+$as_echo_n "checking for sim hardware settings... " >&6; }
 # Check whether --enable-sim-hardware was given.
 if test "${enable_sim_hardware+set}" = set; then :
   enableval=$enable_sim_hardware;
@@ -1749,44 +1745,38 @@ else
   enable_sim_hardware="yes"
 fi
 
-case ${enable_sim_hardware} in
-  yes|no) ;;
-  ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
-  *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
-  *)  hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
+sim_hw_sockser=
 if test "$enable_sim_hardware" = no; then
-  sim_hw_objs=
   sim_hw_cflags="-DWITH_HW=0"
-  sim_hw=
-else
+elif test "$enable_sim_hardware" = yes; then
   sim_hw_cflags="-DWITH_HW=1"
-  # remove duplicates
-  sim_hw=""
-  sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
-  for i in $hardware ; do
-    case " $sim_hw " in
-      *" $i "*) ;;
-      *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
-    esac
-  done
   # mingw does not support sockser
   case ${host} in
     *mingw*) ;;
     *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
        # that you instatiate.  Instead, other code will call into it directly.
        # At some point, we should convert it over.
-       sim_hw_objs="$sim_hw_objs dv-sockser.o"
+       sim_hw_sockser="dv-sockser.o"
        sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
        ;;
   esac
-  if test x"$silent" != x"yes"; then
-    echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
-  fi
+else
+  as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5
+fi
+if test "$enable_sim_hardware" = "yes"; then
+  SIM_ENABLE_HW_TRUE=
+  SIM_ENABLE_HW_FALSE='#'
+else
+  SIM_ENABLE_HW_TRUE='#'
+  SIM_ENABLE_HW_FALSE=
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5
+$as_echo "${enable_sim_hardware}" >&6; }
+
+
+
 
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
@@ -1810,9 +1800,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
-
-
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index a45eebd..f98adb2 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -18,6 +18,4 @@ SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
 AC_SUBST(traps_obj)
 AC_SUBST(sim_extra_cflags)
 
-SIM_AC_OPTION_HARDWARE(m32r_cache m32r_uart)
-
 SIM_AC_OUTPUT