gencode.c: Kill, Kill, Kill....

Remove last remenats of old gencode simulator.

1 files changed, 14 insertions, 62 deletions

diff --git a/sim/mips/configure.in b/sim/mips/configure.in
index bcd36d6..9a43832 100644
--- a/sim/mips/configure.in
+++ b/sim/mips/configure.in
@@ -11,25 +11,6 @@ SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
 SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_WARNINGS
 
-# Ensure a reasonable default simulator is constructed: (DEPRECATED)
-case "${target}" in
-# start-sanitize-tx19
-  mips*tx19*)		SIMCONF="-mips1 -mcpu=r1900 -mno-fp --warnings";;
-# end-sanitize-tx19
-# start-sanitize-tx49
-  mips*tx49*)		SIMCONF="-mips3 --warnings -mcpu=r4900";;
-# end-sanitize-tx49
-# start-sanitize-r5900
-  mips64r59*-*-*)      SIMCONF="-mips3 --warnings -mcpu=r5900";;
-# end-sanitize-r5900
-  mips64vr41*)		SIMCOMF="-mips0 -mcpu=r4100 -mgp64 --warnings" ;;
-  mips64*-*-*)          SIMCONF="-mips0 --warnings";;
-  mips16*-*-*)          SIMCONF="-mips0 --warnings";;
-  mips*-*-*)            SIMCONF="-mips2 --warnings";;
-  *)                    SIMCONF="-mips0 --warnings";;
-esac
-AC_SUBST(SIMCONF)
-
 # DEPRECATED
 #
 # Instead of defining a `subtarget' macro, code should be checking
@@ -135,107 +116,78 @@ SIM_AC_OPTION_SMP($mips_smp)
 #
 # Select the IGEN architecture
 #
-sim_use_gen=IGEN
+sim_gen=IGEN
 sim_igen_machine="-M mipsIV"
 sim_m16_machine="-M mips16"
 sim_igen_filter="32,64,f"
 sim_m16_filter="16"
 case "${target}" in
 # start-sanitize-tx19
-  mips*tx19*)		sim_default_gen=M16
-			sim_use_gen=M16
+  mips*tx19*)		sim_gen=M16
 			sim_igen_machine="-M tx19"
 			sim_m16_machine="-M tx19"
 			sim_igen_filter="32"
 			sim_m16_filter="16"
 			;;
 # end-sanitize-tx19
-  mips*tx39*)		sim_default_gen=IGEN
-			sim_use_gen=IGEN
+  mips*tx39*)		sim_gen=IGEN
 			sim_igen_filter="32,f"
 			sim_igen_machine="-M r3900"
 			;;
 # start-sanitize-r5900
-  mips64r59*-*-*)	sim_default_gen=IGEN
-			sim_use_gen=IGEN
+  mips64r59*-*-*)	sim_gen=IGEN
 			sim_igen_machine="-M r5900"
 			;;
 # end-sanitize-r5900
 # start-sanitize-vr4320
-  mips64vr4320-*-*)	sim_default_gen=IGEN
-			sim_use_gen=IGEN
+  mips64vr4320-*-*)	sim_gen=IGEN
 			sim_igen_machine="-M mipsIV,vr4320 -G gen-multi-sim=vr4320"
 			;;
 # end-sanitize-vr4320
-  mips64vr43*-*-*)	sim_default_gen=IGEN
-			sim_use_gen=IGEN
+  mips64vr43*-*-*)	sim_gen=IGEN
 			sim_igen_machine="-M mipsIV"
 # start-sanitize-vr4320
 			sim_igen_machine="-M mipsIV,vr4320 -G gen-multi-sim=mipsIV"
 # end-sanitize-vr4320
 			;;
 # start-sanitize-cygnus
-  mips64vr54*-*-*)	sim_default_gen=IGEN
-			sim_use_gen=IGEN
+  mips64vr54*-*-*)	sim_gen=IGEN
 			sim_igen_machine="-M vr5000,vr5400 -G gen-multi-sim=vr5400"
 			;;
 # end-sanitize-cygnus
-  mips64vr5*-*-*)	sim_default_gen=IGEN
-			sim_use_gen=IGEN
+  mips64vr5*-*-*)	sim_gen=IGEN
 			sim_igen_machine="-M vr5000"
 # start-sanitize-cygnus
 			sim_igen_machine="-M vr5000,vr5400 -G gen-multi-sim=vr5000"
 			;;
 # end-sanitize-cygnus
-  mips64vr41*)		sim_default_gen=M16
-			sim_use_gen=M16
+  mips64vr41*)		sim_gen=M16
 			sim_igen_machine="-M vr4100,mips16"
 			sim_m16_machine="-M vr4100,mips16"
 			sim_igen_filter="32,64,f"
 			sim_m16_filter="16"
                         ;;
-  mips64*-*-*)		sim_default_gen=IGEN
-			sim_igen_filter="32,64,f"
-			sim_use_gen=IGEN
+  mips64*-*-*)		sim_igen_filter="32,64,f"
+			sim_gen=IGEN
 			;;
-  mips16*-*-*)		sim_default_gen=M16
+  mips16*-*-*)		sim_gen=M16
 			sim_igen_filter="32,64,f"
 			sim_m16_filter="16"
-			sim_use_gen=NO
 			;;
-  mips*lsi*)	        sim_default_gen=M16
-			sim_use_gen=M16
+  mips*lsi*)	        sim_gen=M16
 			sim_igen_machine="-M mipsIII,mips16"
 			sim_m16_machine="-M mips16,mipsIII"
 			sim_igen_filter="32,f"
 			sim_m16_filter="16"
                         ;;
-  mips*-*-*)		sim_default_gen=IGEN
+  mips*-*-*)		sim_gen=IGEN
 			sim_igen_filter="32,f"
-			sim_use_gen=IGEN
 			;;
 esac
 sim_igen_flags="-F ${sim_igen_filter} ${sim_igen_machine} ${sim_igen_smp}"
 sim_m16_flags=" -F ${sim_m16_filter}  ${sim_m16_machine}  ${sim_igen_smp}"
 AC_SUBST(sim_igen_flags)
 AC_SUBST(sim_m16_flags)
-
-
-
-#
-# Enable igen
-#
-AC_ARG_ENABLE(sim-igen,
-[  --enable-sim-igen=opts		Enable IGEN simulator],
-[case "${enableval}" in
-  yes) sim_gen="${sim_default_gen}";;
-  no)  sim_gen=NO;;
-  16)  sim_gen=M16;;
-  *)   AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-igen"); sim_gen="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_gen" != x""; then
-  echo "Setting sim_gen = $sim_gen" 6>&1
-fi],[sim_gen="${sim_use_gen}"])dnl
 AC_SUBST(sim_gen)