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

Fix formatting.

Browse Source
This commit is contained in:
Nick Clifton 2000-07-03 21:52:37 +00:00
parent 2bfa91eece
commit c07ab2ec0c
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opcodes/ChangeLog
View File

@ -1,3 +1,8 @@
2000-07-03 Kazu Hirata <kazu@hxi.com>
* h8300-dis.c (bfd_h8_disassemble): Improve readability.
* h8500-dis.c: Fix formatting.
2000-07-01 Alan Modra <alan@linuxcare.com.au> 2000-07-01 Alan Modra <alan@linuxcare.com.au>
* Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed

10
opcodes/h8300-dis.c
View File

@ -87,7 +87,7 @@ bfd_h8_disassemble (addr, info, mode)
int bit = 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;
char CONST **pregnames = mode != 0 ? lregnames : wregnames; char CONST **pregnames = mode != 0 ? lregnames : wregnames;
int status; int status;
int l; int l;
@ -112,13 +112,11 @@ bfd_h8_disassemble (addr, info, mode)
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) for (q = h8_opcodes; q->name; q++)
{ {
op_type *nib; op_type *nib = q->data.nib;
unsigned int len = 0; unsigned int len = 0;
nib = q->data.nib;
while (1) while (1)
{ {
op_type looking_for = *nib; op_type looking_for = *nib;
@ -398,7 +396,7 @@ bfd_h8_disassemble (addr, info, mode)
} }
fail: fail:
q++; ;
} }
/* Fell off the end. */ /* Fell off the end. */

46
opcodes/h8500-dis.c
View File

@ -69,8 +69,7 @@ fetch_data (info, addr)
return 1; return 1;
} }
static char *crname[] = static char *crname[] = { "sr", "ccr", "*", "br", "ep", "dp", "*", "tp" };
{"sr", "ccr", "*", "br", "ep", "dp", "*", "tp"};
int int
print_insn_h8500 (addr, info) print_insn_h8500 (addr, info)
@ -91,21 +90,22 @@ print_insn_h8500 (addr, info)
/* Error return. */ /* Error return. */
return -1; return -1;
if (0) { if (0)
static int one; {
if (!one ) static int one;
{
one = 1;
for (opcode = h8500_table; opcode->name; opcode++)
{
if ((opcode->bytes[0].contents & 0x8) == 0)
printf("%s\n", opcode->name);
}
}
}
if (!one)
{
one = 1;
for (opcode = h8500_table; opcode->name; opcode++)
{
if ((opcode->bytes[0].contents & 0x8) == 0)
printf ("%s\n", opcode->name);
}
}
}
/* Run down the table to find the one which matches */ /* Run down the table to find the one which matches. */
for (opcode = h8500_table; opcode->name; opcode++) for (opcode = h8500_table; opcode->name; opcode++)
{ {
int byte; int byte;
@ -119,6 +119,7 @@ if (0) {
int qim = 0; int qim = 0;
int i; int i;
int cr = 0; int cr = 0;
for (byte = 0; byte < opcode->length; byte++) for (byte = 0; byte < opcode->length; byte++)
{ {
FETCH_DATA (info, buffer + byte + 1); FETCH_DATA (info, buffer + byte + 1);
@ -129,7 +130,7 @@ if (0) {
} }
else else
{ {
/* extract any info parts */ /* Extract any info parts. */
switch (opcode->bytes[byte].insert) switch (opcode->bytes[byte].insert)
{ {
case 0: case 0:
@ -221,8 +222,8 @@ if (0) {
} }
} }
} }
/* We get here when all the masks have passed so we can output the /* We get here when all the masks have passed so we can output
operands*/ the operands. */
FETCH_DATA (info, buffer + opcode->length); FETCH_DATA (info, buffer + opcode->length);
for (i = 0; i < opcode->length; i++) for (i = 0; i < opcode->length; i++)
{ {
@ -322,7 +323,8 @@ if (0) {
func (stream, "#0x%0x:8", imm & 0xff); func (stream, "#0x%0x:8", imm & 0xff);
break; break;
case PCREL16: case PCREL16:
func (stream, "0x%0x:16", (pcrel + addr + opcode->length) & 0xffff); func (stream, "0x%0x:16",
(pcrel + addr + opcode->length) & 0xffff);
break; break;
case PCREL8: case PCREL8:
func (stream, "#0x%0x:8", func (stream, "#0x%0x:8",
@ -337,12 +339,12 @@ if (0) {
} }
} }
return opcode->length; return opcode->length;
next:; next:
;
} }
/* Couldn't understand anything */ /* Couldn't understand anything. */
/* xgettext:c-format */ /* xgettext:c-format */
func (stream, _("%02x\t\t*unknown*"), buffer[0]); func (stream, _("%02x\t\t*unknown*"), buffer[0]);
return 1; return 1;
} }