espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-10 09:59:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

* h8300-dis.c: Fix formatting.

Browse Source 
(bfd_h8_disassemble): Distinguish adds/subs, inc/dec.[wl]
        correctly.
This commit is contained in:
Jeff Law
2000-06-12 22:23:25 +00:00
parent 2c8f79c2da
commit 53d388d148
2 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opcodes/ChangeLog
View File

@ -1,3 +1,9 @@
2000-06-12 Kazu Hirata <kazu@hxi.com>
* h8300-dis.c: Fix formatting.
(bfd_h8_disassemble): Distinguish adds/subs, inc/dec.[wl]
correctly.
Fri Jun 9 21:49:02 2000 Denis Chertykov <denisc@overta.ru> Fri Jun 9 21:49:02 2000 Denis Chertykov <denisc@overta.ru>
* avr-dis.c (avr_operand): Bugfix for jmp/call address. * avr-dis.c (avr_operand): Bugfix for jmp/call address.

24
opcodes/h8300-dis.c
View File

@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "dis-asm.h" #include "dis-asm.h"
#include "opintl.h" #include "opintl.h"
/* Run through the opcodes and sort them into order to make them easy /* Run through the opcodes and sort them into order to make them easy
to disassemble. */ to disassemble. */
static void static void
@ -50,7 +49,7 @@ bfd_h8_disassemble_init ()
/* Just make sure there are an even number of nibbles in it, and /* Just make sure there are an even number of nibbles in it, and
that the count is the same as the length. */ that the count is the same as the length. */
for (i = 0; p->data.nib[i] != E; i++) for (i = 0; p->data.nib[i] != E; i++)
/*EMPTY*/; ;
if (i & 1) if (i & 1)
abort (); abort ();
@ -59,7 +58,6 @@ bfd_h8_disassemble_init ()
} }
} }
unsigned int unsigned int
bfd_h8_disassemble (addr, info, mode) bfd_h8_disassemble (addr, info, mode)
bfd_vma addr; bfd_vma addr;
@ -111,7 +109,7 @@ bfd_h8_disassemble (addr, info, mode)
} }
for (l = 2; status == 0 && l < 10; l += 2) for (l = 2; status == 0 && l < 10; l += 2)
status = info->read_memory_func (addr + l, data+l, 2, info); status = info->read_memory_func (addr + l, data + l, 2, info);
/* Find the exact opcode/arg combo. */ /* Find the exact opcode/arg combo. */
while (q->name) while (q->name)
@ -137,7 +135,7 @@ bfd_h8_disassemble (addr, info, mode)
{ {
if ((int) looking_for & (int) B31) if ((int) looking_for & (int) B31)
{ {
if (! (((int) thisnib & 0x8) != 0)) if (!(((int) thisnib & 0x8) != 0))
goto fail; goto fail;
looking_for = (op_type) ((int) looking_for & ~(int) B31); looking_for = (op_type) ((int) looking_for & ~(int) B31);
@ -153,7 +151,10 @@ bfd_h8_disassemble (addr, info, mode)
if (looking_for & DBIT) if (looking_for & DBIT)
{ {
if ((looking_for & 2) != (thisnib & 2)) /* Exclude adds/subs by looking at bit 0 and 2, and
make sure the operand size, either w or l,
matches by looking at bit 1. */
if ((looking_for & 7) != (thisnib & 7))
goto fail; goto fail;
abs = (thisnib & 0x8) ? 2 : 1; abs = (thisnib & 0x8) ? 2 : 1;
@ -185,7 +186,7 @@ bfd_h8_disassemble (addr, info, mode)
abs = (data[i] << 24) abs = (data[i] << 24)
| (data[i + 1] << 16) | (data[i + 1] << 16)
| (data[i + 2] << 8) | (data[i + 2] << 8)
| (data[i+ 3]); | (data[i + 3]);
plen = 32; plen = 32;
} }
@ -351,20 +352,22 @@ bfd_h8_disassemble (addr, info, mode)
{ {
abs += 2; abs += 2;
fprintf (stream, fprintf (stream,
".%s%d (%x)", (short) abs > 0 ? "+" : "", ".%s%d (%x)",
(short) abs > 0 ? "+" : "",
(short) abs, addr + (short) abs + 2); (short) abs, addr + (short) abs + 2);
} }
else else
{ {
fprintf (stream, fprintf (stream,
".%s%d (%x)", (char) abs > 0 ? "+" : "", ".%s%d (%x)",
(char) abs > 0 ? "+" : "",
(char) abs, addr + (char) abs + 2); (char) abs, addr + (char) abs + 2);
} }
} }
else if (x & DISP) else if (x & DISP)
{ {
fprintf (stream, "@(0x%x:%d,%s)", fprintf (stream, "@(0x%x:%d,%s)",
abs,plen, pregnames[rdisp]); abs, plen, pregnames[rdisp]);
} }
else if (x & CCR) else if (x & CCR)
{ {
@ -402,7 +405,6 @@ bfd_h8_disassemble (addr, info, mode)
fprintf (stream, "%02x %02x .word\tH'%x,H'%x", fprintf (stream, "%02x %02x .word\tH'%x,H'%x",
data[0], data[1], data[0], data[1],
data[0], data[1]); data[0], data[1]);
return 2; return 2;
} }