diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/h8300-dis.c | 125 |
2 files changed, 56 insertions, 75 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index a2c890f..c7205c9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2000-06-01 Kazu Hirata <kazu@hxi.com> + + * h8300-dis.c (bfd_h8_disassemble_init): Fix a typo. + (bfd_h8_disassemble): Distinguish the operand size of inc/dev.[wl] + correctly. Fix a typo. + 2000-05-31 Nick Clifton <nickc@cygnus.com> * opintl.h (_(String)): Explain why dgettext is used instead of diff --git a/opcodes/h8300-dis.c b/opcodes/h8300-dis.c index 435d4c0..180f600 100644 --- a/opcodes/h8300-dis.c +++ b/opcodes/h8300-dis.c @@ -1,5 +1,5 @@ /* Disassemble h8300 instructions. - Copyright (C) 1993, 1998 Free Software Foundation, Inc. + Copyright (C) 1993, 1998, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,14 +25,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Run through the opcodes and sort them into order to make them easy - to disassemble - */ + to disassemble. */ static void bfd_h8_disassemble_init () { unsigned int i; - - struct h8_opcode *p; for (p = h8_opcodes; p->name; p++) @@ -46,6 +43,7 @@ bfd_h8_disassemble_init () } else n1 = 0; + if ((int) p->data.nib[1] < 16) { n2 = (int) p->data.nib[1]; @@ -54,14 +52,15 @@ bfd_h8_disassemble_init () n2 = 0; /* Just make sure there are an even number of nibbles in it, and - that the count is the same s the length */ + that the count is the same as the length. */ for (i = 0; p->data.nib[i] != E; i++) /*EMPTY*/ ; + if (i & 1) abort (); + p->length = i / 2; } - } @@ -71,24 +70,23 @@ bfd_h8_disassemble (addr, info, mode) disassemble_info *info; 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[] = { "r0h", "r1h", "r2h", "r3h", "r4h", "r5h", "r6h", "r7h", - "r0l", "r1l", "r2l", "r3l", "r4l", "r5l", "r6l", "r7l"}; - + "r0l", "r1l", "r2l", "r3l", "r4l", "r5l", "r6l", "r7l" + }; static CONST char *wregnames[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7" - }; + }; static CONST char *lregnames[] = { "er0", "er1", "er2", "er3", "er4", "er5", "er6", "er7", "er0", "er1", "er2", "er3", "er4", "er5", "er6", "er7" - } - ; + }; int rs = 0; int rd = 0; @@ -101,7 +99,6 @@ bfd_h8_disassemble (addr, info, mode) char CONST **pregnames = mode != 0 ? lregnames : wregnames; int status; int l; - unsigned char data[20]; void *stream = info->stream; fprintf_ftype fprintf = info->fprintf_func; @@ -112,20 +109,17 @@ bfd_h8_disassemble (addr, info, mode) init = 1; } - status = info->read_memory_func(addr, data, 2, info); + status = info->read_memory_func (addr, data, 2, info); if (status != 0) { - info->memory_error_func(status, addr, info); + info->memory_error_func (status, addr, info); return -1; } - for (l = 2; status == 0 && l < 10; l+=2) - { - status = info->read_memory_func(addr+l, data+l, 2, info); - } - + for (l = 2; status == 0 && l < 10; l += 2) + 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) { op_type *nib; @@ -142,20 +136,18 @@ bfd_h8_disassemble (addr, info, mode) if (looking_for < 16 && looking_for >=0) { - if (looking_for != thisnib) goto fail; } - else { - if ((int) looking_for & (int) B31) { if (! (((int) thisnib & 0x8) != 0)) goto fail; looking_for = (op_type) ((int) looking_for & ~(int) B31); } + if ((int) looking_for & (int) B30) { if (!(((int) thisnib & 0x8) == 0)) @@ -165,48 +157,43 @@ bfd_h8_disassemble (addr, info, mode) if (looking_for & DBIT) { - if ((looking_for & 5) != (thisnib & 5)) goto fail; + if ((looking_for & 2) != (thisnib & 2)) + goto fail; abs = (thisnib & 0x8) ? 2 : 1; } - else if (looking_for & (REG | IND|INC|DEC)) { if (looking_for & SRC) - { - rs = thisnib; - } + rs = thisnib; else - { - rd = thisnib; - } + rd = thisnib; } else if (looking_for & L_16) { abs = (data[len >> 1]) * 256 + data[(len + 2) >> 1]; plen = 16; - } - else if(looking_for & ABSJMP) + else if (looking_for & ABSJMP) { abs = (data[1] << 16) | (data[2] << 8) | (data[3]); } - else if(looking_for & MEMIND) + else if (looking_for & MEMIND) { abs = data[1]; } else if (looking_for & L_32) { int i = len >> 1; + abs = (data[i] << 24) | (data[i + 1] << 16) | (data[i + 2] << 8) | (data[i+ 3]); - plen =32; - + plen = 32; } else if (looking_for & L_24) { @@ -216,7 +203,7 @@ bfd_h8_disassemble (addr, info, mode) } else if (looking_for & IGNORE) { - + ; } else if (looking_for & DISPREG) { @@ -259,19 +246,14 @@ bfd_h8_disassemble (addr, info, mode) } else if (looking_for == E) { + int i; - { - int i; - - for (i = 0; i < q->length; i++) - { - fprintf (stream, "%02x ", data[i]); - } - for (; i < 6; i++) - { - fprintf (stream, " "); - } - } + for (i = 0; i < q->length; i++) + fprintf (stream, "%02x ", data[i]); + + for (; i < 6; i++) + fprintf (stream, " "); + fprintf (stream, "%s\t", q->name); /* Gross. Disgusting. */ @@ -297,19 +279,18 @@ bfd_h8_disassemble (addr, info, mode) return q->length; } - /* Fill in the args */ + /* Fill in the args. */ { op_type *args = q->args.nib; int hadone = 0; - while (*args != E) { int x = *args; + if (hadone) fprintf (stream, ","); - if (x & L_3) { fprintf (stream, "#0x%x", (unsigned) bit); @@ -325,6 +306,7 @@ bfd_h8_disassemble (addr, info, mode) else if (x & REG) { int rn = (x & DST) ? rd : rs; + switch (x & SIZE) { case L_8: @@ -337,7 +319,6 @@ bfd_h8_disassemble (addr, info, mode) case L_32: fprintf (stream, "%s", lregnames[rn]); break; - } } else if (x & MACREG) @@ -352,46 +333,41 @@ bfd_h8_disassemble (addr, info, mode) { fprintf (stream, "@-%s", pregnames[rd]); } - else if (x & IND) { int rn = (x & DST) ? rd : rs; fprintf (stream, "@%s", pregnames[rn]); } - else if (x & ABS8MEM) { fprintf (stream, "@0x%x:8", (unsigned) abs); } - else if (x & (ABS|ABSJMP)) { fprintf (stream, "@0x%x:%d", (unsigned) abs, plen); } - else if (x & MEMIND) { fprintf (stream, "@@%d (%x)", abs, abs); } - else if (x & PCREL) { if (x & L_16) { - abs +=2; + 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 + { + fprintf (stream, ".%s%d (%x)", (char) abs > 0 ? "+" : "", (char) abs, + addr + (char) abs + 2); + } } else if (x & DISP) { fprintf (stream, "@(0x%x:%d,%s)", abs,plen, pregnames[rdisp]); } - else if (x & CCR) { fprintf (stream, "ccr"); @@ -403,14 +379,13 @@ bfd_h8_disassemble (addr, info, mode) else /* xgettext:c-format */ fprintf (stream, _("Hmmmm %x"), x); + hadone = 1; args++; } } return q->length; } - - else { /* xgettext:c-format */ @@ -426,7 +401,7 @@ bfd_h8_disassemble (addr, info, mode) q++; } - /* Fell of the end */ + /* Fell of the end. */ fprintf (stream, "%02x %02x .word\tH'%x,H'%x", data[0], data[1], data[0], data[1]); @@ -435,24 +410,24 @@ bfd_h8_disassemble (addr, info, mode) int print_insn_h8300 (addr, info) -bfd_vma addr; -disassemble_info *info; + bfd_vma addr; + disassemble_info *info; { return bfd_h8_disassemble (addr, info , 0); } int print_insn_h8300h (addr, info) -bfd_vma addr; -disassemble_info *info; + bfd_vma addr; + disassemble_info *info; { return bfd_h8_disassemble (addr, info , 1); } int print_insn_h8300s (addr, info) -bfd_vma addr; -disassemble_info *info; + bfd_vma addr; + disassemble_info *info; { return bfd_h8_disassemble (addr, info , 2); } |