2001-02-10 08:58:38 +08:00
|
|
|
/* s390-dis.c -- Disassemble S390 instructions
|
2022-01-02 06:30:17 +08:00
|
|
|
Copyright (C) 2000-2022 Free Software Foundation, Inc.
|
2001-02-10 08:58:38 +08:00
|
|
|
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
|
|
|
|
|
2007-07-05 17:49:03 +08:00
|
|
|
This file is part of the GNU opcodes library.
|
2001-02-10 08:58:38 +08:00
|
|
|
|
2007-07-05 17:49:03 +08:00
|
|
|
This library is free software; you can redistribute it and/or modify
|
2001-02-10 08:58:38 +08:00
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-05 17:49:03 +08:00
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
|
|
any later version.
|
2001-02-10 08:58:38 +08:00
|
|
|
|
2007-07-05 17:49:03 +08:00
|
|
|
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.
|
2001-02-10 08:58:38 +08:00
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-07-05 17:49:03 +08:00
|
|
|
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. */
|
2001-02-10 08:58:38 +08:00
|
|
|
|
2012-05-17 23:13:28 +08:00
|
|
|
#include "sysdep.h"
|
2001-02-10 08:58:38 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include "ansidecl.h"
|
Move print_insn_XXX to an opcodes internal header
With the changes done in previous patches, print_insn_XXX functions
don't have to be external visible out of opcodes, because both gdb
and objdump select disassemblers through a single interface.
This patch moves these print_insn_XXX declarations from
include/dis-asm.h to opcodes/disassemble.h, which is a new header
added by this patch.
include:
2017-05-24 Yao Qi <yao.qi@linaro.org>
* dis-asm.h: Move some function declarations to
opcodes/disassemble.h.
opcodes:
2017-05-24 Yao Qi <yao.qi@linaro.org>
* alpha-dis.c: Include disassemble.h, don't include
dis-asm.h.
* avr-dis.c, bfin-dis.c, cr16-dis.c: Likewise.
* crx-dis.c, d10v-dis.c, d30v-dis.c: Likewise.
* disassemble.c, dlx-dis.c, epiphany-dis.c: Likewise.
* fr30-dis.c, ft32-dis.c, h8300-dis.c, h8500-dis.c: Likewise.
* hppa-dis.c, i370-dis.c, i386-dis.c: Likewise.
* i860-dis.c, i960-dis.c, ip2k-dis.c: Likewise.
* iq2000-dis.c, lm32-dis.c, m10200-dis.c: Likewise.
* m10300-dis.c, m32r-dis.c, m68hc11-dis.c: Likewise.
* m68k-dis.c, m88k-dis.c, mcore-dis.c: Likewise.
* metag-dis.c, microblaze-dis.c, mmix-dis.c: Likewise.
* moxie-dis.c, msp430-dis.c, mt-dis.c:
* nds32-dis.c, nios2-dis.c, ns32k-dis.c: Likewise.
* or1k-dis.c, pdp11-dis.c, pj-dis.c: Likewise.
* ppc-dis.c, pru-dis.c, riscv-dis.c: Likewise.
* rl78-dis.c, s390-dis.c, score-dis.c: Likewise.
* sh-dis.c, sh64-dis.c, tic30-dis.c: Likewise.
* tic4x-dis.c, tic54x-dis.c, tic6x-dis.c: Likewise.
* tic80-dis.c, tilegx-dis.c, tilepro-dis.c: Likewise.
* v850-dis.c, vax-dis.c, visium-dis.c: Likewise.
* w65-dis.c, wasm32-dis.c, xc16x-dis.c: Likewise.
* xgate-dis.c, xstormy16-dis.c, xtensa-dis.c: Likewise.
* z80-dis.c, z8k-dis.c: Likewise.
* disassemble.h: New file.
2017-05-25 00:23:52 +08:00
|
|
|
#include "disassemble.h"
|
2008-04-10 21:36:43 +08:00
|
|
|
#include "opintl.h"
|
2001-02-10 08:58:38 +08:00
|
|
|
#include "opcode/s390.h"
|
2017-03-01 02:32:07 +08:00
|
|
|
#include "libiberty.h"
|
2001-02-10 08:58:38 +08:00
|
|
|
|
|
|
|
static int opc_index[256];
|
|
|
|
static int current_arch_mask = 0;
|
2016-06-10 19:40:48 +08:00
|
|
|
static int option_use_insn_len_bits_p = 0;
|
2001-02-10 08:58:38 +08:00
|
|
|
|
2017-03-01 02:32:07 +08:00
|
|
|
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") }
|
|
|
|
};
|
|
|
|
|
2001-07-23 21:41:14 +08:00
|
|
|
/* Set up index table for first opcode byte. */
|
|
|
|
|
2017-03-01 02:32:07 +08:00
|
|
|
void
|
|
|
|
disassemble_init_s390 (struct disassemble_info *info)
|
2001-02-10 08:58:38 +08:00
|
|
|
{
|
2014-08-19 22:42:13 +08:00
|
|
|
int i;
|
2008-04-10 21:36:43 +08:00
|
|
|
const char *p;
|
2001-02-10 08:58:38 +08:00
|
|
|
|
2001-07-23 21:41:14 +08:00
|
|
|
memset (opc_index, 0, sizeof (opc_index));
|
2014-08-19 22:42:13 +08:00
|
|
|
|
|
|
|
/* 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;
|
2008-04-10 21:36:43 +08:00
|
|
|
|
2017-03-01 02:32:07 +08:00
|
|
|
current_arch_mask = 1 << S390_OPCODE_ZARCH;
|
|
|
|
option_use_insn_len_bits_p = 0;
|
|
|
|
|
2008-04-10 21:36:43 +08:00
|
|
|
for (p = info->disassembler_options; p != NULL; )
|
2001-07-23 21:41:14 +08:00
|
|
|
{
|
2021-03-19 18:50:26 +08:00
|
|
|
if (startswith (p, "esa"))
|
2008-04-10 21:36:43 +08:00
|
|
|
current_arch_mask = 1 << S390_OPCODE_ESA;
|
2021-03-19 18:50:26 +08:00
|
|
|
else if (startswith (p, "zarch"))
|
2008-04-10 21:36:43 +08:00
|
|
|
current_arch_mask = 1 << S390_OPCODE_ZARCH;
|
2021-03-19 18:50:26 +08:00
|
|
|
else if (startswith (p, "insnlength"))
|
2016-06-10 19:40:48 +08:00
|
|
|
option_use_insn_len_bits_p = 1;
|
2008-04-10 21:36:43 +08:00
|
|
|
else
|
opcodes error messages
Another patch aimed at making binutils comply with the GNU coding
standard. The generated files require
https://sourceware.org/ml/cgen/2018-q1/msg00004.html
cpu/
* frv.opc: Include opintl.h.
(add_next_to_vliw): Use opcodes_error_handler to print error.
Standardize error message.
(fr500_check_insn_major_constraints, frv_vliw_add_insn): Likewise.
opcodes/
* sysdep.h (opcodes_error_handler): Define.
(_bfd_error_handler): Declare.
* Makefile.am: Remove stray #.
* opc2c.c (main): Remove bogus -l arg handling. Print "DO NOT
EDIT" comment.
* aarch64-dis.c, * arc-dis.c, * arm-dis.c, * avr-dis.c,
* d30v-dis.c, * h8300-dis.c, * mmix-dis.c, * ppc-dis.c,
* riscv-dis.c, * s390-dis.c, * sparc-dis.c, * v850-dis.c: Use
opcodes_error_handler to print errors. Standardize error messages.
* msp430-decode.opc, * nios2-dis.c, * rl78-decode.opc: Likewise,
and include opintl.h.
* nds32-asm.c: Likewise, and include sysdep.h and opintl.h.
* i386-gen.c: Standardize error messages.
* msp430-decode.c, * rl78-decode.c, rx-decode.c: Regenerate.
* Makefile.in: Regenerate.
* epiphany-asm.c, * epiphany-desc.c, * epiphany-dis.c,
* epiphany-ibld.c, * fr30-asm.c, * fr30-desc.c, * fr30-dis.c,
* fr30-ibld.c, * frv-asm.c, * frv-desc.c, * frv-dis.c, * frv-ibld.c,
* frv-opc.c, * ip2k-asm.c, * ip2k-desc.c, * ip2k-dis.c, * ip2k-ibld.c,
* iq2000-asm.c, * iq2000-desc.c, * iq2000-dis.c, * iq2000-ibld.c,
* lm32-asm.c, * lm32-desc.c, * lm32-dis.c, * lm32-ibld.c,
* m32c-asm.c, * m32c-desc.c, * m32c-dis.c, * m32c-ibld.c,
* m32r-asm.c, * m32r-desc.c, * m32r-dis.c, * m32r-ibld.c,
* mep-asm.c, * mep-desc.c, * mep-dis.c, * mep-ibld.c, * mt-asm.c,
* mt-desc.c, * mt-dis.c, * mt-ibld.c, * or1k-asm.c, * or1k-desc.c,
* or1k-dis.c, * or1k-ibld.c, * xc16x-asm.c, * xc16x-desc.c,
* xc16x-dis.c, * xc16x-ibld.c, * xstormy16-asm.c, * xstormy16-desc.c,
* xstormy16-dis.c, * xstormy16-ibld.c: Regenerate.
2018-03-02 05:53:50 +08:00
|
|
|
/* xgettext:c-format */
|
|
|
|
opcodes_error_handler (_("unknown S/390 disassembler option: %s"), p);
|
2008-04-10 21:36:43 +08:00
|
|
|
|
|
|
|
p = strchr (p, ',');
|
|
|
|
if (p != NULL)
|
|
|
|
p++;
|
2001-07-23 21:41:14 +08:00
|
|
|
}
|
2001-02-10 08:58:38 +08:00
|
|
|
}
|
|
|
|
|
2014-08-19 22:42:13 +08:00
|
|
|
/* 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;
|
|
|
|
};
|
|
|
|
|
2001-02-10 08:58:38 +08:00
|
|
|
/* Extracts an operand value from an instruction. */
|
2009-09-10 16:47:20 +08:00
|
|
|
/* 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
|
2014-08-19 22:42:13 +08:00
|
|
|
the operand. */
|
2001-02-10 08:58:38 +08:00
|
|
|
|
2014-08-19 22:42:13 +08:00
|
|
|
static inline union operand_value
|
|
|
|
s390_extract_operand (const bfd_byte *insn,
|
|
|
|
const struct s390_operand *operand)
|
2001-02-10 08:58:38 +08:00
|
|
|
{
|
2014-08-19 22:42:13 +08:00
|
|
|
union operand_value ret;
|
2001-02-10 08:58:38 +08:00
|
|
|
unsigned int val;
|
|
|
|
int bits;
|
2015-01-16 19:19:21 +08:00
|
|
|
const bfd_byte *orig_insn = insn;
|
2001-02-10 08:58:38 +08:00
|
|
|
|
2001-07-23 21:41:14 +08:00
|
|
|
/* Extract fragments of the operand byte for byte. */
|
|
|
|
insn += operand->shift / 8;
|
2001-02-10 08:58:38 +08:00
|
|
|
bits = (operand->shift & 7) + operand->bits;
|
|
|
|
val = 0;
|
2001-07-23 21:41:14 +08:00
|
|
|
do
|
|
|
|
{
|
|
|
|
val <<= 8;
|
|
|
|
val |= (unsigned int) *insn++;
|
|
|
|
bits -= 8;
|
|
|
|
}
|
|
|
|
while (bits > 0);
|
2001-02-10 08:58:38 +08:00
|
|
|
val >>= -bits;
|
2001-07-23 21:41:14 +08:00
|
|
|
val &= ((1U << (operand->bits - 1)) << 1) - 1;
|
|
|
|
|
* s390-dis.c (s390_extract_operand): Add support for long displacements.
* s390-mkopc.c (s390_opcode_cpu_val): Add support for cpu type z990.
* s390-opc.c (D20_20): Add define for 20 bit displacements.
(INSTR_RRF_R0RR, INSTR_RSL_R0RD, INSTR_RSY_RRRD, INSTR_RSY_RURD,
INSTR_RSY_AARD, INSTR_RXY_RRRD, INSTR_RXY_FRRD, INSTR_SIY_URD): Add
new instruction formats.
(MASK_RRF_R0RR, MASK_RSL_R0RD, MASK_RSY_RRRD, MASK_RSY_RURD,
MASK_RSY_AARD, MASK_RXY_RRRD, MASK_RXY_FRRD, MASK_SIY_URD): Likewise.
(s390_opformats): Likewise.
* s390-opc.txt: Add new instructions for cpu type z990. Add missing
hfp instructions. Add missing instructions pgin, pgout and xsch.
2003-07-01 22:47:58 +08:00
|
|
|
/* Check for special long displacement case. */
|
|
|
|
if (operand->bits == 20 && operand->shift == 20)
|
|
|
|
val = (val & 0xff) << 12 | (val & 0xfff00) >> 8;
|
|
|
|
|
2014-08-19 22:42:13 +08:00
|
|
|
/* 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;
|
2015-01-16 19:19:21 +08:00
|
|
|
|
|
|
|
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));
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
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. */
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_mnemonic,
|
|
|
|
"%s", opcode->name);
|
2014-08-19 22:42:13 +08:00
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
2015-01-16 19:19:21 +08:00
|
|
|
/* For instructions with a last optional operand don't print it
|
|
|
|
if zero. */
|
2017-05-29 18:34:56 +08:00
|
|
|
if ((opcode->flags & (S390_INSTR_FLAG_OPTPARM | S390_INSTR_FLAG_OPTPARM2))
|
2015-01-16 19:19:21 +08:00
|
|
|
&& val.u == 0
|
|
|
|
&& opindex[1] == 0)
|
|
|
|
break;
|
2014-08-19 22:42:13 +08:00
|
|
|
|
2017-05-29 18:34:56 +08:00
|
|
|
if ((opcode->flags & S390_INSTR_FLAG_OPTPARM2)
|
|
|
|
&& val.u == 0 && opindex[1] != 0 && opindex[2] == 0)
|
|
|
|
{
|
|
|
|
union operand_value next_op_val =
|
|
|
|
s390_extract_operand (buffer, s390_operands + opindex[1]);
|
|
|
|
if (next_op_val.u == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-08-19 22:42:13 +08:00
|
|
|
if (flags & S390_OPERAND_GPR)
|
2022-07-05 21:17:14 +08:00
|
|
|
{
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_register,
|
|
|
|
"%%r%u", val.u);
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
else if (flags & S390_OPERAND_FPR)
|
2022-07-05 21:17:14 +08:00
|
|
|
{
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_register,
|
|
|
|
"%%f%u", val.u);
|
|
|
|
}
|
2015-01-16 19:19:21 +08:00
|
|
|
else if (flags & S390_OPERAND_VR)
|
2022-07-05 21:17:14 +08:00
|
|
|
{
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_register,
|
|
|
|
"%%v%i", val.u);
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
else if (flags & S390_OPERAND_AR)
|
2022-07-05 21:17:14 +08:00
|
|
|
{
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_register,
|
|
|
|
"%%a%u", val.u);
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
else if (flags & S390_OPERAND_CR)
|
2022-07-05 21:17:14 +08:00
|
|
|
{
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_register,
|
|
|
|
"%%c%u", val.u);
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
else if (flags & S390_OPERAND_PCREL)
|
2015-01-16 19:19:21 +08:00
|
|
|
{
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
2015-01-16 19:19:21 +08:00
|
|
|
info->print_address_func (memaddr + val.i + val.i, info);
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
else if (flags & S390_OPERAND_SIGNED)
|
2022-07-05 21:17:14 +08:00
|
|
|
{
|
|
|
|
enum disassembler_style style;
|
|
|
|
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
|
|
|
style = ((flags & S390_OPERAND_DISP)
|
|
|
|
? dis_style_address_offset : dis_style_immediate);
|
|
|
|
info->fprintf_styled_func (info->stream, style, "%i", val.i);
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
else
|
2015-01-16 19:19:21 +08:00
|
|
|
{
|
2022-07-05 21:17:14 +08:00
|
|
|
enum disassembler_style style;
|
|
|
|
|
2015-01-16 19:19:21 +08:00
|
|
|
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;
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"%c", separator);
|
|
|
|
style = ((flags & S390_OPERAND_DISP)
|
|
|
|
? dis_style_address_offset : dis_style_immediate);
|
|
|
|
info->fprintf_styled_func (info->stream, style, "%u", val.u);
|
2015-01-16 19:19:21 +08:00
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
|
|
|
|
if (flags & S390_OPERAND_DISP)
|
|
|
|
separator = '(';
|
|
|
|
else if (flags & S390_OPERAND_BASE)
|
|
|
|
{
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text, ")");
|
2014-08-19 22:42:13 +08:00
|
|
|
separator = ',';
|
|
|
|
}
|
|
|
|
else
|
|
|
|
separator = ',';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check whether opcode A's mask is more specific than that of B. */
|
2001-07-23 21:41:14 +08:00
|
|
|
|
2014-08-19 22:42:13 +08:00
|
|
|
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]));
|
2001-02-10 08:58:38 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Print a S390 instruction. */
|
|
|
|
|
|
|
|
int
|
2005-07-01 19:16:33 +08:00
|
|
|
print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
|
2001-02-10 08:58:38 +08:00
|
|
|
{
|
|
|
|
bfd_byte buffer[6];
|
2014-08-19 22:42:13 +08:00
|
|
|
const struct s390_opcode *opcode = NULL;
|
2001-02-10 08:58:38 +08:00
|
|
|
unsigned int value;
|
2016-06-10 19:40:48 +08:00
|
|
|
int status, opsize, bufsize, bytes_to_dump, i;
|
2001-02-10 08:58:38 +08:00
|
|
|
|
|
|
|
/* 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. */
|
2001-07-23 21:41:14 +08:00
|
|
|
memset (buffer, 0, 6);
|
2014-08-19 22:42:13 +08:00
|
|
|
status = info->read_memory_func (memaddr, buffer, 6, info);
|
2001-07-23 21:41:14 +08:00
|
|
|
if (status != 0)
|
|
|
|
{
|
|
|
|
for (bufsize = 0; bufsize < 6; bufsize++)
|
2014-08-19 22:42:13 +08:00
|
|
|
if (info->read_memory_func (memaddr, buffer, bufsize + 1, info) != 0)
|
2001-07-23 21:41:14 +08:00
|
|
|
break;
|
|
|
|
if (bufsize <= 0)
|
|
|
|
{
|
2014-08-19 22:42:13 +08:00
|
|
|
info->memory_error_func (status, memaddr, info);
|
2001-07-23 21:41:14 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
opsize = s390_insn_length (buffer);
|
2001-07-23 21:41:14 +08:00
|
|
|
status = opsize > bufsize;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bufsize = 6;
|
2014-08-19 22:42:13 +08:00
|
|
|
opsize = s390_insn_length (buffer);
|
2001-07-23 21:41:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (status == 0)
|
|
|
|
{
|
2010-09-27 21:33:00 +08:00
|
|
|
const struct s390_opcode *op;
|
|
|
|
|
2014-08-19 22:42:13 +08:00
|
|
|
/* 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++)
|
2001-07-23 21:41:14 +08:00
|
|
|
{
|
2014-08-19 22:42:13 +08:00
|
|
|
if ((op->modes & current_arch_mask)
|
|
|
|
&& s390_insn_matches_opcode (buffer, op)
|
|
|
|
&& (opcode == NULL
|
|
|
|
|| opcode_mask_more_specific (op, opcode)))
|
|
|
|
opcode = op;
|
2001-07-23 21:41:14 +08:00
|
|
|
}
|
|
|
|
|
2016-06-10 19:40:48 +08:00
|
|
|
if (opcode != NULL)
|
|
|
|
{
|
|
|
|
/* The instruction is valid. Print it and return its size. */
|
|
|
|
s390_print_insn_with_opcode (memaddr, info, buffer, opcode);
|
|
|
|
return opsize;
|
|
|
|
}
|
2014-08-19 22:42:13 +08:00
|
|
|
}
|
|
|
|
|
2016-06-10 19:40:48 +08:00
|
|
|
/* 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;
|
|
|
|
|
2014-08-19 22:42:13 +08:00
|
|
|
/* Fall back to hex print. */
|
2016-06-10 19:40:48 +08:00
|
|
|
switch (bytes_to_dump)
|
2001-07-23 21:41:14 +08:00
|
|
|
{
|
2016-06-10 19:40:48 +08:00
|
|
|
case 4:
|
2001-07-23 21:41:14 +08:00
|
|
|
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];
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_assembler_directive,
|
|
|
|
".long");
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"\t");
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_immediate,
|
|
|
|
"0x%08x", value);
|
2001-07-23 21:41:14 +08:00
|
|
|
return 4;
|
2016-06-10 19:40:48 +08:00
|
|
|
case 2:
|
2001-07-23 21:41:14 +08:00
|
|
|
value = (unsigned int) buffer[0];
|
|
|
|
value = (value << 8) + (unsigned int) buffer[1];
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_assembler_directive,
|
|
|
|
".short");
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"\t");
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_immediate,
|
|
|
|
"0x%04x", value);
|
2001-07-23 21:41:14 +08:00
|
|
|
return 2;
|
2016-06-10 19:40:48 +08:00
|
|
|
default:
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_assembler_directive,
|
|
|
|
".byte");
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_text,
|
|
|
|
"\t");
|
|
|
|
info->fprintf_styled_func (info->stream, dis_style_immediate,
|
|
|
|
"0x%02x", (unsigned int) buffer[0]);
|
2016-06-10 19:40:48 +08:00
|
|
|
for (i = 1; i < bytes_to_dump; i++)
|
2022-07-05 21:17:14 +08:00
|
|
|
info->fprintf_styled_func (info->stream, dis_style_immediate,
|
|
|
|
"0x%02x", (unsigned int) buffer[i]);
|
2016-06-10 19:40:48 +08:00
|
|
|
return bytes_to_dump;
|
2001-02-10 08:58:38 +08:00
|
|
|
}
|
2016-06-10 19:40:48 +08:00
|
|
|
return 0;
|
2001-02-10 08:58:38 +08:00
|
|
|
}
|
2008-04-10 21:36:43 +08:00
|
|
|
|
GDB PR tdep/8282: MIPS: Wire in `set disassembler-options'
Implement MIPS target support for passing options to the disassembler,
complementing commit 65b48a81404c ("GDB: Add support for the new
set/show disassembler-options commands.").
This includes options that expect an argument, so adjust the generic
code and data structures used so as to handle such options. So as to
give backends syntax flexibility no specific delimiter has been defined
to separate options from their respective arguments, so it has to be
included as the last character of the option name. Completion code
however has not been adjusted and consequently option arguments cannot
be completed at this time.
Also the MIPS target has non-empty defaults for the options, so that ABI
names for the general-purpose registers respect our `set mips abi ...'
setting rather than always being determined from the ELF headers of the
binary file selected. Handle these defaults as implicit options, never
shown to the user and always prepended to the user-specified options, so
that the latters can override the defaults.
The resulting output for the MIPS target is as follows:
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
no-aliases Use canonical instruction forms.
msa Recognize MSA instructions.
virt Recognize the virtualization ASE instructions.
xpa Recognize the eXtended Physical Address (XPA) ASE
instructions.
ginv Recognize the Global INValidate (GINV) ASE instructions.
gpr-names=ABI Print GPR names according to specified ABI.
Default: based on binary being disassembled.
fpr-names=ABI Print FPR names according to specified ABI.
Default: numeric.
cp0-names=ARCH Print CP0 register names according to specified architecture.
Default: based on binary being disassembled.
hwr-names=ARCH Print HWR names according to specified architecture.
Default: based on binary being disassembled.
reg-names=ABI Print GPR and FPR names according to specified ABI.
reg-names=ARCH Print CP0 register and HWR names according to specified
architecture.
For the options above, the following values are supported for "ABI":
numeric 32 n32 64
For the options above, the following values are supported for "ARCH":
numeric r3000 r3900 r4000 r4010 vr4100 vr4111 vr4120 r4300 r4400 r4600
r4650 r5000 vr5400 vr5500 r5900 r6000 rm7000 rm9000 r8000 r10000 r12000
r14000 r16000 mips5 mips32 mips32r2 mips32r3 mips32r5 mips32r6 mips64
mips64r2 mips64r3 mips64r5 mips64r6 interaptiv-mr2 sb1 loongson2e
loongson2f loongson3a octeon octeon+ octeon2 octeon3 xlr xlp
(gdb)
which corresponds to what `objdump --help' used to print for the MIPS
target, with minor formatting changes, most notably option argument
lists being wrapped, but also the amount of white space separating
options from the respective descriptions. The relevant part the new
code is now also used by `objdump --help', which means these formatting
changes apply to both outputs, except for argument list wrapping, which
is GDB-specific.
This also adds a separating new line between the heading and option
lists where descriptions are provided, hence:
(gdb) set architecture s390:31-bit
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
esa Disassemble in ESA architecture mode
zarch Disassemble in z/Architecture mode
insnlength Print unknown instructions according to length from first two bits
(gdb)
but:
(gdb) set architecture powerpc:common
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
403, 405, 440, 464, 476, 601, 603, 604, 620, 7400, 7410, 7450, 7455, 750cl,
821, 850, 860, a2, altivec, any, booke, booke32, cell, com, e200z4, e300,
e500, e500mc, e500mc64, e5500, e6500, e500x2, efs, efs2, power4, power5,
power6, power7, power8, power9, ppc, ppc32, 32, ppc64, 64, ppc64bridge,
ppcps, pwr, pwr2, pwr4, pwr5, pwr5x, pwr6, pwr7, pwr8, pwr9, pwrx, raw, spe,
spe2, titan, vle, vsx
(gdb)
Existing affected target backends have been adjusted accordingly.
This has been verified manually with:
(gdb) set architecture arm
(gdb) set architecture powerpc:common
(gdb) set architecture s390:31-bit
to cause no issues with the `show disassembler-options' and `set
disassembler-options' commands. A test case for the MIPS target has
also been provided, covering the default settings with ABI overrides as
well as disassembler option overrides.
2018-07-02 Maciej W. Rozycki <macro@mips.com>
Simon Marchi <simon.marchi@polymtl.ca>
include/
PR tdep/8282
* dis-asm.h (disasm_option_arg_t): New typedef.
(disasm_options_and_args_t): Likewise.
(disasm_options_t): Add `arg' member, document members.
(disassembler_options_mips): New prototype.
(disassembler_options_arm, disassembler_options_powerpc)
(disassembler_options_s390): Update prototypes.
opcodes/
PR tdep/8282
* mips-dis.c (mips_option_arg_t): New enumeration.
(mips_options): New variable.
(disassembler_options_mips): New function.
(print_mips_disassembler_options): Reimplement in terms of
`disassembler_options_mips'.
* arm-dis.c (disassembler_options_arm): Adapt to using the
`disasm_options_and_args_t' structure.
* ppc-dis.c (disassembler_options_powerpc): Likewise.
* s390-dis.c (disassembler_options_s390): Likewise.
gdb/
PR tdep/8282
* disasm.h (gdb_disassembler): Add
`m_disassembler_options_holder'. member
* disasm.c (get_all_disassembler_options): New function.
(gdb_disassembler::gdb_disassembler): Use it.
(gdb_buffered_insn_length_init_dis): Likewise.
(gdb_buffered_insn_length): Adjust accordingly.
(set_disassembler_options): Handle options with arguments.
(show_disassembler_options_sfunc): Likewise. Add a leading new
line if showing options with descriptions.
(disassembler_options_completer): Adapt to using the
`disasm_options_and_args_t' structure.
* mips-tdep.c (mips_disassembler_options): New variable.
(mips_disassembler_options_o32): Likewise.
(mips_disassembler_options_n32): Likewise.
(mips_disassembler_options_n64): Likewise.
(gdb_print_insn_mips): Don't set `disassembler_options'.
(gdb_print_insn_mips_n32, gdb_print_insn_mips_n64): Remove
functions.
(mips_gdbarch_init): Always set `gdbarch_print_insn' to
`gdb_print_insn_mips'. Set `gdbarch_disassembler_options',
`gdbarch_disassembler_options_implicit' and
`gdbarch_valid_disassembler_options'.
* arm-tdep.c (_initialize_arm_tdep): Adapt to using the
`disasm_options_and_args_t' structure.
* gdbarch.sh (disassembler_options_implicit): New `gdbarch'
method.
(valid_disassembler_options): Switch from `disasm_options_t' to
the `disasm_options_and_args_t' structure.
* NEWS: Document `set disassembler-options' support for the MIPS
target.
* gdbarch.h: Regenerate.
* gdbarch.c: Regenerate.
gdb/doc/
PR tdep/8282
* gdb.texinfo (Source and Machine Code): Document `set
disassembler-options' support for the MIPS target.
gdb/testsuite/
PR tdep/8282
* gdb.arch/mips-disassembler-options.exp: New test.
* gdb.arch/mips-disassembler-options.s: New test source.
2018-07-03 06:57:21 +08:00
|
|
|
const disasm_options_and_args_t *
|
2017-03-01 02:32:07 +08:00
|
|
|
disassembler_options_s390 (void)
|
|
|
|
{
|
GDB PR tdep/8282: MIPS: Wire in `set disassembler-options'
Implement MIPS target support for passing options to the disassembler,
complementing commit 65b48a81404c ("GDB: Add support for the new
set/show disassembler-options commands.").
This includes options that expect an argument, so adjust the generic
code and data structures used so as to handle such options. So as to
give backends syntax flexibility no specific delimiter has been defined
to separate options from their respective arguments, so it has to be
included as the last character of the option name. Completion code
however has not been adjusted and consequently option arguments cannot
be completed at this time.
Also the MIPS target has non-empty defaults for the options, so that ABI
names for the general-purpose registers respect our `set mips abi ...'
setting rather than always being determined from the ELF headers of the
binary file selected. Handle these defaults as implicit options, never
shown to the user and always prepended to the user-specified options, so
that the latters can override the defaults.
The resulting output for the MIPS target is as follows:
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
no-aliases Use canonical instruction forms.
msa Recognize MSA instructions.
virt Recognize the virtualization ASE instructions.
xpa Recognize the eXtended Physical Address (XPA) ASE
instructions.
ginv Recognize the Global INValidate (GINV) ASE instructions.
gpr-names=ABI Print GPR names according to specified ABI.
Default: based on binary being disassembled.
fpr-names=ABI Print FPR names according to specified ABI.
Default: numeric.
cp0-names=ARCH Print CP0 register names according to specified architecture.
Default: based on binary being disassembled.
hwr-names=ARCH Print HWR names according to specified architecture.
Default: based on binary being disassembled.
reg-names=ABI Print GPR and FPR names according to specified ABI.
reg-names=ARCH Print CP0 register and HWR names according to specified
architecture.
For the options above, the following values are supported for "ABI":
numeric 32 n32 64
For the options above, the following values are supported for "ARCH":
numeric r3000 r3900 r4000 r4010 vr4100 vr4111 vr4120 r4300 r4400 r4600
r4650 r5000 vr5400 vr5500 r5900 r6000 rm7000 rm9000 r8000 r10000 r12000
r14000 r16000 mips5 mips32 mips32r2 mips32r3 mips32r5 mips32r6 mips64
mips64r2 mips64r3 mips64r5 mips64r6 interaptiv-mr2 sb1 loongson2e
loongson2f loongson3a octeon octeon+ octeon2 octeon3 xlr xlp
(gdb)
which corresponds to what `objdump --help' used to print for the MIPS
target, with minor formatting changes, most notably option argument
lists being wrapped, but also the amount of white space separating
options from the respective descriptions. The relevant part the new
code is now also used by `objdump --help', which means these formatting
changes apply to both outputs, except for argument list wrapping, which
is GDB-specific.
This also adds a separating new line between the heading and option
lists where descriptions are provided, hence:
(gdb) set architecture s390:31-bit
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
esa Disassemble in ESA architecture mode
zarch Disassemble in z/Architecture mode
insnlength Print unknown instructions according to length from first two bits
(gdb)
but:
(gdb) set architecture powerpc:common
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
403, 405, 440, 464, 476, 601, 603, 604, 620, 7400, 7410, 7450, 7455, 750cl,
821, 850, 860, a2, altivec, any, booke, booke32, cell, com, e200z4, e300,
e500, e500mc, e500mc64, e5500, e6500, e500x2, efs, efs2, power4, power5,
power6, power7, power8, power9, ppc, ppc32, 32, ppc64, 64, ppc64bridge,
ppcps, pwr, pwr2, pwr4, pwr5, pwr5x, pwr6, pwr7, pwr8, pwr9, pwrx, raw, spe,
spe2, titan, vle, vsx
(gdb)
Existing affected target backends have been adjusted accordingly.
This has been verified manually with:
(gdb) set architecture arm
(gdb) set architecture powerpc:common
(gdb) set architecture s390:31-bit
to cause no issues with the `show disassembler-options' and `set
disassembler-options' commands. A test case for the MIPS target has
also been provided, covering the default settings with ABI overrides as
well as disassembler option overrides.
2018-07-02 Maciej W. Rozycki <macro@mips.com>
Simon Marchi <simon.marchi@polymtl.ca>
include/
PR tdep/8282
* dis-asm.h (disasm_option_arg_t): New typedef.
(disasm_options_and_args_t): Likewise.
(disasm_options_t): Add `arg' member, document members.
(disassembler_options_mips): New prototype.
(disassembler_options_arm, disassembler_options_powerpc)
(disassembler_options_s390): Update prototypes.
opcodes/
PR tdep/8282
* mips-dis.c (mips_option_arg_t): New enumeration.
(mips_options): New variable.
(disassembler_options_mips): New function.
(print_mips_disassembler_options): Reimplement in terms of
`disassembler_options_mips'.
* arm-dis.c (disassembler_options_arm): Adapt to using the
`disasm_options_and_args_t' structure.
* ppc-dis.c (disassembler_options_powerpc): Likewise.
* s390-dis.c (disassembler_options_s390): Likewise.
gdb/
PR tdep/8282
* disasm.h (gdb_disassembler): Add
`m_disassembler_options_holder'. member
* disasm.c (get_all_disassembler_options): New function.
(gdb_disassembler::gdb_disassembler): Use it.
(gdb_buffered_insn_length_init_dis): Likewise.
(gdb_buffered_insn_length): Adjust accordingly.
(set_disassembler_options): Handle options with arguments.
(show_disassembler_options_sfunc): Likewise. Add a leading new
line if showing options with descriptions.
(disassembler_options_completer): Adapt to using the
`disasm_options_and_args_t' structure.
* mips-tdep.c (mips_disassembler_options): New variable.
(mips_disassembler_options_o32): Likewise.
(mips_disassembler_options_n32): Likewise.
(mips_disassembler_options_n64): Likewise.
(gdb_print_insn_mips): Don't set `disassembler_options'.
(gdb_print_insn_mips_n32, gdb_print_insn_mips_n64): Remove
functions.
(mips_gdbarch_init): Always set `gdbarch_print_insn' to
`gdb_print_insn_mips'. Set `gdbarch_disassembler_options',
`gdbarch_disassembler_options_implicit' and
`gdbarch_valid_disassembler_options'.
* arm-tdep.c (_initialize_arm_tdep): Adapt to using the
`disasm_options_and_args_t' structure.
* gdbarch.sh (disassembler_options_implicit): New `gdbarch'
method.
(valid_disassembler_options): Switch from `disasm_options_t' to
the `disasm_options_and_args_t' structure.
* NEWS: Document `set disassembler-options' support for the MIPS
target.
* gdbarch.h: Regenerate.
* gdbarch.c: Regenerate.
gdb/doc/
PR tdep/8282
* gdb.texinfo (Source and Machine Code): Document `set
disassembler-options' support for the MIPS target.
gdb/testsuite/
PR tdep/8282
* gdb.arch/mips-disassembler-options.exp: New test.
* gdb.arch/mips-disassembler-options.s: New test source.
2018-07-03 06:57:21 +08:00
|
|
|
static disasm_options_and_args_t *opts_and_args;
|
2017-03-01 02:32:07 +08:00
|
|
|
|
GDB PR tdep/8282: MIPS: Wire in `set disassembler-options'
Implement MIPS target support for passing options to the disassembler,
complementing commit 65b48a81404c ("GDB: Add support for the new
set/show disassembler-options commands.").
This includes options that expect an argument, so adjust the generic
code and data structures used so as to handle such options. So as to
give backends syntax flexibility no specific delimiter has been defined
to separate options from their respective arguments, so it has to be
included as the last character of the option name. Completion code
however has not been adjusted and consequently option arguments cannot
be completed at this time.
Also the MIPS target has non-empty defaults for the options, so that ABI
names for the general-purpose registers respect our `set mips abi ...'
setting rather than always being determined from the ELF headers of the
binary file selected. Handle these defaults as implicit options, never
shown to the user and always prepended to the user-specified options, so
that the latters can override the defaults.
The resulting output for the MIPS target is as follows:
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
no-aliases Use canonical instruction forms.
msa Recognize MSA instructions.
virt Recognize the virtualization ASE instructions.
xpa Recognize the eXtended Physical Address (XPA) ASE
instructions.
ginv Recognize the Global INValidate (GINV) ASE instructions.
gpr-names=ABI Print GPR names according to specified ABI.
Default: based on binary being disassembled.
fpr-names=ABI Print FPR names according to specified ABI.
Default: numeric.
cp0-names=ARCH Print CP0 register names according to specified architecture.
Default: based on binary being disassembled.
hwr-names=ARCH Print HWR names according to specified architecture.
Default: based on binary being disassembled.
reg-names=ABI Print GPR and FPR names according to specified ABI.
reg-names=ARCH Print CP0 register and HWR names according to specified
architecture.
For the options above, the following values are supported for "ABI":
numeric 32 n32 64
For the options above, the following values are supported for "ARCH":
numeric r3000 r3900 r4000 r4010 vr4100 vr4111 vr4120 r4300 r4400 r4600
r4650 r5000 vr5400 vr5500 r5900 r6000 rm7000 rm9000 r8000 r10000 r12000
r14000 r16000 mips5 mips32 mips32r2 mips32r3 mips32r5 mips32r6 mips64
mips64r2 mips64r3 mips64r5 mips64r6 interaptiv-mr2 sb1 loongson2e
loongson2f loongson3a octeon octeon+ octeon2 octeon3 xlr xlp
(gdb)
which corresponds to what `objdump --help' used to print for the MIPS
target, with minor formatting changes, most notably option argument
lists being wrapped, but also the amount of white space separating
options from the respective descriptions. The relevant part the new
code is now also used by `objdump --help', which means these formatting
changes apply to both outputs, except for argument list wrapping, which
is GDB-specific.
This also adds a separating new line between the heading and option
lists where descriptions are provided, hence:
(gdb) set architecture s390:31-bit
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
esa Disassemble in ESA architecture mode
zarch Disassemble in z/Architecture mode
insnlength Print unknown instructions according to length from first two bits
(gdb)
but:
(gdb) set architecture powerpc:common
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
403, 405, 440, 464, 476, 601, 603, 604, 620, 7400, 7410, 7450, 7455, 750cl,
821, 850, 860, a2, altivec, any, booke, booke32, cell, com, e200z4, e300,
e500, e500mc, e500mc64, e5500, e6500, e500x2, efs, efs2, power4, power5,
power6, power7, power8, power9, ppc, ppc32, 32, ppc64, 64, ppc64bridge,
ppcps, pwr, pwr2, pwr4, pwr5, pwr5x, pwr6, pwr7, pwr8, pwr9, pwrx, raw, spe,
spe2, titan, vle, vsx
(gdb)
Existing affected target backends have been adjusted accordingly.
This has been verified manually with:
(gdb) set architecture arm
(gdb) set architecture powerpc:common
(gdb) set architecture s390:31-bit
to cause no issues with the `show disassembler-options' and `set
disassembler-options' commands. A test case for the MIPS target has
also been provided, covering the default settings with ABI overrides as
well as disassembler option overrides.
2018-07-02 Maciej W. Rozycki <macro@mips.com>
Simon Marchi <simon.marchi@polymtl.ca>
include/
PR tdep/8282
* dis-asm.h (disasm_option_arg_t): New typedef.
(disasm_options_and_args_t): Likewise.
(disasm_options_t): Add `arg' member, document members.
(disassembler_options_mips): New prototype.
(disassembler_options_arm, disassembler_options_powerpc)
(disassembler_options_s390): Update prototypes.
opcodes/
PR tdep/8282
* mips-dis.c (mips_option_arg_t): New enumeration.
(mips_options): New variable.
(disassembler_options_mips): New function.
(print_mips_disassembler_options): Reimplement in terms of
`disassembler_options_mips'.
* arm-dis.c (disassembler_options_arm): Adapt to using the
`disasm_options_and_args_t' structure.
* ppc-dis.c (disassembler_options_powerpc): Likewise.
* s390-dis.c (disassembler_options_s390): Likewise.
gdb/
PR tdep/8282
* disasm.h (gdb_disassembler): Add
`m_disassembler_options_holder'. member
* disasm.c (get_all_disassembler_options): New function.
(gdb_disassembler::gdb_disassembler): Use it.
(gdb_buffered_insn_length_init_dis): Likewise.
(gdb_buffered_insn_length): Adjust accordingly.
(set_disassembler_options): Handle options with arguments.
(show_disassembler_options_sfunc): Likewise. Add a leading new
line if showing options with descriptions.
(disassembler_options_completer): Adapt to using the
`disasm_options_and_args_t' structure.
* mips-tdep.c (mips_disassembler_options): New variable.
(mips_disassembler_options_o32): Likewise.
(mips_disassembler_options_n32): Likewise.
(mips_disassembler_options_n64): Likewise.
(gdb_print_insn_mips): Don't set `disassembler_options'.
(gdb_print_insn_mips_n32, gdb_print_insn_mips_n64): Remove
functions.
(mips_gdbarch_init): Always set `gdbarch_print_insn' to
`gdb_print_insn_mips'. Set `gdbarch_disassembler_options',
`gdbarch_disassembler_options_implicit' and
`gdbarch_valid_disassembler_options'.
* arm-tdep.c (_initialize_arm_tdep): Adapt to using the
`disasm_options_and_args_t' structure.
* gdbarch.sh (disassembler_options_implicit): New `gdbarch'
method.
(valid_disassembler_options): Switch from `disasm_options_t' to
the `disasm_options_and_args_t' structure.
* NEWS: Document `set disassembler-options' support for the MIPS
target.
* gdbarch.h: Regenerate.
* gdbarch.c: Regenerate.
gdb/doc/
PR tdep/8282
* gdb.texinfo (Source and Machine Code): Document `set
disassembler-options' support for the MIPS target.
gdb/testsuite/
PR tdep/8282
* gdb.arch/mips-disassembler-options.exp: New test.
* gdb.arch/mips-disassembler-options.s: New test source.
2018-07-03 06:57:21 +08:00
|
|
|
if (opts_and_args == NULL)
|
2017-03-01 02:32:07 +08:00
|
|
|
{
|
|
|
|
size_t i, num_options = ARRAY_SIZE (options);
|
GDB PR tdep/8282: MIPS: Wire in `set disassembler-options'
Implement MIPS target support for passing options to the disassembler,
complementing commit 65b48a81404c ("GDB: Add support for the new
set/show disassembler-options commands.").
This includes options that expect an argument, so adjust the generic
code and data structures used so as to handle such options. So as to
give backends syntax flexibility no specific delimiter has been defined
to separate options from their respective arguments, so it has to be
included as the last character of the option name. Completion code
however has not been adjusted and consequently option arguments cannot
be completed at this time.
Also the MIPS target has non-empty defaults for the options, so that ABI
names for the general-purpose registers respect our `set mips abi ...'
setting rather than always being determined from the ELF headers of the
binary file selected. Handle these defaults as implicit options, never
shown to the user and always prepended to the user-specified options, so
that the latters can override the defaults.
The resulting output for the MIPS target is as follows:
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
no-aliases Use canonical instruction forms.
msa Recognize MSA instructions.
virt Recognize the virtualization ASE instructions.
xpa Recognize the eXtended Physical Address (XPA) ASE
instructions.
ginv Recognize the Global INValidate (GINV) ASE instructions.
gpr-names=ABI Print GPR names according to specified ABI.
Default: based on binary being disassembled.
fpr-names=ABI Print FPR names according to specified ABI.
Default: numeric.
cp0-names=ARCH Print CP0 register names according to specified architecture.
Default: based on binary being disassembled.
hwr-names=ARCH Print HWR names according to specified architecture.
Default: based on binary being disassembled.
reg-names=ABI Print GPR and FPR names according to specified ABI.
reg-names=ARCH Print CP0 register and HWR names according to specified
architecture.
For the options above, the following values are supported for "ABI":
numeric 32 n32 64
For the options above, the following values are supported for "ARCH":
numeric r3000 r3900 r4000 r4010 vr4100 vr4111 vr4120 r4300 r4400 r4600
r4650 r5000 vr5400 vr5500 r5900 r6000 rm7000 rm9000 r8000 r10000 r12000
r14000 r16000 mips5 mips32 mips32r2 mips32r3 mips32r5 mips32r6 mips64
mips64r2 mips64r3 mips64r5 mips64r6 interaptiv-mr2 sb1 loongson2e
loongson2f loongson3a octeon octeon+ octeon2 octeon3 xlr xlp
(gdb)
which corresponds to what `objdump --help' used to print for the MIPS
target, with minor formatting changes, most notably option argument
lists being wrapped, but also the amount of white space separating
options from the respective descriptions. The relevant part the new
code is now also used by `objdump --help', which means these formatting
changes apply to both outputs, except for argument list wrapping, which
is GDB-specific.
This also adds a separating new line between the heading and option
lists where descriptions are provided, hence:
(gdb) set architecture s390:31-bit
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
esa Disassemble in ESA architecture mode
zarch Disassemble in z/Architecture mode
insnlength Print unknown instructions according to length from first two bits
(gdb)
but:
(gdb) set architecture powerpc:common
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
403, 405, 440, 464, 476, 601, 603, 604, 620, 7400, 7410, 7450, 7455, 750cl,
821, 850, 860, a2, altivec, any, booke, booke32, cell, com, e200z4, e300,
e500, e500mc, e500mc64, e5500, e6500, e500x2, efs, efs2, power4, power5,
power6, power7, power8, power9, ppc, ppc32, 32, ppc64, 64, ppc64bridge,
ppcps, pwr, pwr2, pwr4, pwr5, pwr5x, pwr6, pwr7, pwr8, pwr9, pwrx, raw, spe,
spe2, titan, vle, vsx
(gdb)
Existing affected target backends have been adjusted accordingly.
This has been verified manually with:
(gdb) set architecture arm
(gdb) set architecture powerpc:common
(gdb) set architecture s390:31-bit
to cause no issues with the `show disassembler-options' and `set
disassembler-options' commands. A test case for the MIPS target has
also been provided, covering the default settings with ABI overrides as
well as disassembler option overrides.
2018-07-02 Maciej W. Rozycki <macro@mips.com>
Simon Marchi <simon.marchi@polymtl.ca>
include/
PR tdep/8282
* dis-asm.h (disasm_option_arg_t): New typedef.
(disasm_options_and_args_t): Likewise.
(disasm_options_t): Add `arg' member, document members.
(disassembler_options_mips): New prototype.
(disassembler_options_arm, disassembler_options_powerpc)
(disassembler_options_s390): Update prototypes.
opcodes/
PR tdep/8282
* mips-dis.c (mips_option_arg_t): New enumeration.
(mips_options): New variable.
(disassembler_options_mips): New function.
(print_mips_disassembler_options): Reimplement in terms of
`disassembler_options_mips'.
* arm-dis.c (disassembler_options_arm): Adapt to using the
`disasm_options_and_args_t' structure.
* ppc-dis.c (disassembler_options_powerpc): Likewise.
* s390-dis.c (disassembler_options_s390): Likewise.
gdb/
PR tdep/8282
* disasm.h (gdb_disassembler): Add
`m_disassembler_options_holder'. member
* disasm.c (get_all_disassembler_options): New function.
(gdb_disassembler::gdb_disassembler): Use it.
(gdb_buffered_insn_length_init_dis): Likewise.
(gdb_buffered_insn_length): Adjust accordingly.
(set_disassembler_options): Handle options with arguments.
(show_disassembler_options_sfunc): Likewise. Add a leading new
line if showing options with descriptions.
(disassembler_options_completer): Adapt to using the
`disasm_options_and_args_t' structure.
* mips-tdep.c (mips_disassembler_options): New variable.
(mips_disassembler_options_o32): Likewise.
(mips_disassembler_options_n32): Likewise.
(mips_disassembler_options_n64): Likewise.
(gdb_print_insn_mips): Don't set `disassembler_options'.
(gdb_print_insn_mips_n32, gdb_print_insn_mips_n64): Remove
functions.
(mips_gdbarch_init): Always set `gdbarch_print_insn' to
`gdb_print_insn_mips'. Set `gdbarch_disassembler_options',
`gdbarch_disassembler_options_implicit' and
`gdbarch_valid_disassembler_options'.
* arm-tdep.c (_initialize_arm_tdep): Adapt to using the
`disasm_options_and_args_t' structure.
* gdbarch.sh (disassembler_options_implicit): New `gdbarch'
method.
(valid_disassembler_options): Switch from `disasm_options_t' to
the `disasm_options_and_args_t' structure.
* NEWS: Document `set disassembler-options' support for the MIPS
target.
* gdbarch.h: Regenerate.
* gdbarch.c: Regenerate.
gdb/doc/
PR tdep/8282
* gdb.texinfo (Source and Machine Code): Document `set
disassembler-options' support for the MIPS target.
gdb/testsuite/
PR tdep/8282
* gdb.arch/mips-disassembler-options.exp: New test.
* gdb.arch/mips-disassembler-options.s: New test source.
2018-07-03 06:57:21 +08:00
|
|
|
disasm_options_t *opts;
|
|
|
|
|
|
|
|
opts_and_args = XNEW (disasm_options_and_args_t);
|
|
|
|
opts_and_args->args = NULL;
|
|
|
|
|
|
|
|
opts = &opts_and_args->options;
|
2017-03-01 02:32:07 +08:00
|
|
|
opts->name = XNEWVEC (const char *, num_options + 1);
|
|
|
|
opts->description = XNEWVEC (const char *, num_options + 1);
|
GDB PR tdep/8282: MIPS: Wire in `set disassembler-options'
Implement MIPS target support for passing options to the disassembler,
complementing commit 65b48a81404c ("GDB: Add support for the new
set/show disassembler-options commands.").
This includes options that expect an argument, so adjust the generic
code and data structures used so as to handle such options. So as to
give backends syntax flexibility no specific delimiter has been defined
to separate options from their respective arguments, so it has to be
included as the last character of the option name. Completion code
however has not been adjusted and consequently option arguments cannot
be completed at this time.
Also the MIPS target has non-empty defaults for the options, so that ABI
names for the general-purpose registers respect our `set mips abi ...'
setting rather than always being determined from the ELF headers of the
binary file selected. Handle these defaults as implicit options, never
shown to the user and always prepended to the user-specified options, so
that the latters can override the defaults.
The resulting output for the MIPS target is as follows:
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
no-aliases Use canonical instruction forms.
msa Recognize MSA instructions.
virt Recognize the virtualization ASE instructions.
xpa Recognize the eXtended Physical Address (XPA) ASE
instructions.
ginv Recognize the Global INValidate (GINV) ASE instructions.
gpr-names=ABI Print GPR names according to specified ABI.
Default: based on binary being disassembled.
fpr-names=ABI Print FPR names according to specified ABI.
Default: numeric.
cp0-names=ARCH Print CP0 register names according to specified architecture.
Default: based on binary being disassembled.
hwr-names=ARCH Print HWR names according to specified architecture.
Default: based on binary being disassembled.
reg-names=ABI Print GPR and FPR names according to specified ABI.
reg-names=ARCH Print CP0 register and HWR names according to specified
architecture.
For the options above, the following values are supported for "ABI":
numeric 32 n32 64
For the options above, the following values are supported for "ARCH":
numeric r3000 r3900 r4000 r4010 vr4100 vr4111 vr4120 r4300 r4400 r4600
r4650 r5000 vr5400 vr5500 r5900 r6000 rm7000 rm9000 r8000 r10000 r12000
r14000 r16000 mips5 mips32 mips32r2 mips32r3 mips32r5 mips32r6 mips64
mips64r2 mips64r3 mips64r5 mips64r6 interaptiv-mr2 sb1 loongson2e
loongson2f loongson3a octeon octeon+ octeon2 octeon3 xlr xlp
(gdb)
which corresponds to what `objdump --help' used to print for the MIPS
target, with minor formatting changes, most notably option argument
lists being wrapped, but also the amount of white space separating
options from the respective descriptions. The relevant part the new
code is now also used by `objdump --help', which means these formatting
changes apply to both outputs, except for argument list wrapping, which
is GDB-specific.
This also adds a separating new line between the heading and option
lists where descriptions are provided, hence:
(gdb) set architecture s390:31-bit
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
esa Disassemble in ESA architecture mode
zarch Disassemble in z/Architecture mode
insnlength Print unknown instructions according to length from first two bits
(gdb)
but:
(gdb) set architecture powerpc:common
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
403, 405, 440, 464, 476, 601, 603, 604, 620, 7400, 7410, 7450, 7455, 750cl,
821, 850, 860, a2, altivec, any, booke, booke32, cell, com, e200z4, e300,
e500, e500mc, e500mc64, e5500, e6500, e500x2, efs, efs2, power4, power5,
power6, power7, power8, power9, ppc, ppc32, 32, ppc64, 64, ppc64bridge,
ppcps, pwr, pwr2, pwr4, pwr5, pwr5x, pwr6, pwr7, pwr8, pwr9, pwrx, raw, spe,
spe2, titan, vle, vsx
(gdb)
Existing affected target backends have been adjusted accordingly.
This has been verified manually with:
(gdb) set architecture arm
(gdb) set architecture powerpc:common
(gdb) set architecture s390:31-bit
to cause no issues with the `show disassembler-options' and `set
disassembler-options' commands. A test case for the MIPS target has
also been provided, covering the default settings with ABI overrides as
well as disassembler option overrides.
2018-07-02 Maciej W. Rozycki <macro@mips.com>
Simon Marchi <simon.marchi@polymtl.ca>
include/
PR tdep/8282
* dis-asm.h (disasm_option_arg_t): New typedef.
(disasm_options_and_args_t): Likewise.
(disasm_options_t): Add `arg' member, document members.
(disassembler_options_mips): New prototype.
(disassembler_options_arm, disassembler_options_powerpc)
(disassembler_options_s390): Update prototypes.
opcodes/
PR tdep/8282
* mips-dis.c (mips_option_arg_t): New enumeration.
(mips_options): New variable.
(disassembler_options_mips): New function.
(print_mips_disassembler_options): Reimplement in terms of
`disassembler_options_mips'.
* arm-dis.c (disassembler_options_arm): Adapt to using the
`disasm_options_and_args_t' structure.
* ppc-dis.c (disassembler_options_powerpc): Likewise.
* s390-dis.c (disassembler_options_s390): Likewise.
gdb/
PR tdep/8282
* disasm.h (gdb_disassembler): Add
`m_disassembler_options_holder'. member
* disasm.c (get_all_disassembler_options): New function.
(gdb_disassembler::gdb_disassembler): Use it.
(gdb_buffered_insn_length_init_dis): Likewise.
(gdb_buffered_insn_length): Adjust accordingly.
(set_disassembler_options): Handle options with arguments.
(show_disassembler_options_sfunc): Likewise. Add a leading new
line if showing options with descriptions.
(disassembler_options_completer): Adapt to using the
`disasm_options_and_args_t' structure.
* mips-tdep.c (mips_disassembler_options): New variable.
(mips_disassembler_options_o32): Likewise.
(mips_disassembler_options_n32): Likewise.
(mips_disassembler_options_n64): Likewise.
(gdb_print_insn_mips): Don't set `disassembler_options'.
(gdb_print_insn_mips_n32, gdb_print_insn_mips_n64): Remove
functions.
(mips_gdbarch_init): Always set `gdbarch_print_insn' to
`gdb_print_insn_mips'. Set `gdbarch_disassembler_options',
`gdbarch_disassembler_options_implicit' and
`gdbarch_valid_disassembler_options'.
* arm-tdep.c (_initialize_arm_tdep): Adapt to using the
`disasm_options_and_args_t' structure.
* gdbarch.sh (disassembler_options_implicit): New `gdbarch'
method.
(valid_disassembler_options): Switch from `disasm_options_t' to
the `disasm_options_and_args_t' structure.
* NEWS: Document `set disassembler-options' support for the MIPS
target.
* gdbarch.h: Regenerate.
* gdbarch.c: Regenerate.
gdb/doc/
PR tdep/8282
* gdb.texinfo (Source and Machine Code): Document `set
disassembler-options' support for the MIPS target.
gdb/testsuite/
PR tdep/8282
* gdb.arch/mips-disassembler-options.exp: New test.
* gdb.arch/mips-disassembler-options.s: New test source.
2018-07-03 06:57:21 +08:00
|
|
|
opts->arg = NULL;
|
2017-03-01 02:32:07 +08:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
GDB PR tdep/8282: MIPS: Wire in `set disassembler-options'
Implement MIPS target support for passing options to the disassembler,
complementing commit 65b48a81404c ("GDB: Add support for the new
set/show disassembler-options commands.").
This includes options that expect an argument, so adjust the generic
code and data structures used so as to handle such options. So as to
give backends syntax flexibility no specific delimiter has been defined
to separate options from their respective arguments, so it has to be
included as the last character of the option name. Completion code
however has not been adjusted and consequently option arguments cannot
be completed at this time.
Also the MIPS target has non-empty defaults for the options, so that ABI
names for the general-purpose registers respect our `set mips abi ...'
setting rather than always being determined from the ELF headers of the
binary file selected. Handle these defaults as implicit options, never
shown to the user and always prepended to the user-specified options, so
that the latters can override the defaults.
The resulting output for the MIPS target is as follows:
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
no-aliases Use canonical instruction forms.
msa Recognize MSA instructions.
virt Recognize the virtualization ASE instructions.
xpa Recognize the eXtended Physical Address (XPA) ASE
instructions.
ginv Recognize the Global INValidate (GINV) ASE instructions.
gpr-names=ABI Print GPR names according to specified ABI.
Default: based on binary being disassembled.
fpr-names=ABI Print FPR names according to specified ABI.
Default: numeric.
cp0-names=ARCH Print CP0 register names according to specified architecture.
Default: based on binary being disassembled.
hwr-names=ARCH Print HWR names according to specified architecture.
Default: based on binary being disassembled.
reg-names=ABI Print GPR and FPR names according to specified ABI.
reg-names=ARCH Print CP0 register and HWR names according to specified
architecture.
For the options above, the following values are supported for "ABI":
numeric 32 n32 64
For the options above, the following values are supported for "ARCH":
numeric r3000 r3900 r4000 r4010 vr4100 vr4111 vr4120 r4300 r4400 r4600
r4650 r5000 vr5400 vr5500 r5900 r6000 rm7000 rm9000 r8000 r10000 r12000
r14000 r16000 mips5 mips32 mips32r2 mips32r3 mips32r5 mips32r6 mips64
mips64r2 mips64r3 mips64r5 mips64r6 interaptiv-mr2 sb1 loongson2e
loongson2f loongson3a octeon octeon+ octeon2 octeon3 xlr xlp
(gdb)
which corresponds to what `objdump --help' used to print for the MIPS
target, with minor formatting changes, most notably option argument
lists being wrapped, but also the amount of white space separating
options from the respective descriptions. The relevant part the new
code is now also used by `objdump --help', which means these formatting
changes apply to both outputs, except for argument list wrapping, which
is GDB-specific.
This also adds a separating new line between the heading and option
lists where descriptions are provided, hence:
(gdb) set architecture s390:31-bit
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
esa Disassemble in ESA architecture mode
zarch Disassemble in z/Architecture mode
insnlength Print unknown instructions according to length from first two bits
(gdb)
but:
(gdb) set architecture powerpc:common
(gdb) show disassembler-options
The current disassembler options are ''
The following disassembler options are supported for use with the
'set disassembler-options <option>[,<option>...]' command:
403, 405, 440, 464, 476, 601, 603, 604, 620, 7400, 7410, 7450, 7455, 750cl,
821, 850, 860, a2, altivec, any, booke, booke32, cell, com, e200z4, e300,
e500, e500mc, e500mc64, e5500, e6500, e500x2, efs, efs2, power4, power5,
power6, power7, power8, power9, ppc, ppc32, 32, ppc64, 64, ppc64bridge,
ppcps, pwr, pwr2, pwr4, pwr5, pwr5x, pwr6, pwr7, pwr8, pwr9, pwrx, raw, spe,
spe2, titan, vle, vsx
(gdb)
Existing affected target backends have been adjusted accordingly.
This has been verified manually with:
(gdb) set architecture arm
(gdb) set architecture powerpc:common
(gdb) set architecture s390:31-bit
to cause no issues with the `show disassembler-options' and `set
disassembler-options' commands. A test case for the MIPS target has
also been provided, covering the default settings with ABI overrides as
well as disassembler option overrides.
2018-07-02 Maciej W. Rozycki <macro@mips.com>
Simon Marchi <simon.marchi@polymtl.ca>
include/
PR tdep/8282
* dis-asm.h (disasm_option_arg_t): New typedef.
(disasm_options_and_args_t): Likewise.
(disasm_options_t): Add `arg' member, document members.
(disassembler_options_mips): New prototype.
(disassembler_options_arm, disassembler_options_powerpc)
(disassembler_options_s390): Update prototypes.
opcodes/
PR tdep/8282
* mips-dis.c (mips_option_arg_t): New enumeration.
(mips_options): New variable.
(disassembler_options_mips): New function.
(print_mips_disassembler_options): Reimplement in terms of
`disassembler_options_mips'.
* arm-dis.c (disassembler_options_arm): Adapt to using the
`disasm_options_and_args_t' structure.
* ppc-dis.c (disassembler_options_powerpc): Likewise.
* s390-dis.c (disassembler_options_s390): Likewise.
gdb/
PR tdep/8282
* disasm.h (gdb_disassembler): Add
`m_disassembler_options_holder'. member
* disasm.c (get_all_disassembler_options): New function.
(gdb_disassembler::gdb_disassembler): Use it.
(gdb_buffered_insn_length_init_dis): Likewise.
(gdb_buffered_insn_length): Adjust accordingly.
(set_disassembler_options): Handle options with arguments.
(show_disassembler_options_sfunc): Likewise. Add a leading new
line if showing options with descriptions.
(disassembler_options_completer): Adapt to using the
`disasm_options_and_args_t' structure.
* mips-tdep.c (mips_disassembler_options): New variable.
(mips_disassembler_options_o32): Likewise.
(mips_disassembler_options_n32): Likewise.
(mips_disassembler_options_n64): Likewise.
(gdb_print_insn_mips): Don't set `disassembler_options'.
(gdb_print_insn_mips_n32, gdb_print_insn_mips_n64): Remove
functions.
(mips_gdbarch_init): Always set `gdbarch_print_insn' to
`gdb_print_insn_mips'. Set `gdbarch_disassembler_options',
`gdbarch_disassembler_options_implicit' and
`gdbarch_valid_disassembler_options'.
* arm-tdep.c (_initialize_arm_tdep): Adapt to using the
`disasm_options_and_args_t' structure.
* gdbarch.sh (disassembler_options_implicit): New `gdbarch'
method.
(valid_disassembler_options): Switch from `disasm_options_t' to
the `disasm_options_and_args_t' structure.
* NEWS: Document `set disassembler-options' support for the MIPS
target.
* gdbarch.h: Regenerate.
* gdbarch.c: Regenerate.
gdb/doc/
PR tdep/8282
* gdb.texinfo (Source and Machine Code): Document `set
disassembler-options' support for the MIPS target.
gdb/testsuite/
PR tdep/8282
* gdb.arch/mips-disassembler-options.exp: New test.
* gdb.arch/mips-disassembler-options.s: New test source.
2018-07-03 06:57:21 +08:00
|
|
|
return opts_and_args;
|
2017-03-01 02:32:07 +08:00
|
|
|
}
|
|
|
|
|
2008-04-10 21:36:43 +08:00
|
|
|
void
|
|
|
|
print_s390_disassembler_options (FILE *stream)
|
|
|
|
{
|
2017-03-01 02:32:07 +08:00
|
|
|
unsigned int i, max_len = 0;
|
2008-04-10 21:36:43 +08:00
|
|
|
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"));
|
|
|
|
|
2017-03-01 02:32:07 +08:00
|
|
|
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));
|
2008-04-10 21:36:43 +08:00
|
|
|
}
|