[SOL] Fix SBF target in LLDB

LucasSte · Jun 28, 2024 · 8547b3f · 8547b3f
1 parent 9cedb0a
commit 8547b3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lldb/include/lldb/Utility/ArchSpec.h b/lldb/include/lldb/Utility/ArchSpec.h
@@ -106,9 +106,9 @@ class ArchSpec {
     eBPF_abi_sbf_v2 = 0x00000020,
   };
 
-  enum BPFSubType {
-    eBPFSubType_sbf,
-    eBPFSubType_sbfv2,
+  enum SBFSubType {
+    eSBFSubType_sbf,
+    eSBFSubType_sbfv2,
   };
 
   enum RISCVSubType {

diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -248,10 +248,10 @@ bool ELFNote::Parse(const DataExtractor &data, lldb::offset_t *offset) {
   return true;
 }
 
-static uint32_t bpfVariantFromElfFlags(const elf::ELFHeader &header) {
+static uint32_t sbfVariantFromElfFlags(const elf::ELFHeader &header) {
   if (header.e_flags & llvm::ELF::EF_SBF_V2)
-      return ArchSpec::eBPFSubType_sbfv2;
-  return ArchSpec::eBPFSubType_sbf;
+      return ArchSpec::eSBFSubType_sbfv2;
+  return ArchSpec::eSBFSubType_sbf;
 }
 
 static uint32_t mipsVariantFromElfFlags (const elf::ELFHeader &header) {
@@ -350,6 +350,8 @@ static uint32_t subTypeFromElfHeader(const elf::ELFHeader &header) {
     return loongarchVariantFromElfFlags(header);
   else if (header.e_machine == llvm::ELF::EM_BPF)
     return bpfVariantFromElfFlags(header);
+  else if (header.e_machine == llvm::ELF::EM_SBF)
+    return sbfVariantFromElfFlags(header);
 
   return LLDB_INVALID_CPUTYPE;
 }

diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
@@ -430,9 +430,9 @@ static const ArchDefinitionEntry g_elf_arch_entries[] = {
     {ArchSpec::eCore_loongarch64, llvm::ELF::EM_LOONGARCH,
      ArchSpec::eLoongArchSubType_loongarch64, 0xFFFFFFFFu,
      0xFFFFFFFFu}, // loongarch64
-    {ArchSpec::eCore_sbf, llvm::ELF::EM_BPF, ArchSpec::eBPFSubType_sbf,
+    {ArchSpec::eCore_sbf, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbf,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbf
-    {ArchSpec::eCore_sbfv2, llvm::ELF::EM_BPF, ArchSpec::eBPFSubType_sbfv2,
+    {ArchSpec::eCore_sbfv2, llvm::ELF::EM_SBF, ArchSpec::eSBFSubType_sbfv2,
      0xFFFFFFFFu, 0xFFFFFFFFu}, // sbfv2
 };