[Lldb-commits] [lldb] [lldb][RISCV] Handle subsets of CSRs in RV32 core dump images (PR #142932)

[Jonas Devlieghere via lldb-commits]

================
@@ -7,75 +7,372 @@
 //===----------------------------------------------------------------------===//
 
 #include "RegisterContextPOSIXCore_riscv32.h"
+
 #include "lldb/Utility/DataBufferHeap.h"
 
+#define GPR_OFFSET(idx) ((idx) * sizeof(uint32_t))
+#define FPR_OFFSET(idx) ((idx) * sizeof(uint32_t))
+#define CSR_OFFSET(idx) ((idx) * sizeof(uint32_t))
+
+#define DECLARE_REGISTER_INFOS_RISCV32_STRUCT
+#include "Plugins/Process/Utility/RegisterInfos_riscv32.h"
+#undef DECLARE_REGISTER_INFOS_RISCV32_STRUCT
+
 using namespace lldb_private;
 
 std::unique_ptr<RegisterContextCorePOSIX_riscv32>
 RegisterContextCorePOSIX_riscv32::Create(Thread &thread, const ArchSpec &arch,
                                          const DataExtractor &gpregset,
                                          llvm::ArrayRef<CoreNote> notes) {
-  Flags opt_regsets = RegisterInfoPOSIX_riscv32::eRegsetMaskDefault;
-
   return std::unique_ptr<RegisterContextCorePOSIX_riscv32>(
       new RegisterContextCorePOSIX_riscv32(
-          thread,
-          std::make_unique<RegisterInfoPOSIX_riscv32>(arch, opt_regsets),
+          thread, std::make_unique<RegisterInfoPOSIXDynamic_riscv32>(arch),
           gpregset, notes));
 }
 
 RegisterContextCorePOSIX_riscv32::RegisterContextCorePOSIX_riscv32(
-    Thread &thread, std::unique_ptr<RegisterInfoPOSIX_riscv32> register_info,
+    Thread &thread,
+    std::unique_ptr<RegisterInfoPOSIXDynamic_riscv32> register_info,
     const DataExtractor &gpregset, llvm::ArrayRef<CoreNote> notes)
-    : RegisterContextPOSIX_riscv32(thread, std::move(register_info)) {
+    : RegisterContext(thread, 0), m_reg_infos_up(std::move(register_info)) {
+  // Compute the maximum register counts for GPR, FPR, and CSR.
+  uint32_t k_num_gpr_registers = (sizeof(g_register_infos_riscv32_gpr) /
+                                  sizeof(g_register_infos_riscv32_gpr[0]));
+  uint32_t k_num_fpr_registers = (sizeof(g_register_infos_riscv32_fpr) /
+                                  sizeof(g_register_infos_riscv32_fpr[0]));
+  uint32_t k_num_csr_registers = (sizeof(g_register_infos_riscv32_csr) /
+                                  sizeof(g_register_infos_riscv32_csr[0]));
 
-  m_gpr.SetData(std::make_shared<DataBufferHeap>(gpregset.GetDataStart(),
-                                                 gpregset.GetByteSize()));
-  m_gpr.SetByteOrder(gpregset.GetByteOrder());
+  std::vector<DynamicRegisterInfo::Register> registers;
+  uint32_t byte_offset = 0;
 
-  if (m_register_info_up->IsFPPresent()) {
-    ArchSpec arch = m_register_info_up->GetTargetArchitecture();
-    m_fpr = getRegset(notes, arch.GetTriple(), FPR_Desc);
+  // Build dynamic register information for GPR.
+  m_gpregset.SetData(std::make_shared<DataBufferHeap>(gpregset.GetDataStart(),
+                                                      gpregset.GetByteSize()));
+  if (m_gpregset.GetByteSize() >= g_register_infos_riscv32_gpr[0].byte_size) {
+    // GPR is available.
+    assert((m_gpregset.GetByteSize() /
+            g_register_infos_riscv32_gpr[0].byte_size) == k_num_gpr_registers &&
+           "GPR has the wrong number of registers!");
+    m_gpregset.SetByteOrder(gpregset.GetByteOrder());
+    for (auto gpr : g_register_infos_riscv32_gpr) {
+      std::vector<uint32_t> value_regs;
+      std::vector<uint32_t> invalidate_regs;
+      if (gpr.value_regs)
+        for (int idx = 0; gpr.value_regs[idx] != LLDB_INVALID_REGNUM; ++idx)
+          value_regs.push_back(gpr.value_regs[idx]);
+      if (gpr.invalidate_regs)
+        for (int idx = 0; gpr.invalidate_regs[idx] != LLDB_INVALID_REGNUM;
+             ++idx)
+          invalidate_regs.push_back(gpr.invalidate_regs[idx]);
+      DynamicRegisterInfo::Register reg{
+          lldb_private::ConstString(gpr.name),
+          lldb_private::ConstString(gpr.alt_name),
+          lldb_private::ConstString("GPR"),
+          gpr.byte_size,
+          byte_offset,
+          gpr.encoding,
+          gpr.format,
+          gpr.kinds[lldb::eRegisterKindDWARF],
+          gpr.kinds[lldb::eRegisterKindEHFrame],
+          gpr.kinds[lldb::eRegisterKindGeneric],
+          gpr.kinds[lldb::eRegisterKindProcessPlugin],
+          value_regs,
+          invalidate_regs,
+          /* value_reg_offset */ 0,
----------------
JDevlieghere wrote:

```suggestion
          /*value_reg_offset=*/0,
```

https://github.com/llvm/llvm-project/pull/142932