X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FObject%2FBinary.cpp;h=a2b167a665c567c0b41b9aec3785c8d21fcd23cd;hb=cfe562c99bbd5f82382b6dc314c2d77727477ff7;hp=4d5242789be316d4c32096f062e15fa0e647ed10;hpb=974a445bd90795248274493eda5cdbf6721910f7;p=oota-llvm.git diff --git a/lib/Object/Binary.cpp b/lib/Object/Binary.cpp index 4d5242789be..a2b167a665c 100644 --- a/lib/Object/Binary.cpp +++ b/lib/Object/Binary.cpp @@ -19,54 +19,35 @@ // 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; -Binary::~Binary() { - delete Data; -} +Binary::~Binary() {} -Binary::Binary(unsigned int Type, MemoryBuffer *Source) - : TypeID(Type) - , Data(Source) {} +Binary::Binary(unsigned int Type, MemoryBufferRef Source) + : TypeID(Type), Data(Source) {} -StringRef Binary::getData() const { - return Data->getBuffer(); -} +StringRef Binary::getData() const { return Data.getBuffer(); } -StringRef Binary::getFileName() const { - return Data->getBufferIdentifier(); -} +StringRef Binary::getFileName() const { return Data.getBufferIdentifier(); } + +MemoryBufferRef Binary::getMemoryBufferRef() const { return Data; } + +ErrorOr> object::createBinary(MemoryBufferRef Buffer, + LLVMContext *Context) { + sys::fs::file_magic Type = sys::fs::identify_magic(Buffer.getBuffer()); -error_code object::createBinary(MemoryBuffer *Source, - OwningPtr &Result) { - OwningPtr scopedSource(Source); - if (!Source) - return make_error_code(errc::invalid_argument); - sys::fs::file_magic type = sys::fs::identify_magic(Source->getBuffer()); - error_code ec; - switch (type) { - case sys::fs::file_magic::archive: { - OwningPtr ret(new Archive(scopedSource.take(), ec)); - if (ec) return ec; - Result.swap(ret); - return object_error::success; - } + switch (Type) { + case sys::fs::file_magic::archive: + return Archive::create(Buffer); + case sys::fs::file_magic::elf: 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 ret( - ObjectFile::createELFObjectFile(scopedSource.take())); - if (!ret) - return object_error::invalid_file_type; - Result.swap(ret); - return object_error::success; - } + case sys::fs::file_magic::elf_core: 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: @@ -76,43 +57,35 @@ error_code object::createBinary(MemoryBuffer *Source, 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 ret( - ObjectFile::createMachOObjectFile(scopedSource.take())); - if (!ret) - return object_error::invalid_file_type; - Result.swap(ret); - return object_error::success; - } - case sys::fs::file_magic::macho_universal_binary: { - OwningPtr ret(new MachOUniversalBinary(scopedSource.take(), ec)); - if (ec) return ec; - Result.swap(ret); - return object_error::success; - } + case sys::fs::file_magic::macho_dsym_companion: + case sys::fs::file_magic::macho_kext_bundle: case sys::fs::file_magic::coff_object: case sys::fs::file_magic::coff_import_library: - case sys::fs::file_magic::pecoff_executable: { - OwningPtr ret( - ObjectFile::createCOFFObjectFile(scopedSource.take())); - if (!ret) - return object_error::invalid_file_type; - Result.swap(ret); - return object_error::success; - } - case sys::fs::file_magic::unknown: + case sys::fs::file_magic::pecoff_executable: case sys::fs::file_magic::bitcode: - case sys::fs::file_magic::windows_resource: { + return ObjectFile::createSymbolicFile(Buffer, Type, Context); + case sys::fs::file_magic::macho_universal_binary: + return MachOUniversalBinary::create(Buffer); + case sys::fs::file_magic::unknown: + 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 &Result) { - OwningPtr File; - if (error_code ec = MemoryBuffer::getFileOrSTDIN(Path, File)) - return ec; - return createBinary(File.take(), Result); +ErrorOr> object::createBinary(StringRef Path) { + ErrorOr> FileOrErr = + MemoryBuffer::getFileOrSTDIN(Path); + if (std::error_code EC = FileOrErr.getError()) + return EC; + std::unique_ptr &Buffer = FileOrErr.get(); + + ErrorOr> BinOrErr = + createBinary(Buffer->getMemBufferRef()); + if (std::error_code EC = BinOrErr.getError()) + return EC; + std::unique_ptr &Bin = BinOrErr.get(); + + return OwningBinary(std::move(Bin), std::move(Buffer)); }