--- src/opcodes/h8300-dis.c Thu Jun 1 14:19:59 2000 +++ src-new/opcodes/h8300-dis.c Thu Jun 1 19:24:41 2000 @@ -43,7 +43,7 @@ } else n1 = 0; - + if ((int) p->data.nib[1] < 16) { n2 = (int) p->data.nib[1]; @@ -54,11 +54,11 @@ /* Just make sure there are an even number of nibbles in it, and that the count is the same as the length. */ for (i = 0; p->data.nib[i] != E; i++) - /*EMPTY*/ ; - + /*EMPTY*/; + if (i & 1) abort (); - + p->length = i / 2; } } @@ -81,7 +81,6 @@ "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", @@ -99,7 +98,7 @@ char CONST **pregnames = mode != 0 ? lregnames : wregnames; int status; int l; - unsigned char data[20]; + unsigned char data[20]; void *stream = info->stream; fprintf_ftype fprintf = info->fprintf_func; @@ -110,14 +109,14 @@ } status = info->read_memory_func (addr, data, 2, info); - if (status != 0) + if (status != 0) { 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); + status = info->read_memory_func (addr + l, data + l, 2, info); /* Find the exact opcode/arg combo. */ while (q->name) @@ -126,31 +125,31 @@ unsigned int len = 0; nib = q->data.nib; - + while (1) { op_type looking_for = *nib; int thisnib = data[len >> 1]; - + thisnib = (len & 1) ? (thisnib & 0xf) : ((thisnib >> 4) & 0xf); - - if (looking_for < 16 && looking_for >=0) + + if (looking_for < 16 && looking_for >= 0) { - if (looking_for != thisnib) + if (looking_for != thisnib) goto fail; } - else + else { if ((int) looking_for & (int) B31) { - if (! (((int) thisnib & 0x8) != 0)) + 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)) + if (!(((int) thisnib & 0x8) == 0)) goto fail; looking_for = (op_type) ((int) looking_for & ~(int) B30); } @@ -160,8 +159,8 @@ if ((looking_for & 2) != (thisnib & 2)) goto fail; abs = (thisnib & 0x8) ? 2 : 1; - } - else if (looking_for & (REG | IND|INC|DEC)) + } + else if (looking_for & (REG | IND | INC | DEC)) { if (looking_for & SRC) rs = thisnib; @@ -175,10 +174,7 @@ } else if (looking_for & ABSJMP) { - abs = - (data[1] << 16) - | (data[2] << 8) - | (data[3]); + abs = (data[1] << 16) | (data[2] << 8) | (data[3]); } else if (looking_for & MEMIND) { @@ -187,19 +183,19 @@ 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]); + | (data[i + 2] << 8) + | (data[i + 3]); plen = 32; } else if (looking_for & L_24) { int i = len >> 1; - abs = (data[i] << 16) | (data[i + 1] << 8)| (data[i+2]); - plen =24; + abs = (data[i] << 16) | (data[i + 1] << 8) | (data[i + 2]); + plen = 24; } else if (looking_for & IGNORE) { @@ -211,7 +207,7 @@ } else if (looking_for & KBIT) { - switch (thisnib) + switch (thisnib) { case 9: abs = 4; @@ -228,7 +224,7 @@ } else if (looking_for & L_8) { - plen = 8; + plen = 8; abs = data[len >> 1]; } else if (looking_for & L_3) @@ -250,10 +246,10 @@ 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. */ @@ -287,7 +283,7 @@ while (*args != E) { int x = *args; - + if (hadone) fprintf (stream, ","); @@ -295,10 +291,10 @@ { fprintf (stream, "#0x%x", (unsigned) bit); } - else if (x & (IMM|KBIT|DBIT)) + else if (x & (IMM | KBIT | DBIT)) { /* Bletch. For shal #2,er0 and friends. */ - if (*(args+1) & SRC_IN_DST) + if (*(args + 1) & SRC_IN_DST) abs = 2; fprintf (stream, "#0x%x", (unsigned) abs); @@ -306,7 +302,7 @@ else if (x & REG) { int rn = (x & DST) ? rd : rs; - + switch (x & SIZE) { case L_8: @@ -342,7 +338,7 @@ { fprintf (stream, "@0x%x:8", (unsigned) abs); } - else if (x & (ABS|ABSJMP)) + else if (x & (ABS | ABSJMP)) { fprintf (stream, "@0x%x:%d", (unsigned) abs, plen); } @@ -352,21 +348,26 @@ } else if (x & PCREL) { - if (x & L_16) + if (x & L_16) { abs += 2; - fprintf (stream, ".%s%d (%x)", (short) abs > 0 ? "+" : "", (short) abs, + 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, + 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]); + fprintf (stream, "@(0x%x:%d,%s)", + abs, plen, pregnames[rdisp]); } else if (x & CCR) { @@ -379,7 +380,7 @@ else /* xgettext:c-format */ fprintf (stream, _("Hmmmm %x"), x); - + hadone = 1; args++; } @@ -392,42 +393,42 @@ fprintf (stream, _("Don't understand %x \n"), looking_for); } } - + len++; nib++; } - + fail: q++; } - /* Fell of the end. */ + /* Fell off the end. */ fprintf (stream, "%02x %02x .word\tH'%x,H'%x", data[0], data[1], data[0], data[1]); return 2; } -int +int print_insn_h8300 (addr, info) - bfd_vma addr; + bfd_vma addr; disassemble_info *info; { - return bfd_h8_disassemble (addr, info , 0); + return bfd_h8_disassemble (addr, info, 0); } -int +int print_insn_h8300h (addr, info) bfd_vma addr; disassemble_info *info; { - return bfd_h8_disassemble (addr, info , 1); + return bfd_h8_disassemble (addr, info, 1); } -int +int print_insn_h8300s (addr, info) bfd_vma addr; disassemble_info *info; { - return bfd_h8_disassemble (addr, info , 2); + return bfd_h8_disassemble (addr, info, 2); }