* Removing last known memories of tx3904 and am30 sanitization.

diff --git a/sim/mips/.Sanitize b/sim/mips/.Sanitize
index 38fa481..7c610f6 100644 (file)
--- a/sim/mips/.Sanitize
+++ b/sim/mips/.Sanitize
@@ -31,13 +31,6 @@ else
         lose_these_too="${r5900_files} ${lose_these_too}"
 fi
 
-tx3904_files="dv-tx3904cpu.c dv-tx3904irc.c dv-tx3904tmr.c dv-tx3904sio.c"
-if ( echo $* | grep keep\-tx3904 > /dev/null ) ; then
-        keep_these_too="${tx3904_files} ${keep_these_too}"
-else
-        lose_these_too="${tx3904_files} ${lose_these_too}"
-fi
-
 sky_files="ChangeLog.sky sky-device.c sky-device.h sky-dma.c sky-dma.h sky-bits.h"
 sky_files="$sky_files sky-engine.c sky-gpuif.c sky-gpuif.h"
 sky_files="$sky_files sky-gs.c sky-gs.h"
@@ -74,6 +67,10 @@ acconfig.h
 config.in
 configure
 configure.in
+dv-tx3904cpu.c
+dv-tx3904irc.c
+dv-tx3904tmr.c
+dv-tx3904sio.c
 interp.c
 sim-main.c
 sim-main.h
@@ -299,35 +296,6 @@ else
 fi
 
 
-tx3904_files="ChangeLog configure configure.in interp.c"
-
-if ( echo $* | grep keep\-tx3904 > /dev/null ) ; then
-       for i in $tx3904_files ; do
-               if test ! -d $i && (grep sanitize-tx3904 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Keeping tx3904 stuff in $i
-                       fi
-               fi
-       done
-else
-       for i in * ; do
-               if test ! -d $i && (grep sanitize-tx3904 $i > /dev/null) ; then
-                       if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"tx3904\" from $i...
-                       fi
-                       cp $i new
-                       sed '/start\-sanitize\-tx3904/,/end-\sanitize\-tx3904/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
-
 branchbug4011_files="interp.c mips.igen sim-main.h ChangeLog"
 if ( echo $* | grep keep\-branchbug4011 > /dev/null ) ; then
        for i in $branchbug4011_files ; do

diff --git a/sim/mn10300/.Sanitize b/sim/mn10300/.Sanitize
index 973b44f..22d4130 100644 (file)
--- a/sim/mn10300/.Sanitize
+++ b/sim/mn10300/.Sanitize
@@ -22,12 +22,6 @@ else
         lose_these_too="${am33_files} ${lose_these_too}"
 fi
 
-am30_files="dv-mn103cpu.c dv-mn103int.c dv-mn103tim.c dv-mn103ser.c dv-mn103iop.c"
-if ( echo $* | grep keep\-am30 > /dev/null ) ; then
-        keep_these_too="${am30_files} ${keep_these_too}"
-else
-        lose_these_too="${am30_files} ${lose_these_too}"
-fi
 
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
@@ -43,6 +37,11 @@ acconfig.h
 config.in
 configure
 configure.in
+dv-mn103cpu.c
+dv-mn103int.c
+dv-mn103tim.c
+dv-mn103ser.c
+dv-mn103iop.c
 mn10300_sim.h
 gencode.c
 interp.c
@@ -58,34 +57,6 @@ Things-to-lose:
 
 Do-last:
 
-am30_files="ChangeLog interp.c configure configure.in"
-if ( echo $* | grep keep\-am30 > /dev/null ) ; then
-        for i in $am30_files ; do
-                if test ! -d $i && (grep sanitize-am30 $i > /dev/null) ; then
-                        if [ -n "${verbose}" ] ; then
-                                echo Keeping am30 stuff in $i
-                        fi
-                fi
-        done
-else
-        for i in $am30_files ; do
-                if test ! -d $i && (grep sanitize-am30 $i > /dev/null) ; then
-                        if [ -n "${verbose}" ] ; then
-                                echo Removing traces of \"am30\" from $i...
-                        fi
-                        cp $i new
-                        sed '/start\-sanitize\-am30/,/end-\sanitize\-am30/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
-
 am33_files="ChangeLog mn10300_sim.h mn10300.igen Makefile.in"
 if ( echo $* | grep keep\-am33 > /dev/null ) ; then
         for i in $am33_files ; do