65b48a8140
This commit adds support to GDB so that it can modify the disassembler-options value that is passed to the disassembler, similar to objdump's -M option. Currently, the only supported targets are ARM, PowerPC and S/390, but adding support for a new target(s) is not difficult. include/ * dis-asm.h (disasm_options_t): New typedef. (parse_arm_disassembler_option): Remove prototype. (set_arm_regname_option): Likewise. (get_arm_regnames): Likewise. (get_arm_regname_num_options): Likewise. (disassemble_init_s390): New prototype. (disassembler_options_powerpc): Likewise. (disassembler_options_arm): Likewise. (disassembler_options_s390): Likewise. (remove_whitespace_and_extra_commas): Likewise. (disassembler_options_cmp): Likewise. (next_disassembler_option): New inline function. (FOR_EACH_DISASSEMBLER_OPTION): New macro. opcodes/ * disassemble.c Include "safe-ctype.h". (disassemble_init_for_target): Handle s390 init. (remove_whitespace_and_extra_commas): New function. (disassembler_options_cmp): Likewise. * arm-dis.c: Include "libiberty.h". (NUM_ELEM): Delete. (regnames): Use long disassembler style names. Add force-thumb and no-force-thumb options. (NUM_ARM_REGNAMES): Rename from this... (NUM_ARM_OPTIONS): ...to this. Use ARRAY_SIZE. (get_arm_regname_num_options): Delete. (set_arm_regname_option): Likewise. (get_arm_regnames): Likewise. (parse_disassembler_options): Likewise. (parse_arm_disassembler_option): Rename from this... (parse_arm_disassembler_options): ...to this. Make static. Use new FOR_EACH_DISASSEMBLER_OPTION macro to scan over options. (print_insn): Use parse_arm_disassembler_options. (disassembler_options_arm): New function. (print_arm_disassembler_options): Handle updated regnames. * ppc-dis.c: Include "libiberty.h". (ppc_opts): Add "32" and "64" entries. (ppc_parse_cpu): Use ARRAY_SIZE and disassembler_options_cmp. (powerpc_init_dialect): Add break to switch statement. Use new FOR_EACH_DISASSEMBLER_OPTION macro. (disassembler_options_powerpc): New function. (print_ppc_disassembler_options): Use ARRAY_SIZE. Remove printing of "32" and "64". * s390-dis.c: Include "libiberty.h". (init_flag): Remove unneeded variable. (struct s390_options_t): New structure type. (options): New structure. (init_disasm): Rename from this... (disassemble_init_s390): ...to this. Add initializations for current_arch_mask and option_use_insn_len_bits_p. Remove init_flag. (print_insn_s390): Delete call to init_disasm. (disassembler_options_s390): New function. (print_s390_disassembler_options): Print using information from struct 'options'. * po/opcodes.pot: Regenerate. binutils/ * objdump.c (main): Use remove_whitespace_and_extra_commas. gdb/ * NEWS: Mention new set/show disassembler-options commands. * doc/gdb.texinfo: Document new set/show disassembler-options commands. * disasm.c: Include "arch-utils.h", "gdbcmd.h" and "safe-ctype.h". (prospective_options): New static variable. (gdb_disassembler::gdb_disassembler): Initialize m_di.disassembler_options. (gdb_buffered_insn_length_init_dis): Initilize di->disassembler_options. (get_disassembler_options): New function. (set_disassembler_options): Likewise. (set_disassembler_options_sfunc): Likewise. (show_disassembler_options_sfunc): Likewise. (disassembler_options_completer): Likewise. (_initialize_disasm): Likewise. * disasm.h (get_disassembler_options): New prototype. (set_disassembler_options): Likewise. * gdbarch.sh (gdbarch_disassembler_options): New variable. (gdbarch_verify_disassembler_options): Likewise. * gdbarch.c: Regenerate. * gdbarch.h: Likewise. * arm-tdep.c (num_disassembly_options): Delete. (set_disassembly_style): Likewise. (arm_disassembler_options): New static variable. (set_disassembly_style_sfunc): Convert short style name into long option name. Call set_disassembler_options. (show_disassembly_style_sfunc): New function. (arm_gdbarch_init): Call set_gdbarch_disassembler_options and set_gdbarch_verify_disassembler_options. (_initialize_arm_tdep): Delete regnames variable and update callers. (arm_disassembler_options): Initialize. (disasm_options): New variable. (num_disassembly_options): Rename from this... (num_disassembly_styles): ...to this. Compute by scanning through disasm_options. (valid_disassembly_styles): Initialize using disasm_options. Remove calls to parse_arm_disassembler_option, get_arm_regnames and set_arm_regname_option. Pass show_disassembly_style_sfunc to the "disassembler" setshow command. * rs6000-tdep.c (powerpc_disassembler_options): New static variable. (rs6000_gdbarch_init): Call set_gdbarch_disassembler_options and set_gdbarch_verify_disassembler_options. * s390-tdep.c (s390_disassembler_options): New static variable. (s390_gdbarch_init):all set_gdbarch_disassembler_options and set_gdbarch_verify_disassembler_options. gdb/testsuite/ * gdb.arch/powerpc-power.exp: Delete test. * gdb.arch/powerpc-power.s: Likewise. * gdb.disasm/disassembler-options.exp: New test. * gdb.arch/powerpc-altivec.exp: Likewise. * gdb.arch/powerpc-altivec.s: Likewise. * gdb.arch/powerpc-altivec2.exp: Likewise. * gdb.arch/powerpc-altivec2.s: Likewise. * gdb.arch/powerpc-altivec3.exp: Likewise. * gdb.arch/powerpc-altivec3.s: Likewise. * gdb.arch/powerpc-power7.exp: Likewise. * gdb.arch/powerpc-power7.s: Likewise. * gdb.arch/powerpc-power8.exp: Likewise. * gdb.arch/powerpc-power8.s: Likewise. * gdb.arch/powerpc-power9.exp: Likewise. * gdb.arch/powerpc-power9.s: Likewise. * gdb.arch/powerpc-vsx.exp: Likewise. * gdb.arch/powerpc-vsx.s: Likewise. * gdb.arch/powerpc-vsx2.exp: Likewise. * gdb.arch/powerpc-vsx2.s: Likewise. * gdb.arch/powerpc-vsx3.exp: Likewise. * gdb.arch/powerpc-vsx3.s: Likewise. * gdb.arch/arm-disassembler-options.exp: Likewise. * gdb.arch/powerpc-disassembler-options.exp: Likewise. * gdb.arch/s390-disassembler-options.exp: Likewise.
417 lines
12 KiB
C
417 lines
12 KiB
C
/* s390-dis.c -- Disassemble S390 instructions
|
|
Copyright (C) 2000-2017 Free Software Foundation, Inc.
|
|
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
|
|
|
|
This file is part of the GNU opcodes library.
|
|
|
|
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 3, or (at your option)
|
|
any later version.
|
|
|
|
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 file; see the file COPYING. If not, write to the
|
|
Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#include "sysdep.h"
|
|
#include <stdio.h>
|
|
#include "ansidecl.h"
|
|
#include "dis-asm.h"
|
|
#include "opintl.h"
|
|
#include "opcode/s390.h"
|
|
#include "libiberty.h"
|
|
|
|
static int opc_index[256];
|
|
static int current_arch_mask = 0;
|
|
static int option_use_insn_len_bits_p = 0;
|
|
|
|
typedef struct
|
|
{
|
|
const char *name;
|
|
const char *description;
|
|
} s390_options_t;
|
|
|
|
static const s390_options_t options[] =
|
|
{
|
|
{ "esa" , N_("Disassemble in ESA architecture mode") },
|
|
{ "zarch", N_("Disassemble in z/Architecture mode") },
|
|
{ "insnlength", N_("Print unknown instructions according to "
|
|
"length from first two bits") }
|
|
};
|
|
|
|
/* Set up index table for first opcode byte. */
|
|
|
|
void
|
|
disassemble_init_s390 (struct disassemble_info *info)
|
|
{
|
|
int i;
|
|
const char *p;
|
|
|
|
memset (opc_index, 0, sizeof (opc_index));
|
|
|
|
/* Reverse order, such that each opc_index ends up pointing to the
|
|
first matching entry instead of the last. */
|
|
for (i = s390_num_opcodes; i--; )
|
|
opc_index[s390_opcodes[i].opcode[0]] = i;
|
|
|
|
current_arch_mask = 1 << S390_OPCODE_ZARCH;
|
|
option_use_insn_len_bits_p = 0;
|
|
|
|
for (p = info->disassembler_options; p != NULL; )
|
|
{
|
|
if (CONST_STRNEQ (p, "esa"))
|
|
current_arch_mask = 1 << S390_OPCODE_ESA;
|
|
else if (CONST_STRNEQ (p, "zarch"))
|
|
current_arch_mask = 1 << S390_OPCODE_ZARCH;
|
|
else if (CONST_STRNEQ (p, "insnlength"))
|
|
option_use_insn_len_bits_p = 1;
|
|
else
|
|
fprintf (stderr, "Unknown S/390 disassembler option: %s\n", p);
|
|
|
|
p = strchr (p, ',');
|
|
if (p != NULL)
|
|
p++;
|
|
}
|
|
}
|
|
|
|
/* Derive the length of an instruction from its first byte. */
|
|
|
|
static inline int
|
|
s390_insn_length (const bfd_byte *buffer)
|
|
{
|
|
/* 00xxxxxx -> 2, 01xxxxxx/10xxxxxx -> 4, 11xxxxxx -> 6. */
|
|
return ((buffer[0] >> 6) + 3) & ~1U;
|
|
}
|
|
|
|
/* Match the instruction in BUFFER against the given OPCODE, excluding
|
|
the first byte. */
|
|
|
|
static inline int
|
|
s390_insn_matches_opcode (const bfd_byte *buffer,
|
|
const struct s390_opcode *opcode)
|
|
{
|
|
return (buffer[1] & opcode->mask[1]) == opcode->opcode[1]
|
|
&& (buffer[2] & opcode->mask[2]) == opcode->opcode[2]
|
|
&& (buffer[3] & opcode->mask[3]) == opcode->opcode[3]
|
|
&& (buffer[4] & opcode->mask[4]) == opcode->opcode[4]
|
|
&& (buffer[5] & opcode->mask[5]) == opcode->opcode[5];
|
|
}
|
|
|
|
union operand_value
|
|
{
|
|
int i;
|
|
unsigned int u;
|
|
};
|
|
|
|
/* Extracts an operand value from an instruction. */
|
|
/* We do not perform the shift operation for larl-type address
|
|
operands here since that would lead to an overflow of the 32 bit
|
|
integer value. Instead the shift operation is done when printing
|
|
the operand. */
|
|
|
|
static inline union operand_value
|
|
s390_extract_operand (const bfd_byte *insn,
|
|
const struct s390_operand *operand)
|
|
{
|
|
union operand_value ret;
|
|
unsigned int val;
|
|
int bits;
|
|
const bfd_byte *orig_insn = insn;
|
|
|
|
/* Extract fragments of the operand byte for byte. */
|
|
insn += operand->shift / 8;
|
|
bits = (operand->shift & 7) + operand->bits;
|
|
val = 0;
|
|
do
|
|
{
|
|
val <<= 8;
|
|
val |= (unsigned int) *insn++;
|
|
bits -= 8;
|
|
}
|
|
while (bits > 0);
|
|
val >>= -bits;
|
|
val &= ((1U << (operand->bits - 1)) << 1) - 1;
|
|
|
|
/* Check for special long displacement case. */
|
|
if (operand->bits == 20 && operand->shift == 20)
|
|
val = (val & 0xff) << 12 | (val & 0xfff00) >> 8;
|
|
|
|
/* Sign extend value if the operand is signed or pc relative. Avoid
|
|
integer overflows. */
|
|
if (operand->flags & (S390_OPERAND_SIGNED | S390_OPERAND_PCREL))
|
|
{
|
|
unsigned int m = 1U << (operand->bits - 1);
|
|
|
|
if (val >= m)
|
|
ret.i = (int) (val - m) - 1 - (int) (m - 1U);
|
|
else
|
|
ret.i = (int) val;
|
|
}
|
|
else if (operand->flags & S390_OPERAND_LENGTH)
|
|
/* Length x in an instruction has real length x + 1. */
|
|
ret.u = val + 1;
|
|
|
|
else if (operand->flags & S390_OPERAND_VR)
|
|
{
|
|
/* Extract the extra bits for a vector register operand stored
|
|
in the RXB field. */
|
|
unsigned vr = operand->shift == 32 ? 3
|
|
: (unsigned) operand->shift / 4 - 2;
|
|
|
|
ret.u = val | ((orig_insn[4] & (1 << (3 - vr))) << (vr + 1));
|
|
}
|
|
else
|
|
ret.u = val;
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Print the S390 instruction in BUFFER, assuming that it matches the
|
|
given OPCODE. */
|
|
|
|
static void
|
|
s390_print_insn_with_opcode (bfd_vma memaddr,
|
|
struct disassemble_info *info,
|
|
const bfd_byte *buffer,
|
|
const struct s390_opcode *opcode)
|
|
{
|
|
const unsigned char *opindex;
|
|
char separator;
|
|
|
|
/* Mnemonic. */
|
|
info->fprintf_func (info->stream, "%s", opcode->name);
|
|
|
|
/* Operands. */
|
|
separator = '\t';
|
|
for (opindex = opcode->operands; *opindex != 0; opindex++)
|
|
{
|
|
const struct s390_operand *operand = s390_operands + *opindex;
|
|
union operand_value val = s390_extract_operand (buffer, operand);
|
|
unsigned long flags = operand->flags;
|
|
|
|
if ((flags & S390_OPERAND_INDEX) && val.u == 0)
|
|
continue;
|
|
if ((flags & S390_OPERAND_BASE) &&
|
|
val.u == 0 && separator == '(')
|
|
{
|
|
separator = ',';
|
|
continue;
|
|
}
|
|
|
|
/* For instructions with a last optional operand don't print it
|
|
if zero. */
|
|
if ((opcode->flags & S390_INSTR_FLAG_OPTPARM)
|
|
&& val.u == 0
|
|
&& opindex[1] == 0)
|
|
break;
|
|
|
|
if (flags & S390_OPERAND_GPR)
|
|
info->fprintf_func (info->stream, "%c%%r%u", separator, val.u);
|
|
else if (flags & S390_OPERAND_FPR)
|
|
info->fprintf_func (info->stream, "%c%%f%u", separator, val.u);
|
|
else if (flags & S390_OPERAND_VR)
|
|
info->fprintf_func (info->stream, "%c%%v%i", separator, val.u);
|
|
else if (flags & S390_OPERAND_AR)
|
|
info->fprintf_func (info->stream, "%c%%a%u", separator, val.u);
|
|
else if (flags & S390_OPERAND_CR)
|
|
info->fprintf_func (info->stream, "%c%%c%u", separator, val.u);
|
|
else if (flags & S390_OPERAND_PCREL)
|
|
{
|
|
info->fprintf_func (info->stream, "%c", separator);
|
|
info->print_address_func (memaddr + val.i + val.i, info);
|
|
}
|
|
else if (flags & S390_OPERAND_SIGNED)
|
|
info->fprintf_func (info->stream, "%c%i", separator, val.i);
|
|
else
|
|
{
|
|
if (flags & S390_OPERAND_OR1)
|
|
val.u &= ~1;
|
|
if (flags & S390_OPERAND_OR2)
|
|
val.u &= ~2;
|
|
if (flags & S390_OPERAND_OR8)
|
|
val.u &= ~8;
|
|
|
|
if ((opcode->flags & S390_INSTR_FLAG_OPTPARM)
|
|
&& val.u == 0
|
|
&& opindex[1] == 0)
|
|
break;
|
|
info->fprintf_func (info->stream, "%c%u", separator, val.u);
|
|
}
|
|
|
|
if (flags & S390_OPERAND_DISP)
|
|
separator = '(';
|
|
else if (flags & S390_OPERAND_BASE)
|
|
{
|
|
info->fprintf_func (info->stream, ")");
|
|
separator = ',';
|
|
}
|
|
else
|
|
separator = ',';
|
|
}
|
|
}
|
|
|
|
/* Check whether opcode A's mask is more specific than that of B. */
|
|
|
|
static int
|
|
opcode_mask_more_specific (const struct s390_opcode *a,
|
|
const struct s390_opcode *b)
|
|
{
|
|
return (((int) a->mask[0] + a->mask[1] + a->mask[2]
|
|
+ a->mask[3] + a->mask[4] + a->mask[5])
|
|
> ((int) b->mask[0] + b->mask[1] + b->mask[2]
|
|
+ b->mask[3] + b->mask[4] + b->mask[5]));
|
|
}
|
|
|
|
/* Print a S390 instruction. */
|
|
|
|
int
|
|
print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
|
|
{
|
|
bfd_byte buffer[6];
|
|
const struct s390_opcode *opcode = NULL;
|
|
unsigned int value;
|
|
int status, opsize, bufsize, bytes_to_dump, i;
|
|
|
|
/* The output looks better if we put 6 bytes on a line. */
|
|
info->bytes_per_line = 6;
|
|
|
|
/* Every S390 instruction is max 6 bytes long. */
|
|
memset (buffer, 0, 6);
|
|
status = info->read_memory_func (memaddr, buffer, 6, info);
|
|
if (status != 0)
|
|
{
|
|
for (bufsize = 0; bufsize < 6; bufsize++)
|
|
if (info->read_memory_func (memaddr, buffer, bufsize + 1, info) != 0)
|
|
break;
|
|
if (bufsize <= 0)
|
|
{
|
|
info->memory_error_func (status, memaddr, info);
|
|
return -1;
|
|
}
|
|
opsize = s390_insn_length (buffer);
|
|
status = opsize > bufsize;
|
|
}
|
|
else
|
|
{
|
|
bufsize = 6;
|
|
opsize = s390_insn_length (buffer);
|
|
}
|
|
|
|
if (status == 0)
|
|
{
|
|
const struct s390_opcode *op;
|
|
|
|
/* Find the "best match" in the opcode table. */
|
|
for (op = s390_opcodes + opc_index[buffer[0]];
|
|
op != s390_opcodes + s390_num_opcodes
|
|
&& op->opcode[0] == buffer[0];
|
|
op++)
|
|
{
|
|
if ((op->modes & current_arch_mask)
|
|
&& s390_insn_matches_opcode (buffer, op)
|
|
&& (opcode == NULL
|
|
|| opcode_mask_more_specific (op, opcode)))
|
|
opcode = op;
|
|
}
|
|
|
|
if (opcode != NULL)
|
|
{
|
|
/* The instruction is valid. Print it and return its size. */
|
|
s390_print_insn_with_opcode (memaddr, info, buffer, opcode);
|
|
return opsize;
|
|
}
|
|
}
|
|
|
|
/* For code sections it makes sense to skip unknown instructions
|
|
according to their length bits. */
|
|
if (status == 0
|
|
&& option_use_insn_len_bits_p
|
|
&& info->section != NULL
|
|
&& (info->section->flags & SEC_CODE))
|
|
bytes_to_dump = opsize;
|
|
else
|
|
/* By default unknown instructions are printed as .long's/.short'
|
|
depending on how many bytes are available. */
|
|
bytes_to_dump = bufsize >= 4 ? 4 : bufsize;
|
|
|
|
if (bytes_to_dump == 0)
|
|
return 0;
|
|
|
|
/* Fall back to hex print. */
|
|
switch (bytes_to_dump)
|
|
{
|
|
case 4:
|
|
value = (unsigned int) buffer[0];
|
|
value = (value << 8) + (unsigned int) buffer[1];
|
|
value = (value << 8) + (unsigned int) buffer[2];
|
|
value = (value << 8) + (unsigned int) buffer[3];
|
|
info->fprintf_func (info->stream, ".long\t0x%08x", value);
|
|
return 4;
|
|
case 2:
|
|
value = (unsigned int) buffer[0];
|
|
value = (value << 8) + (unsigned int) buffer[1];
|
|
info->fprintf_func (info->stream, ".short\t0x%04x", value);
|
|
return 2;
|
|
default:
|
|
info->fprintf_func (info->stream, ".byte\t0x%02x",
|
|
(unsigned int) buffer[0]);
|
|
for (i = 1; i < bytes_to_dump; i++)
|
|
info->fprintf_func (info->stream, ",0x%02x",
|
|
(unsigned int) buffer[i]);
|
|
return bytes_to_dump;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
const disasm_options_t *
|
|
disassembler_options_s390 (void)
|
|
{
|
|
static disasm_options_t *opts = NULL;
|
|
|
|
if (opts == NULL)
|
|
{
|
|
size_t i, num_options = ARRAY_SIZE (options);
|
|
opts = XNEW (disasm_options_t);
|
|
opts->name = XNEWVEC (const char *, num_options + 1);
|
|
opts->description = XNEWVEC (const char *, num_options + 1);
|
|
for (i = 0; i < num_options; i++)
|
|
{
|
|
opts->name[i] = options[i].name;
|
|
opts->description[i] = _(options[i].description);
|
|
}
|
|
/* The array we return must be NULL terminated. */
|
|
opts->name[i] = NULL;
|
|
opts->description[i] = NULL;
|
|
}
|
|
|
|
return opts;
|
|
}
|
|
|
|
void
|
|
print_s390_disassembler_options (FILE *stream)
|
|
{
|
|
unsigned int i, max_len = 0;
|
|
fprintf (stream, _("\n\
|
|
The following S/390 specific disassembler options are supported for use\n\
|
|
with the -M switch (multiple options should be separated by commas):\n"));
|
|
|
|
for (i = 0; i < ARRAY_SIZE (options); i++)
|
|
{
|
|
unsigned int len = strlen (options[i].name);
|
|
if (max_len < len)
|
|
max_len = len;
|
|
}
|
|
|
|
for (i = 0, max_len++; i < ARRAY_SIZE (options); i++)
|
|
fprintf (stream, " %s%*c %s\n",
|
|
options[i].name,
|
|
(int)(max_len - strlen (options[i].name)), ' ',
|
|
_(options[i].description));
|
|
}
|