d1c9b20ff9
In preparation for adding the RISC-V gdbserver, this commit restructures the API for looking up target descriptions. The current API is riscv_create_target_description, which creates a target description from a riscv_gdbarch_features, but also caches the created target descriptions so that for a given features object we always get back the same target description object. This is important for GDB due to the way gdbarch objects are reused. As the same target description is always returned to GDB, and can be returned multiple times, it is returned as a const, however, the current cache actually stores a non-const target description. This is improved in this patch so that the cache holds a const target description. For gdbsever, this caching of the target descriptions is not needed, the gdbserver looks up one target description to describe the target it is actually running on and that is it. Further the gdbserver actually needs to modify the target description that is looked up, so for the gdbsever, returning a const target description is not acceptable. This commit aims to address this by creating two parallel target description APIs, on is the old riscv_create_target_description, however, this no longer performs any caching, and just creates a new target description, and returns it as non-const. The second API is riscv_lookup_target_description, this one performs the caching, and calls riscv_create_target_description to create a target description when needed. In order to make sure the correct API is used in the correct place I have guarded the code using the GDBSERVER define. For GDB the riscv_create_target_description is static, and not generally usable throughout GDB, only the lookup API is global. In gdbserver, the lookup functions, and the cache are not defined or created at all, only the riscv_create_target_description API is available. There should be no user visible changes after this commit. gdb/ChangeLog: * arch/riscv.c (struct riscv_gdbarch_features_hasher): Only define if GDBSERVER is not defined. (riscv_tdesc_cache): Likewise, also store const target_desc. (STATIC_IN_GDB): Define. (riscv_create_target_description): Update declaration with STATIC_IN_GDB. (riscv_lookup_target_description): New function, only define if GDBSERVER is not defined. * arch/riscv.h (riscv_create_target_description): Declare only when GDBSERVER is defined. (riscv_lookup_target_description): New declaration when GDBSERVER is not defined. * nat/riscv-linux-tdesc.c (riscv_linux_read_description): Rename to... (riscv_linux_read_features): ...this, and return riscv_gdbarch_features instead of target_desc. * nat/riscv-linux-tdesc.h: Include 'arch/riscv.h'. (riscv_linux_read_description): Rename to... (riscv_linux_read_features): ...this. * riscv-linux-nat.c (riscv_linux_nat_target::read_description): Update to use riscv_gdbarch_features and riscv_lookup_target_description. * riscv-tdep.c (riscv_find_default_target_description): Use riscv_lookup_target_description instead of riscv_create_target_description.
116 lines
3.2 KiB
C
116 lines
3.2 KiB
C
/* Copyright (C) 2018-2020 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 "gdbsupport/common-defs.h"
|
|
#include "riscv.h"
|
|
#include <stdlib.h>
|
|
#include <unordered_map>
|
|
|
|
#include "../features/riscv/32bit-cpu.c"
|
|
#include "../features/riscv/64bit-cpu.c"
|
|
#include "../features/riscv/32bit-fpu.c"
|
|
#include "../features/riscv/64bit-fpu.c"
|
|
|
|
#ifndef GDBSERVER
|
|
#define STATIC_IN_GDB static
|
|
#else
|
|
#define STATIC_IN_GDB
|
|
#endif
|
|
|
|
/* See arch/riscv.h. */
|
|
|
|
STATIC_IN_GDB target_desc *
|
|
riscv_create_target_description (const struct riscv_gdbarch_features features)
|
|
{
|
|
/* Now we should create a new target description. */
|
|
target_desc *tdesc = allocate_target_description ();
|
|
|
|
#ifndef IN_PROCESS_AGENT
|
|
std::string arch_name = "riscv";
|
|
|
|
if (features.xlen == 4)
|
|
arch_name.append (":rv32i");
|
|
else if (features.xlen == 8)
|
|
arch_name.append (":rv64i");
|
|
else if (features.xlen == 16)
|
|
arch_name.append (":rv128i");
|
|
|
|
if (features.flen == 4)
|
|
arch_name.append ("f");
|
|
else if (features.flen == 8)
|
|
arch_name.append ("d");
|
|
else if (features.flen == 16)
|
|
arch_name.append ("q");
|
|
|
|
set_tdesc_architecture (tdesc, arch_name.c_str ());
|
|
#endif
|
|
|
|
long regnum = 0;
|
|
|
|
/* For now we only support creating 32-bit or 64-bit x-registers. */
|
|
if (features.xlen == 4)
|
|
regnum = create_feature_riscv_32bit_cpu (tdesc, regnum);
|
|
else if (features.xlen == 8)
|
|
regnum = create_feature_riscv_64bit_cpu (tdesc, regnum);
|
|
|
|
/* For now we only support creating 32-bit or 64-bit f-registers. */
|
|
if (features.flen == 4)
|
|
regnum = create_feature_riscv_32bit_fpu (tdesc, regnum);
|
|
else if (features.flen == 8)
|
|
regnum = create_feature_riscv_64bit_fpu (tdesc, regnum);
|
|
|
|
return tdesc;
|
|
}
|
|
|
|
#ifndef GDBSERVER
|
|
|
|
/* Wrapper used by std::unordered_map to generate hash for feature set. */
|
|
struct riscv_gdbarch_features_hasher
|
|
{
|
|
std::size_t
|
|
operator() (const riscv_gdbarch_features &features) const noexcept
|
|
{
|
|
return features.hash ();
|
|
}
|
|
};
|
|
|
|
/* Cache of previously seen target descriptions, indexed by the feature set
|
|
that created them. */
|
|
static std::unordered_map<riscv_gdbarch_features,
|
|
const target_desc *,
|
|
riscv_gdbarch_features_hasher> riscv_tdesc_cache;
|
|
|
|
/* See arch/riscv.h. */
|
|
|
|
const target_desc *
|
|
riscv_lookup_target_description (const struct riscv_gdbarch_features features)
|
|
{
|
|
/* Lookup in the cache. */
|
|
const auto it = riscv_tdesc_cache.find (features);
|
|
if (it != riscv_tdesc_cache.end ())
|
|
return it->second;
|
|
|
|
target_desc *tdesc = riscv_create_target_description (features);
|
|
|
|
/* Add to the cache. */
|
|
riscv_tdesc_cache.emplace (features, tdesc);
|
|
|
|
return tdesc;
|
|
}
|
|
|
|
#endif /* !GDBSERVER */
|