Add new file vr.igen which is a merge of vr5400.igen and vr4320.igen.

Hack sanitize so that it doesn't sanitize vrXXX when either of
keep-vr5400 or keep-vr4320 are specified.
Move two basic vr4100 instructions from mips.igen to vr.igen.

1 files changed, 33 insertions, 2 deletions

diff --git a/sim/mips/.Sanitize b/sim/mips/.Sanitize
index 7bef23e..b3b3e93 100644
--- a/sim/mips/.Sanitize
+++ b/sim/mips/.Sanitize
@@ -86,6 +86,7 @@ m16.dc
 m16run.c
 mips.dc
 tx.igen
+vr.igen
 
 Things-to-lose:
 
@@ -212,7 +213,7 @@ else
 fi
 
 
-vr5400_files="ChangeLog configure configure.in sim-main.h interp.c gencode.c mips.igen mips.dc m16.igen vr5400.igen mdmx.igen"
+vr5400_files="ChangeLog configure configure.in sim-main.h interp.c gencode.c mips.igen mips.dc vr5400.igen mdmx.igen vr.igen"
 
 if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then
 	for i in $vr5400_files ; do
@@ -241,7 +242,7 @@ else
 	done
 fi
 
-vr4320_files="ChangeLog Makefile.in configure configure.in mips.igen"
+vr4320_files="ChangeLog Makefile.in configure configure.in mips.igen vr.igen vr4320.igen"
 
 if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
 	for i in $vr4320_files ; do
@@ -271,6 +272,36 @@ else
 fi
 
 
+vrXXXX_files="vr.igen"
+
+if ( echo $* | grep keep\-vr > /dev/null ) ; then
+	for i in $vrXXXX_files ; do
+		if test ! -d $i && (grep sanitize-vrXXXX $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping vrXXXX stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-vrXXXX $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"vrXXXX\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-vrXXXX/,/end-\sanitize\-vrXXXX/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
+
 tx3904_files="ChangeLog configure configure.in interp.c"
 
 if ( echo $* | grep keep\-tx3904 > /dev/null ) ; then