diff options
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rw-r--r-- | opcodes/w65-dis.c | 69 |
2 files changed, 38 insertions, 35 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index ef0cdb8..66f458b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2000-08-29 Kazu Hirata <kazu@hxi.com> + + * w65-dis.c: Fix formatting. + 2000-08-28 Jim Wilson <wilson@cygnus.com> * ia64-dis.c (print_insn_ia64): Add failed label after ia64_free_opcode diff --git a/opcodes/w65-dis.c b/opcodes/w65-dis.c index 309bd5a..c9771d5 100644 --- a/opcodes/w65-dis.c +++ b/opcodes/w65-dis.c @@ -1,5 +1,5 @@ /* Disassemble WDC 65816 instructions. - Copyright (C) 1995, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 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 @@ -23,13 +23,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "w65-opc.h" #include "dis-asm.h" -static fprintf_ftype fpr; -static void *stream; -static struct disassemble_info *local_info; +static fprintf_ftype fpr; +static void *stream; +static struct disassemble_info *local_info; #if 0 -static char *lname[] = {"r0","r1","r2","r3","r4","r5","r6","r7","s0"}; +static char *lname[] = { "r0","r1","r2","r3","r4","r5","r6","r7","s0" }; -static char *findname (val) +static char * +findname (val) unsigned int val; { if (val >= 0x10 && val <= 0x20) @@ -41,79 +42,77 @@ static void print_operand (lookup, format, args) int lookup; char *format; - unsigned int *args; + unsigned int *args; { int val; int c; while (*format) { - switch ( c = *format++) + switch (c = *format++) { case '$': val = args[(*format++) - '0']; - if (lookup) + if (lookup) { #if 0 - name = findname(val); + name = findname (val); if (name) - fpr(stream, "%s", name); + fpr (stream, "%s", name); else #endif - local_info->print_address_func (val, local_info); + local_info->print_address_func (val, local_info); } else fpr (stream, "0x%x", val); break; default: - fpr(stream,"%c", c); + fpr (stream, "%c", c); break; } } } -int -print_insn_w65(memaddr, info) + +int +print_insn_w65 (memaddr, info) bfd_vma memaddr; struct disassemble_info *info; { - - int status = 0; unsigned char insn[4]; register struct opinfo *op; int i; - int X =0; + int X = 0; int M = 0; int args[2]; -stream = info->stream; + stream = info->stream; fpr = info->fprintf_func; -local_info = info; - for (i = 0; i <4 && status == 0; i++) + local_info = info; + for (i = 0; i < 4 && status == 0; i++) { - status = info->read_memory_func(memaddr+i, insn + i, 1, info); - } - + status = info->read_memory_func (memaddr + i, insn + i, 1, info); + } - for (op = optable; op->val != insn[0]; op++) + for (op = optable; op->val != insn[0]; op++) ; - fpr(stream,"%s", op->name); - - /* Prepare all the posible operand values */ + fpr (stream, "%s", op->name); + + /* Prepare all the posible operand values. */ { int size = 1; int asR_W65_ABS8 = insn[1]; int asR_W65_ABS16 = (insn[2] << 8) + asR_W65_ABS8; int asR_W65_ABS24 = (insn[3] << 16) + asR_W65_ABS16; - int asR_W65_PCR8 = ((char)(asR_W65_ABS8)) + memaddr + 2; - int asR_W65_PCR16 = ((short)(asR_W65_ABS16)) + memaddr + 3; + int asR_W65_PCR8 = ((char) (asR_W65_ABS8)) + memaddr + 2; + int asR_W65_PCR16 = ((short) (asR_W65_ABS16)) + memaddr + 3; - switch (op->amode) { - DISASM(); - } + switch (op->amode) + { + DISASM (); + } - return size; + return size; } - } |