No longer sanitize away h8s stuff

This commit is contained in:
Jeff Law
1996-07-05 18:39:32 +00:00
parent 34255b708c
commit d78f416f84
8 changed files with 23 additions and 134 deletions

View File

@ -160,34 +160,6 @@ else
fi fi
h8s_files="ChangeLog"
if ( echo $* | grep keep\-h8s > /dev/null ) ; then
for i in $h8s_files ; do
if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Keeping h8s stuff in $i
fi
fi
done
else
for i in $h8s_files ; do
if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Removing traces of \"h8s\" from $i...
fi
cp $i new
sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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 for i in * ; do
if test ! -d $i && (grep sanitize $i > /dev/null) ; then if test ! -d $i && (grep sanitize $i > /dev/null) ; then
echo '***' Some mentions of Sanitize are still left in $i! 1>&2 echo '***' Some mentions of Sanitize are still left in $i! 1>&2

View File

@ -304,7 +304,6 @@ Tue Jun 18 13:19:51 1996 Jeffrey A. Law <law@rtl.cygnus.com>
Don't always promote L_8 to L_16. Don't always promote L_8 to L_16.
(do_a_fix_imm): Clean up L_32 and L_24 handling. (do_a_fix_imm): Clean up L_32 and L_24 handling.
start-sanitize-h8s
* config/tc-h8300.c (Smode): New variable. * config/tc-h8300.c (Smode): New variable.
(h8300hmode): Turn off Hmode. (h8300hmode): Turn off Hmode.
(h8300smode): New function. Turn on Smode and Hmode. (h8300smode): New function. Turn on Smode and Hmode.
@ -317,7 +316,6 @@ start-sanitize-h8s
* config/tc-h8300.h (COFF_MAGIC): Handle H8/S magic number. * config/tc-h8300.h (COFF_MAGIC): Handle H8/S magic number.
(Smode): Declare. (Smode): Declare.
end-sanitize-h8s
Mon Jun 17 15:50:53 1996 J.T. Conklin <jtc@rtl.cygnus.com> Mon Jun 17 15:50:53 1996 J.T. Conklin <jtc@rtl.cygnus.com>
* doc/as.texinfo: Reorder chapter of machine dependent options so * doc/as.texinfo: Reorder chapter of machine dependent options so

View File

@ -150,36 +150,4 @@ Things-to-lose:
Do-last: Do-last:
if [ -n "${verbose}" ] ; then
echo Processing \"h8s\"...
fi
h8s_files="tc-h8300.c tc-h8300.h"
if ( echo $* | grep keep\-h8s > /dev/null ) ; then
for i in $h8s_files ; do
if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Keeping h8s stuff in $i
fi
fi
done
else
for i in $h8s_files ; do
if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Removing traces of \"h8s\" from $i...
fi
cp $i new
sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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
# End of file. # End of file.

View File

