Tidied up the sanitization.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 91c95d54b450358de53b8fa8fc78252916cf02a9..4b0b74f6f08e3dbf68ca96dc1b3ea012b7b918ec 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,30 @@
+start-sanitize-v850
+Wed Aug 13 18:58:56 1997  Nick Clifton  <[email protected]>
+
+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  <[email protected]>
 
        * doc/internals.texi: Document rs_leb128.

diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 1b810dd090a97167e05f7408327307926c456ca4..3338e40863837925bd9216e3f3828e784d3df182 100644 (file)
--- 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 ! -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 ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
+               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