RuntimeDyld alignment adjustment from MachO file.

The MachO file stores section alignment as log2(alignment-in-bytes). The
allocation routines want the raw alignment-in-bytes value, so adjust
for that.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148604 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach 2012-01-21 00:21:53 +00:00
parent 12a8863828
commit 93391348dc

View File

@ -272,16 +272,18 @@ loadSegment64(const MachOObject *Obj,
// Allocate memory via the MM for the section.
uint8_t *Buffer;
uint32_t SectionID = Sections.size();
unsigned Align = 1 << Sect->Align; // .o file has log2 alignment.
if (Sect->Flags == 0x80000400)
Buffer = MemMgr->allocateCodeSection(Sect->Size, Sect->Align, SectionID);
Buffer = MemMgr->allocateCodeSection(Sect->Size, Align, SectionID);
else
Buffer = MemMgr->allocateDataSection(Sect->Size, Sect->Align, SectionID);
Buffer = MemMgr->allocateDataSection(Sect->Size, Align, SectionID);
DEBUG(dbgs() << "Loading "
<< ((Sect->Flags == 0x80000400) ? "text" : "data")
<< " (ID #" << SectionID << ")"
<< " '" << Sect->SegmentName << ","
<< Sect->Name << "' of size " << Sect->Size
<< " (align " << Align << ")"
<< " to address " << Buffer << ".\n");
// Copy the payload from the object file into the allocated buffer.