-
Notifications
You must be signed in to change notification settings - Fork 11.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[lldb] Add template method for getting const or mutable regs from DynamicRegisterInfo #71402
Conversation
…amicRegisterInfo GDBRemoteRegisterContext only needs to iterate them, ArchitectureAArch64 needs to mutate them if scalable registers change size.
@llvm/pr-subscribers-lldb Author: David Spickett (DavidSpickett) ChangesGDBRemoteRegisterContext only needs to iterate them, ArchitectureAArch64 needs to mutate them if scalable registers change size. Full diff: https://github.com/llvm/llvm-project/pull/71402.diff 3 Files Affected:
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 <=
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! Looks good to me! Left some comments but it's mostly a matter of style. Pick what approach you like the most :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works for me.
GDBRemoteRegisterContext only needs to iterate them, ArchitectureAArch64 needs to mutate them if scalable registers change size.