OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No longer need to sanitize away h8s stuff.

This commit is contained in:
Jeff Law 1996-07-05 18:59:31 +00:00
parent cce8528df9
commit 25b344a4a2
8 changed files with 47 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
opcodes/.Sanitize
View File

@ -105,34 +105,6 @@ else
done done
fi fi
h8s_files="ChangeLog disassemble.c h8300-dis.c"
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

5
opcodes/ChangeLog
View File

@ -1,5 +1,7 @@
Thu Jul 4 11:42:51 1996 Ian Lance Taylor <ian@cygnus.com> Thu Jul 4 11:42:51 1996 Ian Lance Taylor <ian@cygnus.com>
* Released binutils 2.7.
* alpha-opc.c: Correct second case of "mov" to use OPRL. * alpha-opc.c: Correct second case of "mov" to use OPRL.
Wed Jul 3 16:03:47 1996 Stu Grossman (grossman@critters.cygnus.com) Wed Jul 3 16:03:47 1996 Stu Grossman (grossman@critters.cygnus.com)
@ -49,10 +51,9 @@ Tue Jun 18 15:58:27 1996 Jeffrey A. Law <law@rtl.cygnus.com>
* h8300-dis.c (bfd_h8_disassemble): Rename "hmode" argument * h8300-dis.c (bfd_h8_disassemble): Rename "hmode" argument
to just "mode". to just "mode".
start-sanitize-h8s
* disassemble.c (disassembler): Handle H8/S. * disassemble.c (disassembler): Handle H8/S.
* h8300-dis.c (print_insn_h8300s): New function for H8/S. * h8300-dis.c (print_insn_h8300s): New function for H8/S.
end-sanitize-h8s
Tue Jun 18 18:06:50 1996 Ian Lance Taylor <ian@cygnus.com> Tue Jun 18 18:06:50 1996 Ian Lance Taylor <ian@cygnus.com>
* sparc-opc.c: Add beq/teq as aliases for be/te. * sparc-opc.c: Add beq/teq as aliases for be/te.

8
opcodes/disassemble.c
View File

@ -86,6 +86,8 @@ disassembler (abfd)
case bfd_arch_h8300: case bfd_arch_h8300:
if (bfd_get_mach(abfd) == bfd_mach_h8300h) if (bfd_get_mach(abfd) == bfd_mach_h8300h)
disassemble = print_insn_h8300h; disassemble = print_insn_h8300h;
else if (bfd_get_mach(abfd) == bfd_mach_h8300s)
disassemble = print_insn_h8300s;
else else
disassemble = print_insn_h8300; disassemble = print_insn_h8300;
break; break;
@ -156,11 +158,7 @@ disassembler (abfd)
#endif #endif
#ifdef ARCH_sparc #ifdef ARCH_sparc
case bfd_arch_sparc: case bfd_arch_sparc:
if (bfd_get_mach (abfd) == bfd_mach_sparc_v9 disassemble = print_insn_sparc;
|| bfd_get_mach (abfd) == bfd_mach_sparc_v9a)
disassemble = print_insn_sparc64;
else
disassemble = print_insn_sparc;
break; break;
#endif #endif
#ifdef ARCH_w65 #ifdef ARCH_w65

52
opcodes/h8300-dis.c
View File

