forked from Imagelibrary/binutils-gdb
GDB: Add support for the new set/show disassembler-options commands.
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.
This commit is contained in:
Peter Bergner
@@ -25,16 +25,30 @@
|
||||
#include "dis-asm.h"
|
||||
#include "opintl.h"
|
||||
#include "opcode/s390.h"
|
||||
#include "libiberty.h"
|
||||
|
||||
static int init_flag = 0;
|
||||
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. */
|
||||
|
||||
static void
|
||||
init_disasm (struct disassemble_info *info)
|
||||
void
|
||||
disassemble_init_s390 (struct disassemble_info *info)
|
||||
{
|
||||
int i;
|
||||
const char *p;
|
||||
@@ -46,6 +60,9 @@ init_disasm (struct disassemble_info *info)
|
||||
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"))
|
||||
@@ -61,11 +78,6 @@ init_disasm (struct disassemble_info *info)
|
||||
if (p != NULL)
|
||||
p++;
|
||||
}
|
||||
|
||||
if (!current_arch_mask)
|
||||
current_arch_mask = 1 << S390_OPCODE_ZARCH;
|
||||
|
||||
init_flag = 1;
|
||||
}
|
||||
|
||||
/* Derive the length of an instruction from its first byte. */
|
||||
@@ -266,9 +278,6 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
|
||||
unsigned int value;
|
||||
int status, opsize, bufsize, bytes_to_dump, i;
|
||||
|
||||
if (init_flag == 0)
|
||||
init_disasm (info);
|
||||
|
||||
/* The output looks better if we put 6 bytes on a line. */
|
||||
info->bytes_per_line = 6;
|
||||
|
||||
@@ -360,15 +369,48 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
|
||||
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"));
|
||||
|
||||
fprintf (stream, _(" esa Disassemble in ESA architecture mode\n"));
|
||||
fprintf (stream, _(" zarch Disassemble in z/Architecture mode\n"));
|
||||
fprintf (stream, _(" insnlength Print unknown instructions according "
|
||||
"to length from first two bits\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));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user