From 58036ae4c9512e830c709bcf4f8839f40431767b Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 14 Aug 1997 19:34:58 +0000
Subject: [PATCH] Tidied up the sanitization.

---
 gas/ChangeLog        | 27 +++++++++++++++++++++++++++
 gas/config/.Sanitize | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 91c95d54b4..4b0b74f6f0 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,30 @@
+start-sanitize-v850
+Wed Aug 13 18:58:56 1997  Nick Clifton  <nickc@cygnus.com>
+
+start-sanitize-v850e
+	* config/.Sanitize (Do-first, Do-last): Add support for keep-v850e
+	command line option.
+end-sanitize-v850e
+
+start-sanitize-v850eq
+	* config/.Sanitize (Do-first, Do-last): Add support for keep-v850eq
+	command line option.
+end-sanitize-v850eq
+
+start-sanitize-v850eq
+	* config/tc-v850.c (md_assemble, md_show_usage, md_parse_option):
+	Add support for v850eq instructions.
+start-sanitize-v850eq
+	
+start-sanitize-v850e
+	* config/tc-v850.c (md_assemble, md_show_usage, md_parse_option):
+	Add support for v850e instructions.
+start-sanitize-v850e
+	
+	* config/tc-v850.c (md_assemble): Fix error recovery to reload
+	text of entire opcode. 
+end-sanitize-v850
+
 Tue Aug 12 10:27:34 1997  Richard Henderson  <rth@cygnus.com>
 
 	* doc/internals.texi: Document rs_leb128.
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 1b810dd090..3338e40863 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -248,8 +248,17 @@ fi
 
 v850e_files="tc-v850.c tc-v850.h"
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
+ if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
 	for i in $v850e_files ; do
-		if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
+		if test ! -f $i && (grep sanitize-v850eq $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping v850e and v850eq stuff in $i
+			fi
+		fi
+	done
+ else
+	for i in $v850e_files ; do
+		if test ! -r $i && (grep sanitize-v850eq $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
 				echo Removing traces of \"v850eq\" from $i...
 			fi
@@ -264,10 +273,11 @@ if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 			mv new $i
 		fi
 	done
+ fi
 else
  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
 	for i in $v850e_files ; do
-		if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
+		if test ! -f $i && (grep sanitize-v850eq $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
 				echo Keeping v850e and v850eq stuff in $i
 			fi
@@ -275,22 +285,33 @@ else
 	done
  else
 	for i in $v850e_files ; do
-		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+		if test ! -r $i && (grep sanitize-v850e $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
 				echo Removing traces of \"v850e\" from $i...
 			fi
 			cp $i new
 			sed '/start\-sanitize\-v850e/,/end\-sanitize\-v850e/d' < $i > new
-			cp new newer
-			sed '/start\-sanitize\-v850eq/,/end\-sanitize\-v850eq/d' < new > newer
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
 				fi
 				mv $i .Recover
 			fi
-			mv newer $i
-			rm new
+			mv new $i
+		fi
+		if test ! -r $i && (grep sanitize-v850eq $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"v850eq\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-v850eq/,/end\-sanitize\-v850eq/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