https://github.com/DavidSpickett updated
https://github.com/llvm/llvm-project/pull/71402
>From 8b074aa5024deadfb74db6c10a812e5a474c6f1a Mon Sep 17 00:00:00 2001
From: David Spickett <david.spick...@linaro.org>
Date: Mon, 6 Nov 2023 15:02:29 +0000
Subject: [PATCH 1/2] [lldb] Add template method for getting const or mutable
regs from DynamicRegisterInfo
GDBRemoteRegisterContext only needs to iterate them,
ArchitectureAArch64 needs to mutate them if scalable
registers change size.
---
.../include/lldb/Target/DynamicRegisterInfo.h | 14 +++++++++----
.../AArch64/ArchitectureAArch64.cpp | 21 ++++++++-----------
.../gdb-remote/GDBRemoteRegisterContext.cpp | 4 +++-
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/lldb/include/lldb/Target/DynamicRegisterInfo.h
b/lldb/include/lldb/Target/DynamicRegisterInfo.h
index 0e175a99eb7d58a..6dc1380e22059f1 100644
--- a/lldb/include/lldb/Target/DynamicRegisterInfo.h
+++ b/lldb/include/lldb/Target/DynamicRegisterInfo.h
@@ -89,12 +89,18 @@ class DynamicRegisterInfo {
GetRegisterInfo(llvm::StringRef reg_name) const;
typedef std::vector<lldb_private::RegisterInfo> reg_collection;
- llvm::iterator_range<reg_collection::const_iterator> registers() const {
- return llvm::iterator_range<reg_collection::const_iterator>(m_regs);
+
+ template <typename T> T registers();
+
+ 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::iterator> registers_mutable() {
- return llvm::iterator_range<reg_collection::iterator>(m_regs);
+ typedef llvm::iterator_range<reg_collection::iterator> reg_collection_range;
+ template <> reg_collection_range registers() {
+ return reg_collection_range(m_regs);
}
void ConfigureOffsets();
diff --git a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
index 2954eaa2083af08..181ba4e7d877216 100644
--- a/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
+++ b/lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp
@@ -38,11 +38,9 @@ ArchitectureAArch64::Create(const ArchSpec &arch) {
return std::unique_ptr<Architecture>(new ArchitectureAArch64());
}
-static void UpdateARM64SVERegistersInfos(
- llvm::iterator_range<
- lldb_private::DynamicRegisterInfo::reg_collection::iterator>
- regs,
- uint64_t vg) {
+static void
+UpdateARM64SVERegistersInfos(DynamicRegisterInfo::reg_collection_range regs,
+ uint64_t vg) {
// SVE Z register size is vg x 8 bytes.
uint32_t z_reg_byte_size = vg * 8;
@@ -62,11 +60,9 @@ static void UpdateARM64SVERegistersInfos(
}
}
-static void UpdateARM64SMERegistersInfos(
- llvm::iterator_range<
- lldb_private::DynamicRegisterInfo::reg_collection::iterator>
- regs,
- uint64_t svg) {
+static void
+UpdateARM64SMERegistersInfos(DynamicRegisterInfo::reg_collection_range 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.
@@ -108,10 +104,11 @@ 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(reg_info.registers_mutable(), *vg_reg_value);
+ UpdateARM64SVERegistersInfos(regs, *vg_reg_value);
if (svg_reg_value)
- UpdateARM64SMERegistersInfos(reg_info.registers_mutable(), *svg_reg_value);
+ UpdateARM64SMERegistersInfos(regs, *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 e35983f0e7fbd40..e9bd65fad1502bf 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
@@ -228,7 +228,9 @@ 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())) {
+ for (auto x : llvm::enumerate(
+ m_reg_info_sp->registers<
+ DynamicRegisterInfo::reg_collection_const_range>())) {
const struct RegisterInfo ®info = x.value();
m_reg_valid[x.index()] =
(reginfo.byte_offset + reginfo.byte_size <=
>From f3a8fe418db028727dad4214647ac58ba95c3a96 Mon Sep 17 00:00:00 2001
From: David Spickett <david.spick...@linaro.org>
Date: Tue, 7 Nov 2023 08:54:29 +0000
Subject: [PATCH 2/2] Delete default template
---
lldb/include/lldb/Target/DynamicRegisterInfo.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lldb/include/lldb/Target/DynamicRegisterInfo.h
b/lldb/include/lldb/Target/DynamicRegisterInfo.h
index 6dc1380e22059f1..af76c742c98f961 100644
--- a/lldb/include/lldb/Target/DynamicRegisterInfo.h
+++ b/lldb/include/lldb/Target/DynamicRegisterInfo.h
@@ -90,7 +90,7 @@ class DynamicRegisterInfo {
typedef std::vector<lldb_private::RegisterInfo> reg_collection;
- template <typename T> T registers();
+ template <typename T> T registers() = delete;
typedef llvm::iterator_range<reg_collection::const_iterator>
reg_collection_const_range;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
