[llvm] r179021 - Add all 4 MachO object types. Use the stored type to implement is64Bits().
Rafael Espindola
rafael.espindola at gmail.com
Mon Apr 8 06:25:33 PDT 2013
Author: rafael
Date: Mon Apr 8 08:25:33 2013
New Revision: 179021
URL: http://llvm.org/viewvc/llvm-project?rev=179021&view=rev
Log:
Add all 4 MachO object types. Use the stored type to implement is64Bits().
Modified:
llvm/trunk/include/llvm/Object/Binary.h
llvm/trunk/include/llvm/Object/MachO.h
llvm/trunk/lib/Object/MachOObjectFile.cpp
Modified: llvm/trunk/include/llvm/Object/Binary.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/Binary.h?rev=179021&r1=179020&r2=179021&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/Binary.h (original)
+++ llvm/trunk/include/llvm/Object/Binary.h Mon Apr 8 08:25:33 2013
@@ -41,11 +41,17 @@ protected:
// Object and children.
ID_StartObjects,
ID_COFF,
+
ID_ELF32L, // ELF 32-bit, little endian
ID_ELF32B, // ELF 32-bit, big endian
ID_ELF64L, // ELF 64-bit, little endian
ID_ELF64B, // ELF 64-bit, big endian
- ID_MachO,
+
+ ID_MachO32L, // MachO 32-bit, little endian
+ ID_MachO32B, // MachO 32-bit, big endian
+ ID_MachO64L, // MachO 64-bit, little endian
+ ID_MachO64B, // MachO 64-bit, big endian
+
ID_EndObjects
};
@@ -56,6 +62,13 @@ protected:
return is64Bits ? ID_ELF64B : ID_ELF32B;
}
+ static unsigned int getMachOType(bool isLE, bool is64Bits) {
+ if (isLE)
+ return is64Bits ? ID_MachO64L : ID_MachO32L;
+ else
+ return is64Bits ? ID_MachO64B : ID_MachO32B;
+ }
+
public:
virtual ~Binary();
@@ -79,7 +92,7 @@ public:
}
bool isMachO() const {
- return TypeID == ID_MachO;
+ return TypeID >= ID_MachO32L && TypeID <= ID_MachO64B;
}
bool isCOFF() const {
Modified: llvm/trunk/include/llvm/Object/MachO.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachO.h?rev=179021&r1=179020&r2=179021&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/MachO.h (original)
+++ llvm/trunk/include/llvm/Object/MachO.h Mon Apr 8 08:25:33 2013
@@ -139,7 +139,7 @@ namespace MachOFormat {
class MachOObjectFile : public ObjectFile {
public:
- MachOObjectFile(MemoryBuffer *Object, error_code &ec);
+ MachOObjectFile(MemoryBuffer *Object, bool Is64bits, error_code &ec);
virtual symbol_iterator begin_symbols() const;
virtual symbol_iterator end_symbols() const;
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=179021&r1=179020&r2=179021&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Mon Apr 8 08:25:33 2013
@@ -28,8 +28,9 @@ using namespace object;
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 @@ MachOObjectFile::MachOObjectFile(MemoryB
}
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 @@ StringRef MachOObjectFile::getData(size_
}
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;
More information about the llvm-commits
mailing list