X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FObject%2FBinary.cpp;h=f1da11ceab58bb92d4dd90d8b2f528b4b3fe4bc3;hb=3767c7446edea95277509477a9bb3048ef2e0b95;hp=75f5a58ac08328d35c5a0bf8331329c2d60bca23;hpb=c44c915372ee453bd63a8b6b3eca586ab6f18545;p=oota-llvm.git

diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp
index 75f5a58ac08..f1da11ceab5 100644
--- a/lib/Object/Binary.cpp
+++ b/lib/Object/Binary.cpp
@@ -13,9 +13,16 @@
 
 #include "llvm/Object/Binary.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 
+// Include headers for createBinary.
+#include "llvm/Object/Archive.h"
+#include "llvm/Object/COFF.h"
+#include "llvm/Object/MachOUniversal.h"
+#include "llvm/Object/ObjectFile.h"
+
 using namespace llvm;
 using namespace object;
 
@@ -35,16 +42,71 @@ StringRef Binary::getFileName() const {
   return Data->getBufferIdentifier();
 }
 
-error_code object::createBinary(MemoryBuffer *Source,
-                                OwningPtr<Binary> &Result) {
-  // We don't support any at the moment.
-  delete Source;
-  return object_error::invalid_file_type;
+ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source) {
+  OwningPtr<MemoryBuffer> scopedSource(Source);
+  sys::fs::file_magic type = sys::fs::identify_magic(Source->getBuffer());
+  error_code EC;
+  switch (type) {
+    case sys::fs::file_magic::archive: {
+      OwningPtr<Binary> Ret(new Archive(scopedSource.take(), EC));
+      if (EC)
+        return EC;
+      return Ret.take();
+    }
+    case sys::fs::file_magic::elf_relocatable:
+    case sys::fs::file_magic::elf_executable:
+    case sys::fs::file_magic::elf_shared_object:
+    case sys::fs::file_magic::elf_core: {
+      OwningPtr<Binary> Ret(
+          ObjectFile::createELFObjectFile(scopedSource.take()));
+      if (!Ret)
+        return object_error::invalid_file_type;
+      return Ret.take();
+    }
+    case sys::fs::file_magic::macho_object:
+    case sys::fs::file_magic::macho_executable:
+    case sys::fs::file_magic::macho_fixed_virtual_memory_shared_lib:
+    case sys::fs::file_magic::macho_core:
+    case sys::fs::file_magic::macho_preload_executable:
+    case sys::fs::file_magic::macho_dynamically_linked_shared_lib:
+    case sys::fs::file_magic::macho_dynamic_linker:
+    case sys::fs::file_magic::macho_bundle:
+    case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub:
+    case sys::fs::file_magic::macho_dsym_companion: {
+      OwningPtr<Binary> Ret(
+          ObjectFile::createMachOObjectFile(scopedSource.take()));
+      if (!Ret)
+        return object_error::invalid_file_type;
+      return Ret.take();
+    }
+    case sys::fs::file_magic::macho_universal_binary: {
+      OwningPtr<Binary> Ret(new MachOUniversalBinary(scopedSource.take(), EC));
+      if (EC)
+        return EC;
+      return Ret.take();
+    }
+    case sys::fs::file_magic::coff_object:
+    case sys::fs::file_magic::coff_import_library:
+    case sys::fs::file_magic::pecoff_executable: {
+      OwningPtr<Binary> Ret(
+          ObjectFile::createCOFFObjectFile(scopedSource.take()));
+      if (!Ret)
+        return object_error::invalid_file_type;
+      return Ret.take();
+    }
+    case sys::fs::file_magic::unknown:
+    case sys::fs::file_magic::bitcode:
+    case sys::fs::file_magic::windows_resource: {
+      // Unrecognized object file format.
+      return object_error::invalid_file_type;
+    }
+  }
+  llvm_unreachable("Unexpected Binary File Type");
 }
 
-error_code object::createBinary(StringRef Path, OwningPtr<Binary> &Result) {
+ErrorOr<Binary *> object::createBinary(StringRef Path) {
   OwningPtr<MemoryBuffer> File;
-  if (error_code ec = MemoryBuffer::getFile(Path, File))
-    return ec;
-  return createBinary(File.take(), Result);
+  if (error_code EC = MemoryBuffer::getFileOrSTDIN(Path, File))
+    return EC;
+  return createBinary(File.take());
 }