[lld] [llvm] [readobj][Arm][AArch64] Refactor Build Attributes parsing under ELFAtributeParser and add support for AArch64 Build Attributes (PR #128727)
Oliver Stannard via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 26 02:39:59 PST 2025
================
@@ -9,69 +9,22 @@
#ifndef LLVM_SUPPORT_ELFATTRIBUTEPARSER_H
#define LLVM_SUPPORT_ELFATTRIBUTEPARSER_H
-#include "ELFAttributes.h"
#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/DataExtractor.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Error.h"
-#include <optional>
-#include <unordered_map>
-
namespace llvm {
-class StringRef;
-class ScopedPrinter;
class ELFAttributeParser {
- StringRef vendor;
- std::unordered_map<unsigned, unsigned> attributes;
- std::unordered_map<unsigned, StringRef> attributesStr;
-
- virtual Error handler(uint64_t tag, bool &handled) = 0;
-
-protected:
- ScopedPrinter *sw;
- TagNameMap tagToStringMap;
- DataExtractor de{ArrayRef<uint8_t>{}, true, 0};
- DataExtractor::Cursor cursor{0};
-
- void printAttribute(unsigned tag, unsigned value, StringRef valueDesc);
-
- Error parseStringAttribute(const char *name, unsigned tag,
- ArrayRef<const char *> strings);
- Error parseAttributeList(uint32_t length);
- void parseIndexList(SmallVectorImpl<uint8_t> &indexList);
- Error parseSubsection(uint32_t length);
-
- void setAttributeString(unsigned tag, StringRef value) {
- attributesStr.emplace(tag, value);
- }
-
public:
- virtual ~ELFAttributeParser() { static_cast<void>(!cursor.takeError()); }
- Error integerAttribute(unsigned tag);
- Error stringAttribute(unsigned tag);
-
- ELFAttributeParser(ScopedPrinter *sw, TagNameMap tagNameMap, StringRef vendor)
- : vendor(vendor), sw(sw), tagToStringMap(tagNameMap) {}
-
- ELFAttributeParser(TagNameMap tagNameMap, StringRef vendor)
- : vendor(vendor), sw(nullptr), tagToStringMap(tagNameMap) {}
-
- Error parse(ArrayRef<uint8_t> section, llvm::endianness endian);
+ virtual ~ELFAttributeParser() {}
- std::optional<unsigned> getAttributeValue(unsigned tag) const {
- auto I = attributes.find(tag);
- if (I == attributes.end())
- return std::nullopt;
- return I->second;
- }
- std::optional<StringRef> getAttributeString(unsigned tag) const {
- auto I = attributesStr.find(tag);
- if (I == attributesStr.end())
- return std::nullopt;
- return I->second;
- }
+ virtual Error parse(ArrayRef<uint8_t> Section, llvm::endianness Endian);
+ virtual std::optional<unsigned>
+ getAttributeValue(StringRef BuildAttrSubsectionName, unsigned Tag) const;
----------------
ostannard wrote:
These could have an overload which only takes `Tag`, to avoid needing most of the changes in the other architecture backends.
https://github.com/llvm/llvm-project/pull/128727
More information about the llvm-commits
mailing list