@ -13,7 +13,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define DEFINE_TABLE #define DEFINE_TABLE
@ -64,10 +64,10 @@ bfd_h8_disassemble_init ()
unsigned int unsigned int
bfd_h8_disassemble (addr, info, hmode) bfd_h8_disassemble (addr, info, mode)
bfd_vma addr; bfd_vma addr;
disassemble_info *info; disassemble_info *info;
int hmode; int mode;
{ {
/* Find the first entry in the table for this opcode */ /* Find the first entry in the table for this opcode */
static CONST char *regnames[] = static CONST char *regnames[] =
@ -92,10 +92,11 @@ bfd_h8_disassemble (addr, info, hmode)
int rd = 0; int rd = 0;
int rdisp = 0; int rdisp = 0;
int abs = 0; int abs = 0;
int bit = 0;
int plen = 0; int plen = 0;
static boolean init = 0; static boolean init = 0;
struct h8_opcode *q = h8_opcodes; struct h8_opcode *q = h8_opcodes;
char CONST **pregnames = hmode ? lregnames : wregnames; char CONST **pregnames = mode != 0 ? lregnames : wregnames;
int status; int status;
int l; int l;
@ -243,7 +244,11 @@ bfd_h8_disassemble (addr, info, hmode)
else if (looking_for & L_3) else if (looking_for & L_3)
{ {
plen = 3; plen = 3;
bit = thisnib;
}
else if (looking_for & L_2)
{
plen = 2;
abs = thisnib; abs = thisnib;
} }
else if (looking_for == E) else if (looking_for == E)
@ -275,9 +280,12 @@ bfd_h8_disassemble (addr, info, hmode)
fprintf (stream, ","); fprintf (stream, ",");
if (x & (IMM|KBIT|DBIT)) if (x & L_3)
{
fprintf (stream, "#0x%x", (unsigned) bit);
}
else if (x & (IMM|KBIT|DBIT))
{ {
fprintf (stream, "#0x%x", (unsigned) abs); fprintf (stream, "#0x%x", (unsigned) abs);
} }
else if (x & REG) else if (x & REG)
@ -314,7 +322,12 @@ bfd_h8_disassemble (addr, info, hmode)
fprintf (stream, "@%s", pregnames[rn]); fprintf (stream, "@%s", pregnames[rn]);
} }
else if (x & (ABS|ABSJMP|ABSMOV)) else if (x & ABS8MEM)
{
fprintf (stream, "@0x%x:8", (unsigned) abs);
}
else if (x & (ABS|ABSJMP))
{ {
fprintf (stream, "@0x%x:%d", (unsigned) abs, plen); fprintf (stream, "@0x%x:%d", (unsigned) abs, plen);
} }
@ -326,10 +339,16 @@ bfd_h8_disassemble (addr, info, hmode)
else if (x & PCREL) else if (x & PCREL)
{ {
if (x & L_16) if (x & L_16)
abs +=2; {
fprintf (stream, ".%s%d (%x)", (char) abs > 0 ? "+" : "", (char) abs, abs +=2;
addr + (char) abs + 2); fprintf (stream, ".%s%d (%x)", (short) abs > 0 ? "+" : "", (short) abs,
addr + (short) abs + 2);
}
else {
fprintf (stream, ".%s%d (%x)", (char) abs > 0 ? "+" : "", (char) abs,
addr + (char) abs + 2);
}
} }
else if (x & DISP) else if (x & DISP)
{ {
@ -381,7 +400,7 @@ disassemble_info *info;
return bfd_h8_disassemble (addr, info , 0); return bfd_h8_disassemble (addr, info , 0);
} }
int int
print_insn_h8300h (addr, info) print_insn_h8300h (addr, info)
bfd_vma addr; bfd_vma addr;
disassemble_info *info; disassemble_info *info;
@ -389,3 +408,10 @@ disassemble_info *info;
return bfd_h8_disassemble (addr, info , 1); return bfd_h8_disassemble (addr, info , 1);
} }
int
print_insn_h8300s (addr, info)
bfd_vma addr;
disassemble_info *info;
{
return bfd_h8_disassemble (addr, info , 2);
}

27
sim/h8300/.Sanitize
View File

@ -17,33 +17,6 @@
Do-first: Do-first:
h8s_files="ChangeLog compile.c run.c"
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
# 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

4
sim/h8300/ChangeLog
View File

