From 8f3c5ddbde56814632c53656a80d3d98370c1cd9 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Sun, 21 Sep 1997 00:19:41 +0000 Subject: Removed v850eq sanitization. Added Things-to-loose entries for unspecifed/empty directories. --- gas/.Sanitize | 31 ++++---------------- gas/config/.Sanitize | 61 +++------------------------------------- gas/config/tc-v850.c | 33 +++++----------------- gas/testsuite/.Sanitize | 28 ------------------ gas/testsuite/gas/.Sanitize | 12 ++++---- gas/testsuite/gas/hppa/.Sanitize | 2 ++ 6 files changed, 24 insertions(+), 143 deletions(-) diff --git a/gas/.Sanitize b/gas/.Sanitize index 1687d4f..ddf3bff 100644 --- a/gas/.Sanitize +++ b/gas/.Sanitize @@ -110,6 +110,11 @@ write.h Things-to-lose: +obsolete +regress +regress.m68k +testscripts + Do-last: if ( echo $* | grep keep\-gm > /dev/null ) ; then @@ -141,32 +146,6 @@ fi v850_files="ChangeLog configure.in configure" -if ( echo $* | grep keep\-v850eq > /dev/null ) ; then - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850eq $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850eq stuff in $i - fi - fi - done -else - for i in $v850_files ; do - if test ! -d $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 if ( echo $* | grep keep\-v850e > /dev/null ) ; then for i in $v850_files ; do if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize index 8a874e2..34b56e3 100644 --- a/gas/config/.Sanitize +++ b/gas/config/.Sanitize @@ -31,12 +31,6 @@ else lose_these_too="${tic80_files} ${lose_these_too}" fi -if ( echo $* | grep keep\-v850 > /dev/null ) ; then - keep_these_too="tc-v850.c tc-v850.h ${keep_these_too}" -else - lose_these_too="tc-v850.c tc-v850.h ${lose_these_too}" -fi - # All files listed between the "Things-to-keep:" line and the # "Files-to-sed:" line will be kept. All other files will be removed. # Directories listed in this section will have their own Sanitize @@ -129,6 +123,8 @@ tc-sparc.c tc-sparc.h tc-tahoe.c tc-tahoe.h +tc-v850.c +tc-v850.h tc-vax.c tc-vax.h tc-w65.c @@ -170,6 +166,8 @@ vms-a-conf.h Things-to-lose: +vms + Do-last: r5900_files="tc-mips.c" @@ -293,57 +291,7 @@ 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 -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 -else - 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 -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 if test -r $i && (grep sanitize-v850e $i > /dev/null) ; then if [ -n "${verbose}" ] ; then echo Removing traces of \"v850e\" from $i... @@ -359,7 +307,6 @@ else mv new $i fi done - fi fi # End of file. diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c index 0e14e8e..249c853 100644 --- a/gas/config/tc-v850.c +++ b/gas/config/tc-v850.c @@ -241,11 +241,9 @@ set_machine (int number) { case 0: processor_mask = PROCESSOR_V850; break; /* start-sanitize-v850e */ - case bfd_mach_v850e: processor_mask = PROCESSOR_V850E; break; -/* end-sanitize-v850e */ -/* start-sanitize-v850eq */ + case bfd_mach_v850e: processor_mask = PROCESSOR_V850E; break; case bfd_mach_v850eq: processor_mask = PROCESSOR_V850EQ; break; -/* end-sanitize-v850eq */ +/* end-sanitize-v850e */ } } @@ -269,10 +267,8 @@ const pseudo_typeS md_pseudo_table[] = {"call_table_data", v850_call_table_data, 0}, {"call_table_text", v850_call_table_text, 0}, {"v850e", set_machine, bfd_mach_v850e}, -/* end-sanitize-v850e */ -/* start-sanitize-v850eq */ {"v850eq", set_machine, bfd_mach_v850eq}, -/* end-sanitize-v850eq */ +/* end-sanitize-v850e */ { NULL, NULL, 0} }; @@ -611,10 +607,8 @@ parse_register_list ) { static int type1_regs[ 32 ] = { 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 29, 28, 23, 22, 21, 20, 27, 26, 25, 24 }; -/* start-sanitize-v850eq */ static int type2_regs[ 32 ] = { 19, 18, 17, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 31, 29, 28, 23, 22, 21, 20, 27, 26, 25, 24 }; static int type3_regs[ 32 ] = { 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 15, 13, 12, 7, 6, 5, 4, 11, 10, 9, 8 }; -/* end-sanitize-v850eq */ int * regs; expressionS exp; @@ -623,10 +617,8 @@ parse_register_list switch (operand->shift) { case 0xffe00001: regs = type1_regs; break; -/* start-sanitize-v850eq */ case 0xfff8000f: regs = type2_regs; break; case 0xfff8001f: regs = type3_regs; break; -/* end-sanitize-v850eq */ default: as_bad ("unknown operand shift: %x\n", operand->shift ); return "internal failure in parse_register_list"; @@ -649,9 +641,7 @@ parse_register_list if (exp.X_op != O_constant) return "constant expression or register list expected"; -/* start-sanitize-v850eq */ if (regs == type1_regs) -/* end-sanitize-v850eq */ { if (exp.X_add_number & 0xFFFFF000) return "high bits set in register list expression"; @@ -664,7 +654,6 @@ parse_register_list * insn |= (1 << i); } } -/* start-sanitize-v850eq */ else if (regs == type2_regs) { if (exp.X_add_number & 0xFFFE0000) @@ -700,7 +689,6 @@ parse_register_list if (exp.X_add_number & (1 << 16)) * insn |= (1 << 19); } -/* end-sanitize-v850eq */ return NULL; } @@ -823,10 +811,8 @@ md_show_usage (stream) fprintf (stream, "\t-mv850 The code is targeted at the v850\n"); /* start-sanitize-v850e */ fprintf (stream, "\t-mv850e The code is targeted at the v850e\n"); -/* end-sanitize-v850e */ -/* start-sanitize-v850eq */ fprintf (stream, "\t-mv850eq The code is targeted at the v850eq\n"); -/* end-sanitize-v850eq */ +/* end-sanitize-v850e */ } int @@ -863,15 +849,13 @@ md_parse_option (c, arg) processor_mask = PROCESSOR_V850E; return 1; } -/* end-sanitize-v850e */ -/* start-sanitize-v850eq */ else if (strcmp (arg, "v850eq") == 0) { machine = bfd_mach_v850eq; processor_mask = PROCESSOR_V850EQ; return 1; } -/* end-sanitize-v850eq */ +/* end-sanitize-v850e */ break; } @@ -981,7 +965,7 @@ md_begin () register const struct v850_opcode * op; flagword applicable; -/* start-sanitize-v850eq */ +/* start-sanitize-v850e */ if (strncmp (TARGET_CPU, "v850eq", 6) == 0) { if (machine == -1) @@ -990,10 +974,7 @@ md_begin () if (processor_mask == -1) processor_mask = PROCESSOR_V850EQ; } - else -/* end-sanitize-v850eq */ -/* start-sanitize-v850e */ - if (strncmp (TARGET_CPU, "v850e", 5) == 0) + else if (strncmp (TARGET_CPU, "v850e", 5) == 0) { if (machine == -1) machine = bfd_mach_v850e; diff --git a/gas/testsuite/.Sanitize b/gas/testsuite/.Sanitize index aeea958..199827c 100644 --- a/gas/testsuite/.Sanitize +++ b/gas/testsuite/.Sanitize @@ -44,34 +44,6 @@ if [ -n "${verbose}" ] ; then echo Processing \"v850\"... 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 - 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 - tic80_files="ChangeLog" if ( echo $* | grep keep\-tic80 > /dev/null ) ; then for i in $tic80_files ; do diff --git a/gas/testsuite/gas/.Sanitize b/gas/testsuite/gas/.Sanitize index c4c4f1a..197c98a 100644 --- a/gas/testsuite/gas/.Sanitize +++ b/gas/testsuite/gas/.Sanitize @@ -23,12 +23,6 @@ else lose_these_too="tic80 ${lose_these_too}" fi -if ( echo $* | grep keep\-v850 > /dev/null ) ; then - keep_these_too="v850 ${keep_these_too}" -else - lose_these_too="v850 ${lose_these_too}" -fi - if ( echo $* | grep keep\-d30v > /dev/null ) ; then keep_these_too="d30v ${keep_these_too}" else @@ -65,10 +59,16 @@ sparc sparc-solaris sun4 template +v850 vax Things-to-lose: +gasp +i386-bsd +ieee.fp +mn10x00 + Do-last: # End of file. diff --git a/gas/testsuite/gas/hppa/.Sanitize b/gas/testsuite/gas/hppa/.Sanitize index b846cbc..fc84517 100644 --- a/gas/testsuite/gas/hppa/.Sanitize +++ b/gas/testsuite/gas/hppa/.Sanitize @@ -34,6 +34,8 @@ unsorted Things-to-lose: +more.parse + Do-last: # End of file. -- cgit v1.1