[RISCV-LLDB] RISCV feature attribute support and allows overriding additional(default) feature #147990

I have updated the core logic to to handle all the feature attributes.

Author: santhoshe447

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

@@ -1318,8 +1318,18 @@ void ObjectFileELF::ParseRISCVAttributes(DataExtractor &data, uint64_t length,
       }
     }
   }
-  if (!attr.empty() && attr.contains("xqci")) {
-    arch_spec.SetAdditionalDisassemblyFeatureStr("+xqci,");
+
+  // List of RISC-V architecture extensions to detect from ELF.
+  // These extensions are extracted from the ".riscv.attributes" section.
+  // New extensions can be added to this list for detection without
+  // modifying the core logic.
+  std::vector<std::string> riscv_extensions = {"xqci"};
+
+  for (const auto &ext : riscv_extensions) {
+    if (!attr.empty() && attr.contains(ext) &&
+        !arch_spec.GetAdditionalDisassemblyFeatureStr().contains(ext)) {
+      arch_spec.SetAdditionalDisassemblyFeatureStr("+" + ext + ",");
+    }
   }
 }
 
@@ -1613,9 +1623,7 @@ size_t ObjectFileELF::GetSectionHeaderInfo(SectionHeaderColl &section_headers,
           DataExtractor data;
           if (sheader.sh_type == SHT_RISCV_ATTRIBUTES && section_size != 0 &&
               (data.SetData(object_data, sheader.sh_offset, section_size) ==
-               section_size) &&
-              !arch_spec.GetAdditionalDisassemblyFeatureStr().contains(
-                  "xqci")) {
+               section_size)) {
             ParseRISCVAttributes(data, section_size, arch_spec);
           }
         }

lldb/test/Shell/Disassemble/TestDisassembleRISCVXqciInstrutions.test

@@ -2,10 +2,10 @@
 
 # RUN: %lldb -b -o "disassemble -b -n main" %p/Inputs/riscv_xqci.out | FileCheck %s
 
-# CHECK: 1f 05 58 00 00 00  qc.e.li a0, 0x58
-# CHECK: 16 15              qc.extu a0, a0, 0x6, 0x0
+# CHECK: 051f 0058 0000  qc.e.li a0, 0x58
+# CHECK: 1516              qc.extu a0, a0, 0x6, 0x0
 
 # RUN: %lldb -b -o "disassemble -b -n main -Y -xqci,+c" %p/Inputs/riscv_xqci.out | FileCheck --check-prefix=CHECK-NOXQCI %s
 
-# CHECK-NOXQCI: <invalid>
+# CHECK-NOXQCI: <unknown>