diff options
| -rw-r--r-- | .Sanitize | 18 | ||||
| -rw-r--r-- | bfd/.Sanitize | 26 | ||||
| -rw-r--r-- | bfd/aout-rce.c (renamed from bfd/aout-r16.c) | 0 | ||||
| -rw-r--r-- | bfd/archures.c | 12 | ||||
| -rwxr-xr-x | bfd/config.bfd | 6 | ||||
| -rw-r--r-- | bfd/configure.in | 6 | ||||
| -rw-r--r-- | bfd/cpu-rce.c (renamed from bfd/cpu-r16.c) | 2 | ||||
| -rw-r--r-- | bfd/targets.c | 12 | ||||
| -rw-r--r-- | gas/.Sanitize | 18 | ||||
| -rw-r--r-- | gas/config/tc-rce.c (renamed from gas/config/tc-r16.c) | 12 | ||||
| -rw-r--r-- | gas/config/tc-rce.h (renamed from gas/config/tc-r16.h) | 8 | ||||
| -rw-r--r-- | gas/configure.in | 6 | ||||
| -rw-r--r-- | gdb/.Sanitize | 36 | ||||
| -rw-r--r-- | gdb/configure.in | 4 | ||||
| -rw-r--r-- | ld/config/.Sanitize | 8 | ||||
| -rw-r--r-- | ld/config/rce-aout.mt (renamed from ld/config/r16-aout.mt) | 0 | ||||
| -rw-r--r-- | opcodes/.Sanitize | 26 | ||||
| -rw-r--r-- | opcodes/configure.in | 6 | ||||
| -rw-r--r-- | opcodes/rce-dis.c (renamed from opcodes/r16-dis.c) | 4 | ||||
| -rw-r--r-- | opcodes/rce-opc.h (renamed from opcodes/r16-opc.h) | 6 |
20 files changed, 128 insertions, 88 deletions
@@ -207,24 +207,24 @@ else done fi -r16_files = "config.sub" +rce_files="config.sub" -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 +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/bfd/.Sanitize b/bfd/.Sanitize index 24eba61..f3d944f 100644 --- a/bfd/.Sanitize +++ b/bfd/.Sanitize @@ -23,12 +23,12 @@ else lose_these_too="${mpw_files} ${lose_these_too}" fi -r16_files="cpu-r16.c aout-r16.c" +rce_files="cpu-rce.c aout-rce.c" -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 @@ -263,23 +263,23 @@ else done fi -r16_files = "ChangeLog archures.c config.bfd configure.in targets.c" -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="ChangeLog archures.c config.bfd configure.in targets.c" +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/bfd/aout-r16.c b/bfd/aout-rce.c index a89f140..a89f140 100644 --- a/bfd/aout-r16.c +++ b/bfd/aout-rce.c diff --git a/bfd/archures.c b/bfd/archures.c index 31acf4a..ea4586d 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -435,9 +435,9 @@ extern void bfd_mips_arch PARAMS ((void)); extern void bfd_powerpc_arch PARAMS ((void)); extern void bfd_rs6000_arch PARAMS ((void)); extern void bfd_sh_arch PARAMS ((void)); -/* start-sanitize-r16 */ -extern void bfd_r16_arch PARAMS ((void)); -/* end-sanitize-r16 */ +/* start-sanitize-rce */ +extern void bfd_rce_arch PARAMS ((void)); +/* end-sanitize-rce */ extern void bfd_sparc_arch PARAMS ((void)); extern void bfd_vax_arch PARAMS ((void)); extern void bfd_we32k_arch PARAMS ((void)); @@ -463,9 +463,9 @@ static void (*archures_init_table[]) PARAMS ((void)) = bfd_powerpc_arch, bfd_rs6000_arch, bfd_sh_arch, -/* start-sanitize-r16 */ - bfd_r16_arch, -/* end-sanitize-r16 */ +/* start-sanitize-rce */ + bfd_rce_arch, +/* end-sanitize-rce */ bfd_sparc_arch, bfd_vax_arch, bfd_we32k_arch, diff --git a/bfd/config.bfd b/bfd/config.bfd index 3f93128..dd28600 100755 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -34,9 +34,9 @@ case "${canon}" in h8300*-*-*) bfd_name=h8300-coff strip_underscore=yes ;; h8500-*-*) bfd_name=h8500-coff strip_underscore=yes ;; sh-*-*) bfd_name=sh-coff strip_underscore=yes ;; -# start-sanitize-r16 - r16-*-aout) bfd_name=r16-aout ;; -# end-sanitize-r16 +# start-sanitize-rce + rce-*-aout) bfd_name=rce-aout ;; +# end-sanitize-rce hppa*-*-*elf*) bfd_name=hppa-elf ;; hppa*-*-bsd*) bfd_name=hppabsd ;; hppa*-*-hpux*) bfd_name=hppahpux ;; diff --git a/bfd/configure.in b/bfd/configure.in index 04a4223..ab3ef94 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -202,9 +202,9 @@ do pc532machaout_vec) tb="$tb pc532-mach.o aout-ns32k.o stab-syms.o" ;; rs6000coff_vec) tb="$tb coff-rs6000.o" ;; shcoff_vec) tb="$tb coff-sh.o cofflink.o" ;; -# start-sanitize-r16 - r16_aout_vec) tb="$tb aout32.o reloc16.o" ;; -# end-sanitize-r16 +# start-sanitize-rce + rce_aout_vec) tb="$tb aout32.o reloc16.o" ;; +# end-sanitize-rce shlcoff_vec) tb="$tb coff-sh.o cofflink.o" ;; som_vec) tb="$tb som.o" ;; sparclynx_aout_vec) tb="$tb sparclynx.o lynx-core.o aout32.o stab-syms.o" ;; diff --git a/bfd/cpu-r16.c b/bfd/cpu-rce.c index 276fe3a..3300b0a 100644 --- a/bfd/cpu-r16.c +++ b/bfd/cpu-rce.c @@ -56,7 +56,7 @@ static bfd_arch_info_type arch_info_struct[] = 32, /* 32 bits in a word */ 32, /* 32 bits in an address */ 8, /* 8 bits in a byte */ - bfd_arch_r16, + bfd_arch_rce, 0, /* only 1 machine */ "SOP", /* arch_name */ "SOP", /* printable name */ diff --git a/bfd/targets.c b/bfd/targets.c index 4bfe769..7fabbac 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -486,9 +486,9 @@ extern const bfd_target pc532machaout_vec; extern const bfd_target riscix_vec; extern const bfd_target rs6000coff_vec; extern const bfd_target shcoff_vec; -/* start-sanitize-r16 */ -extern bfd_target r16_aout_vec; -/* end-sanitize-r16 */ +/* start-sanitize-rce */ +extern bfd_target rce_aout_vec; +/* end-sanitize-rce */ extern const bfd_target shlcoff_vec; extern const bfd_target sparclynx_aout_vec; extern const bfd_target sparclynx_coff_vec; @@ -640,9 +640,9 @@ const bfd_target * const bfd_target_vector[] = { &rs6000coff_vec, &shcoff_vec, &shlcoff_vec, -/* start-sanitize-r16 */ - &r16_aout_vec, -/* end-sanitize-r16 */ +/* start-sanitize-rce */ + &rce_aout_vec, +/* end-sanitize-rce */ &sparclynx_aout_vec, &sparclynx_coff_vec, &sparcnetbsd_vec, diff --git a/gas/.Sanitize b/gas/.Sanitize index 26df3f4..a6e4825 100644 --- a/gas/.Sanitize +++ b/gas/.Sanitize @@ -125,24 +125,24 @@ else done fi -r16_files = "configure.in" +rce_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 +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/gas/config/tc-r16.c b/gas/config/tc-rce.c index 153274e..62698aa 100644 --- a/gas/config/tc-r16.c +++ b/gas/config/tc-rce.c @@ -1,4 +1,4 @@ -/* tc-r16.c -- Assemble code for the Experimental R16 +/* tc-rce.c -- Assemble code for the Experimental R16 Copyright (C) 1993 Free Software Foundation. @@ -28,7 +28,7 @@ #include "bfd.h" #include "subsegs.h" #define DEFINE_TABLE -#include "../opcodes/r16-opc.h" +#include "../opcodes/rce-opc.h" #include <ctype.h> #if 1 /**** TEMP ****/ @@ -116,13 +116,13 @@ static struct hash_control *opcode_hash_control; /* Opcode mnemonics */ void md_begin () { - r16_opcode_info *opcode; + rce_opcode_info *opcode; char *prev_name = ""; opcode_hash_control = hash_new (); /* Insert unique names into hash table */ - for (opcode = r16_table; opcode->name; opcode++) + for (opcode = rce_table; opcode->name; opcode++) { if (strcmp (prev_name, opcode->name)) { @@ -272,7 +272,7 @@ char *str; { char *op_start; char *op_end; - r16_opcode_info *opcode; + rce_opcode_info *opcode; char *output; int nlen = 0; unsigned short inst; @@ -298,7 +298,7 @@ char *str; return; } - opcode = (r16_opcode_info *) hash_find (opcode_hash_control, name); + opcode = (rce_opcode_info *) hash_find (opcode_hash_control, name); if (opcode == NULL) { as_bad ("unknown opcode \"%s\"", name); diff --git a/gas/config/tc-r16.h b/gas/config/tc-rce.h index 7e82378..98f779d 100644 --- a/gas/config/tc-r16.h +++ b/gas/config/tc-rce.h @@ -1,4 +1,4 @@ -/* This file is tc-r16.h +/* This file is tc-rce.h Copyright (C) 1993 Free Software Foundation, Inc. @@ -23,15 +23,15 @@ #ifdef BFD_ASSEMBLER -#define TARGET_ARCH bfd_arch_r16 +#define TARGET_ARCH bfd_arch_rce #define TARGET_BYTES_BIG_ENDIAN 1 #ifdef OBJ_AOUT -#define TARGET_FORMAT "a.out-r16" +#define TARGET_FORMAT "a.out-rce" #endif #else /* ! BFD_ASSEMBLER */ -#define BFD_ARCH bfd_arch_r16 +#define BFD_ARCH bfd_arch_rce #define NO_RELOC 0 #define RELOC_32 1234 diff --git a/gas/configure.in b/gas/configure.in index 3098eec..dbbe8e7 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -150,9 +150,9 @@ case ${generic_target} in sh-*-coff) obj_format=coff ;; -# start-sanitize-r16 - r16-*-aout) obj_format=aout ;; -# end-sanitize-r16 +# start-sanitize-rce + rce-*-aout) obj_format=aout ;; +# end-sanitize-rce ns32k-pc532-mach*) obj_format=aout emulation=pc532 ;; ns32k-pc532-netbsd*) obj_format=aout emulation=nbsd532 ;; diff --git a/gdb/.Sanitize b/gdb/.Sanitize index 95bcd48..e5a24b1 100644 --- a/gdb/.Sanitize +++ b/gdb/.Sanitize @@ -404,4 +404,40 @@ else 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 + if [ -n "${verbose}" ] ; then + echo Keeping r16 stuff in $i + fi + fi + done +else + for i in $r16_files ; do + if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Removing traces of \"r16\" from $i... + fi + cp $i new + sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/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 + +for i in * ; do + if test ! -d $i && (grep sanitize $i > /dev/null) ; then + echo '***' Some mentions of Sanitize are still left in $i! 1>&2 + fi +done + +# # End of file. diff --git a/gdb/configure.in b/gdb/configure.in index f3ee9c0..f929fd9 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -198,6 +198,10 @@ h8500-*-*) gdb_target=h8500hms ;; sh-*-*) gdb_target=sh ;; +# start-sanitize-r16 +r16-*-*) gdb_target=r16 ;; +# end-sanitize-r16 + hppa*-*-bsd*) gdb_target=hppabsd ;; hppa*-*-pro*) gdb_target=hppapro ;; hppa*-*-hpux*) gdb_target=hppahpux ;; diff --git a/ld/config/.Sanitize b/ld/config/.Sanitize index 5abf006..47ae500 100644 --- a/ld/config/.Sanitize +++ b/ld/config/.Sanitize @@ -15,12 +15,12 @@ Do-first: -r16_files="r16-aout.mt" +rce_files="rce-aout.mt" -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 diff --git a/ld/config/r16-aout.mt b/ld/config/rce-aout.mt index e053df9..e053df9 100644 --- a/ld/config/r16-aout.mt +++ b/ld/config/rce-aout.mt 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 }, |