No longer need to sanitize away h8s stuff.

4 files changed, 2 insertions, 43 deletions

diff --git a/sim/h8300/.Sanitize b/sim/h8300/.Sanitize
index 00d5f5b..9e8ed06 100644
--- a/sim/h8300/.Sanitize
+++ b/sim/h8300/.Sanitize
@@ -17,33 +17,6 @@
 
 Do-first:
 
-h8s_files="ChangeLog compile.c run.c"
-if ( echo $* | grep keep\-h8s > /dev/null ) ; then
-	for i in $h8s_files ; do
-		if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping h8s stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $h8s_files ; do
-		if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"h8s\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 90a61c6..4550b6a 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -9,7 +9,6 @@ Tue Jul  2 23:08:45 1996  Jeffrey A Law  (law@cygnus.com)
 	by two bits.
 	(OSHIFTS): Corresponding changes.
 
-start-sanitize-h8s 
 Tue Jul  2 01:37:27 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* compile.c (sim_resume): Handle "ldm.l" and "stm.l".
@@ -18,7 +17,6 @@ Wed Jun 26 08:58:53 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* compile.c (h8300smode): Declare.
 
-end-sanitize-h8s
 Wed Jun 26 12:20:56 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
         * Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir,
@@ -28,13 +26,11 @@ Wed Jun 26 12:20:56 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
         (AC_PROG_INSTALL): Added.
         * configure: Rebuilt.
 
-start-sanitize-h8s
 Tue Jun 18 16:31:10 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
 
 	* compile.c (sim_load): Treat the H8/S like the H8/300H for now.
 	* run.c (main): Treat the H8/S like the H8/300H for now.
 	
-end-sanitize-h8s 
 Fri May 24 10:35:25 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* compile.c (SEXTCHAR): Clear upper bits when sign
diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c
index a04657b..7159af2 100644
--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -84,9 +84,7 @@ int debug;
 static cpu_state_type cpu;
 
 int h8300hmode = 0;
-/* start-sanitize-h8s */
 int h8300smode = 0;
-/* end-sanitize-h8s */
 
 static int memory_size;
 
@@ -1467,7 +1465,6 @@ sim_resume (step, siggnal)
 	case O (O_NOP, SB):
 	  goto next;
 
-/* start-sanitize-h8s */
 	case O (O_STM, SL):
 	  {
 	    int nregs, firstreg, i;
@@ -1502,7 +1499,6 @@ sim_resume (step, siggnal)
 	  }
 	  goto next;
 
-/* end-sanitize-h8s */
 	default:
 	  cpu.exception = SIGILL;
 	  goto end;
@@ -1973,10 +1969,7 @@ sim_load (prog, from_tty)
       if (bfd_check_format (abfd, bfd_object)) 
 	{
 	  set_h8300h (abfd->arch_info->mach == bfd_mach_h8300h
-/* start-sanitize-h8s */
-		      || abfd->arch_info->mach == bfd_mach_h8300s
-/* end-sanitize-h8s */
-		      );
+		      || abfd->arch_info->mach == bfd_mach_h8300s);
 	}
       bfd_close (abfd);
     }
diff --git a/sim/h8300/run.c b/sim/h8300/run.c
index 8921ae6..7dc57b7 100644
--- a/sim/h8300/run.c
+++ b/sim/h8300/run.c
@@ -90,10 +90,7 @@ main (ac, av)
     }
 
   if (abfd->arch_info->mach == bfd_mach_h8300h
-/* start-sanitize-h8s */
-      || abfd->arch_info->mach == bfd_mach_h8300s
-/* end-sanitize-h8s */
-      )
+      || abfd->arch_info->mach == bfd_mach_h8300s)
     set_h8300h (1);
 
   for (s = abfd->sections; s; s=s->next)