X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fns32k-dis.c;h=12df182d0a442bec0f222741126739130f7dd4c1;hb=c1a66c0629d3b62075a73793f1a7e7393e23e7e2;hp=7ed4ab2fbe57f8dd5f0c3d685e3294d568bece0a;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/ns32k-dis.c b/opcodes/ns32k-dis.c index 7ed4ab2fbe..12df182d0a 100644 --- a/opcodes/ns32k-dis.c +++ b/opcodes/ns32k-dis.c @@ -1,28 +1,26 @@ /* Print National Semiconductor 32000 instructions. - Copyright 1986, 1988, 1991, 1992, 1994, 1998, 2001, 2002, 2005 - Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. - This file is part of opcodes library. + This file is part of the GNU opcodes library. - This program is free software; you can redistribute it and/or modify + This library 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. + the Free Software Foundation; either version 3, 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. + It 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 "bfd.h" #include "sysdep.h" -#include "dis-asm.h" +#include "bfd.h" +#include "disassemble.h" #if !defined(const) && !defined(__STDC__) #define const #endif @@ -59,7 +57,7 @@ struct private bfd_byte *max_fetched; bfd_byte the_buffer[MAXLEN]; bfd_vma insn_start; - jmp_buf bailout; + OPCODES_SIGJMP_BUF bailout; }; @@ -84,7 +82,7 @@ fetch_data (struct disassemble_info *info, bfd_byte *addr) if (status != 0) { (*info->memory_error_func) (status, start, info); - longjmp (priv->bailout, 1); + OPCODES_SIGLONGJMP (priv->bailout, 1); } else priv->max_fetched = addr; @@ -264,9 +262,11 @@ list_search (int reg_value, const struct ns32k_option *optionP, char *result) static int bit_extract (bfd_byte *buffer, int offset, int count) { - int result; - int bit; + unsigned int result; + unsigned int bit; + if (offset < 0 || count < 0) + return 0; buffer += offset >> 3; offset &= 7; bit = 1; @@ -291,9 +291,11 @@ bit_extract (bfd_byte *buffer, int offset, int count) static int bit_extract_simple (bfd_byte *buffer, int offset, int count) { - int result; - int bit; + unsigned int result; + unsigned int bit; + if (offset < 0 || count < 0) + return 0; buffer += offset >> 3; offset &= 7; bit = 1; @@ -315,18 +317,18 @@ bit_extract_simple (bfd_byte *buffer, int offset, int count) static void bit_copy (bfd_byte *buffer, int offset, int count, char *to) { + if (offset < 0 || count < 0) + return; for (; count > 8; count -= 8, to++, offset += 8) *to = bit_extract (buffer, offset, 8); *to = bit_extract (buffer, offset, count); } static int -sign_extend (int value, int bits) +sign_extend (unsigned int value, unsigned int bits) { - value = value & ((1 << bits) - 1); - return (value & (1 << (bits - 1)) - ? value | (~((1 << bits) - 1)) - : value); + unsigned int sign = 1u << (bits - 1); + return ((value & (sign + sign - 1)) ^ sign) - sign; } static void @@ -345,9 +347,7 @@ flip_bytes (char *ptr, int count) } /* Given a character C, does it represent a general addressing mode? */ -#define Is_gen(c) \ - ((c) == 'F' || (c) == 'L' || (c) == 'B' \ - || (c) == 'W' || (c) == 'D' || (c) == 'A' || (c) == 'I' || (c) == 'Z') +#define Is_gen(c) (strchr ("FLBWDAIZf", (c)) != NULL) /* Adressing modes. */ #define Adrmod_index_byte 0x1c @@ -415,7 +415,7 @@ invalid_float (bfd_byte *p, int len) #else /* Assumes the bytes have been swapped to local order. */ typedef union -{ +{ double d; float f; struct { unsigned m:23, e:8, :1;} sf; @@ -446,7 +446,7 @@ invalid_float (float_type_u *p, int len) bit position of the addressing extension. BUFFER contains the instruction. ADDR is where BUFFER was read from. Put the disassembled version of the operand in RESULT. INDEX_OFFSET is the bit position - of the index byte (it contains garbage if this operand is not a + of the index byte (it contains -1 if this operand is not a general operand using scaled indexed addressing mode). */ static int @@ -467,7 +467,6 @@ print_insn_arg (int d, int Ivalue; int addr_mode; int disp1, disp2; - int index; int size; switch (d) @@ -475,6 +474,7 @@ print_insn_arg (int d, case 'f': /* A "gen" operand but 5 bits from the end of instruction. */ ioffset -= 5; + /* Fall through. */ case 'Z': case 'F': case 'L': @@ -617,17 +617,17 @@ print_insn_arg (int d, case 0x1d: case 0x1e: case 0x1f: - /* Scaled index basemode[R0 -- R7:B,W,D,Q]. */ - index = bit_extract (buffer, index_offset - 8, 3); - print_insn_arg (d, index_offset, aoffsetp, buffer, addr, - result, 0); { + int bit_index; static const char *ind = "bwdq"; char *off; + /* Scaled index basemode[R0 -- R7:B,W,D,Q]. */ + bit_index = bit_extract (buffer, index_offset - 8, 3); + print_insn_arg (d, index_offset, aoffsetp, buffer, addr, + result, 0); off = result + strlen (result); - sprintf (off, "[r%d:%c]", index, - ind[addr_mode & 3]); + sprintf (off, "[r%d:%c]", bit_index, ind[addr_mode & 3]); } break; } @@ -748,7 +748,7 @@ print_insn_ns32k (bfd_vma memaddr, disassemble_info *info) info->private_data = & priv; priv.max_fetched = priv.the_buffer; priv.insn_start = memaddr; - if (setjmp (priv.bailout) != 0) + if (OPCODES_SIGSETJMP (priv.bailout) != 0) /* Error return. */ return -1; @@ -790,14 +790,12 @@ print_insn_ns32k (bfd_vma memaddr, disassemble_info *info) if (*d) { /* Offset in bits of the first thing beyond each index byte. - Element 0 is for operand A and element 1 is for operand B. - The rest are irrelevant, but we put them here so we don't - index outside the array. */ - int index_offset[MAX_ARGS]; + Element 0 is for operand A and element 1 is for operand B. */ + int index_offset[2]; /* 0 for operand A, 1 for operand B, greater for other args. */ int whicharg = 0; - + (*dis_info->fprintf_func)(dis_info->stream, "\t"); maxarg = 0; @@ -806,9 +804,12 @@ print_insn_ns32k (bfd_vma memaddr, disassemble_info *info) if we are using scaled indexed addressing mode, since the index bytes occur right after the basic instruction, not as part of the addressing extension. */ - if (Is_gen(d[1])) + index_offset[0] = -1; + index_offset[1] = -1; + if (Is_gen (d[1])) { - int addr_mode = bit_extract (buffer, ioffset - 5, 5); + int bitoff = d[1] == 'f' ? 10 : 5; + int addr_mode = bit_extract (buffer, ioffset - bitoff, 5); if (Adrmod_is_index (addr_mode)) { @@ -817,7 +818,7 @@ print_insn_ns32k (bfd_vma memaddr, disassemble_info *info) } } - if (d[2] && Is_gen(d[3])) + if (d[2] && Is_gen (d[3])) { int addr_mode = bit_extract (buffer, ioffset - 10, 5); @@ -831,15 +832,18 @@ print_insn_ns32k (bfd_vma memaddr, disassemble_info *info) while (*d) { argnum = *d - '1'; + if (argnum >= MAX_ARGS) + abort (); d++; - if (argnum > maxarg && argnum < MAX_ARGS) + if (argnum > maxarg) maxarg = argnum; ioffset = print_insn_arg (*d, ioffset, &aoffset, buffer, memaddr, arg_bufs[argnum], - index_offset[whicharg]); + whicharg > 1 ? -1 : index_offset[whicharg]); d++; whicharg++; } + for (argnum = 0; argnum <= maxarg; argnum++) { bfd_vma addr;