diff options
Diffstat (limited to 'gdbserver')
-rw-r--r-- | gdbserver/configure.srv | 9 | ||||
-rw-r--r-- | gdbserver/linux-amd64-ipa.cc | 2 | ||||
-rw-r--r-- | gdbserver/linux-i386-ipa.cc | 2 | ||||
-rw-r--r-- | gdbserver/linux-x86-low.cc | 2 | ||||
-rw-r--r-- | gdbserver/linux-x86-tdesc.cc | 311 | ||||
-rw-r--r-- | gdbserver/linux-x86-tdesc.h | 49 |
6 files changed, 20 insertions, 355 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" diff --git a/gdbserver/linux-amd64-ipa.cc b/gdbserver/linux-amd64-ipa.cc index 6f4ce6f..c53758a 100644 --- a/gdbserver/linux-amd64-ipa.cc +++ b/gdbserver/linux-amd64-ipa.cc @@ -20,9 +20,9 @@ #include <sys/mman.h> #include "tracepoint.h" -#include "linux-x86-tdesc.h" #include "gdbsupport/x86-xstate.h" #include "arch/amd64-linux-tdesc.h" +#include "arch/x86-linux-tdesc-features.h" /* fast tracepoints collect registers. */ diff --git a/gdbserver/linux-i386-ipa.cc b/gdbserver/linux-i386-ipa.cc index 460f37e..2b36327 100644 --- a/gdbserver/linux-i386-ipa.cc +++ b/gdbserver/linux-i386-ipa.cc @@ -20,9 +20,9 @@ #include <sys/mman.h> #include "tracepoint.h" -#include "linux-x86-tdesc.h" #include "gdbsupport/x86-xstate.h" #include "arch/i386-linux-tdesc.h" +#include "arch/x86-linux-tdesc-features.h" /* GDB register numbers. */ diff --git a/gdbserver/linux-x86-low.cc b/gdbserver/linux-x86-low.cc index 99828a8..e4a455c 100644 --- a/gdbserver/linux-x86-low.cc +++ b/gdbserver/linux-x86-low.cc @@ -35,6 +35,7 @@ #endif #include "arch/i386-linux-tdesc.h" +#include "arch/x86-linux-tdesc-features.h" #include "gdb_proc_service.h" /* Don't include elf/common.h if linux/elf.h got included by @@ -50,7 +51,6 @@ #include "nat/linux-nat.h" #include "nat/x86-linux.h" #include "nat/x86-linux-dregs.h" -#include "linux-x86-tdesc.h" #include "nat/x86-linux-tdesc.h" #ifdef __x86_64__ diff --git a/gdbserver/linux-x86-tdesc.cc b/gdbserver/linux-x86-tdesc.cc index f563689..13c8076 100644 --- a/gdbserver/linux-x86-tdesc.cc +++ b/gdbserver/linux-x86-tdesc.cc @@ -17,314 +17,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "arch/x86-linux-tdesc.h" #include "tdesc.h" -#include "linux-x86-tdesc.h" -#include "arch/i386.h" -#include "gdbsupport/x86-xstate.h" -#ifdef __x86_64__ -#include "arch/amd64.h" -#include "arch/amd64-linux-tdesc.h" -#endif #include "x86-tdesc.h" -#include "arch/i386-linux-tdesc.h" - -/* A structure used to describe a single xstate feature bit that might, or - might not, be checked for when creating a target description for one of - i386, amd64, or x32. - - The different CPU/ABI types check for different xstate features when - creating a target description. - - We want to cache target descriptions, and this is currently done in - three separate caches, one each for i386, amd64, and x32. Additionally, - the caching we're discussing here is Linux only, and for Linux, the only - thing that has an impact on target description creation is the xcr0 - value. - - In order to ensure the cache functions correctly we need to filter out - only those xcr0 feature bits that are relevant, we can then cache target - descriptions based on the relevant feature bits. Two xcr0 values might - be different, but have the same relevant feature bits. In this case we - would expect the two xcr0 values to map to the same cache entry. */ - -struct x86_xstate_feature { - /* The xstate feature mask. This is a mask against an xcr0 value. */ - uint64_t feature; - - /* Is this feature checked when creating an i386 target description. */ - bool is_i386; - - /* Is this feature checked when creating an amd64 target description. */ - bool is_amd64; - - /* Is this feature checked when creating an x32 target description. */ - bool is_x32; -}; - -/* A constant table that describes all of the xstate features that are - checked when building a target description for i386, amd64, or x32. - - If in the future, due to simplifications or refactoring, this table ever - ends up with 'true' for every xcr0 feature on every target type, then this - is an indication that this table should probably be removed, and that the - rest of the code in this file can be simplified. */ - -static constexpr x86_xstate_feature x86_linux_all_xstate_features[] = { - /* Feature, i386, amd64, x32. */ - { X86_XSTATE_PKRU, true, true, true }, - { X86_XSTATE_AVX512, true, true, true }, - { X86_XSTATE_AVX, true, true, true }, - { X86_XSTATE_MPX, true, true, false }, - { X86_XSTATE_SSE, true, false, false }, - { X86_XSTATE_X87, true, false, false } -}; - -/* Return a compile time constant which is a mask of all the xstate features - that are checked for when building an i386 target description. */ - -static constexpr uint64_t -x86_linux_i386_xcr0_feature_mask () -{ - uint64_t mask = 0; - - for (const auto &entry : x86_linux_all_xstate_features) - if (entry.is_i386) - mask |= entry.feature; - - return mask; -} - -/* Return a compile time constant which is a mask of all the xstate features - that are checked for when building an amd64 target description. */ - -static constexpr uint64_t -x86_linux_amd64_xcr0_feature_mask () -{ - uint64_t mask = 0; - - for (const auto &entry : x86_linux_all_xstate_features) - if (entry.is_amd64) - mask |= entry.feature; - - return mask; -} - -/* Return a compile time constant which is a mask of all the xstate features - that are checked for when building an x32 target description. */ - -static constexpr uint64_t -x86_linux_x32_xcr0_feature_mask () -{ - uint64_t mask = 0; - - for (const auto &entry : x86_linux_all_xstate_features) - if (entry.is_x32) - mask |= entry.feature; - - return mask; -} - -/* Return a compile time constant which is a count of the number of xstate - features that are checked for when building an i386 target description. */ - -static constexpr int -x86_linux_i386_tdesc_count_1 () -{ - uint64_t count = 0; - - for (const auto &entry : x86_linux_all_xstate_features) - if (entry.is_i386) - ++count; - - gdb_assert (count > 0); - - return (1 << count); -} - -/* Return a compile time constant which is a count of the number of xstate - features that are checked for when building an amd64 target description. */ - -static constexpr int -x86_linux_amd64_tdesc_count_1 () -{ - uint64_t count = 0; - - for (const auto &entry : x86_linux_all_xstate_features) - if (entry.is_amd64) - ++count; - - gdb_assert (count > 0); - - return (1 << count); -} - -/* Return a compile time constant which is a count of the number of xstate - features that are checked for when building an x32 target description. */ - -static constexpr int -x86_linux_x32_tdesc_count_1 () -{ - uint64_t count = 0; - - for (const auto &entry : x86_linux_all_xstate_features) - if (entry.is_x32) - ++count; - - gdb_assert (count > 0); - - return (1 << count); -} - -#ifdef IN_PROCESS_AGENT - -/* See linux-x86-tdesc.h. */ - -int -x86_linux_amd64_tdesc_count () -{ - return x86_linux_amd64_tdesc_count_1 (); -} - -/* See linux-x86-tdesc.h. */ - -int -x86_linux_x32_tdesc_count () -{ - return x86_linux_x32_tdesc_count_1 (); -} - -/* See linux-x86-tdesc.h. */ - -int -x86_linux_i386_tdesc_count () -{ - return x86_linux_i386_tdesc_count_1 (); -} - -#endif /* IN_PROCESS_AGENT */ - -/* Convert an xcr0 value into an integer. The integer will be passed to - the in-process-agent where it will then be passed to - x86_linux_tdesc_idx_to_xcr0 to get back the xcr0 value. */ - -int -x86_linux_xcr0_to_tdesc_idx (uint64_t xcr0) -{ - /* The following table shows which features are checked for when creating - the target descriptions (see nat/x86-linux-tdesc.c), the feature order - represents the bit order within the generated index number. - - i386 | x87 sse mpx avx avx512 pkru - amd64 | mpx avx avx512 pkru - i32 | avx avx512 pkru - - The features are ordered so that for each mode (i386, amd64, i32) the - generated index will form a continuous range. */ - - int idx = 0; - - for (int i = 0; i < ARRAY_SIZE (x86_linux_all_xstate_features); ++i) - { - if ((xcr0 & x86_linux_all_xstate_features[i].feature) - == x86_linux_all_xstate_features[i].feature) - idx |= (1 << i); - } - - return idx; -} - -#ifdef IN_PROCESS_AGENT - -/* Convert an index number (as returned from x86_linux_xcr0_to_tdesc_idx) - into an xcr0 value which can then be used to create a target - description. */ - -uint64_t -x86_linux_tdesc_idx_to_xcr0 (int idx) -{ - uint64_t xcr0 = 0; - - for (int i = 0; i < ARRAY_SIZE (x86_linux_all_xstate_features); ++i) - { - if ((idx & (1 << i)) != 0) - xcr0 |= x86_linux_all_xstate_features[i].feature; - } - - return xcr0; -} - -#endif /* IN_PROCESS_AGENT */ - -#if defined __i386__ || !defined IN_PROCESS_AGENT -/* A cache of all possible i386 target descriptions. */ +/* See arch/x86-linux-tdesc.h. */ -static struct target_desc *i386_tdescs[x86_linux_i386_tdesc_count_1 ()] = { }; - -/* See nat/x86-linux-tdesc.h. */ - -const struct target_desc * -i386_linux_read_description (uint64_t xcr0) +void +x86_linux_post_init_tdesc (target_desc *tdesc, bool is_64bit) { - xcr0 &= x86_linux_i386_xcr0_feature_mask (); - int idx = x86_linux_xcr0_to_tdesc_idx (xcr0); - - gdb_assert (idx >= 0 && idx < x86_linux_i386_tdesc_count_1 ()); - - target_desc **tdesc = &i386_tdescs[idx]; - - if (*tdesc == nullptr) - { - *tdesc = i386_create_target_description (xcr0, true, false); - - init_target_desc (*tdesc, i386_expedite_regs); - } - - return *tdesc; -} -#endif - #ifdef __x86_64__ - -/* A cache of all possible amd64 target descriptions. */ - -static target_desc *amd64_tdescs[x86_linux_amd64_tdesc_count_1 ()] = { }; - -/* A cache of all possible x32 target descriptions. */ - -static target_desc *x32_tdescs[x86_linux_x32_tdesc_count_1 ()] = { }; - -/* See nat/x86-linux-tdesc.h. */ - -const struct target_desc * -amd64_linux_read_description (uint64_t xcr0, bool is_x32) -{ - if (is_x32) - xcr0 &= x86_linux_x32_xcr0_feature_mask (); - else - xcr0 &= x86_linux_amd64_xcr0_feature_mask (); - - int idx = x86_linux_xcr0_to_tdesc_idx (xcr0); - - if (is_x32) - gdb_assert (idx >= 0 && idx < x86_linux_x32_tdesc_count_1 ()); - else - gdb_assert (idx >= 0 && idx < x86_linux_amd64_tdesc_count_1 ()); - - target_desc **tdesc = nullptr; - - if (is_x32) - tdesc = &x32_tdescs[idx]; + if (is_64bit) + init_target_desc (tdesc, amd64_expedite_regs); else - tdesc = &amd64_tdescs[idx]; - - if (*tdesc == nullptr) - { - *tdesc = amd64_create_target_description (xcr0, is_x32, true, true); - - init_target_desc (*tdesc, amd64_expedite_regs); - } - return *tdesc; -} - #endif + init_target_desc (tdesc, i386_expedite_regs); +} diff --git a/gdbserver/linux-x86-tdesc.h b/gdbserver/linux-x86-tdesc.h deleted file mode 100644 index c06af21..0000000 --- a/gdbserver/linux-x86-tdesc.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Low level support for x86 (i386 and x86-64), shared between gdbserver - and IPA. - - Copyright (C) 2016-2024 Free Software Foundation, Inc. - - This file is part of GDB. - - 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/>. */ - -#ifndef GDBSERVER_LINUX_X86_TDESC_H -#define GDBSERVER_LINUX_X86_TDESC_H - -/* Convert an xcr0 value into an integer. The integer will be passed to - the in-process-agent where it will then be passed to - x86_linux_tdesc_idx_to_xcr0 to get back the xcr0 value. */ - -extern int x86_linux_xcr0_to_tdesc_idx (uint64_t xcr0); - -#ifdef IN_PROCESS_AGENT - -/* Convert an index number (as returned from x86_linux_xcr0_to_tdesc_idx) - into an xcr0 value which can then be used to create a target - description. */ - -extern uint64_t x86_linux_tdesc_idx_to_xcr0 (int idx); - -/* Within the in-process-agent we need to pre-initialise all of the target - descriptions, to do this we need to know how many target descriptions - there are for each different target type. These functions return the - target description count for the relevant target. */ - -extern int x86_linux_amd64_tdesc_count (); -extern int x86_linux_x32_tdesc_count (); -extern int x86_linux_i386_tdesc_count (); - -#endif /* IN_PROCESS_AGENT */ - -#endif /* GDBSERVER_LINUX_X86_TDESC_H */ |