identify_magic is not free, so we should avoid calling it twice. The argument
also makes it cheap for createBinary to just forward to createObjectFile.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199813
91177308-0d34-0410-b5e6-
96231b3b80d8
#include "llvm/Object/Error.h"
#include "llvm/Support/ErrorOr.h"
#include "llvm/Object/Error.h"
#include "llvm/Support/ErrorOr.h"
+#include "llvm/Support/FileSystem.h"
/// @param Source The data to create the Binary from. Ownership is transferred
/// to the Binary if successful. If an error is returned,
/// Source is destroyed by createBinary before returning.
/// @param Source The data to create the Binary from. Ownership is transferred
/// to the Binary if successful. If an error is returned,
/// Source is destroyed by createBinary before returning.
-ErrorOr<Binary *> createBinary(MemoryBuffer *Source);
+ErrorOr<Binary *> createBinary(MemoryBuffer *Source,
+ sys::fs::file_magic Type =
+ sys::fs::file_magic::unknown);
ErrorOr<Binary *> createBinary(StringRef Path);
}
ErrorOr<Binary *> createBinary(StringRef Path);
}
#include "llvm/Object/Binary.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Object/Binary.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
#include <cstring>
#include <vector>
#include "llvm/Support/MemoryBuffer.h"
#include <cstring>
#include <vector>
/// return true.
/// @brief Create ObjectFile from path.
static ErrorOr<ObjectFile *> createObjectFile(StringRef ObjectPath);
/// return true.
/// @brief Create ObjectFile from path.
static ErrorOr<ObjectFile *> createObjectFile(StringRef ObjectPath);
- static ErrorOr<ObjectFile *> createObjectFile(MemoryBuffer *Object);
+ static ErrorOr<ObjectFile *>
+ createObjectFile(MemoryBuffer *Object,
+ sys::fs::file_magic Type = sys::fs::file_magic::unknown);
static inline bool classof(const Binary *v) {
return v->isObject();
static inline bool classof(const Binary *v) {
return v->isObject();
return Data->getBufferIdentifier();
}
return Data->getBufferIdentifier();
}
-ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source) {
+ErrorOr<Binary *> object::createBinary(MemoryBuffer *Source,
+ sys::fs::file_magic Type) {
OwningPtr<MemoryBuffer> scopedSource(Source);
OwningPtr<MemoryBuffer> scopedSource(Source);
- sys::fs::file_magic type = sys::fs::identify_magic(Source->getBuffer());
- switch (type) {
+ if (Type == sys::fs::file_magic::unknown)
+ Type = sys::fs::identify_magic(Source->getBuffer());
+
+ switch (Type) {
case sys::fs::file_magic::archive:
return Archive::create(scopedSource.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:
case sys::fs::file_magic::archive:
return Archive::create(scopedSource.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:
- return ObjectFile::createELFObjectFile(scopedSource.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_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_bundle:
case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub:
case sys::fs::file_magic::macho_dsym_companion:
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:
- return ObjectFile::createMachOObjectFile(scopedSource.take());
- case sys::fs::file_magic::macho_universal_binary:
- return MachOUniversalBinary::create(scopedSource.take());
case sys::fs::file_magic::coff_object:
case sys::fs::file_magic::coff_import_library:
case sys::fs::file_magic::pecoff_executable:
case sys::fs::file_magic::coff_object:
case sys::fs::file_magic::coff_import_library:
case sys::fs::file_magic::pecoff_executable:
- return ObjectFile::createCOFFObjectFile(scopedSource.take());
+ return ObjectFile::createObjectFile(scopedSource.take(), Type);
+ case sys::fs::file_magic::macho_universal_binary:
+ return MachOUniversalBinary::create(scopedSource.take());
case sys::fs::file_magic::unknown:
case sys::fs::file_magic::bitcode:
case sys::fs::file_magic::unknown:
case sys::fs::file_magic::bitcode:
- case sys::fs::file_magic::windows_resource: {
+ case sys::fs::file_magic::windows_resource:
// Unrecognized object file format.
return object_error::invalid_file_type;
// Unrecognized object file format.
return object_error::invalid_file_type;
}
llvm_unreachable("Unexpected Binary File Type");
}
}
llvm_unreachable("Unexpected Binary File Type");
}
return section_iterator(SectionRef(Sec, this));
}
return section_iterator(SectionRef(Sec, this));
}
-ErrorOr<ObjectFile *> ObjectFile::createObjectFile(MemoryBuffer *Object) {
+ErrorOr<ObjectFile *> ObjectFile::createObjectFile(MemoryBuffer *Object,
+ sys::fs::file_magic Type) {
OwningPtr<MemoryBuffer> ScopedObj(Object);
OwningPtr<MemoryBuffer> ScopedObj(Object);
- sys::fs::file_magic Type = sys::fs::identify_magic(Object->getBuffer());
+ if (Type == sys::fs::file_magic::unknown)
+ Type = sys::fs::identify_magic(Object->getBuffer());
switch (Type) {
case sys::fs::file_magic::unknown:
switch (Type) {
case sys::fs::file_magic::unknown:
delete Result;
}
} else if (magic == sys::fs::file_magic::archive) {
delete Result;
}
} else if (magic == sys::fs::file_magic::archive) {
- ErrorOr<Binary *> BinaryOrErr = object::createBinary(Buffer.take());
+ ErrorOr<Binary *> BinaryOrErr = object::createBinary(Buffer.take(), magic);
if (error(BinaryOrErr.getError(), Filename))
return;
OwningPtr<Binary> arch(BinaryOrErr.get());
if (error(BinaryOrErr.getError(), Filename))
return;
OwningPtr<Binary> arch(BinaryOrErr.get());
}
}
} else if (magic == sys::fs::file_magic::macho_universal_binary) {
}
}
} else if (magic == sys::fs::file_magic::macho_universal_binary) {
- ErrorOr<Binary *> BinaryOrErr = object::createBinary(Buffer.take());
+ ErrorOr<Binary *> BinaryOrErr = object::createBinary(Buffer.take(), magic);
if (error(BinaryOrErr.getError(), Filename))
return;
OwningPtr<Binary> Bin(BinaryOrErr.get());
if (error(BinaryOrErr.getError(), Filename))
return;
OwningPtr<Binary> Bin(BinaryOrErr.get());
}
}
} else if (magic.is_object()) {
}
}
} else if (magic.is_object()) {
- ErrorOr<Binary *> BinaryOrErr = object::createBinary(Buffer.take());
+ ErrorOr<Binary *> BinaryOrErr = object::createBinary(Buffer.take(), magic);
if (error(BinaryOrErr.getError(), Filename))
return;
OwningPtr<Binary> obj(BinaryOrErr.get());
if (error(BinaryOrErr.getError(), Filename))
return;
OwningPtr<Binary> obj(BinaryOrErr.get());