diff options
| -rw-r--r-- | gdb/NEWS | 7 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 4 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 20 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.disasm/basics.c | 22 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.disasm/basics.exp | 39 |
5 files changed, 86 insertions, 6 deletions
@@ -9,6 +9,13 @@ * GDB index now contains information about the main function. This speeds up startup when it is being used for some large binaries. +* Changed commands + +disassemble + Attempting to use both the 'r' and 'b' flags with the disassemble + command will now give an error. Previously the 'b' flag would + always override the 'r' flag. + * Python API ** New function gdb.notify_mi(NAME, DATA), that emits custom diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 8cadd63..9098958 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1644,6 +1644,10 @@ disassemble_command (const char *arg, int from_tty) == (DISASSEMBLY_SOURCE_DEPRECATED | DISASSEMBLY_SOURCE)) error (_("Cannot specify both /m and /s.")); + if ((flags & (DISASSEMBLY_RAW_INSN | DISASSEMBLY_RAW_BYTES)) + == (DISASSEMBLY_RAW_INSN | DISASSEMBLY_RAW_BYTES)) + error (_("Cannot specify both /r and /b.")); + if (! p || ! *p) { flags |= DISASSEMBLY_OMIT_FNAME; diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index db1a82e..2cd565e 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -10060,12 +10060,20 @@ This specialized command dumps a range of memory as machine instructions. It can also print mixed source+disassembly by specifying the @code{/m} or @code{/s} modifier and print the raw instructions in hex as well as in symbolic form by specifying the @code{/r} or @code{/b} -modifier. The default memory range is the function surrounding the -program counter of the selected frame. A single argument to this -command is a program counter value; @value{GDBN} dumps the function -surrounding this value. When two arguments are given, they should be -separated by a comma, possibly surrounded by whitespace. The arguments -specify a range of addresses to dump, in one of two forms: +modifier. + +Only one of @code{/m} and @code{/s} can be used, attempting to use +both flag will give an error. + +Only one of @code{/r} and @code{/b} can be used, attempting to use +both flag will give an error. + +The default memory range is the function surrounding the program +counter of the selected frame. A single argument to this command is a +program counter value; @value{GDBN} dumps the function surrounding +this value. When two arguments are given, they should be separated by +a comma, possibly surrounded by whitespace. The arguments specify a +range of addresses to dump, in one of two forms: @table @code @item @var{start},@var{end} diff --git a/gdb/testsuite/gdb.disasm/basics.c b/gdb/testsuite/gdb.disasm/basics.c new file mode 100644 index 0000000..002b411 --- /dev/null +++ b/gdb/testsuite/gdb.disasm/basics.c @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright (C) 2023 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/>. */ + +int +main () +{ + return 0; +} diff --git a/gdb/testsuite/gdb.disasm/basics.exp b/gdb/testsuite/gdb.disasm/basics.exp new file mode 100644 index 0000000..78df18d --- /dev/null +++ b/gdb/testsuite/gdb.disasm/basics.exp @@ -0,0 +1,39 @@ +# Copyright (C) 2023 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/>. + +# Some basic tests of the disassemble command. Tests in this script +# should be architecture independent. + +standard_testfile + +if { [prepare_for_testing "failed to prepare" $testfile ${srcfile}] == -1 } { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Check the '/s' and '/m' flags can't be used together. +gdb_test "disassemble /sm main" \ + "Cannot specify both /m and /s\\." +gdb_test "disassemble /ms main" \ + "Cannot specify both /m and /s\\." + +# Check the '/r' and '/b' flags can't be used together. +gdb_test "disassemble /rb main" \ + "Cannot specify both /r and /b\\." +gdb_test "disassemble /br main" \ + "Cannot specify both /r and /b\\." |