Move BinaryRef to a new include/llvm/Object/YAML.h file.

It will be used for ELF dumping too.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183287 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 62 insertions, 32 deletions

diff --git a/include/llvm/Object/COFFYAML.h b/include/llvm/Object/COFFYAML.h
index 4c20260..7e8aefa 100644
--- a/include/llvm/Object/COFFYAML.h
+++ b/include/llvm/Object/COFFYAML.h
@@ -14,9 +14,8 @@
 #ifndef LLVM_OBJECT_COFFYAML_H
 #define LLVM_OBJECT_COFFYAML_H
 
-
+#include "llvm/Object/YAML.h"
 #include "llvm/Support/COFF.h"
-#include "llvm/Support/YAMLTraits.h"
 
 namespace llvm {
 
@@ -36,32 +35,10 @@ inline SectionCharacteristics operator|(SectionCharacteristics a,
 // 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 {
-  /// In an object file this is just a binary blob. In an yaml file it is an hex
-  /// string. Using this avoid having to allocate temporary strings.
-  /// FIXME: not COFF specific.
-  class BinaryRef {
-    ArrayRef<uint8_t> Data;
-    bool isBinary;
-  public:
-    BinaryRef(ArrayRef<uint8_t> Data) : Data(Data), isBinary(true) {}
-    BinaryRef(StringRef Data)
-        : Data(reinterpret_cast<const uint8_t *>(Data.data()), Data.size()),
-          isBinary(false) {}
-    BinaryRef() : isBinary(false) {}
-    StringRef getHex() const {
-      assert(!isBinary);
-      return StringRef(reinterpret_cast<const char*>(Data.data()), Data.size());
-    }
-    ArrayRef<uint8_t> getBinary() const {
-      assert(isBinary);
-      return Data;
-    }
-  };
-
   struct Section {
     COFF::section Header;
     unsigned Alignment;
-    BinaryRef SectionData;
+    object::yaml::BinaryRef SectionData;
     std::vector<COFF::relocation> Relocations;
     StringRef Name;
     Section();
@@ -71,7 +48,7 @@ namespace COFFYAML {
     COFF::symbol Header;
     COFF::SymbolBaseType SimpleType;
     COFF::SymbolComplexType ComplexType;
-    BinaryRef AuxiliaryData;
+    object::yaml::BinaryRef AuxiliaryData;
     StringRef Name;
     Symbol();
   };
@@ -92,12 +69,6 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(COFF::relocation)
 namespace llvm {
 namespace yaml {
 
-template<>
-struct ScalarTraits<COFFYAML::BinaryRef> {
-  static void output(const COFFYAML::BinaryRef &, void*, llvm::raw_ostream &);
-  static StringRef input(StringRef, void*, COFFYAML::BinaryRef &);
-};
-
 template <>
 struct ScalarEnumerationTraits<COFF::MachineTypes> {
   static void enumeration(IO &IO, COFF::MachineTypes &Value);
diff --git a/include/llvm/Object/YAML.h b/include/llvm/Object/YAML.h
new file mode 100644
index 0000000..44d387b
--- /dev/null
+++ b/include/llvm/Object/YAML.h
@@ -0,0 +1,59 @@
+//===- YAML.h - YAMLIO utilities for object files ---------------*- 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 utility classes for handling the YAML representation of
+// object files.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_OBJECT_YAML_H
+#define LLVM_OBJECT_YAML_H
+
+#include "llvm/Support/YAMLTraits.h"
+
+namespace llvm {
+namespace object {
+namespace yaml {
+
+/// In an object file this is just a binary blob. In an yaml file it is an hex
+/// string. Using this avoid having to allocate temporary strings.
+class BinaryRef {
+  ArrayRef<uint8_t> Data;
+  bool isBinary;
+
+public:
+  BinaryRef(ArrayRef<uint8_t> Data) : Data(Data), isBinary(true) {}
+  BinaryRef(StringRef Data)
+      : Data(reinterpret_cast<const uint8_t *>(Data.data()), Data.size()),
+        isBinary(false) {}
+  BinaryRef() : isBinary(false) {}
+  StringRef getHex() const {
+    assert(!isBinary);
+    return StringRef(reinterpret_cast<const char *>(Data.data()), Data.size());
+  }
+  ArrayRef<uint8_t> getBinary() const {
+    assert(isBinary);
+    return Data;
+  }
+};
+
+}
+}
+
+namespace yaml {
+template <> struct ScalarTraits<object::yaml::BinaryRef> {
+  static void output(const object::yaml::BinaryRef &, void *,
+                     llvm::raw_ostream &);
+  static StringRef input(StringRef, void *, object::yaml::BinaryRef &);
+};
+}
+
+}
+
+#endif