[llvm] r262368 - Move ObjectYAML code to a new library.
Pete Cooper via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 1 11:23:27 PST 2016
Thanks! This is much better
> On Mar 1, 2016, at 11:15 AM, Rafael Espindola via llvm-commits <llvm-commits at lists.llvm.org> wrote:
>
> Author: rafael
> Date: Tue Mar 1 13:15:06 2016
> New Revision: 262368
>
> URL: http://llvm.org/viewvc/llvm-project?rev=262368&view=rev
> Log:
> Move ObjectYAML code to a new library.
>
> It is only ever used by obj2yaml and yaml2obj. No point in linking it
> everywhere.
>
> Added:
> llvm/trunk/include/llvm/ObjectYAML/
> llvm/trunk/include/llvm/ObjectYAML/COFFYAML.h
> - copied, changed from r262367, llvm/trunk/include/llvm/Object/COFFYAML.h
> llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h
> - copied, changed from r262367, llvm/trunk/include/llvm/Object/ELFYAML.h
> llvm/trunk/include/llvm/ObjectYAML/YAML.h
> - copied, changed from r262367, llvm/trunk/include/llvm/MC/YAML.h
> llvm/trunk/lib/ObjectYAML/
> llvm/trunk/lib/ObjectYAML/CMakeLists.txt
> llvm/trunk/lib/ObjectYAML/COFFYAML.cpp
> - copied, changed from r262367, llvm/trunk/lib/Object/COFFYAML.cpp
> llvm/trunk/lib/ObjectYAML/ELFYAML.cpp
> - copied, changed from r262367, llvm/trunk/lib/Object/ELFYAML.cpp
> llvm/trunk/lib/ObjectYAML/YAML.cpp
> - copied, changed from r262367, llvm/trunk/lib/MC/YAML.cpp
> llvm/trunk/unittests/ObjectYAML/
> llvm/trunk/unittests/ObjectYAML/CMakeLists.txt
> llvm/trunk/unittests/ObjectYAML/YAMLTest.cpp
> - copied, changed from r262367, llvm/trunk/unittests/MC/YAMLTest.cpp
> Removed:
> llvm/trunk/include/llvm/MC/YAML.h
> llvm/trunk/include/llvm/Object/COFFYAML.h
> llvm/trunk/include/llvm/Object/ELFYAML.h
> llvm/trunk/lib/MC/YAML.cpp
> llvm/trunk/lib/Object/COFFYAML.cpp
> llvm/trunk/lib/Object/ELFYAML.cpp
> llvm/trunk/unittests/MC/YAMLTest.cpp
> Modified:
> llvm/trunk/lib/CMakeLists.txt
> llvm/trunk/lib/MC/CMakeLists.txt
> llvm/trunk/lib/Object/CMakeLists.txt
> llvm/trunk/tools/obj2yaml/CMakeLists.txt
> llvm/trunk/tools/obj2yaml/coff2yaml.cpp
> llvm/trunk/tools/obj2yaml/elf2yaml.cpp
> llvm/trunk/tools/yaml2obj/CMakeLists.txt
> llvm/trunk/tools/yaml2obj/yaml2coff.cpp
> llvm/trunk/tools/yaml2obj/yaml2elf.cpp
> llvm/trunk/unittests/CMakeLists.txt
> llvm/trunk/unittests/MC/CMakeLists.txt
>
> Removed: llvm/trunk/include/llvm/MC/YAML.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/YAML.h?rev=262367&view=auto
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/YAML.h (original)
> +++ llvm/trunk/include/llvm/MC/YAML.h (removed)
> @@ -1,94 +0,0 @@
> -#ifndef LLVM_MC_YAML_H
> -#define LLVM_MC_YAML_H
> -
> -#include "llvm/Support/YAMLTraits.h"
> -
> -namespace llvm {
> -namespace yaml {
> -/// \brief Specialized YAMLIO scalar type for representing a binary blob.
> -///
> -/// A typical use case would be to represent the content of a section in a
> -/// binary file.
> -/// This class has custom YAMLIO traits for convenient reading and writing.
> -/// It renders as a string of hex digits in a YAML file.
> -/// For example, it might render as `DEADBEEFCAFEBABE` (YAML does not
> -/// require the quotation marks, so for simplicity when outputting they are
> -/// omitted).
> -/// When reading, any string whose content is an even number of hex digits
> -/// will be accepted.
> -/// For example, all of the following are acceptable:
> -/// `DEADBEEF`, `"DeADbEeF"`, `"\x44EADBEEF"` (Note: '\x44' == 'D')
> -///
> -/// A significant advantage of using this class is that it never allocates
> -/// temporary strings or buffers for any of its functionality.
> -///
> -/// Example:
> -///
> -/// The YAML mapping:
> -/// \code
> -/// Foo: DEADBEEFCAFEBABE
> -/// \endcode
> -///
> -/// Could be modeled in YAMLIO by the struct:
> -/// \code
> -/// struct FooHolder {
> -/// BinaryRef Foo;
> -/// };
> -/// namespace llvm {
> -/// namespace yaml {
> -/// template <>
> -/// struct MappingTraits<FooHolder> {
> -/// static void mapping(IO &IO, FooHolder &FH) {
> -/// IO.mapRequired("Foo", FH.Foo);
> -/// }
> -/// };
> -/// } // end namespace yaml
> -/// } // end namespace llvm
> -/// \endcode
> -class BinaryRef {
> - friend bool operator==(const BinaryRef &LHS, const BinaryRef &RHS);
> - /// \brief Either raw binary data, or a string of hex bytes (must always
> - /// be an even number of characters).
> - ArrayRef<uint8_t> Data;
> - /// \brief Discriminator between the two states of the `Data` member.
> - bool DataIsHexString;
> -
> -public:
> - BinaryRef(ArrayRef<uint8_t> Data) : Data(Data), DataIsHexString(false) {}
> - BinaryRef(StringRef Data)
> - : Data(reinterpret_cast<const uint8_t *>(Data.data()), Data.size()),
> - DataIsHexString(true) {}
> - BinaryRef() : DataIsHexString(true) {}
> - /// \brief The number of bytes that are represented by this BinaryRef.
> - /// This is the number of bytes that writeAsBinary() will write.
> - ArrayRef<uint8_t>::size_type binary_size() const {
> - if (DataIsHexString)
> - return Data.size() / 2;
> - return Data.size();
> - }
> - /// \brief Write the contents (regardless of whether it is binary or a
> - /// hex string) as binary to the given raw_ostream.
> - void writeAsBinary(raw_ostream &OS) const;
> - /// \brief Write the contents (regardless of whether it is binary or a
> - /// hex string) as hex to the given raw_ostream.
> - ///
> - /// For example, a possible output could be `DEADBEEFCAFEBABE`.
> - void writeAsHex(raw_ostream &OS) const;
> -};
> -
> -inline bool operator==(const BinaryRef &LHS, const BinaryRef &RHS) {
> - // Special case for default constructed BinaryRef.
> - if (LHS.Data.empty() && RHS.Data.empty())
> - return true;
> -
> - return LHS.DataIsHexString == RHS.DataIsHexString && LHS.Data == RHS.Data;
> -}
> -
> -template <> struct ScalarTraits<BinaryRef> {
> - static void output(const BinaryRef &, void *, llvm::raw_ostream &);
> - static StringRef input(StringRef, void *, BinaryRef &);
> - static bool mustQuote(StringRef S) { return needsQuotes(S); }
> -};
> -}
> -}
> -#endif
>
> Removed: llvm/trunk/include/llvm/Object/COFFYAML.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFFYAML.h?rev=262367&view=auto
> ==============================================================================
> --- llvm/trunk/include/llvm/Object/COFFYAML.h (original)
> +++ llvm/trunk/include/llvm/Object/COFFYAML.h (removed)
> @@ -1,223 +0,0 @@
> -//===- COFFYAML.h - COFF YAMLIO implementation ------------------*- C++ -*-===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -//
> -// This file declares classes for handling the YAML representation of COFF.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#ifndef LLVM_OBJECT_COFFYAML_H
> -#define LLVM_OBJECT_COFFYAML_H
> -
> -#include "llvm/ADT/Optional.h"
> -#include "llvm/MC/YAML.h"
> -#include "llvm/Support/COFF.h"
> -
> -namespace llvm {
> -
> -namespace COFF {
> -inline Characteristics operator|(Characteristics a, Characteristics b) {
> - uint32_t Ret = static_cast<uint32_t>(a) | static_cast<uint32_t>(b);
> - return static_cast<Characteristics>(Ret);
> -}
> -
> -inline SectionCharacteristics operator|(SectionCharacteristics a,
> - SectionCharacteristics b) {
> - uint32_t Ret = static_cast<uint32_t>(a) | static_cast<uint32_t>(b);
> - return static_cast<SectionCharacteristics>(Ret);
> -}
> -
> -inline DLLCharacteristics operator|(DLLCharacteristics a,
> - DLLCharacteristics b) {
> - uint16_t Ret = static_cast<uint16_t>(a) | static_cast<uint16_t>(b);
> - return static_cast<DLLCharacteristics>(Ret);
> -}
> -}
> -
> -// The structure of the yaml files is not an exact 1:1 match to COFF. In order
> -// to use yaml::IO, we use these structures which are closer to the source.
> -namespace COFFYAML {
> - LLVM_YAML_STRONG_TYPEDEF(uint8_t, COMDATType)
> - LLVM_YAML_STRONG_TYPEDEF(uint32_t, WeakExternalCharacteristics)
> - LLVM_YAML_STRONG_TYPEDEF(uint8_t, AuxSymbolType)
> -
> - struct Relocation {
> - uint32_t VirtualAddress;
> - uint16_t Type;
> - StringRef SymbolName;
> - };
> -
> - struct Section {
> - COFF::section Header;
> - unsigned Alignment;
> - yaml::BinaryRef SectionData;
> - std::vector<Relocation> Relocations;
> - StringRef Name;
> - Section();
> - };
> -
> - struct Symbol {
> - COFF::symbol Header;
> - COFF::SymbolBaseType SimpleType;
> - COFF::SymbolComplexType ComplexType;
> - Optional<COFF::AuxiliaryFunctionDefinition> FunctionDefinition;
> - Optional<COFF::AuxiliarybfAndefSymbol> bfAndefSymbol;
> - Optional<COFF::AuxiliaryWeakExternal> WeakExternal;
> - StringRef File;
> - Optional<COFF::AuxiliarySectionDefinition> SectionDefinition;
> - Optional<COFF::AuxiliaryCLRToken> CLRToken;
> - StringRef Name;
> - Symbol();
> - };
> -
> - struct PEHeader {
> - COFF::PE32Header Header;
> - Optional<COFF::DataDirectory> DataDirectories[COFF::NUM_DATA_DIRECTORIES];
> - };
> -
> - struct Object {
> - Optional<PEHeader> OptionalHeader;
> - COFF::header Header;
> - std::vector<Section> Sections;
> - std::vector<Symbol> Symbols;
> - Object();
> - };
> -}
> -}
> -
> -LLVM_YAML_IS_SEQUENCE_VECTOR(COFFYAML::Section)
> -LLVM_YAML_IS_SEQUENCE_VECTOR(COFFYAML::Symbol)
> -LLVM_YAML_IS_SEQUENCE_VECTOR(COFFYAML::Relocation)
> -
> -namespace llvm {
> -namespace yaml {
> -
> -template <>
> -struct ScalarEnumerationTraits<COFFYAML::WeakExternalCharacteristics> {
> - static void enumeration(IO &IO, COFFYAML::WeakExternalCharacteristics &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFFYAML::AuxSymbolType> {
> - static void enumeration(IO &IO, COFFYAML::AuxSymbolType &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFFYAML::COMDATType> {
> - static void enumeration(IO &IO, COFFYAML::COMDATType &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFF::MachineTypes> {
> - static void enumeration(IO &IO, COFF::MachineTypes &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFF::SymbolBaseType> {
> - static void enumeration(IO &IO, COFF::SymbolBaseType &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFF::SymbolStorageClass> {
> - static void enumeration(IO &IO, COFF::SymbolStorageClass &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFF::SymbolComplexType> {
> - static void enumeration(IO &IO, COFF::SymbolComplexType &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFF::RelocationTypeI386> {
> - static void enumeration(IO &IO, COFF::RelocationTypeI386 &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFF::RelocationTypeAMD64> {
> - static void enumeration(IO &IO, COFF::RelocationTypeAMD64 &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<COFF::WindowsSubsystem> {
> - static void enumeration(IO &IO, COFF::WindowsSubsystem &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<COFF::Characteristics> {
> - static void bitset(IO &IO, COFF::Characteristics &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<COFF::SectionCharacteristics> {
> - static void bitset(IO &IO, COFF::SectionCharacteristics &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<COFF::DLLCharacteristics> {
> - static void bitset(IO &IO, COFF::DLLCharacteristics &Value);
> -};
> -
> -template <>
> -struct MappingTraits<COFFYAML::Relocation> {
> - static void mapping(IO &IO, COFFYAML::Relocation &Rel);
> -};
> -
> -template <>
> -struct MappingTraits<COFFYAML::PEHeader> {
> - static void mapping(IO &IO, COFFYAML::PEHeader &PH);
> -};
> -
> -template <>
> -struct MappingTraits<COFF::DataDirectory> {
> - static void mapping(IO &IO, COFF::DataDirectory &DD);
> -};
> -
> -template <>
> -struct MappingTraits<COFF::header> {
> - static void mapping(IO &IO, COFF::header &H);
> -};
> -
> -template <> struct MappingTraits<COFF::AuxiliaryFunctionDefinition> {
> - static void mapping(IO &IO, COFF::AuxiliaryFunctionDefinition &AFD);
> -};
> -
> -template <> struct MappingTraits<COFF::AuxiliarybfAndefSymbol> {
> - static void mapping(IO &IO, COFF::AuxiliarybfAndefSymbol &AAS);
> -};
> -
> -template <> struct MappingTraits<COFF::AuxiliaryWeakExternal> {
> - static void mapping(IO &IO, COFF::AuxiliaryWeakExternal &AWE);
> -};
> -
> -template <> struct MappingTraits<COFF::AuxiliarySectionDefinition> {
> - static void mapping(IO &IO, COFF::AuxiliarySectionDefinition &ASD);
> -};
> -
> -template <> struct MappingTraits<COFF::AuxiliaryCLRToken> {
> - static void mapping(IO &IO, COFF::AuxiliaryCLRToken &ACT);
> -};
> -
> -template <>
> -struct MappingTraits<COFFYAML::Symbol> {
> - static void mapping(IO &IO, COFFYAML::Symbol &S);
> -};
> -
> -template <>
> -struct MappingTraits<COFFYAML::Section> {
> - static void mapping(IO &IO, COFFYAML::Section &Sec);
> -};
> -
> -template <>
> -struct MappingTraits<COFFYAML::Object> {
> - static void mapping(IO &IO, COFFYAML::Object &Obj);
> -};
> -
> -} // end namespace yaml
> -} // end namespace llvm
> -
> -#endif
>
> Removed: llvm/trunk/include/llvm/Object/ELFYAML.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELFYAML.h?rev=262367&view=auto
> ==============================================================================
> --- llvm/trunk/include/llvm/Object/ELFYAML.h (original)
> +++ llvm/trunk/include/llvm/Object/ELFYAML.h (removed)
> @@ -1,319 +0,0 @@
> -//===- ELFYAML.h - ELF YAMLIO implementation --------------------*- C++ -*-===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -///
> -/// \file
> -/// \brief This file declares classes for handling the YAML representation
> -/// of ELF.
> -///
> -//===----------------------------------------------------------------------===//
> -
> -#ifndef LLVM_OBJECT_ELFYAML_H
> -#define LLVM_OBJECT_ELFYAML_H
> -
> -#include "llvm/MC/YAML.h"
> -#include "llvm/Support/ELF.h"
> -
> -namespace llvm {
> -namespace ELFYAML {
> -
> -// These types are invariant across 32/64-bit ELF, so for simplicity just
> -// directly give them their exact sizes. We don't need to worry about
> -// endianness because these are just the types in the YAMLIO structures,
> -// and are appropriately converted to the necessary endianness when
> -// reading/generating binary object files.
> -// The naming of these types is intended to be ELF_PREFIX, where PREFIX is
> -// the common prefix of the respective constants. E.g. ELF_EM corresponds
> -// to the `e_machine` constants, like `EM_X86_64`.
> -// In the future, these would probably be better suited by C++11 enum
> -// class's with appropriate fixed underlying type.
> -LLVM_YAML_STRONG_TYPEDEF(uint16_t, ELF_ET)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_EM)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFCLASS)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFDATA)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFOSABI)
> -// Just use 64, since it can hold 32-bit values too.
> -LLVM_YAML_STRONG_TYPEDEF(uint64_t, ELF_EF)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_SHT)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_REL)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_RSS)
> -// Just use 64, since it can hold 32-bit values too.
> -LLVM_YAML_STRONG_TYPEDEF(uint64_t, ELF_SHF)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_STT)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_STV)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_STO)
> -
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, MIPS_AFL_REG)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, MIPS_ABI_FP)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, MIPS_AFL_EXT)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, MIPS_AFL_ASE)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, MIPS_AFL_FLAGS1)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, MIPS_ISA)
> -
> -// For now, hardcode 64 bits everywhere that 32 or 64 would be needed
> -// since 64-bit can hold 32-bit values too.
> -struct FileHeader {
> - ELF_ELFCLASS Class;
> - ELF_ELFDATA Data;
> - ELF_ELFOSABI OSABI;
> - ELF_ET Type;
> - ELF_EM Machine;
> - ELF_EF Flags;
> - llvm::yaml::Hex64 Entry;
> -};
> -struct Symbol {
> - StringRef Name;
> - ELF_STT Type;
> - StringRef Section;
> - llvm::yaml::Hex64 Value;
> - llvm::yaml::Hex64 Size;
> - uint8_t Other;
> -};
> -struct LocalGlobalWeakSymbols {
> - std::vector<Symbol> Local;
> - std::vector<Symbol> Global;
> - std::vector<Symbol> Weak;
> -};
> -
> -struct SectionOrType {
> - StringRef sectionNameOrType;
> -};
> -
> -struct Section {
> - enum class SectionKind {
> - Group,
> - RawContent,
> - Relocation,
> - NoBits,
> - MipsABIFlags
> - };
> - SectionKind Kind;
> - StringRef Name;
> - ELF_SHT Type;
> - ELF_SHF Flags;
> - llvm::yaml::Hex64 Address;
> - StringRef Link;
> - StringRef Info;
> - llvm::yaml::Hex64 AddressAlign;
> - Section(SectionKind Kind) : Kind(Kind) {}
> - virtual ~Section();
> -};
> -struct RawContentSection : Section {
> - yaml::BinaryRef Content;
> - llvm::yaml::Hex64 Size;
> - RawContentSection() : Section(SectionKind::RawContent) {}
> - static bool classof(const Section *S) {
> - return S->Kind == SectionKind::RawContent;
> - }
> -};
> -
> -struct NoBitsSection : Section {
> - llvm::yaml::Hex64 Size;
> - NoBitsSection() : Section(SectionKind::NoBits) {}
> - static bool classof(const Section *S) {
> - return S->Kind == SectionKind::NoBits;
> - }
> -};
> -
> -struct Group : Section {
> - // Members of a group contain a flag and a list of section indices
> - // that are part of the group.
> - std::vector<SectionOrType> Members;
> - Group() : Section(SectionKind::Group) {}
> - static bool classof(const Section *S) {
> - return S->Kind == SectionKind::Group;
> - }
> -};
> -
> -struct Relocation {
> - llvm::yaml::Hex64 Offset;
> - int64_t Addend;
> - ELF_REL Type;
> - StringRef Symbol;
> -};
> -struct RelocationSection : Section {
> - std::vector<Relocation> Relocations;
> - RelocationSection() : Section(SectionKind::Relocation) {}
> - static bool classof(const Section *S) {
> - return S->Kind == SectionKind::Relocation;
> - }
> -};
> -
> -// Represents .MIPS.abiflags section
> -struct MipsABIFlags : Section {
> - llvm::yaml::Hex16 Version;
> - MIPS_ISA ISALevel;
> - llvm::yaml::Hex8 ISARevision;
> - MIPS_AFL_REG GPRSize;
> - MIPS_AFL_REG CPR1Size;
> - MIPS_AFL_REG CPR2Size;
> - MIPS_ABI_FP FpABI;
> - MIPS_AFL_EXT ISAExtension;
> - MIPS_AFL_ASE ASEs;
> - MIPS_AFL_FLAGS1 Flags1;
> - llvm::yaml::Hex32 Flags2;
> - MipsABIFlags() : Section(SectionKind::MipsABIFlags) {}
> - static bool classof(const Section *S) {
> - return S->Kind == SectionKind::MipsABIFlags;
> - }
> -};
> -
> -struct Object {
> - FileHeader Header;
> - std::vector<std::unique_ptr<Section>> Sections;
> - // Although in reality the symbols reside in a section, it is a lot
> - // cleaner and nicer if we read them from the YAML as a separate
> - // top-level key, which automatically ensures that invariants like there
> - // being a single SHT_SYMTAB section are upheld.
> - LocalGlobalWeakSymbols Symbols;
> -};
> -
> -} // end namespace ELFYAML
> -} // end namespace llvm
> -
> -LLVM_YAML_IS_SEQUENCE_VECTOR(std::unique_ptr<llvm::ELFYAML::Section>)
> -LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::Symbol)
> -LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::Relocation)
> -LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::SectionOrType)
> -
> -namespace llvm {
> -namespace yaml {
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_ET> {
> - static void enumeration(IO &IO, ELFYAML::ELF_ET &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_EM> {
> - static void enumeration(IO &IO, ELFYAML::ELF_EM &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_ELFCLASS> {
> - static void enumeration(IO &IO, ELFYAML::ELF_ELFCLASS &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA> {
> - static void enumeration(IO &IO, ELFYAML::ELF_ELFDATA &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_ELFOSABI> {
> - static void enumeration(IO &IO, ELFYAML::ELF_ELFOSABI &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<ELFYAML::ELF_EF> {
> - static void bitset(IO &IO, ELFYAML::ELF_EF &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_SHT> {
> - static void enumeration(IO &IO, ELFYAML::ELF_SHT &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<ELFYAML::ELF_SHF> {
> - static void bitset(IO &IO, ELFYAML::ELF_SHF &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_STT> {
> - static void enumeration(IO &IO, ELFYAML::ELF_STT &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_STV> {
> - static void enumeration(IO &IO, ELFYAML::ELF_STV &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<ELFYAML::ELF_STO> {
> - static void bitset(IO &IO, ELFYAML::ELF_STO &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_REL> {
> - static void enumeration(IO &IO, ELFYAML::ELF_REL &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::ELF_RSS> {
> - static void enumeration(IO &IO, ELFYAML::ELF_RSS &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::MIPS_AFL_REG> {
> - static void enumeration(IO &IO, ELFYAML::MIPS_AFL_REG &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::MIPS_ABI_FP> {
> - static void enumeration(IO &IO, ELFYAML::MIPS_ABI_FP &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::MIPS_AFL_EXT> {
> - static void enumeration(IO &IO, ELFYAML::MIPS_AFL_EXT &Value);
> -};
> -
> -template <>
> -struct ScalarEnumerationTraits<ELFYAML::MIPS_ISA> {
> - static void enumeration(IO &IO, ELFYAML::MIPS_ISA &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<ELFYAML::MIPS_AFL_ASE> {
> - static void bitset(IO &IO, ELFYAML::MIPS_AFL_ASE &Value);
> -};
> -
> -template <>
> -struct ScalarBitSetTraits<ELFYAML::MIPS_AFL_FLAGS1> {
> - static void bitset(IO &IO, ELFYAML::MIPS_AFL_FLAGS1 &Value);
> -};
> -
> -template <>
> -struct MappingTraits<ELFYAML::FileHeader> {
> - static void mapping(IO &IO, ELFYAML::FileHeader &FileHdr);
> -};
> -
> -template <>
> -struct MappingTraits<ELFYAML::Symbol> {
> - static void mapping(IO &IO, ELFYAML::Symbol &Symbol);
> -};
> -
> -template <>
> -struct MappingTraits<ELFYAML::LocalGlobalWeakSymbols> {
> - static void mapping(IO &IO, ELFYAML::LocalGlobalWeakSymbols &Symbols);
> -};
> -
> -template <> struct MappingTraits<ELFYAML::Relocation> {
> - static void mapping(IO &IO, ELFYAML::Relocation &Rel);
> -};
> -
> -template <>
> -struct MappingTraits<std::unique_ptr<ELFYAML::Section>> {
> - static void mapping(IO &IO, std::unique_ptr<ELFYAML::Section> &Section);
> - static StringRef validate(IO &io, std::unique_ptr<ELFYAML::Section> &Section);
> -};
> -
> -template <>
> -struct MappingTraits<ELFYAML::Object> {
> - static void mapping(IO &IO, ELFYAML::Object &Object);
> -};
> -
> -template <> struct MappingTraits<ELFYAML::SectionOrType> {
> - static void mapping(IO &IO, ELFYAML::SectionOrType §ionOrType);
> -};
> -
> -} // end namespace yaml
> -} // end namespace llvm
> -
> -#endif
>
> Copied: llvm/trunk/include/llvm/ObjectYAML/COFFYAML.h (from r262367, llvm/trunk/include/llvm/Object/COFFYAML.h)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/COFFYAML.h?p2=llvm/trunk/include/llvm/ObjectYAML/COFFYAML.h&p1=llvm/trunk/include/llvm/Object/COFFYAML.h&r1=262367&r2=262368&rev=262368&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Object/COFFYAML.h (original)
> +++ llvm/trunk/include/llvm/ObjectYAML/COFFYAML.h Tue Mar 1 13:15:06 2016
> @@ -11,11 +11,11 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#ifndef LLVM_OBJECT_COFFYAML_H
> -#define LLVM_OBJECT_COFFYAML_H
> +#ifndef LLVM_OBJECTYAML_COFFYAML_H
> +#define LLVM_OBJECTYAML_COFFYAML_H
>
> #include "llvm/ADT/Optional.h"
> -#include "llvm/MC/YAML.h"
> +#include "llvm/ObjectYAML/YAML.h"
> #include "llvm/Support/COFF.h"
>
> namespace llvm {
>
> Copied: llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h (from r262367, llvm/trunk/include/llvm/Object/ELFYAML.h)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h?p2=llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h&p1=llvm/trunk/include/llvm/Object/ELFYAML.h&r1=262367&r2=262368&rev=262368&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Object/ELFYAML.h (original)
> +++ llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h Tue Mar 1 13:15:06 2016
> @@ -13,10 +13,10 @@
> ///
> //===----------------------------------------------------------------------===//
>
> -#ifndef LLVM_OBJECT_ELFYAML_H
> -#define LLVM_OBJECT_ELFYAML_H
> +#ifndef LLVM_OBJECTYAML_ELFYAML_H
> +#define LLVM_OBJECTYAML_ELFYAML_H
>
> -#include "llvm/MC/YAML.h"
> +#include "llvm/ObjectYAML/YAML.h"
> #include "llvm/Support/ELF.h"
>
> namespace llvm {
>
> Copied: llvm/trunk/include/llvm/ObjectYAML/YAML.h (from r262367, llvm/trunk/include/llvm/MC/YAML.h)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/YAML.h?p2=llvm/trunk/include/llvm/ObjectYAML/YAML.h&p1=llvm/trunk/include/llvm/MC/YAML.h&r1=262367&r2=262368&rev=262368&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/YAML.h (original)
> +++ llvm/trunk/include/llvm/ObjectYAML/YAML.h Tue Mar 1 13:15:06 2016
> @@ -1,5 +1,14 @@
> -#ifndef LLVM_MC_YAML_H
> -#define LLVM_MC_YAML_H
> +//===- YAML.h ---------------------------------------------------*- C++ -*-===//
> +//
> +// The LLVM Compiler Infrastructure
> +//
> +// This file is distributed under the University of Illinois Open Source
> +// License. See LICENSE.TXT for details.
> +//
> +//===----------------------------------------------------------------------===//
> +
> +#ifndef LLVM_OBJECTYAML_YAML_H
> +#define LLVM_OBJECTYAML_YAML_H
>
> #include "llvm/Support/YAMLTraits.h"
>
>
> Modified: llvm/trunk/lib/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CMakeLists.txt?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/lib/CMakeLists.txt (original)
> +++ llvm/trunk/lib/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -10,6 +10,7 @@ add_subdirectory(Analysis)
> add_subdirectory(LTO)
> add_subdirectory(MC)
> add_subdirectory(Object)
> +add_subdirectory(ObjectYAML)
> add_subdirectory(Option)
> add_subdirectory(DebugInfo)
> add_subdirectory(ExecutionEngine)
>
> Modified: llvm/trunk/lib/MC/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/CMakeLists.txt?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/CMakeLists.txt (original)
> +++ llvm/trunk/lib/MC/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -48,7 +48,6 @@ add_llvm_library(LLVMMC
> SubtargetFeature.cpp
> WinCOFFObjectWriter.cpp
> WinCOFFStreamer.cpp
> - YAML.cpp
>
> ADDITIONAL_HEADER_DIRS
> ${LLVM_MAIN_INCLUDE_DIR}/llvm/MC
>
> Removed: llvm/trunk/lib/MC/YAML.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/YAML.cpp?rev=262367&view=auto
> ==============================================================================
> --- llvm/trunk/lib/MC/YAML.cpp (original)
> +++ llvm/trunk/lib/MC/YAML.cpp (removed)
> @@ -1,61 +0,0 @@
> -//===- YAML.cpp - YAMLIO utilities for object files -----------------------===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -//
> -// This file defines utility classes for handling the YAML representation of
> -// object files.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#include "llvm/MC/YAML.h"
> -#include "llvm/ADT/StringExtras.h"
> -#include "llvm/Support/raw_ostream.h"
> -#include <cctype>
> -
> -using namespace llvm;
> -
> -void yaml::ScalarTraits<yaml::BinaryRef>::output(
> - const yaml::BinaryRef &Val, void *, llvm::raw_ostream &Out) {
> - Val.writeAsHex(Out);
> -}
> -
> -StringRef yaml::ScalarTraits<yaml::BinaryRef>::input(StringRef Scalar, void *,
> - yaml::BinaryRef &Val) {
> - if (Scalar.size() % 2 != 0)
> - return "BinaryRef hex string must contain an even number of nybbles.";
> - // TODO: Can we improve YAMLIO to permit a more accurate diagnostic here?
> - // (e.g. a caret pointing to the offending character).
> - for (unsigned I = 0, N = Scalar.size(); I != N; ++I)
> - if (!isxdigit(Scalar[I]))
> - return "BinaryRef hex string must contain only hex digits.";
> - Val = yaml::BinaryRef(Scalar);
> - return StringRef();
> -}
> -
> -void yaml::BinaryRef::writeAsBinary(raw_ostream &OS) const {
> - if (!DataIsHexString) {
> - OS.write((const char *)Data.data(), Data.size());
> - return;
> - }
> - for (unsigned I = 0, N = Data.size(); I != N; I += 2) {
> - uint8_t Byte;
> - StringRef((const char *)&Data[I], 2).getAsInteger(16, Byte);
> - OS.write(Byte);
> - }
> -}
> -
> -void yaml::BinaryRef::writeAsHex(raw_ostream &OS) const {
> - if (binary_size() == 0)
> - return;
> - if (DataIsHexString) {
> - OS.write((const char *)Data.data(), Data.size());
> - return;
> - }
> - for (uint8_t Byte : Data)
> - OS << hexdigit(Byte >> 4) << hexdigit(Byte & 0xf);
> -}
>
> Modified: llvm/trunk/lib/Object/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/CMakeLists.txt?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Object/CMakeLists.txt (original)
> +++ llvm/trunk/lib/Object/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -3,10 +3,8 @@ add_llvm_library(LLVMObject
> ArchiveWriter.cpp
> Binary.cpp
> COFFObjectFile.cpp
> - COFFYAML.cpp
> ELF.cpp
> ELFObjectFile.cpp
> - ELFYAML.cpp
> Error.cpp
> IRObjectFile.cpp
> MachOObjectFile.cpp
>
> Removed: llvm/trunk/lib/Object/COFFYAML.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFYAML.cpp?rev=262367&view=auto
> ==============================================================================
> --- llvm/trunk/lib/Object/COFFYAML.cpp (original)
> +++ llvm/trunk/lib/Object/COFFYAML.cpp (removed)
> @@ -1,503 +0,0 @@
> -//===- COFFYAML.cpp - COFF YAMLIO implementation --------------------------===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -//
> -// This file defines classes for handling the YAML representation of COFF.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#include "llvm/Object/COFFYAML.h"
> -
> -#define ECase(X) IO.enumCase(Value, #X, COFF::X);
> -namespace llvm {
> -
> -namespace COFFYAML {
> -Section::Section() { memset(&Header, 0, sizeof(COFF::section)); }
> -Symbol::Symbol() { memset(&Header, 0, sizeof(COFF::symbol)); }
> -Object::Object() { memset(&Header, 0, sizeof(COFF::header)); }
> -}
> -
> -namespace yaml {
> -void ScalarEnumerationTraits<COFFYAML::COMDATType>::enumeration(
> - IO &IO, COFFYAML::COMDATType &Value) {
> - IO.enumCase(Value, "0", 0);
> - ECase(IMAGE_COMDAT_SELECT_NODUPLICATES);
> - ECase(IMAGE_COMDAT_SELECT_ANY);
> - ECase(IMAGE_COMDAT_SELECT_SAME_SIZE);
> - ECase(IMAGE_COMDAT_SELECT_EXACT_MATCH);
> - ECase(IMAGE_COMDAT_SELECT_ASSOCIATIVE);
> - ECase(IMAGE_COMDAT_SELECT_LARGEST);
> - ECase(IMAGE_COMDAT_SELECT_NEWEST);
> -}
> -
> -void
> -ScalarEnumerationTraits<COFFYAML::WeakExternalCharacteristics>::enumeration(
> - IO &IO, COFFYAML::WeakExternalCharacteristics &Value) {
> - IO.enumCase(Value, "0", 0);
> - ECase(IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY);
> - ECase(IMAGE_WEAK_EXTERN_SEARCH_LIBRARY);
> - ECase(IMAGE_WEAK_EXTERN_SEARCH_ALIAS);
> -}
> -
> -void ScalarEnumerationTraits<COFFYAML::AuxSymbolType>::enumeration(
> - IO &IO, COFFYAML::AuxSymbolType &Value) {
> - ECase(IMAGE_AUX_SYMBOL_TYPE_TOKEN_DEF);
> -}
> -
> -void ScalarEnumerationTraits<COFF::MachineTypes>::enumeration(
> - IO &IO, COFF::MachineTypes &Value) {
> - ECase(IMAGE_FILE_MACHINE_UNKNOWN);
> - ECase(IMAGE_FILE_MACHINE_AM33);
> - ECase(IMAGE_FILE_MACHINE_AMD64);
> - ECase(IMAGE_FILE_MACHINE_ARM);
> - ECase(IMAGE_FILE_MACHINE_ARMNT);
> - ECase(IMAGE_FILE_MACHINE_ARM64);
> - ECase(IMAGE_FILE_MACHINE_EBC);
> - ECase(IMAGE_FILE_MACHINE_I386);
> - ECase(IMAGE_FILE_MACHINE_IA64);
> - ECase(IMAGE_FILE_MACHINE_M32R);
> - ECase(IMAGE_FILE_MACHINE_MIPS16);
> - ECase(IMAGE_FILE_MACHINE_MIPSFPU);
> - ECase(IMAGE_FILE_MACHINE_MIPSFPU16);
> - ECase(IMAGE_FILE_MACHINE_POWERPC);
> - ECase(IMAGE_FILE_MACHINE_POWERPCFP);
> - ECase(IMAGE_FILE_MACHINE_R4000);
> - ECase(IMAGE_FILE_MACHINE_SH3);
> - ECase(IMAGE_FILE_MACHINE_SH3DSP);
> - ECase(IMAGE_FILE_MACHINE_SH4);
> - ECase(IMAGE_FILE_MACHINE_SH5);
> - ECase(IMAGE_FILE_MACHINE_THUMB);
> - ECase(IMAGE_FILE_MACHINE_WCEMIPSV2);
> -}
> -
> -void ScalarEnumerationTraits<COFF::SymbolBaseType>::enumeration(
> - IO &IO, COFF::SymbolBaseType &Value) {
> - ECase(IMAGE_SYM_TYPE_NULL);
> - ECase(IMAGE_SYM_TYPE_VOID);
> - ECase(IMAGE_SYM_TYPE_CHAR);
> - ECase(IMAGE_SYM_TYPE_SHORT);
> - ECase(IMAGE_SYM_TYPE_INT);
> - ECase(IMAGE_SYM_TYPE_LONG);
> - ECase(IMAGE_SYM_TYPE_FLOAT);
> - ECase(IMAGE_SYM_TYPE_DOUBLE);
> - ECase(IMAGE_SYM_TYPE_STRUCT);
> - ECase(IMAGE_SYM_TYPE_UNION);
> - ECase(IMAGE_SYM_TYPE_ENUM);
> - ECase(IMAGE_SYM_TYPE_MOE);
> - ECase(IMAGE_SYM_TYPE_BYTE);
> - ECase(IMAGE_SYM_TYPE_WORD);
> - ECase(IMAGE_SYM_TYPE_UINT);
> - ECase(IMAGE_SYM_TYPE_DWORD);
> -}
> -
> -void ScalarEnumerationTraits<COFF::SymbolStorageClass>::enumeration(
> - IO &IO, COFF::SymbolStorageClass &Value) {
> - ECase(IMAGE_SYM_CLASS_END_OF_FUNCTION);
> - ECase(IMAGE_SYM_CLASS_NULL);
> - ECase(IMAGE_SYM_CLASS_AUTOMATIC);
> - ECase(IMAGE_SYM_CLASS_EXTERNAL);
> - ECase(IMAGE_SYM_CLASS_STATIC);
> - ECase(IMAGE_SYM_CLASS_REGISTER);
> - ECase(IMAGE_SYM_CLASS_EXTERNAL_DEF);
> - ECase(IMAGE_SYM_CLASS_LABEL);
> - ECase(IMAGE_SYM_CLASS_UNDEFINED_LABEL);
> - ECase(IMAGE_SYM_CLASS_MEMBER_OF_STRUCT);
> - ECase(IMAGE_SYM_CLASS_ARGUMENT);
> - ECase(IMAGE_SYM_CLASS_STRUCT_TAG);
> - ECase(IMAGE_SYM_CLASS_MEMBER_OF_UNION);
> - ECase(IMAGE_SYM_CLASS_UNION_TAG);
> - ECase(IMAGE_SYM_CLASS_TYPE_DEFINITION);
> - ECase(IMAGE_SYM_CLASS_UNDEFINED_STATIC);
> - ECase(IMAGE_SYM_CLASS_ENUM_TAG);
> - ECase(IMAGE_SYM_CLASS_MEMBER_OF_ENUM);
> - ECase(IMAGE_SYM_CLASS_REGISTER_PARAM);
> - ECase(IMAGE_SYM_CLASS_BIT_FIELD);
> - ECase(IMAGE_SYM_CLASS_BLOCK);
> - ECase(IMAGE_SYM_CLASS_FUNCTION);
> - ECase(IMAGE_SYM_CLASS_END_OF_STRUCT);
> - ECase(IMAGE_SYM_CLASS_FILE);
> - ECase(IMAGE_SYM_CLASS_SECTION);
> - ECase(IMAGE_SYM_CLASS_WEAK_EXTERNAL);
> - ECase(IMAGE_SYM_CLASS_CLR_TOKEN);
> -}
> -
> -void ScalarEnumerationTraits<COFF::SymbolComplexType>::enumeration(
> - IO &IO, COFF::SymbolComplexType &Value) {
> - ECase(IMAGE_SYM_DTYPE_NULL);
> - ECase(IMAGE_SYM_DTYPE_POINTER);
> - ECase(IMAGE_SYM_DTYPE_FUNCTION);
> - ECase(IMAGE_SYM_DTYPE_ARRAY);
> -}
> -
> -void ScalarEnumerationTraits<COFF::RelocationTypeI386>::enumeration(
> - IO &IO, COFF::RelocationTypeI386 &Value) {
> - ECase(IMAGE_REL_I386_ABSOLUTE);
> - ECase(IMAGE_REL_I386_DIR16);
> - ECase(IMAGE_REL_I386_REL16);
> - ECase(IMAGE_REL_I386_DIR32);
> - ECase(IMAGE_REL_I386_DIR32NB);
> - ECase(IMAGE_REL_I386_SEG12);
> - ECase(IMAGE_REL_I386_SECTION);
> - ECase(IMAGE_REL_I386_SECREL);
> - ECase(IMAGE_REL_I386_TOKEN);
> - ECase(IMAGE_REL_I386_SECREL7);
> - ECase(IMAGE_REL_I386_REL32);
> -}
> -
> -void ScalarEnumerationTraits<COFF::RelocationTypeAMD64>::enumeration(
> - IO &IO, COFF::RelocationTypeAMD64 &Value) {
> - ECase(IMAGE_REL_AMD64_ABSOLUTE);
> - ECase(IMAGE_REL_AMD64_ADDR64);
> - ECase(IMAGE_REL_AMD64_ADDR32);
> - ECase(IMAGE_REL_AMD64_ADDR32NB);
> - ECase(IMAGE_REL_AMD64_REL32);
> - ECase(IMAGE_REL_AMD64_REL32_1);
> - ECase(IMAGE_REL_AMD64_REL32_2);
> - ECase(IMAGE_REL_AMD64_REL32_3);
> - ECase(IMAGE_REL_AMD64_REL32_4);
> - ECase(IMAGE_REL_AMD64_REL32_5);
> - ECase(IMAGE_REL_AMD64_SECTION);
> - ECase(IMAGE_REL_AMD64_SECREL);
> - ECase(IMAGE_REL_AMD64_SECREL7);
> - ECase(IMAGE_REL_AMD64_TOKEN);
> - ECase(IMAGE_REL_AMD64_SREL32);
> - ECase(IMAGE_REL_AMD64_PAIR);
> - ECase(IMAGE_REL_AMD64_SSPAN32);
> -}
> -
> -void ScalarEnumerationTraits<COFF::WindowsSubsystem>::enumeration(
> - IO &IO, COFF::WindowsSubsystem &Value) {
> - ECase(IMAGE_SUBSYSTEM_UNKNOWN);
> - ECase(IMAGE_SUBSYSTEM_NATIVE);
> - ECase(IMAGE_SUBSYSTEM_WINDOWS_GUI);
> - ECase(IMAGE_SUBSYSTEM_WINDOWS_CUI);
> - ECase(IMAGE_SUBSYSTEM_OS2_CUI);
> - ECase(IMAGE_SUBSYSTEM_POSIX_CUI);
> - ECase(IMAGE_SUBSYSTEM_NATIVE_WINDOWS);
> - ECase(IMAGE_SUBSYSTEM_WINDOWS_CE_GUI);
> - ECase(IMAGE_SUBSYSTEM_EFI_APPLICATION);
> - ECase(IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER);
> - ECase(IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER);
> - ECase(IMAGE_SUBSYSTEM_EFI_ROM);
> - ECase(IMAGE_SUBSYSTEM_XBOX);
> - ECase(IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION);
> -}
> -#undef ECase
> -
> -#define BCase(X) IO.bitSetCase(Value, #X, COFF::X);
> -void ScalarBitSetTraits<COFF::Characteristics>::bitset(
> - IO &IO, COFF::Characteristics &Value) {
> - BCase(IMAGE_FILE_RELOCS_STRIPPED);
> - BCase(IMAGE_FILE_EXECUTABLE_IMAGE);
> - BCase(IMAGE_FILE_LINE_NUMS_STRIPPED);
> - BCase(IMAGE_FILE_LOCAL_SYMS_STRIPPED);
> - BCase(IMAGE_FILE_AGGRESSIVE_WS_TRIM);
> - BCase(IMAGE_FILE_LARGE_ADDRESS_AWARE);
> - BCase(IMAGE_FILE_BYTES_REVERSED_LO);
> - BCase(IMAGE_FILE_32BIT_MACHINE);
> - BCase(IMAGE_FILE_DEBUG_STRIPPED);
> - BCase(IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP);
> - BCase(IMAGE_FILE_NET_RUN_FROM_SWAP);
> - BCase(IMAGE_FILE_SYSTEM);
> - BCase(IMAGE_FILE_DLL);
> - BCase(IMAGE_FILE_UP_SYSTEM_ONLY);
> - BCase(IMAGE_FILE_BYTES_REVERSED_HI);
> -}
> -
> -void ScalarBitSetTraits<COFF::SectionCharacteristics>::bitset(
> - IO &IO, COFF::SectionCharacteristics &Value) {
> - BCase(IMAGE_SCN_TYPE_NOLOAD);
> - BCase(IMAGE_SCN_TYPE_NO_PAD);
> - BCase(IMAGE_SCN_CNT_CODE);
> - BCase(IMAGE_SCN_CNT_INITIALIZED_DATA);
> - BCase(IMAGE_SCN_CNT_UNINITIALIZED_DATA);
> - BCase(IMAGE_SCN_LNK_OTHER);
> - BCase(IMAGE_SCN_LNK_INFO);
> - BCase(IMAGE_SCN_LNK_REMOVE);
> - BCase(IMAGE_SCN_LNK_COMDAT);
> - BCase(IMAGE_SCN_GPREL);
> - BCase(IMAGE_SCN_MEM_PURGEABLE);
> - BCase(IMAGE_SCN_MEM_16BIT);
> - BCase(IMAGE_SCN_MEM_LOCKED);
> - BCase(IMAGE_SCN_MEM_PRELOAD);
> - BCase(IMAGE_SCN_LNK_NRELOC_OVFL);
> - BCase(IMAGE_SCN_MEM_DISCARDABLE);
> - BCase(IMAGE_SCN_MEM_NOT_CACHED);
> - BCase(IMAGE_SCN_MEM_NOT_PAGED);
> - BCase(IMAGE_SCN_MEM_SHARED);
> - BCase(IMAGE_SCN_MEM_EXECUTE);
> - BCase(IMAGE_SCN_MEM_READ);
> - BCase(IMAGE_SCN_MEM_WRITE);
> -}
> -
> -void ScalarBitSetTraits<COFF::DLLCharacteristics>::bitset(
> - IO &IO, COFF::DLLCharacteristics &Value) {
> - BCase(IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA);
> - BCase(IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE);
> - BCase(IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY);
> - BCase(IMAGE_DLL_CHARACTERISTICS_NX_COMPAT);
> - BCase(IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION);
> - BCase(IMAGE_DLL_CHARACTERISTICS_NO_SEH);
> - BCase(IMAGE_DLL_CHARACTERISTICS_NO_BIND);
> - BCase(IMAGE_DLL_CHARACTERISTICS_APPCONTAINER);
> - BCase(IMAGE_DLL_CHARACTERISTICS_WDM_DRIVER);
> - BCase(IMAGE_DLL_CHARACTERISTICS_GUARD_CF);
> - BCase(IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE);
> -}
> -#undef BCase
> -
> -namespace {
> -struct NSectionSelectionType {
> - NSectionSelectionType(IO &)
> - : SelectionType(COFFYAML::COMDATType(0)) {}
> - NSectionSelectionType(IO &, uint8_t C)
> - : SelectionType(COFFYAML::COMDATType(C)) {}
> - uint8_t denormalize(IO &) { return SelectionType; }
> - COFFYAML::COMDATType SelectionType;
> -};
> -
> -struct NWeakExternalCharacteristics {
> - NWeakExternalCharacteristics(IO &)
> - : Characteristics(COFFYAML::WeakExternalCharacteristics(0)) {}
> - NWeakExternalCharacteristics(IO &, uint32_t C)
> - : Characteristics(COFFYAML::WeakExternalCharacteristics(C)) {}
> - uint32_t denormalize(IO &) { return Characteristics; }
> - COFFYAML::WeakExternalCharacteristics Characteristics;
> -};
> -
> -struct NSectionCharacteristics {
> - NSectionCharacteristics(IO &)
> - : Characteristics(COFF::SectionCharacteristics(0)) {}
> - NSectionCharacteristics(IO &, uint32_t C)
> - : Characteristics(COFF::SectionCharacteristics(C)) {}
> - uint32_t denormalize(IO &) { return Characteristics; }
> - COFF::SectionCharacteristics Characteristics;
> -};
> -
> -struct NAuxTokenType {
> - NAuxTokenType(IO &)
> - : AuxType(COFFYAML::AuxSymbolType(0)) {}
> - NAuxTokenType(IO &, uint8_t C)
> - : AuxType(COFFYAML::AuxSymbolType(C)) {}
> - uint32_t denormalize(IO &) { return AuxType; }
> - COFFYAML::AuxSymbolType AuxType;
> -};
> -
> -struct NStorageClass {
> - NStorageClass(IO &) : StorageClass(COFF::SymbolStorageClass(0)) {}
> - NStorageClass(IO &, uint8_t S) : StorageClass(COFF::SymbolStorageClass(S)) {}
> - uint8_t denormalize(IO &) { return StorageClass; }
> -
> - COFF::SymbolStorageClass StorageClass;
> -};
> -
> -struct NMachine {
> - NMachine(IO &) : Machine(COFF::MachineTypes(0)) {}
> - NMachine(IO &, uint16_t M) : Machine(COFF::MachineTypes(M)) {}
> - uint16_t denormalize(IO &) { return Machine; }
> - COFF::MachineTypes Machine;
> -};
> -
> -struct NHeaderCharacteristics {
> - NHeaderCharacteristics(IO &) : Characteristics(COFF::Characteristics(0)) {}
> - NHeaderCharacteristics(IO &, uint16_t C)
> - : Characteristics(COFF::Characteristics(C)) {}
> - uint16_t denormalize(IO &) { return Characteristics; }
> -
> - COFF::Characteristics Characteristics;
> -};
> -
> -template <typename RelocType>
> -struct NType {
> - NType(IO &) : Type(RelocType(0)) {}
> - NType(IO &, uint16_t T) : Type(RelocType(T)) {}
> - uint16_t denormalize(IO &) { return Type; }
> - RelocType Type;
> -};
> -
> -struct NWindowsSubsystem {
> - NWindowsSubsystem(IO &) : Subsystem(COFF::WindowsSubsystem(0)) {}
> - NWindowsSubsystem(IO &, uint16_t C) : Subsystem(COFF::WindowsSubsystem(C)) {}
> - uint16_t denormalize(IO &) { return Subsystem; }
> -
> - COFF::WindowsSubsystem Subsystem;
> -};
> -
> -struct NDLLCharacteristics {
> - NDLLCharacteristics(IO &) : Characteristics(COFF::DLLCharacteristics(0)) {}
> - NDLLCharacteristics(IO &, uint16_t C)
> - : Characteristics(COFF::DLLCharacteristics(C)) {}
> - uint16_t denormalize(IO &) { return Characteristics; }
> -
> - COFF::DLLCharacteristics Characteristics;
> -};
> -
> -}
> -
> -void MappingTraits<COFFYAML::Relocation>::mapping(IO &IO,
> - COFFYAML::Relocation &Rel) {
> - IO.mapRequired("VirtualAddress", Rel.VirtualAddress);
> - IO.mapRequired("SymbolName", Rel.SymbolName);
> -
> - COFF::header &H = *static_cast<COFF::header *>(IO.getContext());
> - if (H.Machine == COFF::IMAGE_FILE_MACHINE_I386) {
> - MappingNormalization<NType<COFF::RelocationTypeI386>, uint16_t> NT(
> - IO, Rel.Type);
> - IO.mapRequired("Type", NT->Type);
> - } else if (H.Machine == COFF::IMAGE_FILE_MACHINE_AMD64) {
> - MappingNormalization<NType<COFF::RelocationTypeAMD64>, uint16_t> NT(
> - IO, Rel.Type);
> - IO.mapRequired("Type", NT->Type);
> - } else {
> - IO.mapRequired("Type", Rel.Type);
> - }
> -}
> -
> -void MappingTraits<COFF::DataDirectory>::mapping(IO &IO,
> - COFF::DataDirectory &DD) {
> - IO.mapRequired("RelativeVirtualAddress", DD.RelativeVirtualAddress);
> - IO.mapRequired("Size", DD.Size);
> -}
> -
> -void MappingTraits<COFFYAML::PEHeader>::mapping(IO &IO,
> - COFFYAML::PEHeader &PH) {
> - MappingNormalization<NWindowsSubsystem, uint16_t> NWS(IO,
> - PH.Header.Subsystem);
> - MappingNormalization<NDLLCharacteristics, uint16_t> NDC(
> - IO, PH.Header.DLLCharacteristics);
> -
> - IO.mapRequired("AddressOfEntryPoint", PH.Header.AddressOfEntryPoint);
> - IO.mapRequired("ImageBase", PH.Header.ImageBase);
> - IO.mapRequired("SectionAlignment", PH.Header.SectionAlignment);
> - IO.mapRequired("FileAlignment", PH.Header.FileAlignment);
> - IO.mapRequired("MajorOperatingSystemVersion",
> - PH.Header.MajorOperatingSystemVersion);
> - IO.mapRequired("MinorOperatingSystemVersion",
> - PH.Header.MinorOperatingSystemVersion);
> - IO.mapRequired("MajorImageVersion", PH.Header.MajorImageVersion);
> - IO.mapRequired("MinorImageVersion", PH.Header.MinorImageVersion);
> - IO.mapRequired("MajorSubsystemVersion", PH.Header.MajorSubsystemVersion);
> - IO.mapRequired("MinorSubsystemVersion", PH.Header.MinorSubsystemVersion);
> - IO.mapRequired("Subsystem", NWS->Subsystem);
> - IO.mapRequired("DLLCharacteristics", NDC->Characteristics);
> - IO.mapRequired("SizeOfStackReserve", PH.Header.SizeOfStackReserve);
> - IO.mapRequired("SizeOfStackCommit", PH.Header.SizeOfStackCommit);
> - IO.mapRequired("SizeOfHeapReserve", PH.Header.SizeOfHeapReserve);
> - IO.mapRequired("SizeOfHeapCommit", PH.Header.SizeOfHeapCommit);
> -
> - IO.mapOptional("ExportTable", PH.DataDirectories[COFF::EXPORT_TABLE]);
> - IO.mapOptional("ImportTable", PH.DataDirectories[COFF::IMPORT_TABLE]);
> - IO.mapOptional("ResourceTable", PH.DataDirectories[COFF::RESOURCE_TABLE]);
> - IO.mapOptional("ExceptionTable", PH.DataDirectories[COFF::EXCEPTION_TABLE]);
> - IO.mapOptional("CertificateTable", PH.DataDirectories[COFF::CERTIFICATE_TABLE]);
> - IO.mapOptional("BaseRelocationTable",
> - PH.DataDirectories[COFF::BASE_RELOCATION_TABLE]);
> - IO.mapOptional("Debug", PH.DataDirectories[COFF::DEBUG]);
> - IO.mapOptional("Architecture", PH.DataDirectories[COFF::ARCHITECTURE]);
> - IO.mapOptional("GlobalPtr", PH.DataDirectories[COFF::GLOBAL_PTR]);
> - IO.mapOptional("TlsTable", PH.DataDirectories[COFF::TLS_TABLE]);
> - IO.mapOptional("LoadConfigTable",
> - PH.DataDirectories[COFF::LOAD_CONFIG_TABLE]);
> - IO.mapOptional("BoundImport", PH.DataDirectories[COFF::BOUND_IMPORT]);
> - IO.mapOptional("IAT", PH.DataDirectories[COFF::IAT]);
> - IO.mapOptional("DelayImportDescriptor",
> - PH.DataDirectories[COFF::DELAY_IMPORT_DESCRIPTOR]);
> - IO.mapOptional("ClrRuntimeHeader",
> - PH.DataDirectories[COFF::CLR_RUNTIME_HEADER]);
> -}
> -
> -void MappingTraits<COFF::header>::mapping(IO &IO, COFF::header &H) {
> - MappingNormalization<NMachine, uint16_t> NM(IO, H.Machine);
> - MappingNormalization<NHeaderCharacteristics, uint16_t> NC(IO,
> - H.Characteristics);
> -
> - IO.mapRequired("Machine", NM->Machine);
> - IO.mapOptional("Characteristics", NC->Characteristics);
> - IO.setContext(static_cast<void *>(&H));
> -}
> -
> -void MappingTraits<COFF::AuxiliaryFunctionDefinition>::mapping(
> - IO &IO, COFF::AuxiliaryFunctionDefinition &AFD) {
> - IO.mapRequired("TagIndex", AFD.TagIndex);
> - IO.mapRequired("TotalSize", AFD.TotalSize);
> - IO.mapRequired("PointerToLinenumber", AFD.PointerToLinenumber);
> - IO.mapRequired("PointerToNextFunction", AFD.PointerToNextFunction);
> -}
> -
> -void MappingTraits<COFF::AuxiliarybfAndefSymbol>::mapping(
> - IO &IO, COFF::AuxiliarybfAndefSymbol &AAS) {
> - IO.mapRequired("Linenumber", AAS.Linenumber);
> - IO.mapRequired("PointerToNextFunction", AAS.PointerToNextFunction);
> -}
> -
> -void MappingTraits<COFF::AuxiliaryWeakExternal>::mapping(
> - IO &IO, COFF::AuxiliaryWeakExternal &AWE) {
> - MappingNormalization<NWeakExternalCharacteristics, uint32_t> NWEC(
> - IO, AWE.Characteristics);
> - IO.mapRequired("TagIndex", AWE.TagIndex);
> - IO.mapRequired("Characteristics", NWEC->Characteristics);
> -}
> -
> -void MappingTraits<COFF::AuxiliarySectionDefinition>::mapping(
> - IO &IO, COFF::AuxiliarySectionDefinition &ASD) {
> - MappingNormalization<NSectionSelectionType, uint8_t> NSST(
> - IO, ASD.Selection);
> -
> - IO.mapRequired("Length", ASD.Length);
> - IO.mapRequired("NumberOfRelocations", ASD.NumberOfRelocations);
> - IO.mapRequired("NumberOfLinenumbers", ASD.NumberOfLinenumbers);
> - IO.mapRequired("CheckSum", ASD.CheckSum);
> - IO.mapRequired("Number", ASD.Number);
> - IO.mapOptional("Selection", NSST->SelectionType, COFFYAML::COMDATType(0));
> -}
> -
> -void MappingTraits<COFF::AuxiliaryCLRToken>::mapping(
> - IO &IO, COFF::AuxiliaryCLRToken &ACT) {
> - MappingNormalization<NAuxTokenType, uint8_t> NATT(IO, ACT.AuxType);
> - IO.mapRequired("AuxType", NATT->AuxType);
> - IO.mapRequired("SymbolTableIndex", ACT.SymbolTableIndex);
> -}
> -
> -void MappingTraits<COFFYAML::Symbol>::mapping(IO &IO, COFFYAML::Symbol &S) {
> - MappingNormalization<NStorageClass, uint8_t> NS(IO, S.Header.StorageClass);
> -
> - IO.mapRequired("Name", S.Name);
> - IO.mapRequired("Value", S.Header.Value);
> - IO.mapRequired("SectionNumber", S.Header.SectionNumber);
> - IO.mapRequired("SimpleType", S.SimpleType);
> - IO.mapRequired("ComplexType", S.ComplexType);
> - IO.mapRequired("StorageClass", NS->StorageClass);
> - IO.mapOptional("FunctionDefinition", S.FunctionDefinition);
> - IO.mapOptional("bfAndefSymbol", S.bfAndefSymbol);
> - IO.mapOptional("WeakExternal", S.WeakExternal);
> - IO.mapOptional("File", S.File, StringRef());
> - IO.mapOptional("SectionDefinition", S.SectionDefinition);
> - IO.mapOptional("CLRToken", S.CLRToken);
> -}
> -
> -void MappingTraits<COFFYAML::Section>::mapping(IO &IO, COFFYAML::Section &Sec) {
> - MappingNormalization<NSectionCharacteristics, uint32_t> NC(
> - IO, Sec.Header.Characteristics);
> - IO.mapRequired("Name", Sec.Name);
> - IO.mapRequired("Characteristics", NC->Characteristics);
> - IO.mapOptional("VirtualAddress", Sec.Header.VirtualAddress, 0U);
> - IO.mapOptional("VirtualSize", Sec.Header.VirtualSize, 0U);
> - IO.mapOptional("Alignment", Sec.Alignment);
> - IO.mapRequired("SectionData", Sec.SectionData);
> - IO.mapOptional("Relocations", Sec.Relocations);
> -}
> -
> -void MappingTraits<COFFYAML::Object>::mapping(IO &IO, COFFYAML::Object &Obj) {
> - IO.mapOptional("OptionalHeader", Obj.OptionalHeader);
> - IO.mapRequired("header", Obj.Header);
> - IO.mapRequired("sections", Obj.Sections);
> - IO.mapRequired("symbols", Obj.Symbols);
> -}
> -
> -}
> -}
>
> Removed: llvm/trunk/lib/Object/ELFYAML.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/ELFYAML.cpp?rev=262367&view=auto
> ==============================================================================
> --- llvm/trunk/lib/Object/ELFYAML.cpp (original)
> +++ llvm/trunk/lib/Object/ELFYAML.cpp (removed)
> @@ -1,828 +0,0 @@
> -//===- ELFYAML.cpp - ELF YAMLIO implementation ----------------------------===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -//
> -// This file defines classes for handling the YAML representation of ELF.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#include "llvm/Object/ELFYAML.h"
> -#include "llvm/Support/Casting.h"
> -#include "llvm/Support/MipsABIFlags.h"
> -
> -namespace llvm {
> -
> -ELFYAML::Section::~Section() {}
> -
> -namespace yaml {
> -
> -void
> -ScalarEnumerationTraits<ELFYAML::ELF_ET>::enumeration(IO &IO,
> - ELFYAML::ELF_ET &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - ECase(ET_NONE)
> - ECase(ET_REL)
> - ECase(ET_EXEC)
> - ECase(ET_DYN)
> - ECase(ET_CORE)
> -#undef ECase
> - IO.enumFallback<Hex16>(Value);
> -}
> -
> -void
> -ScalarEnumerationTraits<ELFYAML::ELF_EM>::enumeration(IO &IO,
> - ELFYAML::ELF_EM &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - ECase(EM_NONE)
> - ECase(EM_M32)
> - ECase(EM_SPARC)
> - ECase(EM_386)
> - ECase(EM_68K)
> - ECase(EM_88K)
> - ECase(EM_IAMCU)
> - ECase(EM_860)
> - ECase(EM_MIPS)
> - ECase(EM_S370)
> - ECase(EM_MIPS_RS3_LE)
> - ECase(EM_PARISC)
> - ECase(EM_VPP500)
> - ECase(EM_SPARC32PLUS)
> - ECase(EM_960)
> - ECase(EM_PPC)
> - ECase(EM_PPC64)
> - ECase(EM_S390)
> - ECase(EM_SPU)
> - ECase(EM_V800)
> - ECase(EM_FR20)
> - ECase(EM_RH32)
> - ECase(EM_RCE)
> - ECase(EM_ARM)
> - ECase(EM_ALPHA)
> - ECase(EM_SH)
> - ECase(EM_SPARCV9)
> - ECase(EM_TRICORE)
> - ECase(EM_ARC)
> - ECase(EM_H8_300)
> - ECase(EM_H8_300H)
> - ECase(EM_H8S)
> - ECase(EM_H8_500)
> - ECase(EM_IA_64)
> - ECase(EM_MIPS_X)
> - ECase(EM_COLDFIRE)
> - ECase(EM_68HC12)
> - ECase(EM_MMA)
> - ECase(EM_PCP)
> - ECase(EM_NCPU)
> - ECase(EM_NDR1)
> - ECase(EM_STARCORE)
> - ECase(EM_ME16)
> - ECase(EM_ST100)
> - ECase(EM_TINYJ)
> - ECase(EM_X86_64)
> - ECase(EM_PDSP)
> - ECase(EM_PDP10)
> - ECase(EM_PDP11)
> - ECase(EM_FX66)
> - ECase(EM_ST9PLUS)
> - ECase(EM_ST7)
> - ECase(EM_68HC16)
> - ECase(EM_68HC11)
> - ECase(EM_68HC08)
> - ECase(EM_68HC05)
> - ECase(EM_SVX)
> - ECase(EM_ST19)
> - ECase(EM_VAX)
> - ECase(EM_CRIS)
> - ECase(EM_JAVELIN)
> - ECase(EM_FIREPATH)
> - ECase(EM_ZSP)
> - ECase(EM_MMIX)
> - ECase(EM_HUANY)
> - ECase(EM_PRISM)
> - ECase(EM_AVR)
> - ECase(EM_FR30)
> - ECase(EM_D10V)
> - ECase(EM_D30V)
> - ECase(EM_V850)
> - ECase(EM_M32R)
> - ECase(EM_MN10300)
> - ECase(EM_MN10200)
> - ECase(EM_PJ)
> - ECase(EM_OPENRISC)
> - ECase(EM_ARC_COMPACT)
> - ECase(EM_XTENSA)
> - ECase(EM_VIDEOCORE)
> - ECase(EM_TMM_GPP)
> - ECase(EM_NS32K)
> - ECase(EM_TPC)
> - ECase(EM_SNP1K)
> - ECase(EM_ST200)
> - ECase(EM_IP2K)
> - ECase(EM_MAX)
> - ECase(EM_CR)
> - ECase(EM_F2MC16)
> - ECase(EM_MSP430)
> - ECase(EM_BLACKFIN)
> - ECase(EM_SE_C33)
> - ECase(EM_SEP)
> - ECase(EM_ARCA)
> - ECase(EM_UNICORE)
> - ECase(EM_EXCESS)
> - ECase(EM_DXP)
> - ECase(EM_ALTERA_NIOS2)
> - ECase(EM_CRX)
> - ECase(EM_XGATE)
> - ECase(EM_C166)
> - ECase(EM_M16C)
> - ECase(EM_DSPIC30F)
> - ECase(EM_CE)
> - ECase(EM_M32C)
> - ECase(EM_TSK3000)
> - ECase(EM_RS08)
> - ECase(EM_SHARC)
> - ECase(EM_ECOG2)
> - ECase(EM_SCORE7)
> - ECase(EM_DSP24)
> - ECase(EM_VIDEOCORE3)
> - ECase(EM_LATTICEMICO32)
> - ECase(EM_SE_C17)
> - ECase(EM_TI_C6000)
> - ECase(EM_TI_C2000)
> - ECase(EM_TI_C5500)
> - ECase(EM_MMDSP_PLUS)
> - ECase(EM_CYPRESS_M8C)
> - ECase(EM_R32C)
> - ECase(EM_TRIMEDIA)
> - ECase(EM_HEXAGON)
> - ECase(EM_8051)
> - ECase(EM_STXP7X)
> - ECase(EM_NDS32)
> - ECase(EM_ECOG1)
> - ECase(EM_ECOG1X)
> - ECase(EM_MAXQ30)
> - ECase(EM_XIMO16)
> - ECase(EM_MANIK)
> - ECase(EM_CRAYNV2)
> - ECase(EM_RX)
> - ECase(EM_METAG)
> - ECase(EM_MCST_ELBRUS)
> - ECase(EM_ECOG16)
> - ECase(EM_CR16)
> - ECase(EM_ETPU)
> - ECase(EM_SLE9X)
> - ECase(EM_L10M)
> - ECase(EM_K10M)
> - ECase(EM_AARCH64)
> - ECase(EM_AVR32)
> - ECase(EM_STM8)
> - ECase(EM_TILE64)
> - ECase(EM_TILEPRO)
> - ECase(EM_CUDA)
> - ECase(EM_TILEGX)
> - ECase(EM_CLOUDSHIELD)
> - ECase(EM_COREA_1ST)
> - ECase(EM_COREA_2ND)
> - ECase(EM_ARC_COMPACT2)
> - ECase(EM_OPEN8)
> - ECase(EM_RL78)
> - ECase(EM_VIDEOCORE5)
> - ECase(EM_78KOR)
> - ECase(EM_56800EX)
> - ECase(EM_AMDGPU)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_ELFCLASS>::enumeration(
> - IO &IO, ELFYAML::ELF_ELFCLASS &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - // Since the semantics of ELFCLASSNONE is "invalid", just don't accept it
> - // here.
> - ECase(ELFCLASS32)
> - ECase(ELFCLASS64)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA>::enumeration(
> - IO &IO, ELFYAML::ELF_ELFDATA &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - // Since the semantics of ELFDATANONE is "invalid", just don't accept it
> - // here.
> - ECase(ELFDATA2LSB)
> - ECase(ELFDATA2MSB)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_ELFOSABI>::enumeration(
> - IO &IO, ELFYAML::ELF_ELFOSABI &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - ECase(ELFOSABI_NONE)
> - ECase(ELFOSABI_HPUX)
> - ECase(ELFOSABI_NETBSD)
> - ECase(ELFOSABI_GNU)
> - ECase(ELFOSABI_GNU)
> - ECase(ELFOSABI_HURD)
> - ECase(ELFOSABI_SOLARIS)
> - ECase(ELFOSABI_AIX)
> - ECase(ELFOSABI_IRIX)
> - ECase(ELFOSABI_FREEBSD)
> - ECase(ELFOSABI_TRU64)
> - ECase(ELFOSABI_MODESTO)
> - ECase(ELFOSABI_OPENBSD)
> - ECase(ELFOSABI_OPENVMS)
> - ECase(ELFOSABI_NSK)
> - ECase(ELFOSABI_AROS)
> - ECase(ELFOSABI_FENIXOS)
> - ECase(ELFOSABI_CLOUDABI)
> - ECase(ELFOSABI_C6000_ELFABI)
> - ECase(ELFOSABI_C6000_LINUX)
> - ECase(ELFOSABI_ARM)
> - ECase(ELFOSABI_STANDALONE)
> -#undef ECase
> -}
> -
> -void ScalarBitSetTraits<ELFYAML::ELF_EF>::bitset(IO &IO,
> - ELFYAML::ELF_EF &Value) {
> - const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
> - assert(Object && "The IO context is not initialized");
> -#define BCase(X) IO.bitSetCase(Value, #X, ELF::X);
> -#define BCaseMask(X, M) IO.maskedBitSetCase(Value, #X, ELF::X, ELF::M);
> - switch (Object->Header.Machine) {
> - case ELF::EM_ARM:
> - BCase(EF_ARM_SOFT_FLOAT)
> - BCase(EF_ARM_VFP_FLOAT)
> - BCaseMask(EF_ARM_EABI_UNKNOWN, EF_ARM_EABIMASK)
> - BCaseMask(EF_ARM_EABI_VER1, EF_ARM_EABIMASK)
> - BCaseMask(EF_ARM_EABI_VER2, EF_ARM_EABIMASK)
> - BCaseMask(EF_ARM_EABI_VER3, EF_ARM_EABIMASK)
> - BCaseMask(EF_ARM_EABI_VER4, EF_ARM_EABIMASK)
> - BCaseMask(EF_ARM_EABI_VER5, EF_ARM_EABIMASK)
> - break;
> - case ELF::EM_MIPS:
> - BCase(EF_MIPS_NOREORDER)
> - BCase(EF_MIPS_PIC)
> - BCase(EF_MIPS_CPIC)
> - BCase(EF_MIPS_ABI2)
> - BCase(EF_MIPS_32BITMODE)
> - BCase(EF_MIPS_FP64)
> - BCase(EF_MIPS_NAN2008)
> - BCase(EF_MIPS_MICROMIPS)
> - BCase(EF_MIPS_ARCH_ASE_M16)
> - BCase(EF_MIPS_ARCH_ASE_MDMX)
> - BCaseMask(EF_MIPS_ABI_O32, EF_MIPS_ABI)
> - BCaseMask(EF_MIPS_ABI_O64, EF_MIPS_ABI)
> - BCaseMask(EF_MIPS_ABI_EABI32, EF_MIPS_ABI)
> - BCaseMask(EF_MIPS_ABI_EABI64, EF_MIPS_ABI)
> - BCaseMask(EF_MIPS_MACH_3900, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_4010, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_4100, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_4650, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_4120, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_4111, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_SB1, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_OCTEON, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_XLR, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_OCTEON2, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_OCTEON3, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_5400, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_5900, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_5500, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_9000, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_LS2E, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_LS2F, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_MACH_LS3A, EF_MIPS_MACH)
> - BCaseMask(EF_MIPS_ARCH_1, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_2, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_3, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_4, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_5, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_32, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_64, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_32R2, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_64R2, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_32R6, EF_MIPS_ARCH)
> - BCaseMask(EF_MIPS_ARCH_64R6, EF_MIPS_ARCH)
> - break;
> - case ELF::EM_HEXAGON:
> - BCase(EF_HEXAGON_MACH_V2)
> - BCase(EF_HEXAGON_MACH_V3)
> - BCase(EF_HEXAGON_MACH_V4)
> - BCase(EF_HEXAGON_MACH_V5)
> - BCase(EF_HEXAGON_ISA_V2)
> - BCase(EF_HEXAGON_ISA_V3)
> - BCase(EF_HEXAGON_ISA_V4)
> - BCase(EF_HEXAGON_ISA_V5)
> - break;
> - case ELF::EM_AVR:
> - BCase(EF_AVR_ARCH_AVR1)
> - BCase(EF_AVR_ARCH_AVR2)
> - BCase(EF_AVR_ARCH_AVR25)
> - BCase(EF_AVR_ARCH_AVR3)
> - BCase(EF_AVR_ARCH_AVR31)
> - BCase(EF_AVR_ARCH_AVR35)
> - BCase(EF_AVR_ARCH_AVR4)
> - BCase(EF_AVR_ARCH_AVR51)
> - BCase(EF_AVR_ARCH_AVR6)
> - BCase(EF_AVR_ARCH_AVRTINY)
> - BCase(EF_AVR_ARCH_XMEGA1)
> - BCase(EF_AVR_ARCH_XMEGA2)
> - BCase(EF_AVR_ARCH_XMEGA3)
> - BCase(EF_AVR_ARCH_XMEGA4)
> - BCase(EF_AVR_ARCH_XMEGA5)
> - BCase(EF_AVR_ARCH_XMEGA6)
> - BCase(EF_AVR_ARCH_XMEGA7)
> - break;
> - case ELF::EM_AMDGPU:
> - case ELF::EM_X86_64:
> - break;
> - default:
> - llvm_unreachable("Unsupported architecture");
> - }
> -#undef BCase
> -#undef BCaseMask
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_SHT>::enumeration(
> - IO &IO, ELFYAML::ELF_SHT &Value) {
> - const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
> - assert(Object && "The IO context is not initialized");
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - ECase(SHT_NULL)
> - ECase(SHT_PROGBITS)
> - // No SHT_SYMTAB. Use the top-level `Symbols` key instead.
> - // FIXME: Issue a diagnostic with this information.
> - ECase(SHT_STRTAB)
> - ECase(SHT_RELA)
> - ECase(SHT_HASH)
> - ECase(SHT_DYNAMIC)
> - ECase(SHT_NOTE)
> - ECase(SHT_NOBITS)
> - ECase(SHT_REL)
> - ECase(SHT_SHLIB)
> - ECase(SHT_DYNSYM)
> - ECase(SHT_INIT_ARRAY)
> - ECase(SHT_FINI_ARRAY)
> - ECase(SHT_PREINIT_ARRAY)
> - ECase(SHT_GROUP)
> - ECase(SHT_SYMTAB_SHNDX)
> - ECase(SHT_LOOS)
> - ECase(SHT_GNU_ATTRIBUTES)
> - ECase(SHT_GNU_HASH)
> - ECase(SHT_GNU_verdef)
> - ECase(SHT_GNU_verneed)
> - ECase(SHT_GNU_versym)
> - ECase(SHT_HIOS)
> - ECase(SHT_LOPROC)
> - switch (Object->Header.Machine) {
> - case ELF::EM_ARM:
> - ECase(SHT_ARM_EXIDX)
> - ECase(SHT_ARM_PREEMPTMAP)
> - ECase(SHT_ARM_ATTRIBUTES)
> - ECase(SHT_ARM_DEBUGOVERLAY)
> - ECase(SHT_ARM_OVERLAYSECTION)
> - break;
> - case ELF::EM_HEXAGON:
> - ECase(SHT_HEX_ORDERED)
> - break;
> - case ELF::EM_X86_64:
> - ECase(SHT_X86_64_UNWIND)
> - break;
> - case ELF::EM_MIPS:
> - ECase(SHT_MIPS_REGINFO)
> - ECase(SHT_MIPS_OPTIONS)
> - ECase(SHT_MIPS_ABIFLAGS)
> - break;
> - default:
> - // Nothing to do.
> - break;
> - }
> -#undef ECase
> -}
> -
> -void ScalarBitSetTraits<ELFYAML::ELF_SHF>::bitset(IO &IO,
> - ELFYAML::ELF_SHF &Value) {
> - const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
> -#define BCase(X) IO.bitSetCase(Value, #X, ELF::X);
> - BCase(SHF_WRITE)
> - BCase(SHF_ALLOC)
> - BCase(SHF_EXCLUDE)
> - BCase(SHF_EXECINSTR)
> - BCase(SHF_MERGE)
> - BCase(SHF_STRINGS)
> - BCase(SHF_INFO_LINK)
> - BCase(SHF_LINK_ORDER)
> - BCase(SHF_OS_NONCONFORMING)
> - BCase(SHF_GROUP)
> - BCase(SHF_TLS)
> - switch(Object->Header.Machine) {
> - case ELF::EM_AMDGPU:
> - BCase(SHF_AMDGPU_HSA_GLOBAL)
> - BCase(SHF_AMDGPU_HSA_READONLY)
> - BCase(SHF_AMDGPU_HSA_CODE)
> - BCase(SHF_AMDGPU_HSA_AGENT)
> - break;
> - case ELF::EM_HEXAGON:
> - BCase(SHF_HEX_GPREL)
> - break;
> - case ELF::EM_MIPS:
> - BCase(SHF_MIPS_NODUPES)
> - BCase(SHF_MIPS_NAMES)
> - BCase(SHF_MIPS_LOCAL)
> - BCase(SHF_MIPS_NOSTRIP)
> - BCase(SHF_MIPS_GPREL)
> - BCase(SHF_MIPS_MERGE)
> - BCase(SHF_MIPS_ADDR)
> - BCase(SHF_MIPS_STRING)
> - break;
> - case ELF::EM_X86_64:
> - BCase(SHF_X86_64_LARGE)
> - break;
> - default:
> - // Nothing to do.
> - break;
> - }
> -#undef BCase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_STT>::enumeration(
> - IO &IO, ELFYAML::ELF_STT &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - ECase(STT_NOTYPE)
> - ECase(STT_OBJECT)
> - ECase(STT_FUNC)
> - ECase(STT_SECTION)
> - ECase(STT_FILE)
> - ECase(STT_COMMON)
> - ECase(STT_TLS)
> - ECase(STT_GNU_IFUNC)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_STV>::enumeration(
> - IO &IO, ELFYAML::ELF_STV &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - ECase(STV_DEFAULT)
> - ECase(STV_INTERNAL)
> - ECase(STV_HIDDEN)
> - ECase(STV_PROTECTED)
> -#undef ECase
> -}
> -
> -void ScalarBitSetTraits<ELFYAML::ELF_STO>::bitset(IO &IO,
> - ELFYAML::ELF_STO &Value) {
> - const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
> - assert(Object && "The IO context is not initialized");
> -#define BCase(X) IO.bitSetCase(Value, #X, ELF::X);
> - switch (Object->Header.Machine) {
> - case ELF::EM_MIPS:
> - BCase(STO_MIPS_OPTIONAL)
> - BCase(STO_MIPS_PLT)
> - BCase(STO_MIPS_PIC)
> - BCase(STO_MIPS_MICROMIPS)
> - break;
> - default:
> - break; // Nothing to do
> - }
> -#undef BCase
> -#undef BCaseMask
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_RSS>::enumeration(
> - IO &IO, ELFYAML::ELF_RSS &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, ELF::X);
> - ECase(RSS_UNDEF)
> - ECase(RSS_GP)
> - ECase(RSS_GP0)
> - ECase(RSS_LOC)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::ELF_REL>::enumeration(
> - IO &IO, ELFYAML::ELF_REL &Value) {
> - const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
> - assert(Object && "The IO context is not initialized");
> -#define ELF_RELOC(X, Y) IO.enumCase(Value, #X, ELF::X);
> - switch (Object->Header.Machine) {
> - case ELF::EM_X86_64:
> -#include "llvm/Support/ELFRelocs/x86_64.def"
> - break;
> - case ELF::EM_MIPS:
> -#include "llvm/Support/ELFRelocs/Mips.def"
> - break;
> - case ELF::EM_HEXAGON:
> -#include "llvm/Support/ELFRelocs/Hexagon.def"
> - break;
> - case ELF::EM_386:
> - case ELF::EM_IAMCU:
> -#include "llvm/Support/ELFRelocs/i386.def"
> - break;
> - case ELF::EM_AARCH64:
> -#include "llvm/Support/ELFRelocs/AArch64.def"
> - break;
> - case ELF::EM_ARM:
> -#include "llvm/Support/ELFRelocs/ARM.def"
> - break;
> - default:
> - llvm_unreachable("Unsupported architecture");
> - }
> -#undef ELF_RELOC
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::MIPS_AFL_REG>::enumeration(
> - IO &IO, ELFYAML::MIPS_AFL_REG &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, Mips::AFL_##X);
> - ECase(REG_NONE)
> - ECase(REG_32)
> - ECase(REG_64)
> - ECase(REG_128)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::MIPS_ABI_FP>::enumeration(
> - IO &IO, ELFYAML::MIPS_ABI_FP &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, Mips::Val_GNU_MIPS_ABI_##X);
> - ECase(FP_ANY)
> - ECase(FP_DOUBLE)
> - ECase(FP_SINGLE)
> - ECase(FP_SOFT)
> - ECase(FP_OLD_64)
> - ECase(FP_XX)
> - ECase(FP_64)
> - ECase(FP_64A)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::MIPS_AFL_EXT>::enumeration(
> - IO &IO, ELFYAML::MIPS_AFL_EXT &Value) {
> -#define ECase(X) IO.enumCase(Value, #X, Mips::AFL_##X);
> - ECase(EXT_NONE)
> - ECase(EXT_XLR)
> - ECase(EXT_OCTEON2)
> - ECase(EXT_OCTEONP)
> - ECase(EXT_LOONGSON_3A)
> - ECase(EXT_OCTEON)
> - ECase(EXT_5900)
> - ECase(EXT_4650)
> - ECase(EXT_4010)
> - ECase(EXT_4100)
> - ECase(EXT_3900)
> - ECase(EXT_10000)
> - ECase(EXT_SB1)
> - ECase(EXT_4111)
> - ECase(EXT_4120)
> - ECase(EXT_5400)
> - ECase(EXT_5500)
> - ECase(EXT_LOONGSON_2E)
> - ECase(EXT_LOONGSON_2F)
> - ECase(EXT_OCTEON3)
> -#undef ECase
> -}
> -
> -void ScalarEnumerationTraits<ELFYAML::MIPS_ISA>::enumeration(
> - IO &IO, ELFYAML::MIPS_ISA &Value) {
> - IO.enumCase(Value, "MIPS1", 1);
> - IO.enumCase(Value, "MIPS2", 2);
> - IO.enumCase(Value, "MIPS3", 3);
> - IO.enumCase(Value, "MIPS4", 4);
> - IO.enumCase(Value, "MIPS5", 5);
> - IO.enumCase(Value, "MIPS32", 32);
> - IO.enumCase(Value, "MIPS64", 64);
> -}
> -
> -void ScalarBitSetTraits<ELFYAML::MIPS_AFL_ASE>::bitset(
> - IO &IO, ELFYAML::MIPS_AFL_ASE &Value) {
> -#define BCase(X) IO.bitSetCase(Value, #X, Mips::AFL_ASE_##X);
> - BCase(DSP)
> - BCase(DSPR2)
> - BCase(EVA)
> - BCase(MCU)
> - BCase(MDMX)
> - BCase(MIPS3D)
> - BCase(MT)
> - BCase(SMARTMIPS)
> - BCase(VIRT)
> - BCase(MSA)
> - BCase(MIPS16)
> - BCase(MICROMIPS)
> - BCase(XPA)
> -#undef BCase
> -}
> -
> -void ScalarBitSetTraits<ELFYAML::MIPS_AFL_FLAGS1>::bitset(
> - IO &IO, ELFYAML::MIPS_AFL_FLAGS1 &Value) {
> -#define BCase(X) IO.bitSetCase(Value, #X, Mips::AFL_FLAGS1_##X);
> - BCase(ODDSPREG)
> -#undef BCase
> -}
> -
> -void MappingTraits<ELFYAML::FileHeader>::mapping(IO &IO,
> - ELFYAML::FileHeader &FileHdr) {
> - IO.mapRequired("Class", FileHdr.Class);
> - IO.mapRequired("Data", FileHdr.Data);
> - IO.mapOptional("OSABI", FileHdr.OSABI, ELFYAML::ELF_ELFOSABI(0));
> - IO.mapRequired("Type", FileHdr.Type);
> - IO.mapRequired("Machine", FileHdr.Machine);
> - IO.mapOptional("Flags", FileHdr.Flags, ELFYAML::ELF_EF(0));
> - IO.mapOptional("Entry", FileHdr.Entry, Hex64(0));
> -}
> -
> -namespace {
> -struct NormalizedOther {
> - NormalizedOther(IO &)
> - : Visibility(ELFYAML::ELF_STV(0)), Other(ELFYAML::ELF_STO(0)) {}
> - NormalizedOther(IO &, uint8_t Original)
> - : Visibility(Original & 0x3), Other(Original & ~0x3) {}
> -
> - uint8_t denormalize(IO &) { return Visibility | Other; }
> -
> - ELFYAML::ELF_STV Visibility;
> - ELFYAML::ELF_STO Other;
> -};
> -}
> -
> -void MappingTraits<ELFYAML::Symbol>::mapping(IO &IO, ELFYAML::Symbol &Symbol) {
> - IO.mapOptional("Name", Symbol.Name, StringRef());
> - IO.mapOptional("Type", Symbol.Type, ELFYAML::ELF_STT(0));
> - IO.mapOptional("Section", Symbol.Section, StringRef());
> - IO.mapOptional("Value", Symbol.Value, Hex64(0));
> - IO.mapOptional("Size", Symbol.Size, Hex64(0));
> -
> - MappingNormalization<NormalizedOther, uint8_t> Keys(IO, Symbol.Other);
> - IO.mapOptional("Visibility", Keys->Visibility, ELFYAML::ELF_STV(0));
> - IO.mapOptional("Other", Keys->Other, ELFYAML::ELF_STO(0));
> -}
> -
> -void MappingTraits<ELFYAML::LocalGlobalWeakSymbols>::mapping(
> - IO &IO, ELFYAML::LocalGlobalWeakSymbols &Symbols) {
> - IO.mapOptional("Local", Symbols.Local);
> - IO.mapOptional("Global", Symbols.Global);
> - IO.mapOptional("Weak", Symbols.Weak);
> -}
> -
> -static void commonSectionMapping(IO &IO, ELFYAML::Section &Section) {
> - IO.mapOptional("Name", Section.Name, StringRef());
> - IO.mapRequired("Type", Section.Type);
> - IO.mapOptional("Flags", Section.Flags, ELFYAML::ELF_SHF(0));
> - IO.mapOptional("Address", Section.Address, Hex64(0));
> - IO.mapOptional("Link", Section.Link, StringRef());
> - IO.mapOptional("AddressAlign", Section.AddressAlign, Hex64(0));
> - IO.mapOptional("Info", Section.Info, StringRef());
> -}
> -
> -static void sectionMapping(IO &IO, ELFYAML::RawContentSection &Section) {
> - commonSectionMapping(IO, Section);
> - IO.mapOptional("Content", Section.Content);
> - IO.mapOptional("Size", Section.Size, Hex64(Section.Content.binary_size()));
> -}
> -
> -static void sectionMapping(IO &IO, ELFYAML::NoBitsSection &Section) {
> - commonSectionMapping(IO, Section);
> - IO.mapOptional("Size", Section.Size, Hex64(0));
> -}
> -
> -static void sectionMapping(IO &IO, ELFYAML::RelocationSection &Section) {
> - commonSectionMapping(IO, Section);
> - IO.mapOptional("Relocations", Section.Relocations);
> -}
> -
> -static void groupSectionMapping(IO &IO, ELFYAML::Group &group) {
> - commonSectionMapping(IO, group);
> - IO.mapRequired("Members", group.Members);
> -}
> -
> -void MappingTraits<ELFYAML::SectionOrType>::mapping(
> - IO &IO, ELFYAML::SectionOrType §ionOrType) {
> - IO.mapRequired("SectionOrType", sectionOrType.sectionNameOrType);
> -}
> -
> -static void sectionMapping(IO &IO, ELFYAML::MipsABIFlags &Section) {
> - commonSectionMapping(IO, Section);
> - IO.mapOptional("Version", Section.Version, Hex16(0));
> - IO.mapRequired("ISA", Section.ISALevel);
> - IO.mapOptional("ISARevision", Section.ISARevision, Hex8(0));
> - IO.mapOptional("ISAExtension", Section.ISAExtension,
> - ELFYAML::MIPS_AFL_EXT(Mips::AFL_EXT_NONE));
> - IO.mapOptional("ASEs", Section.ASEs, ELFYAML::MIPS_AFL_ASE(0));
> - IO.mapOptional("FpABI", Section.FpABI,
> - ELFYAML::MIPS_ABI_FP(Mips::Val_GNU_MIPS_ABI_FP_ANY));
> - IO.mapOptional("GPRSize", Section.GPRSize,
> - ELFYAML::MIPS_AFL_REG(Mips::AFL_REG_NONE));
> - IO.mapOptional("CPR1Size", Section.CPR1Size,
> - ELFYAML::MIPS_AFL_REG(Mips::AFL_REG_NONE));
> - IO.mapOptional("CPR2Size", Section.CPR2Size,
> - ELFYAML::MIPS_AFL_REG(Mips::AFL_REG_NONE));
> - IO.mapOptional("Flags1", Section.Flags1, ELFYAML::MIPS_AFL_FLAGS1(0));
> - IO.mapOptional("Flags2", Section.Flags2, Hex32(0));
> -}
> -
> -void MappingTraits<std::unique_ptr<ELFYAML::Section>>::mapping(
> - IO &IO, std::unique_ptr<ELFYAML::Section> &Section) {
> - ELFYAML::ELF_SHT sectionType;
> - if (IO.outputting())
> - sectionType = Section->Type;
> - else
> - IO.mapRequired("Type", sectionType);
> -
> - switch (sectionType) {
> - case ELF::SHT_REL:
> - case ELF::SHT_RELA:
> - if (!IO.outputting())
> - Section.reset(new ELFYAML::RelocationSection());
> - sectionMapping(IO, *cast<ELFYAML::RelocationSection>(Section.get()));
> - break;
> - case ELF::SHT_GROUP:
> - if (!IO.outputting())
> - Section.reset(new ELFYAML::Group());
> - groupSectionMapping(IO, *cast<ELFYAML::Group>(Section.get()));
> - break;
> - case ELF::SHT_NOBITS:
> - if (!IO.outputting())
> - Section.reset(new ELFYAML::NoBitsSection());
> - sectionMapping(IO, *cast<ELFYAML::NoBitsSection>(Section.get()));
> - break;
> - case ELF::SHT_MIPS_ABIFLAGS:
> - if (!IO.outputting())
> - Section.reset(new ELFYAML::MipsABIFlags());
> - sectionMapping(IO, *cast<ELFYAML::MipsABIFlags>(Section.get()));
> - break;
> - default:
> - if (!IO.outputting())
> - Section.reset(new ELFYAML::RawContentSection());
> - sectionMapping(IO, *cast<ELFYAML::RawContentSection>(Section.get()));
> - }
> -}
> -
> -StringRef MappingTraits<std::unique_ptr<ELFYAML::Section>>::validate(
> - IO &io, std::unique_ptr<ELFYAML::Section> &Section) {
> - const auto *RawSection = dyn_cast<ELFYAML::RawContentSection>(Section.get());
> - if (!RawSection || RawSection->Size >= RawSection->Content.binary_size())
> - return StringRef();
> - return "Section size must be greater or equal to the content size";
> -}
> -
> -namespace {
> -struct NormalizedMips64RelType {
> - NormalizedMips64RelType(IO &)
> - : Type(ELFYAML::ELF_REL(ELF::R_MIPS_NONE)),
> - Type2(ELFYAML::ELF_REL(ELF::R_MIPS_NONE)),
> - Type3(ELFYAML::ELF_REL(ELF::R_MIPS_NONE)),
> - SpecSym(ELFYAML::ELF_REL(ELF::RSS_UNDEF)) {}
> - NormalizedMips64RelType(IO &, ELFYAML::ELF_REL Original)
> - : Type(Original & 0xFF), Type2(Original >> 8 & 0xFF),
> - Type3(Original >> 16 & 0xFF), SpecSym(Original >> 24 & 0xFF) {}
> -
> - ELFYAML::ELF_REL denormalize(IO &) {
> - ELFYAML::ELF_REL Res = Type | Type2 << 8 | Type3 << 16 | SpecSym << 24;
> - return Res;
> - }
> -
> - ELFYAML::ELF_REL Type;
> - ELFYAML::ELF_REL Type2;
> - ELFYAML::ELF_REL Type3;
> - ELFYAML::ELF_RSS SpecSym;
> -};
> -}
> -
> -void MappingTraits<ELFYAML::Relocation>::mapping(IO &IO,
> - ELFYAML::Relocation &Rel) {
> - const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
> - assert(Object && "The IO context is not initialized");
> -
> - IO.mapRequired("Offset", Rel.Offset);
> - IO.mapRequired("Symbol", Rel.Symbol);
> -
> - if (Object->Header.Machine == ELFYAML::ELF_EM(ELF::EM_MIPS) &&
> - Object->Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64)) {
> - MappingNormalization<NormalizedMips64RelType, ELFYAML::ELF_REL> Key(
> - IO, Rel.Type);
> - IO.mapRequired("Type", Key->Type);
> - IO.mapOptional("Type2", Key->Type2, ELFYAML::ELF_REL(ELF::R_MIPS_NONE));
> - IO.mapOptional("Type3", Key->Type3, ELFYAML::ELF_REL(ELF::R_MIPS_NONE));
> - IO.mapOptional("SpecSym", Key->SpecSym, ELFYAML::ELF_RSS(ELF::RSS_UNDEF));
> - } else
> - IO.mapRequired("Type", Rel.Type);
> -
> - IO.mapOptional("Addend", Rel.Addend, (int64_t)0);
> -}
> -
> -void MappingTraits<ELFYAML::Object>::mapping(IO &IO, ELFYAML::Object &Object) {
> - assert(!IO.getContext() && "The IO context is initialized already");
> - IO.setContext(&Object);
> - IO.mapRequired("FileHeader", Object.Header);
> - IO.mapOptional("Sections", Object.Sections);
> - IO.mapOptional("Symbols", Object.Symbols);
> - IO.setContext(nullptr);
> -}
> -
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, MIPS_AFL_REG)
> -LLVM_YAML_STRONG_TYPEDEF(uint8_t, MIPS_ABI_FP)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, MIPS_AFL_EXT)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, MIPS_AFL_ASE)
> -LLVM_YAML_STRONG_TYPEDEF(uint32_t, MIPS_AFL_FLAGS1)
> -
> -} // end namespace yaml
> -} // end namespace llvm
>
> Added: llvm/trunk/lib/ObjectYAML/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/CMakeLists.txt?rev=262368&view=auto
> ==============================================================================
> --- llvm/trunk/lib/ObjectYAML/CMakeLists.txt (added)
> +++ llvm/trunk/lib/ObjectYAML/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -0,0 +1,5 @@
> +add_llvm_library(LLVMObjectYAML
> + YAML.cpp
> + COFFYAML.cpp
> + ELFYAML.cpp
> + )
>
> Copied: llvm/trunk/lib/ObjectYAML/COFFYAML.cpp (from r262367, llvm/trunk/lib/Object/COFFYAML.cpp)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/COFFYAML.cpp?p2=llvm/trunk/lib/ObjectYAML/COFFYAML.cpp&p1=llvm/trunk/lib/Object/COFFYAML.cpp&r1=262367&r2=262368&rev=262368&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Object/COFFYAML.cpp (original)
> +++ llvm/trunk/lib/ObjectYAML/COFFYAML.cpp Tue Mar 1 13:15:06 2016
> @@ -11,7 +11,7 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#include "llvm/Object/COFFYAML.h"
> +#include "llvm/ObjectYAML/COFFYAML.h"
>
> #define ECase(X) IO.enumCase(Value, #X, COFF::X);
> namespace llvm {
>
> Copied: llvm/trunk/lib/ObjectYAML/ELFYAML.cpp (from r262367, llvm/trunk/lib/Object/ELFYAML.cpp)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/ELFYAML.cpp?p2=llvm/trunk/lib/ObjectYAML/ELFYAML.cpp&p1=llvm/trunk/lib/Object/ELFYAML.cpp&r1=262367&r2=262368&rev=262368&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Object/ELFYAML.cpp (original)
> +++ llvm/trunk/lib/ObjectYAML/ELFYAML.cpp Tue Mar 1 13:15:06 2016
> @@ -11,7 +11,7 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#include "llvm/Object/ELFYAML.h"
> +#include "llvm/ObjectYAML/ELFYAML.h"
> #include "llvm/Support/Casting.h"
> #include "llvm/Support/MipsABIFlags.h"
>
>
> Copied: llvm/trunk/lib/ObjectYAML/YAML.cpp (from r262367, llvm/trunk/lib/MC/YAML.cpp)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/YAML.cpp?p2=llvm/trunk/lib/ObjectYAML/YAML.cpp&p1=llvm/trunk/lib/MC/YAML.cpp&r1=262367&r2=262368&rev=262368&view=diff
> ==============================================================================
> --- llvm/trunk/lib/MC/YAML.cpp (original)
> +++ llvm/trunk/lib/ObjectYAML/YAML.cpp Tue Mar 1 13:15:06 2016
> @@ -12,7 +12,7 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#include "llvm/MC/YAML.h"
> +#include "llvm/ObjectYAML/YAML.h"
> #include "llvm/ADT/StringExtras.h"
> #include "llvm/Support/raw_ostream.h"
> #include <cctype>
>
> Modified: llvm/trunk/tools/obj2yaml/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/CMakeLists.txt?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/tools/obj2yaml/CMakeLists.txt (original)
> +++ llvm/trunk/tools/obj2yaml/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -1,5 +1,6 @@
> set(LLVM_LINK_COMPONENTS
> Object
> + ObjectYAML
> Support
> )
>
>
> Modified: llvm/trunk/tools/obj2yaml/coff2yaml.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/coff2yaml.cpp?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/tools/obj2yaml/coff2yaml.cpp (original)
> +++ llvm/trunk/tools/obj2yaml/coff2yaml.cpp Tue Mar 1 13:15:06 2016
> @@ -9,7 +9,7 @@
>
> #include "obj2yaml.h"
> #include "llvm/Object/COFF.h"
> -#include "llvm/Object/COFFYAML.h"
> +#include "llvm/ObjectYAML/COFFYAML.h"
> #include "llvm/Support/ErrorHandling.h"
> #include "llvm/Support/YAMLTraits.h"
>
>
> Modified: llvm/trunk/tools/obj2yaml/elf2yaml.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/elf2yaml.cpp?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/tools/obj2yaml/elf2yaml.cpp (original)
> +++ llvm/trunk/tools/obj2yaml/elf2yaml.cpp Tue Mar 1 13:15:06 2016
> @@ -11,7 +11,7 @@
> #include "obj2yaml.h"
> #include "llvm/ADT/STLExtras.h"
> #include "llvm/Object/ELFObjectFile.h"
> -#include "llvm/Object/ELFYAML.h"
> +#include "llvm/ObjectYAML/ELFYAML.h"
> #include "llvm/Support/ErrorHandling.h"
> #include "llvm/Support/YAMLTraits.h"
>
>
> Modified: llvm/trunk/tools/yaml2obj/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/CMakeLists.txt?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/tools/yaml2obj/CMakeLists.txt (original)
> +++ llvm/trunk/tools/yaml2obj/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -1,6 +1,7 @@
> set(LLVM_LINK_COMPONENTS
> MC
> Object
> + ObjectYAML
> Support
> )
>
>
> Modified: llvm/trunk/tools/yaml2obj/yaml2coff.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2coff.cpp?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/tools/yaml2obj/yaml2coff.cpp (original)
> +++ llvm/trunk/tools/yaml2obj/yaml2coff.cpp Tue Mar 1 13:15:06 2016
> @@ -19,7 +19,7 @@
> #include "llvm/ADT/StringMap.h"
> #include "llvm/ADT/StringSwitch.h"
> #include "llvm/Object/COFF.h"
> -#include "llvm/Object/COFFYAML.h"
> +#include "llvm/ObjectYAML/COFFYAML.h"
> #include "llvm/Support/Endian.h"
> #include "llvm/Support/MemoryBuffer.h"
> #include "llvm/Support/SourceMgr.h"
>
> Modified: llvm/trunk/tools/yaml2obj/yaml2elf.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2elf.cpp?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/tools/yaml2obj/yaml2elf.cpp (original)
> +++ llvm/trunk/tools/yaml2obj/yaml2elf.cpp Tue Mar 1 13:15:06 2016
> @@ -16,7 +16,7 @@
> #include "llvm/ADT/ArrayRef.h"
> #include "llvm/MC/StringTableBuilder.h"
> #include "llvm/Object/ELFObjectFile.h"
> -#include "llvm/Object/ELFYAML.h"
> +#include "llvm/ObjectYAML/ELFYAML.h"
> #include "llvm/Support/ELF.h"
> #include "llvm/Support/MemoryBuffer.h"
> #include "llvm/Support/YAMLTraits.h"
>
> Modified: llvm/trunk/unittests/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CMakeLists.txt?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/CMakeLists.txt (original)
> +++ llvm/trunk/unittests/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -23,6 +23,7 @@ add_subdirectory(LineEditor)
> add_subdirectory(Linker)
> add_subdirectory(MC)
> add_subdirectory(MI)
> +add_subdirectory(ObjectYAML)
> add_subdirectory(Option)
> add_subdirectory(ProfileData)
> add_subdirectory(Support)
>
> Modified: llvm/trunk/unittests/MC/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/CMakeLists.txt?rev=262368&r1=262367&r2=262368&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/MC/CMakeLists.txt (original)
> +++ llvm/trunk/unittests/MC/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -10,5 +10,4 @@ add_llvm_unittest(MCTests
> DwarfLineTables.cpp
> StringTableBuilderTest.cpp
> TargetRegistry.cpp
> - YAMLTest.cpp
> )
>
> Removed: llvm/trunk/unittests/MC/YAMLTest.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/YAMLTest.cpp?rev=262367&view=auto
> ==============================================================================
> --- llvm/trunk/unittests/MC/YAMLTest.cpp (original)
> +++ llvm/trunk/unittests/MC/YAMLTest.cpp (removed)
> @@ -1,38 +0,0 @@
> -//===- llvm/unittest/Object/YAMLTest.cpp - Tests for Object YAML ----------===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#include "llvm/MC/YAML.h"
> -#include "llvm/Support/YAMLTraits.h"
> -#include "gtest/gtest.h"
> -
> -using namespace llvm;
> -
> -struct BinaryHolder {
> - yaml::BinaryRef Binary;
> -};
> -
> -namespace llvm {
> -namespace yaml {
> -template <>
> -struct MappingTraits<BinaryHolder> {
> - static void mapping(IO &IO, BinaryHolder &BH) {
> - IO.mapRequired("Binary", BH.Binary);
> - }
> -};
> -} // end namespace yaml
> -} // end namespace llvm
> -
> -TEST(ObjectYAML, BinaryRef) {
> - BinaryHolder BH;
> - SmallVector<char, 32> Buf;
> - llvm::raw_svector_ostream OS(Buf);
> - yaml::Output YOut(OS);
> - YOut << BH;
> - EXPECT_NE(OS.str().find("''"), StringRef::npos);
> -}
>
> Added: llvm/trunk/unittests/ObjectYAML/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ObjectYAML/CMakeLists.txt?rev=262368&view=auto
> ==============================================================================
> --- llvm/trunk/unittests/ObjectYAML/CMakeLists.txt (added)
> +++ llvm/trunk/unittests/ObjectYAML/CMakeLists.txt Tue Mar 1 13:15:06 2016
> @@ -0,0 +1,8 @@
> +set(LLVM_LINK_COMPONENTS
> + ObjectYAML
> + )
> +
> +add_llvm_unittest(ObjectYAMLTests
> + YAMLTest.cpp
> + )
> +
>
> Copied: llvm/trunk/unittests/ObjectYAML/YAMLTest.cpp (from r262367, llvm/trunk/unittests/MC/YAMLTest.cpp)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ObjectYAML/YAMLTest.cpp?p2=llvm/trunk/unittests/ObjectYAML/YAMLTest.cpp&p1=llvm/trunk/unittests/MC/YAMLTest.cpp&r1=262367&r2=262368&rev=262368&view=diff
> ==============================================================================
> --- llvm/trunk/unittests/MC/YAMLTest.cpp (original)
> +++ llvm/trunk/unittests/ObjectYAML/YAMLTest.cpp Tue Mar 1 13:15:06 2016
> @@ -1,4 +1,4 @@
> -//===- llvm/unittest/Object/YAMLTest.cpp - Tests for Object YAML ----------===//
> +//===- YAMLTest.cpp - Tests for Object YAML -------------------------------===//
> //
> // The LLVM Compiler Infrastructure
> //
> @@ -7,7 +7,7 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#include "llvm/MC/YAML.h"
> +#include "llvm/ObjectYAML/YAML.h"
> #include "llvm/Support/YAMLTraits.h"
> #include "gtest/gtest.h"
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list