maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[RuntimeDyld] Handle endiannes differences between the host and target while 

reading MachO files magic numbers in RuntimeDyld.

This is required now that we're testing cross-platform JITing (via
RuntimeDyldChecker), and should fix some issues that David Fang has seen on PPC
builds.

llvm-svn: 213012
This commit is contained in:
Lang Hames 2014-07-14 23:19:50 +00:00
parent cf7c905cfb
commit c832ae3eae
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
View File

@ -120,8 +120,21 @@ public:
} }
}; };
static uint32_t readMachOMagic(const char *InputBuffer, unsigned BufferSize) {
if (BufferSize < 4)
return 0;
StringRef Magic(InputBuffer, 4);
if (Magic == "\xFE\xED\xFA\xCE" || Magic == "\xCE\xFA\xED\xFE")
return 0xFEEDFACE;
else if (Magic == "\xFE\xED\xFA\xCF" || Magic == "\xCF\xFA\xED\xFE")
return 0xFEEDFACF;
// else
return 0;
}
ObjectImage *RuntimeDyldMachO::createObjectImage(ObjectBuffer *Buffer) { ObjectImage *RuntimeDyldMachO::createObjectImage(ObjectBuffer *Buffer) {
uint32_t magic = *((const uint32_t *)Buffer->getBufferStart()); uint32_t magic = readMachOMagic(Buffer->getBufferStart(),
Buffer->getBufferSize());
bool is64 = (magic == MachO::MH_MAGIC_64); bool is64 = (magic == MachO::MH_MAGIC_64);
assert((magic == MachO::MH_MAGIC_64 || magic == MachO::MH_MAGIC) && assert((magic == MachO::MH_MAGIC_64 || magic == MachO::MH_MAGIC) &&
"Unrecognized Macho Magic"); "Unrecognized Macho Magic");
@ -136,7 +149,8 @@ ObjectImage *RuntimeDyldMachO::createObjectImageFromFile(
MemoryBuffer *Buffer = MemoryBuffer *Buffer =
MemoryBuffer::getMemBuffer(ObjFile->getData(), "", false); MemoryBuffer::getMemBuffer(ObjFile->getData(), "", false);
uint32_t magic = *((const uint32_t *)Buffer->getBufferStart()); uint32_t magic = readMachOMagic(Buffer->getBufferStart(),
Buffer->getBufferSize());
bool is64 = (magic == MachO::MH_MAGIC_64); bool is64 = (magic == MachO::MH_MAGIC_64);
assert((magic == MachO::MH_MAGIC_64 || magic == MachO::MH_MAGIC) && assert((magic == MachO::MH_MAGIC_64 || magic == MachO::MH_MAGIC) &&
"Unrecognized Macho Magic"); "Unrecognized Macho Magic");
@ -955,18 +969,9 @@ relocation_iterator RuntimeDyldMachO::processRelocationRef(
bool bool
RuntimeDyldMachO::isCompatibleFormat(const ObjectBuffer *InputBuffer) const { RuntimeDyldMachO::isCompatibleFormat(const ObjectBuffer *InputBuffer) const {
if (InputBuffer->getBufferSize() < 4) uint32_t Magic = readMachOMagic(InputBuffer->getBufferStart(),
return false; InputBuffer->getBufferSize());
StringRef Magic(InputBuffer->getBufferStart(), 4); return (Magic == 0xFEEDFACE || Magic == 0xFEEDFACF);
if (Magic == "\xFE\xED\xFA\xCE")
return true;
if (Magic == "\xCE\xFA\xED\xFE")
return true;
if (Magic == "\xFE\xED\xFA\xCF")
return true;
if (Magic == "\xCF\xFA\xED\xFE")
return true;
return false;
} }
bool RuntimeDyldMachO::isCompatibleFile(const object::ObjectFile *Obj) const { bool RuntimeDyldMachO::isCompatibleFile(const object::ObjectFile *Obj) const {