@ -47,9 +47,7 @@ const char line_comment_chars[] = "#";
void cons (); void cons ();
int Hmode; int Hmode;
/* start-sanitize-h8s */
int Smode; int Smode;
/* end-sanitize-h8s */
#define PSIZE (Hmode ? L_32 : L_16) #define PSIZE (Hmode ? L_32 : L_16)
#define DMODE (L_16) #define DMODE (L_16)
#define DSYMMODE (Hmode ? L_24 : L_16) #define DSYMMODE (Hmode ? L_24 : L_16)
@ -60,19 +58,15 @@ void
h8300hmode () h8300hmode ()
{ {
Hmode = 1; Hmode = 1;
/* start-sanitize-h8s */
Smode = 0; Smode = 0;
/* end-sanitize-h8s */
} }
/* start-sanitize-h8s */
void void
h8300smode () h8300smode ()
{ {
Smode = 1; Smode = 1;
Hmode = 1; Hmode = 1;
} }
/* end-sanitize-h8s */
void void
sbranch (size) sbranch (size)
int size; int size;
@ -89,9 +83,7 @@ const pseudo_typeS md_pseudo_table[] =
{ {
{"h8300h", h8300hmode, 0}, {"h8300h", h8300hmode, 0},
/* start-sanitize-h8s */
{"h8300s", h8300smode, 0}, {"h8300s", h8300smode, 0},
/* end-sanitize-h8s */
{"sbranch", sbranch, L_8}, {"sbranch", sbranch, L_8},
{"lbranch", sbranch, L_16}, {"lbranch", sbranch, L_16},
@ -228,14 +220,12 @@ parse_reg (src, mode, reg, direction)
*reg = 0; *reg = 0;
return 3; return 3;
} }
/* start-sanitize-h8s */
if (src[0] == 'e' && src[1] == 'x' && src[2] == 'r') if (src[0] == 'e' && src[1] == 'x' && src[2] == 'r')
{ {
*mode = EXR; *mode = EXR;
*reg = 0; *reg = 0;
return 3; return 3;
} }
/* end-sanitize-h8s */
if (src[0] == 'f' && src[1] == 'p') if (src[0] == 'f' && src[1] == 'p')
{ {
*mode = PSIZE | REG | direction; *mode = PSIZE | REG | direction;
@ -405,7 +395,6 @@ get_operand (ptr, op, dst, direction)
op->mode = E; op->mode = E;
/* start-sanitize-h8s */
/* Gross. Gross. ldm and stm have a format not easily handled /* Gross. Gross. ldm and stm have a format not easily handled
by get_operand. We deal with it explicitly here. */ by get_operand. We deal with it explicitly here. */
if (src[0] == 'e' && src[1] == 'r' && isdigit(src[2]) if (src[0] == 'e' && src[1] == 'r' && isdigit(src[2])
@ -438,7 +427,6 @@ get_operand (ptr, op, dst, direction)
*ptr = src + 7; *ptr = src + 7;
return; return;
} }
/* end-sanitize-h8s */
len = parse_reg (src, &op->mode, &op->reg, direction); len = parse_reg (src, &op->mode, &op->reg, direction);
if (len) if (len)
@ -586,7 +574,6 @@ get_operand (ptr, op, dst, direction)
return; return;
} }
/* start-sanitize-h8s */
else if (strncmp (src, "mach", 4) == 0 else if (strncmp (src, "mach", 4) == 0
|| strncmp (src, "macl", 4) == 0) || strncmp (src, "macl", 4) == 0)
{ {
@ -595,7 +582,6 @@ get_operand (ptr, op, dst, direction)
*ptr = src + 4; *ptr = src + 4;
return; return;
} }
/* end-sanitize-h8s */
else else
{ {
src = parse_exp (src, &op->exp); src = parse_exp (src, &op->exp);
@ -774,12 +760,10 @@ get_specific (opcode, operands)
&& ((op & SIZE) != (x & SIZE))) && ((op & SIZE) != (x & SIZE)))
found = 0; found = 0;
} }
/* start-sanitize-h8s */
else if ((op & MACREG) != (x & MACREG)) else if ((op & MACREG) != (x & MACREG))
{ {
found = 0; found = 0;
} }
/* end-sanitize-h8s */
else if ((op & MODE) != (x & MODE)) else if ((op & MODE) != (x & MODE))
{ {
found = 0; found = 0;
@ -961,7 +945,7 @@ build_bytes (this_try, operand)
int d; int d;
c = *nibble_ptr++; c = *nibble_ptr++;
d = (c & DST) != 0; d = (c & (DST | SRC_IN_DST)) != 0;
if (c < 16) if (c < 16)
{ {
@ -1042,19 +1026,16 @@ build_bytes (this_try, operand)
nib |= 0x8; nib |= 0x8;
} }
/* start-sanitize-h8s */
if (c & MACREG) if (c & MACREG)
{ {
nib = 2 + operand[d].reg; nib = 2 + operand[d].reg;
} }
/* end-sanitize-h8s */
} }
nibble_count++; nibble_count++;
*p++ = nib; *p++ = nib;
} }
/* start-sanitize-h8s */
/* Disgusting. Why, oh why didn't someone ask us for advice /* Disgusting. Why, oh why didn't someone ask us for advice
on the assembler format. */ on the assembler format. */
if (strcmp (this_try->name, "stm.l") == 0 if (strcmp (this_try->name, "stm.l") == 0
@ -1067,7 +1048,6 @@ build_bytes (this_try, operand)
asnibbles[2] = high - low; asnibbles[2] = high - low;
asnibbles[7] = (this_try->name[0] == 'l') ? high : low; asnibbles[7] = (this_try->name[0] == 'l') ? high : low;
} }
/* end-sanitize-h8s */
for (i = 0; i < this_try->length; i++) for (i = 0; i < this_try->length; i++)
{ {

View File

@ -72,36 +72,4 @@ else
done done
fi fi
if [ -n "${verbose}" ] ; then
echo Processing \"h8s\"...
fi
h8s_files="ChangeLog"
if ( echo $* | grep keep\-h8s > /dev/null ) ; then
for i in $h8s_files ; do
if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Keeping h8s stuff in $i
fi
fi
done
else
for i in $h8s_files ; do
if test ! -d $i && (grep sanitize-h8s $i > /dev/null) ; then
if [ -n "${verbose}" ] ; then
echo Removing traces of \"h8s\" from $i...
fi
cp $i new
sed '/start\-sanitize\-h8s/,/end-\sanitize\-h8s/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
# End of file. # End of file.

View File

@ -3,14 +3,10 @@ Thu Jul 4 14:23:36 1996 Ian Lance Taylor <ian@cygnus.com>
Avoid DOS file naming problems: Avoid DOS file naming problems:
* gas/h8300/branch.s: Rename from branches.s. * gas/h8300/branch.s: Rename from branches.s.
* gas/h8300/branchh.s: Rename from branchesh.s. * gas/h8300/branchh.s: Rename from branchesh.s.
start-sanitize-h8s
* gas/h8300/branchs.s: Rename from branchess.s. * gas/h8300/branchs.s: Rename from branchess.s.
end-sanitize-h8s
* gas/h8300/rotsh.s: Rename from rotshift.s. * gas/h8300/rotsh.s: Rename from rotshift.s.
* gas/h8300/rotshh.s: Rename from rotshifth.s. * gas/h8300/rotshh.s: Rename from rotshifth.s.
start-sanitize-h8s
* gas/h8300/rotshs.s: Rename from rotshifts.s. * gas/h8300/rotshs.s: Rename from rotshifts.s.
end-sanitize-h8s
* gas/h8300/h8300.exp: Corresponding changes. * gas/h8300/h8300.exp: Corresponding changes.
Thu Jul 4 14:01:46 1996 James G. Smith <jsmith@cygnus.co.uk> Thu Jul 4 14:01:46 1996 James G. Smith <jsmith@cygnus.co.uk>
@ -38,7 +34,6 @@ Tue Jun 18 12:39:49 1996 Jeffrey A. Law <law@rtl.cygnus.com>
* gas/h8300/cbranchh.s: Switch into h8300h mode. * gas/h8300/cbranchh.s: Switch into h8300h mode.
* gas/h8300/h8300.exp (H8/300H misc tests): Fix test names. * gas/h8300/h8300.exp (H8/300H misc tests): Fix test names.
start-sanitize-h8s
* gas/h8300/{addsubs.s,bitops1s.s,bitops2s.s}: New tests for the * gas/h8300/{addsubs.s,bitops1s.s,bitops2s.s}: New tests for the
H8/S. H8/S.
* gas/h8300/{bitops3.s,bitops4.s,cbranchs.s,logicals.s}: Likewise. * gas/h8300/{bitops3.s,bitops4.s,cbranchs.s,logicals.s}: Likewise.
@ -47,7 +42,7 @@ start-sanitize-h8s
* gas/h8300/{movbs.s,movws.s,movls.s,pushpops.s}: Likewise. * gas/h8300/{movbs.s,movws.s,movls.s,pushpops.s}: Likewise.
* gas/h8300/{rotshifts.s,extends.s}: Likewise. * gas/h8300/{rotshifts.s,extends.s}: Likewise.
* gas/h8300/h8300.exp: Run them. * gas/h8300/h8300.exp: Run them.
end-sanitize-h8s
Mon Jun 10 14:14:40 1996 Ian Lance Taylor <ian@cygnus.com> Mon Jun 10 14:14:40 1996 Ian Lance Taylor <ian@cygnus.com>
* gas/all/cofftag.s, gas/all/cofftag.d: New test for COFF enum tag * gas/all/cofftag.s, gas/all/cofftag.d: New test for COFF enum tag

View File

@ -17,14 +17,6 @@
Do-first: Do-first:
h8s_files="addsubs.s bitops1s.s bitops2s.s bitops3s.s bitops4s.s branchs.s cbranchs.s compares.s decimals.s divmuls.s extends.s incdecs.s logicals.s macs.s miscs.s movbs.s movls.s movws.s multiples.s pushpops.s rotshs.s"
if ( echo $* | grep keep\-h8s > /dev/null ) ; then
keep_these_too="${h8s_files} ${keep_these_too}"
else
lose_these_too="${h8s_files} ${lose_these_too}"
fi
# All files listed between the "Things-to-keep:" line and the # All files listed between the "Things-to-keep:" line and the
# "Files-to-sed:" line will be kept. All other files will be removed. # "Files-to-sed:" line will be kept. All other files will be removed.
# Directories listed in this section will have their own Sanitize # Directories listed in this section will have their own Sanitize
@ -35,45 +27,66 @@ Things-to-keep:
addsub.s addsub.s
addsubh.s addsubh.s
addsubs.s
bitops1.s bitops1.s
bitops1h.s bitops1h.s
bitops1s.s
bitops2.s bitops2.s
bitops2h.s bitops2h.s
bitops2s.s
bitops3.s bitops3.s
bitops3h.s bitops3h.s
bitops3s.s
bitops4.s bitops4.s
bitops4h.s bitops4h.s
bitops4s.s
branch.s branch.s
branchh.s branchh.s
branchs.s
cbranch.s cbranch.s
cbranchh.s cbranchh.s
cbranchs.s
cmpsi2.s cmpsi2.s
compare.s compare.s
compareh.s compareh.s
compares.s
decimal.s decimal.s
decimalh.s decimalh.s
decimals.s
divmul.s divmul.s
divmulh.s divmulh.s
divmuls.s
extendh.s extendh.s
extends.s
ffxx1.d ffxx1.d
ffxx1.s ffxx1.s
h8300.exp h8300.exp
incdec.s incdec.s
incdech.s incdech.s
incdecs.s
logical.s logical.s
logicalh.s logicalh.s
logicals.s
macs.s
misc.s misc.s
misch.s misch.s
miscs.s
mov32bug.s mov32bug.s
movb.s movb.s
movbh.s movbh.s
movbs.s
movlh.s movlh.s
movls.s
movw.s movw.s
movwh.s movwh.s
movws.s
multiples.s
pushpop.s pushpop.s
pushpoph.s pushpoph.s
pushpops.s
rotsh.s rotsh.s
rotshh.s rotshh.s
rotshs.s
Things-to-lose: Things-to-lose:

View File

@ -1245,8 +1245,6 @@ proc do_h8300h_extend {} {
if [expr $x == 4] then { pass $testname } else { fail $testname } if [expr $x == 4] then { pass $testname } else { fail $testname }
} }
# start-sanitize-h8s
proc do_h8300s_add_sub {} { proc do_h8300s_add_sub {} {
set testname "addsubs.s: h8300s add/sub tests" set testname "addsubs.s: h8300s add/sub tests"
set x 0 set x 0
@ -2086,7 +2084,6 @@ proc do_h8300s_multiple {} {
if [expr $x == 6] then { pass $testname } else { fail $testname } if [expr $x == 6] then { pass $testname } else { fail $testname }
} }
# end-sanitize-h8s
proc do_h8300h_mov32bug {} { proc do_h8300h_mov32bug {} {
set testname "mov32bug.s: h8300h mov32bug test" set testname "mov32bug.s: h8300h mov32bug test"
set x 0 set x 0
@ -2153,7 +2150,6 @@ if [istarget h8300*-*-*] then {
do_h8300h_rotate_shift do_h8300h_rotate_shift
do_h8300h_extend do_h8300h_extend
# start-sanitize-h8s
# Now test the h8300s instruction parser # Now test the h8300s instruction parser
do_h8300s_add_sub do_h8300s_add_sub
do_h8300s_logical do_h8300s_logical
@ -2177,7 +2173,6 @@ if [istarget h8300*-*-*] then {
do_h8300s_mac do_h8300s_mac
do_h8300s_multiple do_h8300s_multiple
# end-sanitize-h8s
do_h8300h_mov32bug do_h8300h_mov32bug
# Now some random tests # Now some random tests