mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-23 18:14:13 +08:00
646d754d14
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>
57 lines
2.3 KiB
C
57 lines
2.3 KiB
C
/* Target description related code for GNU/Linux i386.
|
|
|
|
Copyright (C) 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/>. */
|
|
|
|
#include "arch/x86-linux-tdesc.h"
|
|
#include "arch/i386-linux-tdesc.h"
|
|
#include "arch/i386.h"
|
|
#include "arch/x86-linux-tdesc-features.h"
|
|
|
|
/* See arch/i386-linux-tdesc.h. */
|
|
|
|
const target_desc *
|
|
i386_linux_read_description (uint64_t xcr0)
|
|
{
|
|
/* Cache of previously seen i386 target descriptions, indexed by the xcr0
|
|
value that created the target description. This needs to be static
|
|
within this function to ensure it is initialised before first use. */
|
|
static std::unordered_map<uint64_t, const target_desc_up> i386_tdesc_cache;
|
|
|
|
/* Only some bits are checked when creating a tdesc, but the XCR0 value
|
|
contains other feature bits that are not relevant for tdesc creation.
|
|
When indexing into the I386_TDESC_CACHE we need to use a consistent
|
|
xcr0 value otherwise we might fail to find an existing tdesc which has
|
|
the same set of relevant bits set. */
|
|
xcr0 &= x86_linux_i386_xcr0_feature_mask ();
|
|
|
|
const auto it = i386_tdesc_cache.find (xcr0);
|
|
if (it != i386_tdesc_cache.end ())
|
|
return it->second.get ();
|
|
|
|
/* Create the previously unseen target description. */
|
|
target_desc_up tdesc (i386_create_target_description (xcr0, true, false));
|
|
x86_linux_post_init_tdesc (tdesc.get (), false);
|
|
|
|
/* Add to the cache, and return a pointer borrowed from the
|
|
target_desc_up. This is safe as the cache (and the pointers contained
|
|
within it) are not deleted until GDB exits. */
|
|
target_desc *ptr = tdesc.get ();
|
|
i386_tdesc_cache.emplace (xcr0, std::move (tdesc));
|
|
return ptr;
|
|
}
|