forked from Imagelibrary/binutils-gdb
When debugging two inferiors (or more) against gdbserver, and the inferiors have different architectures, such as e.g., on x86_64 GNU/Linux and one inferior is 64-bit while the other is 32-bit, then GDB can get confused with the different architectures in a couple spots. In both cases I ran into, GDB incorrectly ended up using the architecture of whatever happens to be the selected inferior instead of the architecture of some other given inferior: #1 - When parsing the expedited registers in stop replies. #2 - In the default implementation of the target_thread_architecture target method. These resulted in instances of the infamous "Remote 'g' packet reply is too long" error. For example, with the test added in this commit, we get: ~~~ Continuing. Remote 'g' packet reply is too long (expected 440 bytes, got 816 bytes): ad064000000000000[snip] (gdb) FAIL: gdb.multi/multi-arch.exp: inf1 event with inf2 selected: continue to hello_loop c Continuing. Truncated register 50 in remote 'g' packet (gdb) PASS: gdb.multi/multi-arch.exp: inf2 event with inf1 selected: c ~~~ This commit fixes that. gdb/ChangeLog: 2017-10-04 Pedro Alves <palves@redhat.com> * remote.c (get_remote_arch_state): New 'gdbarch' parameter. Use it instead of target_gdbarch. (get_remote_state, get_remote_packet_size): Adjust get_remote_arch_state calls, passing down target_gdbarch explicitly. (packet_reg_from_regnum, packet_reg_from_pnum): New parameter 'gdbarch' and use it instead of target_gdbarch. (get_memory_packet_size): Adjust get_remote_arch_state calls, passing down target_gdbarch explicitly. (struct stop_reply) <arch>: New field. (remote_parse_stop_reply): Use the stopped thread's architecture, not the current inferior's. Save the architecture in the stop_reply. (process_stop_reply): Use the stop reply's architecture. (process_g_packet, remote_fetch_registers) (remote_prepare_to_store, store_registers_using_G) (remote_store_registers): Adjust get_remote_arch_state calls, using the regcache's architecture. (remote_get_trace_status): Adjust get_remote_arch_state calls, passing down target_gdbarch explicitly. * spu-multiarch.c (spu_thread_architecture): Defer to the target beneath instead of calling target_gdbarch. * target.c (default_thread_architecture): Use the specified inferior's architecture, instead of the current inferior's architecture (via target_gdbarch). gdb/testsuite/ChangeLog: 2017-10-04 Pedro Alves <palves@redhat.com> * gdb.multi/hangout.c: Include <unistd.h>. (hangout_loop): New function. (main): Call alarm. Call hangout_loop in a loop. * gdb.multi/hello.c: Include <unistd.h>. (hello_loop): New function. (main): Call alarm. Call hangout_loop in a loop. * gdb.multi/multi-arch.exp: Test running to a breakpoint one inferior with the other selected.
123 lines
3.4 KiB
Plaintext
123 lines
3.4 KiB
Plaintext
# Copyright 2009-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/>.
|
|
|
|
# Test multi-exec / multi-process features that work for all configurations,
|
|
# even ones that cannot run multiple processes simultaneously.
|
|
|
|
set testfile "multi-arch"
|
|
|
|
# The plain remote target can't do multiple inferiors.
|
|
if [target_info exists use_gdb_stub] {
|
|
return
|
|
}
|
|
|
|
# The 64-bit compile may succeed for i386-linux, but gdb won't be able
|
|
# to load the file.
|
|
if [istarget "i?86-*linux*"] {
|
|
return
|
|
}
|
|
|
|
# Can't use standard_testfile, we want executables with specialized
|
|
# names.
|
|
set exec1 "ma-hello"
|
|
set srcfile1 hello.c
|
|
set binfile1 [standard_output_file ${exec1}]
|
|
|
|
set exec2 "ma-hangout"
|
|
set srcfile2 hangout.c
|
|
set binfile2 [standard_output_file ${exec2}]
|
|
|
|
# Build two executables, one for each arch.
|
|
|
|
if [istarget "s390*-*-*"] {
|
|
set march1 "-m64"
|
|
set march2 "-m31"
|
|
} elseif { [istarget "aarch64*-*-*"] } {
|
|
set march1 ""
|
|
set march2 ""
|
|
} else {
|
|
set march1 "-m64"
|
|
set march2 "-m32"
|
|
}
|
|
|
|
if { [prepare_for_testing "failed to prepare" ${exec1} "${srcfile1}" \
|
|
[list debug additional_flags=${march1}]] } {
|
|
return -1
|
|
}
|
|
|
|
set options [list debug]
|
|
|
|
if [istarget "aarch64*-*-*"] {
|
|
if {[info exists ARM_CC_FOR_TARGET]} {
|
|
lappend options "compiler=${ARM_CC_FOR_TARGET}"
|
|
} else {
|
|
unsupported "ARM compiler is not known"
|
|
return -1
|
|
}
|
|
} else {
|
|
lappend options "additional_flags=${march2}"
|
|
}
|
|
|
|
if { [prepare_for_testing "failed to prepare" ${exec2} "${srcfile2}" \
|
|
$options]} {
|
|
return -1
|
|
}
|
|
|
|
# Start inferior 1
|
|
|
|
clean_restart ${exec1}
|
|
if ![runto_main] then {
|
|
fail "starting inferior 1"
|
|
}
|
|
|
|
# Add and start inferior 2
|
|
|
|
gdb_test "add-inferior" "Added inferior 2.*" "add empty inferior 2"
|
|
gdb_test "inferior 2" "Switching to inferior 2.*" "switch to inferior 2"
|
|
gdb_load ${binfile2}
|
|
|
|
if ![runto_main] then {
|
|
fail "starting inferior 2"
|
|
}
|
|
|
|
# Check we do have two inferiors loaded.
|
|
|
|
gdb_test "info inferiors" \
|
|
"Executable.*${exec1}.*${exec2}.*"
|
|
|
|
# Now select inferior 2, and trigger an event in inferior 1. This
|
|
# tries to check that GDB doesn't incorrectly uses the architecture of
|
|
# inferior 2 when parsing the expedited registers in a stop reply for
|
|
# inferior 1 (when remote debugging).
|
|
|
|
gdb_test_no_output "set schedule-multiple on"
|
|
|
|
with_test_prefix "inf1 event with inf2 selected" {
|
|
gdb_test "inferior 2" "Switching to inferior 2.*thread 2\.1.*main.*${srcfile2}.*"
|
|
gdb_test "b hello_loop" "Breakpoint .* at .*${srcfile1}.*"
|
|
gdb_test "c" " hello_loop.*" "continue to hello_loop"
|
|
}
|
|
|
|
delete_breakpoints
|
|
|
|
# Same, but the other way around: select inferior 1 and trigger an
|
|
# event in inferior 2.
|
|
|
|
with_test_prefix "inf2 event with inf1 selected" {
|
|
gdb_test "inferior 1" "Switching to inferior 1.*thread 1\.1.*hello_loop.*${srcfile1}.*"
|
|
gdb_test "b hangout_loop" "Breakpoint .* at .*${srcfile2}.*"
|
|
gdb_test "c" " hangout_loop.*" "continue to hangout_loop"
|
|
}
|