[PATCH 1/2] sim: mips: delete unused constant variables

[PATCH 1/2] sim: mips: delete unused constant variables

[Mike Frysinger]

Since these never change, inline and delete them.
---
 sim/mips/Makefile.in  |  6 +-----
 sim/mips/configure    | 16 ++--------------
 sim/mips/configure.ac | 10 ----------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index aa66bb3777f9..d8eba877fb8d 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -17,7 +17,7 @@ SIM_IGEN_OBJ = \
 	semantics.o \
 	idecode.o \
 	icache.o \
-	@mips_igen_engine@ \
+	engine.o \
 	irun.o \
 
 
@@ -59,8 +59,6 @@ SIM_MULTI_OBJ = @sim_multi_obj@ \
 		itable.o \
 		multi-run.o \
 
-MIPS_EXTRA_LIBS = @mips_extra_libs@
-
 SIM_OBJS = \
 	interp.o \
 	$(SIM_@sim_gen@_OBJ) \
@@ -81,8 +79,6 @@ SIM_EXTRA_DISTCLEAN = distclean-extra
 
 all: $(SIM_@sim_gen@_ALL)
 
-SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)
-
 SIM_EXTRA_DEPS = itable.h
 
 
diff --git a/sim/mips/configure b/sim/mips/configure
index 084e22f26ae9..4d2ada1f4d61 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -636,9 +636,7 @@ LIBOBJS
 sim_default_model
 sim_scache
 cgen_breaks
-mips_extra_libs
 XMKMF
-mips_igen_engine
 sim_multi_obj
 sim_multi_src
 sim_multi_igen_configs
@@ -11227,7 +11225,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11230 "configure"
+#line 11228 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11333,7 +11331,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11336 "configure"
+#line 11334 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12697,14 +12695,6 @@ fi
 
 
 
-# Choose simulator engine
-case "${target}" in
-  *)    mips_igen_engine="engine.o"
-	;;
-esac
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 $as_echo_n "checking for X... " >&6; }
 
@@ -12898,8 +12888,6 @@ else
 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
-mips_extra_libs=""
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabs in -lm" >&5
 $as_echo_n "checking for fabs in -lm... " >&6; }
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 593ee2bb4b0e..6c9a6b812e38 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -437,17 +437,7 @@ esac
 SIM_AC_OPTION_HARDWARE($hw_extra_devices)
 
 
-# Choose simulator engine
-case "${target}" in
-  *)    mips_igen_engine="engine.o"
-	;;
-esac
-AC_SUBST(mips_igen_engine)
-
-
 AC_PATH_X
-mips_extra_libs=""
-AC_SUBST(mips_extra_libs)
 
 AC_CHECK_LIB(m, fabs)
 AC_CHECK_FUNCS(aint anint sqrt)
-- 
2.31.1

[PATCH 2/2] sim: mips: always enable device models

[Mike Frysinger]

There's no need to restrict these to only specific targets as the user
can select them at runtime if they want them.  Always build them so we
can improve build coverage too.
---
 sim/mips/configure    | 10 +---------
 sim/mips/configure.ac | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/sim/mips/configure b/sim/mips/configure
index 4d2ada1f4d61..d6902677a654 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -12584,16 +12584,8 @@ sim_micromips_flags=" -F ${sim_micromips_filter}  ${sim_micromips_machine}  ${si
 #
 # Add simulated hardware devices
 #
-hw_extra_devices=""
-case "${target}" in
-  mips*tx39*)
-	hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio"
-	;;
-  *)
-	;;
-esac
 
-hardware="cfi core pal glue $hw_extra_devices"
+hardware="cfi core pal glue tx3904cpu tx3904irc tx3904tmr tx3904sio"
 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'`"
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 6c9a6b812e38..fee3816b57af 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -426,15 +426,7 @@ AC_SUBST(sim_multi_obj)
 #
 # Add simulated hardware devices
 #
-hw_extra_devices=""
-case "${target}" in
-  mips*tx39*)
-	hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" 
-	;;
-  *)
-	;;
-esac
-SIM_AC_OPTION_HARDWARE($hw_extra_devices)
+SIM_AC_OPTION_HARDWARE(tx3904cpu tx3904irc tx3904tmr tx3904sio)
 
 
 AC_PATH_X
-- 
2.31.1