mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
2189c31265
This is the next in the new-style debug macro series.
For this one, I decided to omit the function name from the "Sending packet" /
"Packet received" kind of prints, just because it's not very useful in that
context and hinders readability more than anything else. This is completely
arbitrary.
This is with:
[remote] putpkt_binary: Sending packet: $qTStatus#49...
[remote] getpkt_or_notif_sane_1: Packet received: T0;tnotrun:0;tframes:0;tcreated:0;tfree:500000;tsize:500000;circular:0;disconn:0;starttime:0;stoptime:0;username:;notes::
and without:
[remote] Sending packet: $qTStatus#49...
[remote] Packet received: T0;tnotrun:0;tframes:0;tcreated:0;tfree:500000;tsize:500000;circular:0;disconn:0;starttime:0;stoptime:0;username:;notes::
A difference is that previously, the query packet and its reply would be
printed on the same line, like this:
Sending packet: $qTStatus#49...Packet received: T0;tnotrun:0;tframes:0;tcreated:0;tfree:500000;tsize:500000;circular:0;disconn:0;starttime:0;stoptime:0;username:;notes::
Now, they are printed on two lines, since each remote_debug_printf{,_nofunc}
prints its own complete message including an end of line. It's probably
a matter of taste, but I prefer the two-line version, it's easier to
follow, especially when the query packet is long.
As a result, lib/range-stepping-support.exp needs to be updated, as it
currently expects the vCont packet and the reply to be on the same line.
I think it's sufficient in that context to just expect the vCont packet
and not the reply, since the goal is just to count how many vCont;r GDB
sends.
gdb/ChangeLog:
* remote.h (remote_debug_printf): New.
(remote_debug_printf_nofunc): New.
(REMOTE_SCOPED_DEBUG_ENTER_EXIT): New.
* remote.c: Use above macros throughout file.
gdbsupport/ChangeLog:
* common-debug.h (debug_prefixed_printf_cond_nofunc): New.
* common-debug.c (debug_prefixed_vprintf): Handle a nullptr
func.
gdb/testsuite/ChangeLog:
* lib/range-stepping-support.exp (exec_cmd_expect_vCont_count):
Adjust to "set debug remote" changes.
Change-Id: Ica6dead50d3f82e855c7d763f707cef74bed9fee
76 lines
1.9 KiB
Plaintext
76 lines
1.9 KiB
Plaintext
# Copyright 2013-2021 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/>.
|
|
|
|
# Execute command CMD and check that GDB sends the expected number of
|
|
# vCont;r packet. Returns 0 if the test passes, otherwise returns 1.
|
|
|
|
proc exec_cmd_expect_vCont_count { cmd exp_vCont_r } {
|
|
global gdb_prompt
|
|
|
|
gdb_test_no_output "set debug remote 1" ""
|
|
|
|
set test "${cmd}: vCont;r=${exp_vCont_r}"
|
|
set r_counter 0
|
|
set s_counter 0
|
|
set ret 1
|
|
set any {[^\r\n]*}
|
|
gdb_test_multiple $cmd $test {
|
|
-re "vCont;s${any}\r\n" {
|
|
incr s_counter
|
|
exp_continue
|
|
}
|
|
-re "vCont;r${any}\r\n" {
|
|
incr r_counter
|
|
exp_continue
|
|
}
|
|
-re "\r\n" {
|
|
# Prevent overflowing the expect buffer.
|
|
exp_continue
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
if { $r_counter == ${exp_vCont_r} } {
|
|
pass $test
|
|
set ret 0
|
|
} else {
|
|
fail $test
|
|
}
|
|
}
|
|
}
|
|
|
|
gdb_test_no_output "set debug remote 0" ""
|
|
return $ret
|
|
}
|
|
|
|
# Check whether range stepping is supported by the target.
|
|
|
|
proc gdb_range_stepping_enabled { } {
|
|
global gdb_prompt
|
|
|
|
set command "set range-stepping on"
|
|
set message "probe range-stepping support"
|
|
gdb_test_multiple $command $message {
|
|
-re "Range stepping is not supported.*\r\n$gdb_prompt $" {
|
|
pass $message
|
|
return 0
|
|
}
|
|
-re "^$command\r\n$gdb_prompt $" {
|
|
pass $message
|
|
return 1
|
|
}
|
|
}
|
|
|
|
return 0
|
|
}
|