[Lldb-commits] [lldb] 75b195c - Revert "[lldb] Add template method for getting const or mutable regs from DynamicRegisterInfo (#71402)"
David Spickett via lldb-commits
lldb-commits at lists.llvm.org
Tue Nov 7 01:08:06 PST 2023
Author: David Spickett
Date: 2023-11-07T09:07:35Z
New Revision: 75b195cc4cee8d6f3216b7602f8247f5888a47af
URL: https://github.com/llvm/llvm-project/commit/75b195cc4cee8d6f3216b7602f8247f5888a47af
DIFF: https://github.com/llvm/llvm-project/commit/75b195cc4cee8d6f3216b7602f8247f5888a47af.diff
LOG: Revert "[lldb] Add template method for getting const or mutable regs from DynamicRegisterInfo (#71402)"
This reverts commit 4989c62b318229bff2643c244ebbd03c20e2f781 as it fails to build with g++.
Added:
Modified:
lldb/include/lldb/Target/DynamicRegisterInfo.h
lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
Removed:
################################################################################
diff --git a/lldb/include/lldb/Target/DynamicRegisterInfo.h b/lldb/include/lldb/Target/DynamicRegisterInfo.h
index af76c742c98f961..0e175a99eb7d58a 100644
--- a/lldb/include/lldb/Target/DynamicRegisterInfo.h
+++ b/lldb/include/lldb/Target/DynamicRegisterInfo.h
@@ -89,18 +89,12 @@ class DynamicRegisterInfo {
GetRegisterInfo(llvm::StringRef reg_name) const;
typedef std::vector<lldb_private::RegisterInfo> reg_collection;
-
- template <typename T> T registers() = delete;
-
- typedef llvm::iterator_range<reg_collection::const_iterator>
- reg_collection_const_range;
- template <> reg_collection_const_range registers() {
- return reg_collection_const_range(m_regs);
+ llvm::iterator_range<reg_collection::const_iterator> registers() const {
+ return llvm::iterator_range<reg_collection::const_iterator>(m_regs);
}
- typedef llvm::iterator_range<reg_collection::iterator> reg_collection_range;
- template <> reg_collection_range registers() {
- return reg_collection_range(m_regs);
+ llvm::iterator_range<reg_collection::iterator> registers_mutable() {
+ return llvm::iterator_range<reg_collection::iterator>(m_regs);
}
void ConfigureOffsets();
diff --git a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
index 181ba4e7d877216..2954eaa2083af08 100644
--- a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
+++ b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
@@ -38,9 +38,11 @@ ArchitectureAArch64::Create(const ArchSpec &arch) {
return std::unique_ptr<Architecture>(new ArchitectureAArch64());
}
-static void
-UpdateARM64SVERegistersInfos(DynamicRegisterInfo::reg_collection_range regs,
- uint64_t vg) {
+static void UpdateARM64SVERegistersInfos(
+ llvm::iterator_range<
+ lldb_private::DynamicRegisterInfo::reg_collection::iterator>
+ regs,
+ uint64_t vg) {
// SVE Z register size is vg x 8 bytes.
uint32_t z_reg_byte_size = vg * 8;
@@ -60,9 +62,11 @@ UpdateARM64SVERegistersInfos(DynamicRegisterInfo::reg_collection_range regs,
}
}
-static void
-UpdateARM64SMERegistersInfos(DynamicRegisterInfo::reg_collection_range regs,
- uint64_t svg) {
+static void UpdateARM64SMERegistersInfos(
+ llvm::iterator_range<
+ lldb_private::DynamicRegisterInfo::reg_collection::iterator>
+ regs,
+ uint64_t svg) {
for (auto ® : regs) {
if (strcmp(reg.name, "za") == 0) {
// ZA is a register with size (svg*8) * (svg*8). A square essentially.
@@ -104,11 +108,10 @@ bool ArchitectureAArch64::ReconfigureRegisterInfo(DynamicRegisterInfo ®_info,
if (!vg_reg_value && !svg_reg_value)
return false;
- auto regs = reg_info.registers<DynamicRegisterInfo::reg_collection_range>();
if (vg_reg_value)
- UpdateARM64SVERegistersInfos(regs, *vg_reg_value);
+ UpdateARM64SVERegistersInfos(reg_info.registers_mutable(), *vg_reg_value);
if (svg_reg_value)
- UpdateARM64SMERegistersInfos(regs, *svg_reg_value);
+ UpdateARM64SMERegistersInfos(reg_info.registers_mutable(), *svg_reg_value);
// At this point if we have updated any registers, their offsets will all be
// invalid. If we did, we need to update them all.
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
index e9bd65fad1502bf..e35983f0e7fbd40 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
@@ -228,9 +228,7 @@ bool GDBRemoteRegisterContext::ReadRegisterBytes(const RegisterInfo *reg_info) {
SetAllRegisterValid(true);
return true;
} else if (buffer_sp->GetByteSize() > 0) {
- for (auto x : llvm::enumerate(
- m_reg_info_sp->registers<
- DynamicRegisterInfo::reg_collection_const_range>())) {
+ for (auto x : llvm::enumerate(m_reg_info_sp->registers())) {
const struct RegisterInfo ®info = x.value();
m_reg_valid[x.index()] =
(reginfo.byte_offset + reginfo.byte_size <=
More information about the lldb-commits
mailing list