X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fpj-dis.c;h=c75644c35dd6d2e028d010c567af39699347774e;hb=8535fe175a8039d33e9d13dd425abbd6d71ed648;hp=f93bbee362ae12bff2a1736988528da7a7f048e5;hpb=0d8dfecfe98596d2999f2616d7f2b904260022cc;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/pj-dis.c b/opcodes/pj-dis.c index f93bbee362..c75644c35d 100644 --- a/opcodes/pj-dis.c +++ b/opcodes/pj-dis.c @@ -1,21 +1,21 @@ /* pj-dis.c -- Disassemble picoJava instructions. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. Contributed by Steve Chamberlain, of Transmeta (sac@pobox.com). -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 -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ #include #include "sysdep.h" @@ -24,27 +24,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ extern const pj_opc_info_t pj_opc_info[512]; -static int get_int (memaddr, iptr, info) - bfd_vma memaddr; - int *iptr; - struct disassemble_info *info; +static int +get_int (bfd_vma memaddr, int *iptr, struct disassemble_info *info) { unsigned char ival[4]; - int status = info->read_memory_func (memaddr, ival, 4, info); - *iptr = (ival[0] << 24) - | (ival[1] << 16) - | (ival[2] << 8) - | (ival[3] << 0) ; + *iptr = (ival[0] << 24) + | (ival[1] << 16) + | (ival[2] << 8) + | (ival[3] << 0); return status; } int -print_insn_pj (addr, info) - bfd_vma addr; - struct disassemble_info *info; +print_insn_pj (bfd_vma addr, struct disassemble_info *info) { fprintf_ftype fprintf_fn = info->fprintf_func; void *stream = info->stream; @@ -57,9 +52,10 @@ print_insn_pj (addr, info) if (opcode == 0xff) { unsigned char byte_2; + if ((status = info->read_memory_func (addr + 1, &byte_2, 1, info))) goto fail; - fprintf_fn (stream, "%s\t", pj_opc_info[opcode + byte_2].name); + fprintf_fn (stream, "%s\t", pj_opc_info[opcode + byte_2].u.name); return 2; } else @@ -68,13 +64,14 @@ print_insn_pj (addr, info) int insn_start = addr; const pj_opc_info_t *op = &pj_opc_info[opcode]; int a; + addr++; - fprintf_fn (stream, "%s", op->name); + fprintf_fn (stream, "%s", op->u.name); /* The tableswitch instruction is followed by the default - address, low value, high value and the destinations. */ + address, low value, high value and the destinations. */ - if (strcmp (op->name, "tableswitch") == 0) + if (strcmp (op->u.name, "tableswitch") == 0) { int lowval; int highval; @@ -84,7 +81,7 @@ print_insn_pj (addr, info) if ((status = get_int (addr, &val, info))) goto fail; - fprintf_fn (stream," default: "); + fprintf_fn (stream, " default: "); (*info->print_address_func) (val + insn_start, info); addr += 4; @@ -96,23 +93,23 @@ print_insn_pj (addr, info) goto fail; addr += 4; - while (lowval <= highval) { - if ((status = get_int (addr, &val, info))) - goto fail; - fprintf_fn (stream," %d:[", lowval); - (*info->print_address_func) (val + insn_start, info); - fprintf_fn (stream," ]"); - addr += 4; - lowval++; - } + while (lowval <= highval) + { + if ((status = get_int (addr, &val, info))) + goto fail; + fprintf_fn (stream, " %d:[", lowval); + (*info->print_address_func) (val + insn_start, info); + fprintf_fn (stream, " ]"); + addr += 4; + lowval++; + } return addr - insn_start; } /* The lookupswitch instruction is followed by the default address, element count and pairs of values and - addresses. */ - - if (strcmp (op->name, "lookupswitch") == 0) + addresses. */ + if (strcmp (op->u.name, "lookupswitch") == 0) { int count; int val; @@ -122,28 +119,30 @@ print_insn_pj (addr, info) goto fail; addr += 4; - fprintf_fn (stream," default: "); + fprintf_fn (stream, " default: "); (*info->print_address_func) (val + insn_start, info); if ((status = get_int (addr, &count, info))) goto fail; addr += 4; - while (count--) { - if ((status = get_int (addr, &val, info))) - goto fail; - addr += 4; - fprintf_fn (stream," %d:[", val); + while (count--) + { + if ((status = get_int (addr, &val, info))) + goto fail; + addr += 4; + fprintf_fn (stream, " %d:[", val); - if ((status = get_int (addr, &val, info))) - goto fail; - addr += 4; + if ((status = get_int (addr, &val, info))) + goto fail; + addr += 4; - (*info->print_address_func) (val + insn_start, info); - fprintf_fn (stream," ]"); - } + (*info->print_address_func) (val + insn_start, info); + fprintf_fn (stream, " ]"); + } return addr - insn_start; } + for (a = 0; op->arg[a]; a++) { unsigned char data[4];