Skip to content

Commit 4989c62

Browse files
[lldb] Add template method for getting const or mutable regs from DynamicRegisterInfo (#71402)
GDBRemoteRegisterContext only needs to iterate them, ArchitectureAArch64 needs to mutate them if scalable registers change size.
1 parent ebc3302 commit 4989c62

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

lldb/include/lldb/Target/DynamicRegisterInfo.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,18 @@ class DynamicRegisterInfo {
8989
GetRegisterInfo(llvm::StringRef reg_name) const;
9090

9191
typedef std::vector<lldb_private::RegisterInfo> reg_collection;
92-
llvm::iterator_range<reg_collection::const_iterator> registers() const {
93-
return llvm::iterator_range<reg_collection::const_iterator>(m_regs);
92+
93+
template <typename T> T registers() = delete;
94+
95+
typedef llvm::iterator_range<reg_collection::const_iterator>
96+
reg_collection_const_range;
97+
template <> reg_collection_const_range registers() {
98+
return reg_collection_const_range(m_regs);
9499
}
95100

96-
llvm::iterator_range<reg_collection::iterator> registers_mutable() {
97-
return llvm::iterator_range<reg_collection::iterator>(m_regs);
101+
typedef llvm::iterator_range<reg_collection::iterator> reg_collection_range;
102+
template <> reg_collection_range registers() {
103+
return reg_collection_range(m_regs);
98104
}
99105

100106
void ConfigureOffsets();

lldb/source/Plugins/Architecture/AArch64/ArchitectureAArch64.cpp

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ ArchitectureAArch64::Create(const ArchSpec &arch) {
3838
return std::unique_ptr<Architecture>(new ArchitectureAArch64());
3939
}
4040

41-
static void UpdateARM64SVERegistersInfos(
42-
llvm::iterator_range<
43-
lldb_private::DynamicRegisterInfo::reg_collection::iterator>
44-
regs,
45-
uint64_t vg) {
41+
static void
42+
UpdateARM64SVERegistersInfos(DynamicRegisterInfo::reg_collection_range regs,
43+
uint64_t vg) {
4644
// SVE Z register size is vg x 8 bytes.
4745
uint32_t z_reg_byte_size = vg * 8;
4846

@@ -62,11 +60,9 @@ static void UpdateARM64SVERegistersInfos(
6260
}
6361
}
6462

65-
static void UpdateARM64SMERegistersInfos(
66-
llvm::iterator_range<
67-
lldb_private::DynamicRegisterInfo::reg_collection::iterator>
68-
regs,
69-
uint64_t svg) {
63+
static void
64+
UpdateARM64SMERegistersInfos(DynamicRegisterInfo::reg_collection_range regs,
65+
uint64_t svg) {
7066
for (auto &reg : regs) {
7167
if (strcmp(reg.name, "za") == 0) {
7268
// ZA is a register with size (svg*8) * (svg*8). A square essentially.
@@ -108,10 +104,11 @@ bool ArchitectureAArch64::ReconfigureRegisterInfo(DynamicRegisterInfo &reg_info,
108104
if (!vg_reg_value && !svg_reg_value)
109105
return false;
110106

107+
auto regs = reg_info.registers<DynamicRegisterInfo::reg_collection_range>();
111108
if (vg_reg_value)
112-
UpdateARM64SVERegistersInfos(reg_info.registers_mutable(), *vg_reg_value);
109+
UpdateARM64SVERegistersInfos(regs, *vg_reg_value);
113110
if (svg_reg_value)
114-
UpdateARM64SMERegistersInfos(reg_info.registers_mutable(), *svg_reg_value);
111+
UpdateARM64SMERegistersInfos(regs, *svg_reg_value);
115112

116113
// At this point if we have updated any registers, their offsets will all be
117114
// invalid. If we did, we need to update them all.

lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,9 @@ bool GDBRemoteRegisterContext::ReadRegisterBytes(const RegisterInfo *reg_info) {
228228
SetAllRegisterValid(true);
229229
return true;
230230
} else if (buffer_sp->GetByteSize() > 0) {
231-
for (auto x : llvm::enumerate(m_reg_info_sp->registers())) {
231+
for (auto x : llvm::enumerate(
232+
m_reg_info_sp->registers<
233+
DynamicRegisterInfo::reg_collection_const_range>())) {
232234
const struct RegisterInfo &reginfo = x.value();
233235
m_reg_valid[x.index()] =
234236
(reginfo.byte_offset + reginfo.byte_size <=

0 commit comments

Comments
 (0)