mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
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.
165 lines
4.6 KiB
Plaintext
165 lines
4.6 KiB
Plaintext
# Copyright 2014-2017 Free Software Foundation, Inc.
|
|
|
|
# This program 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 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# This file is part of the gdb testsuite.
|
|
|
|
# Test PowerPC instructions disassembly.
|
|
|
|
standard_testfile .s
|
|
set objfile [standard_output_file ${testfile}.o]
|
|
|
|
if {![istarget "powerpc*-*-*"]} then {
|
|
verbose "Skipping PowerPC instructions disassembly."
|
|
return
|
|
}
|
|
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" } {
|
|
untested "PowerPC instructions disassembly"
|
|
return -1
|
|
}
|
|
|
|
clean_restart ${objfile}
|
|
|
|
# Disassemble the function.
|
|
set func ""
|
|
|
|
gdb_test "set disassembler-options power7"
|
|
set test "disass func"
|
|
gdb_test_multiple $test $test {
|
|
-re "\r\nDump of assembler code for function func:(\r\n.*\r\n)End of assembler dump.\r\n$gdb_prompt $" {
|
|
set func $expect_out(1,string)
|
|
pass $test
|
|
}
|
|
}
|
|
|
|
proc instr_to_patt {instr} {
|
|
global decimal hex
|
|
# 0x0000000000000018 <+24>: stxvd2x vs43,r4,r5
|
|
return "\[ \t\]*$hex <\\+$decimal>:\[ \t\]*[string_to_regexp $instr]"
|
|
}
|
|
|
|
proc func_check {instr} {
|
|
global func
|
|
|
|
set test "found: $instr"
|
|
if [regexp -nocase -line [instr_to_patt $instr] $func] {
|
|
pass $test
|
|
} else {
|
|
fail $test
|
|
}
|
|
}
|
|
|
|
func_check "lxvd2x vs3,r4,r5"
|
|
func_check "lxvd2x vs43,r4,r5"
|
|
func_check "stxvd2x vs3,r4,r5"
|
|
func_check "stxvd2x vs43,r4,r5"
|
|
func_check "xxmrghd vs3,vs4,vs5"
|
|
func_check "xxmrghd vs43,vs44,vs45"
|
|
func_check "xxmrgld vs3,vs4,vs5"
|
|
func_check "xxmrgld vs43,vs44,vs45"
|
|
func_check "xxmrghd vs3,vs4,vs5"
|
|
func_check "xxmrghd vs43,vs44,vs45"
|
|
func_check "xxmrgld vs3,vs4,vs5"
|
|
func_check "xxmrgld vs43,vs44,vs45"
|
|
func_check "xxpermdi vs3,vs4,vs5,1"
|
|
func_check "xxpermdi vs43,vs44,vs45,1"
|
|
func_check "xxpermdi vs3,vs4,vs5,2"
|
|
func_check "xxpermdi vs43,vs44,vs45,2"
|
|
func_check "xvmovdp vs3,vs4"
|
|
func_check "xvmovdp vs43,vs44"
|
|
func_check "xvmovdp vs3,vs4"
|
|
func_check "xvmovdp vs43,vs44"
|
|
func_check "xvcpsgndp vs3,vs4,vs5"
|
|
func_check "xvcpsgndp vs43,vs44,vs45"
|
|
func_check "doze"
|
|
func_check "nap"
|
|
func_check "sleep"
|
|
func_check "rvwinkle"
|
|
func_check "prtyw r3,r4"
|
|
func_check "prtyd r13,r14"
|
|
func_check "mfcfar r10"
|
|
func_check "mtcfar r11"
|
|
func_check "cmpb r3,r4,r5"
|
|
func_check "lwzcix r10,r11,r12"
|
|
func_check "dadd f16,f17,f18"
|
|
func_check "daddq f20,f22,f24"
|
|
func_check "dss 3"
|
|
func_check "dssall"
|
|
func_check "dst r5,r4,1"
|
|
func_check "dstt r8,r7,0"
|
|
func_check "dstst r5,r6,3"
|
|
func_check "dststt r4,r5,2"
|
|
func_check "divwe r10,r11,r12"
|
|
func_check "divwe. r11,r12,r13"
|
|
func_check "divweo r12,r13,r14"
|
|
func_check "divweo. r13,r14,r15"
|
|
func_check "divweu r10,r11,r12"
|
|
func_check "divweu. r11,r12,r13"
|
|
func_check "divweuo r12,r13,r14"
|
|
func_check "divweuo. r13,r14,r15"
|
|
func_check "bpermd r7,r17,r27"
|
|
func_check "popcntw r10,r20"
|
|
func_check "popcntd r10,r20"
|
|
func_check "ldbrx r20,r21,r22"
|
|
func_check "stdbrx r20,r21,r22"
|
|
func_check "lfiwzx f10,0,r10"
|
|
func_check "lfiwzx f10,r9,r10"
|
|
func_check "fcfids f4,f5"
|
|
func_check "fcfids. f4,f5"
|
|
func_check "fcfidus f4,f5"
|
|
func_check "fcfidus. f4,f5"
|
|
func_check "fctiwu f4,f5"
|
|
func_check "fctiwu. f4,f5"
|
|
func_check "fctiwuz f4,f5"
|
|
func_check "fctiwuz. f4,f5"
|
|
func_check "fctidu f4,f5"
|
|
func_check "fctidu. f4,f5"
|
|
func_check "fctiduz f4,f5"
|
|
func_check "fctiduz. f4,f5"
|
|
func_check "fcfidu f4,f5"
|
|
func_check "fcfidu. f4,f5"
|
|
func_check "ftdiv cr0,f10,f11"
|
|
func_check "ftdiv cr7,f10,f11"
|
|
func_check "ftsqrt cr0,f10"
|
|
func_check "ftsqrt cr7,f10"
|
|
func_check "dcbtt r8,r9"
|
|
func_check "dcbtstt r8,r9"
|
|
func_check "dcffix f10,f12"
|
|
func_check "dcffix. f20,f22"
|
|
func_check "fre f14,f15"
|
|
func_check "fre. f14,f15"
|
|
func_check "fres f14,f15"
|
|
func_check "fres. f14,f15"
|
|
func_check "frsqrte f14,f15"
|
|
func_check "frsqrte. f14,f15"
|
|
func_check "frsqrtes f14,f15"
|
|
func_check "frsqrtes. f14,f15"
|
|
func_check "isel r2,r3,r4,28"
|
|
func_check "yield"
|
|
func_check "yield"
|
|
func_check "ori r2,r2,0"
|
|
func_check "nop"
|
|
func_check "nop"
|
|
func_check "ori r2,r2,0"
|
|
func_check "mdoio"
|
|
func_check "mdoio"
|
|
func_check "mdoom"
|
|
func_check "mdoom"
|
|
func_check "mfppr r10"
|
|
func_check "mfppr32 r11"
|
|
func_check "mtppr r12"
|
|
func_check "mtppr32 r13"
|
|
func_check "tlbie r10,r11"
|