fix v850 sanitization

diff --git a/include/opcode/.Sanitize b/include/opcode/.Sanitize
index 6c7ef9c..4a3ed8d 100644 (file)
--- a/include/opcode/.Sanitize
+++ b/include/opcode/.Sanitize
@@ -115,23 +115,24 @@ else
        done
 fi
 
-v850_files="ChangeLog"
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-       for i in $v850_files ; do
-               if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
+v850e_files="ChangeLog v850.h"
+
+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 v850 stuff in $i
+                               echo Keeping v850eq stuff in $i
                        fi
                fi
        done
 else
-       for i in $v850_files ; do
-               if test ! -d $i && (grep sanitize-v850 $i > /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 Removing traces of \"v850\" from $i...
+                               echo Removing traces of \"v850eq\" from $i...
                        fi
                        cp $i new
-                       sed '/start\-sanitize\-v850/,/end-\sanitize\-v850/d' < $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...
@@ -143,10 +144,9 @@ else
        done
 fi
 
-v850e_files="ChangeLog v850.h"
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
        for i in $v850e_files ; do
-               if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+               if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
                                echo Keeping v850e stuff in $i
                        fi
@@ -154,7 +154,7 @@ if ( echo $* | grep keep\-v850e > /dev/null ) ; then
        done
 else
        for i in $v850e_files ; do
-               if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
+               if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
                                echo Removing traces of \"v850e\" from $i...
                        fi
@@ -170,22 +170,24 @@ else
                fi
        done
 fi
-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
+
+v850_files="ChangeLog"
+if ( echo $* | grep keep\-v850 > /dev/null ) ; then
+       for i in $v850_files ; do
+               if test -f $i && (grep sanitize-v850 $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
-                               echo Keeping v850eq stuff in $i
+                               echo Keeping v850 stuff in $i
                        fi
                fi
        done
 else
-       for i in $v850e_files ; do
-               if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then
+       for i in $v850_files ; do
+               if test -f $i && (grep sanitize-v850 $i > /dev/null) ; then
                        if [ -n "${verbose}" ] ; then
-                               echo Removing traces of \"v850eq\" from $i...
+                               echo Removing traces of \"v850\" from $i...
                        fi
                        cp $i new
-                       sed '/start\-sanitize\-v850eq/,/end-\sanitize\-v850eq/d' < $i > new
+                       sed '/start\-sanitize\-v850/,/end-\sanitize\-v850/d' < $i > new
                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
                                if [ -n "${verbose}" ] ; then
                                        echo Caching $i in .Recover...

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index b4a4476..327e56f 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,4 +1,4 @@
-start-santizie-v850
+start-sanitize-v850
 Wed Aug 13 18:45:48 1997  Nick Clifton  <nickc@cygnus.com>
 
 start-sanitize-v850e
@@ -11,20 +11,18 @@ start-sanitize-v850eq
        command line options.
 end-sanitize-v850eq
 
-start-sanitize-v850
        * v850.h (struct v850_opcode): Add flags field.
        (struct v850_operand): Extend meaning of 'bits' and 'shift'
        fields. 
-start-sanitize-v850
-       
+
 start-sanitize-v850e
 start-sanitize-v850eq
        (V850E_INSTRUCTION, V850EQ_INSTRUCTION): New flags.
        (V850E_PUSH_POP, V850E_IMMEDIATE16, V850E_IMMEDIATE32): New flags.
 end-sanitize-v850eq
 end-sanitize-v850e
-end-santizie-v850
 
+end-sanitize-v850
 Fri Aug  8 16:58:42 1997  Doug Evans  <dje@canuck.cygnus.com>
 
        * arc.h: New file.