Add all 4 MachO object types. Use the stored type to implement is64Bits().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179021 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp
index 4fe791c..24c916c 100644
--- a/lib/Object/MachOObjectFile.cpp
+++ b/lib/Object/MachOObjectFile.cpp
@@ -28,8 +28,9 @@
namespace llvm {
namespace object {
-MachOObjectFile::MachOObjectFile(MemoryBuffer *Object, error_code &ec)
- : ObjectFile(Binary::ID_MachO, Object) {
+MachOObjectFile::MachOObjectFile(MemoryBuffer *Object, bool Is64bits,
+ error_code &ec)
+ : ObjectFile(getMachOType(true, Is64bits), Object) {
DataRefImpl DRI;
moveToNextSection(DRI);
uint32_t LoadCommandCount = getHeader()->NumLoadCommands;
@@ -41,8 +42,8 @@
}
bool MachOObjectFile::is64Bit() const {
- StringRef Magic = getData(0, 4);
- return (Magic == "\xFE\xED\xFA\xCF") || (Magic == "\xCF\xFA\xED\xFE");
+ unsigned int Type = getType();
+ return Type == ID_MachO64L || Type == ID_MachO64B;
}
const MachOFormat::LoadCommand *
@@ -88,8 +89,10 @@
}
ObjectFile *ObjectFile::createMachOObjectFile(MemoryBuffer *Buffer) {
+ StringRef Magic = Buffer->getBuffer().slice(0, 4);
error_code ec;
- ObjectFile *Ret = new MachOObjectFile(Buffer, ec);
+ bool Is64Bits = Magic == "\xFE\xED\xFA\xCF" || Magic == "\xCF\xFA\xED\xFE";
+ ObjectFile *Ret = new MachOObjectFile(Buffer, Is64Bits, ec);
if (ec)
return NULL;
return Ret;