aboutsummaryrefslogtreecommitdiff
path: root/gdbserver/configure.srv
diff options
context:
space:
mode:
authorAndrew Burgess <aburgess@redhat.com>2024-01-30 15:37:23 +0000
committerAndrew Burgess <aburgess@redhat.com>2024-06-14 09:08:45 +0100
commit646d754d14c2fe70a492a893506a74b0463b6ae8 (patch)
treec26d8f6c7c6c662fe08f3b3fd3836eca8517c123 /gdbserver/configure.srv
parentcc59d02b90cd34eb276f9609a2064011c7c4a001 (diff)
downloadgdb-646d754d14c2fe70a492a893506a74b0463b6ae8.zip
gdb-646d754d14c2fe70a492a893506a74b0463b6ae8.tar.gz
gdb-646d754d14c2fe70a492a893506a74b0463b6ae8.tar.bz2
gdb/gdbserver: share x86/linux tdesc caching
This commit builds on the previous series of commits to share the target description caching code between GDB and gdbserver for x86/Linux targets. The objective of this commit is to move the four functions (2 each of) i386_linux_read_description and amd64_linux_read_description into the gdb/arch/ directory and combine them so we have just a single copy of each. Then GDB, gdbserver, and the in-process-agent (IPA) will link against these shared functions. One curiosity with this patch is the function x86_linux_post_init_tdesc. On the gdbserver side the two functions amd64_linux_read_description and i386_linux_read_description have some functionality that is not present on the GDB side, there is some additional configuration that is performed as each target description is created, to setup the expedited registers. To support this I've added the function x86_linux_post_init_tdesc. This function is called from the two *_linux_read_description functions, but is implemented separately for GDB and gdbserver. An alternative approach that avoids adding x86_linux_post_init_tdesc would be to have x86_linux_tdesc_for_tid return a non-const target description, then in x86_target::low_arch_setup we could inspect the target description to figure out if it is 64-bit or not, and modify the target description as needed. In the end I think that adding the x86_linux_post_init_tdesc function is the simpler solution. The contents of gdbserver/linux-x86-low.cc have moved to gdb/arch/x86-linux-tdesc-features.c, and gdbserver/linux-x86-tdesc.h has moved to gdb/arch/x86-linux-tdesc-features.h, this change leads to some updates in the #includes in the gdbserver/ directory. This commit also changes how target descriptions are cached. Previously both GDB and gdbserver used static C-style arrays to act as the tdesc cache. This was fine, except for two problems. Either the C-style arrays would need to be placed in x86-linux-tdesc-features.c, which would allow us to use the x86_linux_*_tdesc_count_1() functions to size the arrays for us, or we'd need to hard code the array sizes using separate #defines, which we'd then have to keep in sync with the rest of the code in x86-linux-tdesc-features.c. Given both of these problems I decided a better solution would be to just switch to using a std::unordered_map to act as the cache. This will resize automatically, and we can use the xcr0 value as the key. At first inspection, using xcr0 might seem to be a problem; after all the {i386,amd64}_create_target_description functions take more than just the xcr0 value. However, this patch is only for x86/Linux targets, and for x86/Linux all of the other flags passed to the tdesc creation functions have constant values and so are irrelevant when we consider tdesc caching. For testing I've done the following: - Built on x86-64 GNU/Linux for all targets, and just for the native target, - Build on i386 GNU/Linux for all targets, and just for the native target, - Build on a 64-bit, non-x86 GNU/Linux for all targets, just for the native target, and for targets x86_64-*-linux and i386-*-linux. Approved-By: Felix Willgerodt <felix.willgerodt@intel.com>
Diffstat (limited to 'gdbserver/configure.srv')
-rw-r--r--gdbserver/configure.srv9
1 files changed, 9 insertions, 0 deletions
diff --git a/gdbserver/configure.srv b/gdbserver/configure.srv
index 538845b..e24e40e 100644
--- a/gdbserver/configure.srv
+++ b/gdbserver/configure.srv
@@ -111,12 +111,16 @@ case "${gdbserver_host}" in
srv_tgtobj="${srv_tgtobj} nat/x86-linux-dregs.o"
srv_tgtobj="${srv_tgtobj} nat/i386-linux.o"
srv_tgtobj="${srv_tgtobj} nat/x86-linux-tdesc.o"
+ srv_tgtobj="${srv_tgtobj} arch/x86-linux-tdesc-features.o"
+ srv_tgtobj="${srv_tgtobj} arch/i386-linux-tdesc.o"
srv_linux_usrregs=yes
srv_linux_regsets=yes
srv_linux_thread_db=yes
srv_linux_btrace=yes
ipa_obj="linux-i386-ipa.o linux-x86-tdesc-ipa.o"
ipa_obj="${ipa_obj} arch/i386-ipa.o"
+ ipa_obj="${ipa_obj} arch/x86-linux-tdesc-features-ipa.o"
+ ipa_obj="${ipa_obj} arch/i386-linux-tdesc-ipa.o"
;;
i[34567]86-*-mingw*) srv_regobj=""
srv_tgtobj="x86-low.o nat/x86-dregs.o win32-low.o"
@@ -375,12 +379,17 @@ case "${gdbserver_host}" in
srv_tgtobj="${srv_tgtobj} nat/x86-linux-dregs.o"
srv_tgtobj="${srv_tgtobj} nat/x86-linux-tdesc.o"
srv_tgtobj="${srv_tgtobj} nat/amd64-linux-siginfo.o"
+ srv_tgtobj="${srv_tgtobj} arch/x86-linux-tdesc-features.o"
+ srv_tgtobj="${srv_tgtobj} arch/amd64-linux-tdesc.o"
+ srv_tgtobj="${srv_tgtobj} arch/i386-linux-tdesc.o"
srv_linux_usrregs=yes # This is for i386 progs.
srv_linux_regsets=yes
srv_linux_thread_db=yes
srv_linux_btrace=yes
ipa_obj="linux-amd64-ipa.o linux-x86-tdesc-ipa.o"
ipa_obj="${ipa_obj} arch/amd64-ipa.o"
+ ipa_obj="${ipa_obj} arch/x86-linux-tdesc-features-ipa.o"
+ ipa_obj="${ipa_obj} arch/amd64-linux-tdesc-ipa.o"
;;
x86_64-*-mingw*) srv_regobj=""
srv_tgtobj="x86-low.o nat/x86-dregs.o"