projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdbserver: include aarch32/aarch64 header file in corresponding source file
[deliverable/binutils-gdb.git]
/
opcodes
/
ns32k-dis.c
diff --git
a/opcodes/ns32k-dis.c
b/opcodes/ns32k-dis.c
index e96bdf4470ddd47d6f0a219333175ec218651a3b..51b39260c4f68cb5efb854ce07fe950de521fbc0 100644
(file)
--- a/
opcodes/ns32k-dis.c
+++ b/
opcodes/ns32k-dis.c
@@
-1,6
+1,5
@@
/* Print National Semiconductor 32000 instructions.
/* Print National Semiconductor 32000 instructions.
- Copyright 1986, 1988, 1991, 1992, 1994, 1998, 2001, 2002, 2005, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1986-2020 Free Software Foundation, Inc.
This file is part of the GNU opcodes library.
This file is part of the GNU opcodes library.
@@
-21,7
+20,7
@@
#include "sysdep.h"
#include "bfd.h"
#include "sysdep.h"
#include "bfd.h"
-#include "dis
-asm
.h"
+#include "dis
assemble
.h"
#if !defined(const) && !defined(__STDC__)
#define const
#endif
#if !defined(const) && !defined(__STDC__)
#define const
#endif
@@
-58,7
+57,7
@@
struct private
bfd_byte *max_fetched;
bfd_byte the_buffer[MAXLEN];
bfd_vma insn_start;
bfd_byte *max_fetched;
bfd_byte the_buffer[MAXLEN];
bfd_vma insn_start;
-
jmp_buf
bailout;
+
OPCODES_SIGJMP_BUF
bailout;
};
};
@@
-83,7
+82,7
@@
fetch_data (struct disassemble_info *info, bfd_byte *addr)
if (status != 0)
{
(*info->memory_error_func) (status, start, info);
if (status != 0)
{
(*info->memory_error_func) (status, start, info);
-
longjmp
(priv->bailout, 1);
+
OPCODES_SIGLONGJMP
(priv->bailout, 1);
}
else
priv->max_fetched = addr;
}
else
priv->max_fetched = addr;
@@
-263,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)
{
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;
buffer += offset >> 3;
offset &= 7;
bit = 1;
@@
-290,9
+291,11
@@
bit_extract (bfd_byte *buffer, int offset, int count)
static int
bit_extract_simple (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;
buffer += offset >> 3;
offset &= 7;
bit = 1;
@@
-314,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)
{
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
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
}
static void
@@
-414,7
+417,7
@@
invalid_float (bfd_byte *p, int len)
#else
/* Assumes the bytes have been swapped to local order. */
typedef union
#else
/* Assumes the bytes have been swapped to local order. */
typedef union
-{
+{
double d;
float f;
struct { unsigned m:23, e:8, :1;} sf;
double d;
float f;
struct { unsigned m:23, e:8, :1;} sf;
@@
-466,7
+469,6
@@
print_insn_arg (int d,
int Ivalue;
int addr_mode;
int disp1, disp2;
int Ivalue;
int addr_mode;
int disp1, disp2;
- int index;
int size;
switch (d)
int size;
switch (d)
@@
-474,6
+476,7
@@
print_insn_arg (int d,
case 'f':
/* A "gen" operand but 5 bits from the end of instruction. */
ioffset -= 5;
case 'f':
/* A "gen" operand but 5 bits from the end of instruction. */
ioffset -= 5;
+ /* Fall through. */
case 'Z':
case 'F':
case 'L':
case 'Z':
case 'F':
case 'L':
@@
-616,17
+619,17
@@
print_insn_arg (int d,
case 0x1d:
case 0x1e:
case 0x1f:
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;
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);
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;
}
}
break;
}
@@
-747,7
+750,7
@@
print_insn_ns32k (bfd_vma memaddr, disassemble_info *info)
info->private_data = & priv;
priv.max_fetched = priv.the_buffer;
priv.insn_start = memaddr;
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;
/* Error return. */
return -1;
@@
-796,7
+799,7
@@
print_insn_ns32k (bfd_vma memaddr, disassemble_info *info)
/* 0 for operand A, 1 for operand B, greater for other args. */
int whicharg = 0;
/* 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;
(*dis_info->fprintf_func)(dis_info->stream, "\t");
maxarg = 0;
@@
-837,8
+840,10
@@
print_insn_ns32k (bfd_vma memaddr, disassemble_info *info)
memaddr, arg_bufs[argnum],
index_offset[whicharg]);
d++;
memaddr, arg_bufs[argnum],
index_offset[whicharg]);
d++;
- whicharg++;
+ if (whicharg++ >= 1)
+ break;
}
}
+
for (argnum = 0; argnum <= maxarg; argnum++)
{
bfd_vma addr;
for (argnum = 0; argnum <= maxarg; argnum++)
{
bfd_vma addr;
This page took
0.038996 seconds
and
4
git commands to generate.