https://github.com/MkDev11 updated https://github.com/llvm/llvm-project/pull/175262
>From 591b85b1d93df16eef1011b921fb2d793e64e4de Mon Sep 17 00:00:00 2001 From: mkdev11 <[email protected]> Date: Sat, 10 Jan 2026 00:41:01 +0200 Subject: [PATCH] [lldb][RISCV] Fix GetRegisterInfo to support RISCV-32 GetRegisterInfo in EmulateInstructionRISCV.cpp was hardcoded to use RegisterInfoPOSIX_riscv64, which caused LLDB to assert when working with RISCV-32 ELF files. This patch adds a check for the architecture and uses RegisterInfoPOSIX_riscv32 when the target is RISCV-32. Fixes #175092 --- .../Instruction/RISCV/EmulateInstructionRISCV.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lldb/source/Plugins/Instruction/RISCV/EmulateInstructionRISCV.cpp b/lldb/source/Plugins/Instruction/RISCV/EmulateInstructionRISCV.cpp index 2957cb716041d..76016e4dd7cb6 100644 --- a/lldb/source/Plugins/Instruction/RISCV/EmulateInstructionRISCV.cpp +++ b/lldb/source/Plugins/Instruction/RISCV/EmulateInstructionRISCV.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "EmulateInstructionRISCV.h" +#include "Plugins/Process/Utility/RegisterInfoPOSIX_riscv32.h" #include "Plugins/Process/Utility/RegisterInfoPOSIX_riscv64.h" #include "Plugins/Process/Utility/lldb-riscv-register-enums.h" #include "RISCVCInstructions.h" @@ -1837,6 +1838,18 @@ EmulateInstructionRISCV::GetRegisterInfo(RegisterKind reg_kind, } } + if (m_arch.GetCore() == ArchSpec::eCore_riscv32) { + RegisterInfoPOSIX_riscv32 reg_info( + m_arch, RegisterInfoPOSIX_riscv32::eRegsetMaskAll); + const RegisterInfo *array = reg_info.GetRegisterInfo(); + uint32_t length = reg_info.GetRegisterCount(); + + if (reg_index >= length || reg_kind != eRegisterKindLLDB) + return {}; + + return array[reg_index]; + } + RegisterInfoPOSIX_riscv64 reg_info(m_arch, RegisterInfoPOSIX_riscv64::eRegsetMaskAll); const RegisterInfo *array = reg_info.GetRegisterInfo(); _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
