Removed v850 sanitization.

5 files changed, 27 insertions, 86 deletions

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index 071f919..820c9df 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -23,22 +23,6 @@ else
 	lose_these_too="${d30v_files} ${lose_these_too}"
 fi
 
-v850_files="v850-opc.c v850-dis.c"
-
-if ( echo $* | grep keep\-v850 > /dev/null ) ; then
-	keep_these_too="${v850_files} ${keep_these_too}"
-else
- if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-	keep_these_too="${v850_files} ${keep_these_too}"
- else
-  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
-	keep_these_too="${v850_files} ${keep_these_too}"
-  else
-	lose_these_too="${v850_files} ${lose_these_too}"
-  fi
- fi
-fi
-
 tic80_files="tic80-opc.c tic80-dis.c"
 
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
@@ -115,6 +99,8 @@ stamp-h.in
 sysdep.h
 w65-dis.c
 w65-opc.h
+v850-opc.c
+v850-dis.c
 z8k-dis.c
 z8k-opc.h
 z8kgen.c
@@ -151,45 +137,17 @@ else
 	done
 fi
 
-v850_files="ChangeLog Makefile.in Makefile.am configure.in configure disassemble.c"
-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
-			if [ -n "${verbose}" ] ; then
-				echo Keeping v850 stuff in $i
-			fi
-		fi
-	done
-else
-	for i in $v850_files ; do
-		if test ! -d $i && (grep sanitize-v850 $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"v850\" from $i...
-			fi
-			cp $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...
-				fi
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-fi
-
 v850e_files="ChangeLog Makefile.in Makefile.am configure.in configure disassemble.c v850-opc.c v850-dis.c"
-if ( echo $* | grep keep\-v850e > /dev/null ) ; then
-  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
+
+if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
 	for i in $v850e_files ; do
-		if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
+		if test -f $i && (grep sanitize-v850eq $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping v850e/v850eq stuff in $i
+				echo Keeping v850eq stuff in $i
 			fi
 		fi
 	done
-  else
+else
 	for i in $v850e_files ; do
 		if test -f $i && (grep sanitize-v850eq $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
@@ -206,21 +164,23 @@ if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 			mv new $i
 		fi
 	done
-  fi
-else
-  if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
+fi
+if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 	for i in $v850e_files ; do
-		if test -f $i && (grep sanitize-v850eq $i > /dev/null) ; then
+		if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping v850e/v850eq stuff in $i
+				echo Keeping v850e stuff in $i
 			fi
 		fi
 	done
-  else
+else
+    if ( echo $* | grep keep\-v850eq > /dev/null ) ; then
+      true
+    else
 	for i in $v850e_files ; do
 		if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"v850e/v850eq\" from $i...
+				echo Removing traces of \"v850e\" from $i...
 			fi
 			cp $i new
 			sed '/start\-sanitize\-v850e/,/end\-sanitize\-v850e/d' < $i > new
@@ -233,7 +193,7 @@ else
 			mv new $i
 		fi
 	done
-  fi
+    fi
 fi
 
 
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 160e9012..1fd37ea 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -3,7 +3,6 @@ Tue Sep  2 18:39:08 1997  Jeffrey A Law  (law@cygnus.com)
         * mn10200-dis.c (disassemble): PC relative instructions are
         relative to the next instruction, not the current instruction.
 
-start-sanitize-v850
 Tue Sep  2 15:41:55 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* v850-dis.c (disassemble): Only signed extend values that are not
@@ -18,7 +17,6 @@ Tue Sep  2 15:39:40 1997  Nick Clifton  <nickc@cygnus.com>
 Tue Aug 26 09:42:28 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* v850-opc.c (MOVHI): Immediate parameter is unsigned.
-end-sanitize-v850
 
 Mon Aug 25 15:58:07 1997  Christopher Provenzano  <proven@cygnus.com>
 
@@ -84,7 +82,6 @@ Fri Aug 15 05:17:48 1997  Doug Evans  <dje@canuck.cygnus.com>
 	* disassemble.c (ARCH_all): Define ARCH_arc.
 	(disassembler): Add ARC support.
 
-start-sanitize-v850
 Wed Aug 13 18:52:11 1997  Nick Clifton  <nickc@cygnus.com>
 
 start-sanitize-v850eq
@@ -111,8 +108,6 @@ start-sanitize-v850e
 	* v850-opc.c: Reorganised and re-layed out to improve readability
 	and portability.
 
-end-sanitize-v850
-	
 Tue Aug  5 23:09:31 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure: Rebuild with autoconf 2.12.1.
@@ -389,14 +384,12 @@ Thu Mar 27 14:24:43 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mips-opc.c: Add cast when setting mips_opcodes.
 
-start-sanitize-v850
 Tue Mar 25 23:04:00 1997  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* v850-dis.c (disassemble):  Fix sign extension problem.
 	* v850-opc.c (extract_d*):  Fix sign extension problems to make
 	disassembly calculate branch offsets correctly.
 
-end-sanitize-v850
 Mon Mar 24 13:22:13 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* sh-opc.h: Add bf/s and bt/s as synonyms for bf.s and bt.s.
@@ -870,25 +863,21 @@ Thu Jan  2 12:14:29 1997  Jeffrey A Law  (law@cygnus.com)
 	* mn10300-dis.c (disassemble): Make sure all variables are initialized
 	before they are used.
 
-start-sanitize-v850
 Tue Dec 31 12:20:38 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* v850-opc.c (v850_opcodes): Put curly-braces around operands
 	for "breakpoint" instruction.
 
-end-sanitize-v850
 Tue Dec 31 15:38:13 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* Makefile.in (ALL_CFLAGS): Add -D_GNU_SOURCE.
 	(dep): Use ALL_CFLAGS rather than CFLAGS.
 
-start-sanitize-v850
 Tue Dec 31 15:09:16 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* v850-opc.c (D8_{6,7}): Set V850_OPERAND_ADJUST_SHORT_MEMORY
 	flag.
 
-end-sanitize-v850
 Mon Dec 30 17:02:11 1996  Fred Fish  <fnf@cygnus.com>
 
 	* Makefile.in (m68k-opc.o, alpha-opc.o): Remove dis-asm.h dependency.
@@ -1148,30 +1137,25 @@ Fri Nov  1 10:29:11 1996  Richard Henderson  <rth@tamu.edu>
 	(alpha_opcodes): Add new BWX, CIX, and MAX instructions.  
 	Recategorize PALcode instructions.
 
-start-sanitize-v850
 Wed Oct 30 16:46:58 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* v850-opc.c (v850_opcodes): Add relaxing "jbr".
 
-end-sanitize-v850
 Tue Oct 29 16:30:28 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mips-dis.c (_print_insn_mips): Don't print a trailing tab if
 	there are no operand types.
 
-start-sanitize-v850
 Tue Oct 29 12:22:21 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* v850-opc.c (D9_RELAX): Renamed from D9, all references
 	changed.
 	(v850_operands): Make sure D22 immediately follows D9_RELAX.
 
-end-sanitize-v850
 Fri Oct 25 12:12:53 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* i386-dis.c (print_insn_x86): Set info->bytes_per_line to 5.
 
-start-sanitize-v850
 Thu Oct 24 17:53:52 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* v850-opc.c (insert_d8_6): Fix operand insertion for sld.w
@@ -1180,7 +1164,6 @@ Thu Oct 24 17:53:52 1996  Jeffrey A Law  (law@cygnus.com)
 	* v850-opc.c (v850_opcodes): Add "jCC" instructions (aliases for
 	"bCC"instructions).
 
-end-sanitize-v850
 Thu Oct 24 17:21:20 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mips-dis.c (_print_insn_mips): Use a tab between the instruction
@@ -1196,12 +1179,10 @@ Fri Oct 11 16:03:49 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10300-opc.c (mn10300_opcodes): Fix typo in opcode
 	field for movhu instruction.
-start-sanitize-v850
 
 	* v850-dis.c (disassemble): For V850_OPERAND_SIGNED operands,
 	cast value to "long" not "signed long" to keep hpux10
 	compiler quiet.
-end-sanitize-v850
 
 Thu Oct 10 10:25:58 1996  Jeffrey A Law  (law@cygnus.com)
 
@@ -1284,7 +1265,6 @@ Tue Oct  1 10:49:11 1996  Ian Lance Taylor  <ian@cygnus.com>
 	* i386-dis.c (op_rtn): Change to be a pointer.  Adjust uses
 	accordingly.  Don't declare functions using op_rtn.
 
-start-sanitize-v850
 Fri Sep 27 18:28:59 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* v850-dis.c (disassemble):  Add memaddr argument.  Re-arrange
@@ -1295,7 +1275,6 @@ Fri Sep 27 18:28:59 1996  Stu Grossman  (grossman@critters.cygnus.com)
 	bit operands.
 	* (v850_opcodes):  Add breakpoint insn.
 
-end-sanitize-v850
 Mon Sep 23 12:32:26 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* m68k-opc.c: Move the fmovemx data register cases before the
@@ -1321,7 +1300,6 @@ Tue Sep  3 12:09:46 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* sparc-opc.c (sparc_opcodes): Add setuw, setsw, setx.
 
-start-sanitize-v850
 Tue Sep  3 12:05:25 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* v850-dis.c (disassemble): Make static.  Provide prototype.
@@ -1409,13 +1387,11 @@ Wed Aug 28 15:55:43 1996  Jeffrey A Law  (law@cygnus.com)
 	* v850-opc.c (v850_opcodes): Add null opcode to mark the
 	end of the opcode table.
 
-end-sanitize-v850
 Mon Aug 26 13:35:53 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
 	* d10v-opc.c (pre_defined_registers): Added register pairs,
 	"r0-r1", "r2-r3", etc.
 
-start-sanitize-v850
 Fri Aug 23 00:27:01 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* v850-opc.c (v850_operands): Make I16 be a signed operand.
@@ -1498,7 +1474,6 @@ Tue Aug 20 14:41:03 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
 	* configure.in: (bfd_v850_arch) Add new case.
 	* v850-opc.c: New file.
 	
-end-sanitize-v850
 Mon Aug 19 15:21:38 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* sparc-dis.c (print_insn_sparc): Handle little endian sparcs.
diff --git a/opcodes/configure b/opcodes/configure
index b87761a..a5f8231 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -1799,9 +1799,7 @@ if test x${all_targets} = xfalse ; then
 # start-sanitize-tic80
 	bfd_tic80_arch)		ta="$ta tic80-dis.lo tic80-opc.lo" ;;
 # end-sanitize-tic80
-# start-sanitize-v850
 	bfd_v850_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
-# end-sanitize-v850
 # start-sanitize-v850e
 	bfd_v850e_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
 # end-sanitize-v850e
diff --git a/opcodes/configure.in b/opcodes/configure.in
index b268d70..424705f 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -130,9 +130,13 @@ if test x${all_targets} = xfalse ; then
 # start-sanitize-tic80
 	bfd_tic80_arch)		ta="$ta tic80-dis.lo tic80-opc.lo" ;;
 # end-sanitize-tic80
-# start-sanitize-v850
 	bfd_v850_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
-# end-sanitize-v850
+# start-sanitize-v850e
+	bfd_v850e_arch)		ta="$ta v850-opc.lo v850-dis.lo" ;;
+# end-sanitize-v850e
+# start-sanitize-v850eq
+	bfd_v850eq_arch)	ta="$ta v850-opc.lo v850-dis.lo" ;;
+# end-sanitize-v850eq
 	bfd_vax_arch)		;;
 	bfd_w65_arch)		ta="$ta w65-dis.lo" ;;
 	bfd_we32k_arch)		;;
