Rename r16 files to rce, and fix some more .Sanitize typos.

4 files changed, 21 insertions, 21 deletions

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index ef7b20a..9600959 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -23,12 +23,12 @@ else
 	lose_these_too="${mpw_files} ${lose_these_too}"
 fi
 
-r16_files="r16-dis.c r16-opc.h"
+rce_files="rce-dis.c rce-opc.h"
 
-if ( echo $* | grep keep\-r16 > /dev/null ) ; then
-	keep_these_too="${r16_files} ${keep_these_too}"
+if ( echo $* | grep keep\-rce > /dev/null ) ; then
+	keep_these_too="${rce_files} ${keep_these_too}"
 else
-	lose_these_too="${r16_files} ${lose_these_too}"
+	lose_these_too="${rce_files} ${lose_these_too}"
 fi
 
 # All files listed between the "Things-to-keep:" line and the
@@ -96,23 +96,23 @@ else
 	done
 fi
 
-r16_files = "configure.in"
-if ( echo $* | grep keep\-r16 > /dev/null ) ; then
-	for i in $r16_files ; do
-		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+rce_files="configure.in"
+if ( echo $* | grep keep\-rce > /dev/null ) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Keeping r16 stuff in $i
+				echo Keeping rce stuff in $i
 			fi
 		fi
 	done
 else
-	for i in $r16_files ; do
-		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+	for i in $rce_files ; do
+		if test ! -d $i && (grep sanitize-rce $i > /dev/null) ; then
 			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"r16\" from $i...
+				echo Removing traces of \"rce\" from $i...
 			fi
 			cp $i new
-			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/d' < $i > new
+			sed '/start\-sanitize\-rce/,/end-\sanitize\-rce/d' < $i > new
 			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
 				if [ -n "${verbose}" ] ; then
 					echo Caching $i in .Recover...
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 8feb9df..8393ed0 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -103,9 +103,9 @@ if [ x${all_targets} = xfalse ]; then
 	bfd_powerpc_arch)	ta="$ta ppc-dis.o ppc-opc.o" ;;
 	bfd_rs6000_arch)	ta="$ta ppc-dis.o ppc-opc.o" ;;
 	bfd_sh_arch)		ta="$ta sh-dis.o" ;;
-# start-sanitize-r16
-	bfd_r16_arch)		ta="$ta r16-dis.o" ;;
-# end-sanitize-r16
+# start-sanitize-rce
+	bfd_rce_arch)		ta="$ta rce-dis.o" ;;
+# end-sanitize-rce
 	bfd_sparc_arch)		ta="$ta sparc-dis.o sparc-opc.o" ;;
 	bfd_vax_arch)		;;
 	bfd_we32k_arch)		;;
diff --git a/opcodes/r16-dis.c b/opcodes/rce-dis.c
index cf30160..9a1dca2 100644
--- a/opcodes/r16-dis.c
+++ b/opcodes/rce-dis.c
@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define STATIC_TABLE
 #define DEFINE_TABLE
 
-#include "r16-opc.h"
+#include "rce-opc.h"
 #include "dis-asm.h"
 
 int 
@@ -33,7 +33,7 @@ print_insn_sop(memaddr, info)
   unsigned  char nibs[4];
   int status;
   int relmask = ~0;
-  r16_opcode_info *op;
+  rce_opcode_info *op;
   int dslot = 0;
   
   status = info->read_memory_func(memaddr, insn, 2, info);
diff --git a/opcodes/r16-opc.h b/opcodes/rce-opc.h
index 4e29878..e9f697a 100644
--- a/opcodes/r16-opc.h
+++ b/opcodes/rce-opc.h
@@ -1,15 +1,15 @@
 typedef enum {
 	O0, OT, O1, OC, O2, OI, OB, LS, BR, LI, LR, LJ, OM
-} r16_opclass;
+} rce_opclass;
 
 typedef struct inst
 {	char *name;
 	unsigned short opclass;
 	unsigned short inst;
-} r16_opcode_info;
+} rce_opcode_info;
 
 #ifdef DEFINE_TABLE
-r16_opcode_info r16_table[]={
+rce_opcode_info rce_table[]={
 { "bkpt",	O0,	0x0000 },
 { "sync",	O0,	0x0001 },
 { "rte",	O0,	0x0002 },