@ -9,7 +9,6 @@ Tue Jul 2 23:08:45 1996 Jeffrey A Law (law@cygnus.com)
by two bits. by two bits.
(OSHIFTS): Corresponding changes. (OSHIFTS): Corresponding changes.
start-sanitize-h8s
Tue Jul 2 01:37:27 1996 Jeffrey A Law (law@cygnus.com) Tue Jul 2 01:37:27 1996 Jeffrey A Law (law@cygnus.com)
* compile.c (sim_resume): Handle "ldm.l" and "stm.l". * compile.c (sim_resume): Handle "ldm.l" and "stm.l".
@ -18,7 +17,6 @@ Wed Jun 26 08:58:53 1996 Jeffrey A Law (law@cygnus.com)
* compile.c (h8300smode): Declare. * compile.c (h8300smode): Declare.
end-sanitize-h8s
Wed Jun 26 12:20:56 1996 Jason Molenda (crash@godzilla.cygnus.co.jp) Wed Jun 26 12:20:56 1996 Jason Molenda (crash@godzilla.cygnus.co.jp)
* Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir, * Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir,
@ -28,13 +26,11 @@ Wed Jun 26 12:20:56 1996 Jason Molenda (crash@godzilla.cygnus.co.jp)
(AC_PROG_INSTALL): Added. (AC_PROG_INSTALL): Added.
* configure: Rebuilt. * configure: Rebuilt.
start-sanitize-h8s
Tue Jun 18 16:31:10 1996 Jeffrey A. Law <law@rtl.cygnus.com> Tue Jun 18 16:31:10 1996 Jeffrey A. Law <law@rtl.cygnus.com>
* compile.c (sim_load): Treat the H8/S like the H8/300H for now. * compile.c (sim_load): Treat the H8/S like the H8/300H for now.
* run.c (main): Treat the H8/S like the H8/300H for now. * run.c (main): Treat the H8/S like the H8/300H for now.
end-sanitize-h8s
Fri May 24 10:35:25 1996 Jeffrey A Law (law@cygnus.com) Fri May 24 10:35:25 1996 Jeffrey A Law (law@cygnus.com)
* compile.c (SEXTCHAR): Clear upper bits when sign * compile.c (SEXTCHAR): Clear upper bits when sign

9
sim/h8300/compile.c
View File

@ -84,9 +84,7 @@ int debug;
static cpu_state_type cpu; static cpu_state_type cpu;
int h8300hmode = 0; int h8300hmode = 0;
/* start-sanitize-h8s */
int h8300smode = 0; int h8300smode = 0;
/* end-sanitize-h8s */
static int memory_size; static int memory_size;
@ -1467,7 +1465,6 @@ sim_resume (step, siggnal)
case O (O_NOP, SB): case O (O_NOP, SB):
goto next; goto next;
/* start-sanitize-h8s */
case O (O_STM, SL): case O (O_STM, SL):
{ {
int nregs, firstreg, i; int nregs, firstreg, i;
@ -1502,7 +1499,6 @@ sim_resume (step, siggnal)
} }
goto next; goto next;
/* end-sanitize-h8s */
default: default:
cpu.exception = SIGILL; cpu.exception = SIGILL;
goto end; goto end;
@ -1973,10 +1969,7 @@ sim_load (prog, from_tty)
if (bfd_check_format (abfd, bfd_object)) if (bfd_check_format (abfd, bfd_object))
{ {
set_h8300h (abfd->arch_info->mach == bfd_mach_h8300h set_h8300h (abfd->arch_info->mach == bfd_mach_h8300h
/* start-sanitize-h8s */ || abfd->arch_info->mach == bfd_mach_h8300s);
|| abfd->arch_info->mach == bfd_mach_h8300s
/* end-sanitize-h8s */
);
} }
bfd_close (abfd); bfd_close (abfd);
} }

5
sim/h8300/run.c
View File

@ -90,10 +90,7 @@ main (ac, av)
} }
if (abfd->arch_info->mach == bfd_mach_h8300h if (abfd->arch_info->mach == bfd_mach_h8300h
/* start-sanitize-h8s */ || abfd->arch_info->mach == bfd_mach_h8300s)
|| abfd->arch_info->mach == bfd_mach_h8300s
/* end-sanitize-h8s */
)
set_h8300h (1); set_h8300h (1);
for (s = abfd->sections; s; s=s->next) for (s = abfd->sections; s; s=s->next)