diff --git a/opcodes/v850-opc.c b/opcodes/v850-opc.c
index 46dc637..3ed28b5 100644
--- a/opcodes/v850-opc.c
+++ b/opcodes/v850-opc.c
@@ -545,17 +545,21 @@ const struct v850_opcode v850_opcodes[] =
 { "jmp",	one (0x0060),		one (0xffe0),	      	{R1}, 			1 },
   
 /* load/store instructions */
+/* start-sanitize-v850eq */
 #ifdef ARCH_v850eq
 { "sld.bu",	one (0x0300),		one (0x0780),	      	{D7,   EP,   R2_NOTR0},	1 },
 { "sld.hu",	one (0x0400),		one (0x0780),	      	{D8_7, EP,   R2_NOTR0},	1 },
 { "sld.b",      one (0x0060),		one (0x07f0),         	{D4,   EP,   R2}, 	1 },
 { "sld.h",      one (0x0070),		one (0x07f0),         	{D5_4, EP,   R2}, 	1 },
 #else
+/* end-sanitize-v850eq */
 { "sld.b",	one (0x0300),		one (0x0780),	      	{D7,   EP,   R2},	1 },
 { "sld.h",	one (0x0400),		one (0x0780),	      	{D8_7, EP,   R2}, 	1 },
 { "sld.bu",     one (0x0060),		one (0x07f0),         	{D4,   EP,   R2_NOTR0},	1 },
 { "sld.hu",     one (0x0070),		one (0x07f0),         	{D5_4, EP,   R2_NOTR0},	1 },
+/* start-sanitize-v850eq */
 #endif
+/* end-sanitize-v850eq */
 { "sld.w",	one (0x0500),		one (0x0781),	      	{D8_6, EP,   R2}, 	1 },
 { "sst.b",	one (0x0380),		one (0x0780),	      	{R2,   D7,   EP}, 	2 },
 { "sst.h",	one (0x0480),		one (0x0780),	      	{R2,   D8_7, EP}, 	2 },