From 21e051b3d666bcd614391142a936a8a8cccfa3cb Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 7 Dec 2020 09:03:24 +0100 Subject: [PATCH] gdb/main: execute breakpoint commands for '-iex' and '-ex' commands Suppose we have the script file below: break main commands print 123 end run If started with this script file, GDB executes the breakpoint command: $ gdb -q -x myscript --args ./test Reading symbols from ./test... Breakpoint 1 at 0x114e: file test.c, line 2. Breakpoint 1, main () at test.c:2 2 return 0; $1 = 123 (gdb) However, if we remove the "run" line from the script and pass it with the '-ex' option instead, the command is not executed: $ gdb -q -x myscript_no_run --args ./test Reading symbols from ./test... Breakpoint 1 at 0x114e: file test.c, line 2. Starting program: /path/to/test Breakpoint 1, main () at test.c:2 2 return 0; (gdb) If the user enters a command at this point, the breakpoint command is executed, yielding weird output: $ gdb -q -x myscript_no_run --args ./test Reading symbols from ./test... Breakpoint 1 at 0x114e: file test.c, line 2. Starting program: /path/to/test Breakpoint 1, main () at test.c:2 2 return 0; (gdb) print "a" $1 = "a" $2 = 123 When consuming script files, GDB runs bp actions after executing a command. See `command_handler` in event-top.c: if (c[0] != '#') { execute_command (command, ui->instream == ui->stdin_stream); /* Do any commands attached to breakpoint we stopped at. */ bpstat_do_actions (); } However, for '-ex' commands, `bpstat_do_actions` is not invoked. Hence, the misaligned output explained above occurs. To fix the problem, add a call to `bpstat_do_actions` after executing a command. gdb/ChangeLog: 2020-12-07 Tankut Baris Aktemur * main.c (catch_command_errors): Add a flag parameter; invoke `bpstat_do_actions` if the flag is set. (execute_cmdargs): Update a call to `catch_command_errors`. gdb/testsuite/ChangeLog: 2020-12-07 Tankut Baris Aktemur * gdb.base/bp-cmds-run-with-ex.c: New file. * gdb.base/bp-cmds-run-with-ex.exp: New file. * gdb.base/bp-cmds-run-with-ex.gdb: New file. * gdb.gdb/python-interrupts.exp: Update the call to 'catch_command_errors' with the new argument. * gdb.gdb/python-selftest.exp: Ditto. --- gdb/ChangeLog | 6 +++ gdb/main.c | 9 +++- gdb/testsuite/ChangeLog | 9 ++++ gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c | 22 +++++++++ .../gdb.base/bp-cmds-run-with-ex.exp | 49 +++++++++++++++++++ .../gdb.base/bp-cmds-run-with-ex.gdb | 19 +++++++ gdb/testsuite/gdb.gdb/python-interrupts.exp | 2 +- gdb/testsuite/gdb.gdb/python-selftest.exp | 2 +- 8 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c create mode 100644 gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp create mode 100644 gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8b94c029cf8..64e38aebd91 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-12-07 Tankut Baris Aktemur + + * main.c (catch_command_errors): Add a flag parameter; invoke + `bpstat_do_actions` if the flag is set. + (execute_cmdargs): Update a call to `catch_command_errors`. + 2020-12-07 Tom de Vries * ada-lang.c (replace_operator_with_call): Handle shrink resize. diff --git a/gdb/main.c b/gdb/main.c index d3a6637e8d4..9d0fad458c6 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -439,7 +439,8 @@ typedef void (catch_command_errors_const_ftype) (const char *, int); static int catch_command_errors (catch_command_errors_const_ftype command, - const char *arg, int from_tty) + const char *arg, int from_tty, + bool do_bp_actions = false) { try { @@ -448,6 +449,10 @@ catch_command_errors (catch_command_errors_const_ftype command, command (arg, from_tty); maybe_wait_sync_command_done (was_sync); + + /* Do any commands attached to breakpoint we stopped at. */ + if (do_bp_actions) + bpstat_do_actions (); } catch (const gdb_exception &e) { @@ -531,7 +536,7 @@ execute_cmdargs (const std::vector *cmdarg_vec, !batch_flag); else if (cmdarg_p.type == cmd_type) *ret = catch_command_errors (execute_command, cmdarg_p.string, - !batch_flag); + !batch_flag, true); } } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2c4553d6448..62228d44293 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2020-12-07 Tankut Baris Aktemur + + * gdb.base/bp-cmds-run-with-ex.c: New file. + * gdb.base/bp-cmds-run-with-ex.exp: New file. + * gdb.base/bp-cmds-run-with-ex.gdb: New file. + * gdb.gdb/python-interrupts.exp: Update the call to + 'catch_command_errors' with the new argument. + * gdb.gdb/python-selftest.exp: Ditto. + 2020-12-04 Simon Marchi * gdb.arch/amd64-disp-step-avx.exp: Adjust pattern. diff --git a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c new file mode 100644 index 00000000000..f4825c8a7c1 --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.c @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 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 . */ + +int +main () +{ + return 0; +} diff --git a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp new file mode 100644 index 00000000000..447a3875f63 --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.exp @@ -0,0 +1,49 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2020 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 . + +# Test that breakpoint commands are taken into account when the +# debuggee program is executed with a "run" command given through the +# '-ex' option. + +standard_testfile + +if {[build_executable "failed to prepare" $testfile $srcfile]} { + return -1 +} + +set script_file $srcdir/$subdir/$testfile.gdb + +save_vars { GDBFLAGS } { + append GDBFLAGS " -x ${script_file}" + append GDBFLAGS " -ex run" + append GDBFLAGS " --args ${binfile}" + + gdb_exit + if {[gdb_spawn] != 0} { + fail "spawn gdb" + return -1 + } +} + +gdb_test_multiple "" "execute bp commands" { + -re " = 123\r\n$gdb_prompt $" { + pass $gdb_test_name + } + -re "Don't know how to run.*$gdb_prompt $" { + unsupported $gdb_test_name + } +} diff --git a/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb new file mode 100644 index 00000000000..c8da9d70251 --- /dev/null +++ b/gdb/testsuite/gdb.base/bp-cmds-run-with-ex.gdb @@ -0,0 +1,19 @@ +# Copyright 2020 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 . + +break main +commands + print 123 +end diff --git a/gdb/testsuite/gdb.gdb/python-interrupts.exp b/gdb/testsuite/gdb.gdb/python-interrupts.exp index 6e5ce6ee48d..b99b23e481f 100644 --- a/gdb/testsuite/gdb.gdb/python-interrupts.exp +++ b/gdb/testsuite/gdb.gdb/python-interrupts.exp @@ -25,7 +25,7 @@ proc test_python_interrupts {} { } gdb_breakpoint set_active_ext_lang temporary - gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0)" \ + gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, true)" \ "Temporary breakpoint.*silently stop." gdb_test "signal SIGINT" \ "KeyboardInterrupt.*Error while executing Python code." diff --git a/gdb/testsuite/gdb.gdb/python-selftest.exp b/gdb/testsuite/gdb.gdb/python-selftest.exp index ee40245bc53..0c769f23483 100644 --- a/gdb/testsuite/gdb.gdb/python-selftest.exp +++ b/gdb/testsuite/gdb.gdb/python-selftest.exp @@ -22,7 +22,7 @@ proc selftest_python {} { } gdb_test_no_output "set variable gdb_python_initialized = 0" - gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0)" \ + gdb_test "call catch_command_errors(execute_command, \"python print(5)\", 0, true)" \ "Python not initialized.* = 0" return 0 } -- 2.30.2