diff options
author | Tim Northover <Tim.Northover@arm.com> | 2012-10-29 10:47:07 +0000 |
---|---|---|
committer | Tim Northover <Tim.Northover@arm.com> | 2012-10-29 10:47:07 +0000 |
commit | b210e6fea56ecc8126d5101ccd2539da23546641 (patch) | |
tree | 5739d2f77bb5199324d541c202117e10470cab29 /tools/lli | |
parent | f00677d74f1be5b4c7c73e1681a64c9062f4c7ee (diff) | |
download | llvm-b210e6fea56ecc8126d5101ccd2539da23546641.tar.gz llvm-b210e6fea56ecc8126d5101ccd2539da23546641.tar.bz2 llvm-b210e6fea56ecc8126d5101ccd2539da23546641.tar.xz |
Align the data section correctly when loading an ELF file.
Patch by Amara Emerson.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166920 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/lli')
-rw-r--r-- | tools/lli/lli.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index 0ee72387b8..532980a860 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -42,6 +42,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/DynamicLibrary.h" #include "llvm/Support/Memory.h" +#include "llvm/Support/MathExtras.h" #include <cerrno> #ifdef __linux__ @@ -303,9 +304,16 @@ uint8_t *LLIMCJITMemoryManager::allocateDataSection(uintptr_t Size, unsigned SectionID) { if (!Alignment) Alignment = 16; - uint8_t *Addr = (uint8_t*)calloc((Size + Alignment - 1)/Alignment, Alignment); - AllocatedDataMem.push_back(sys::MemoryBlock(Addr, Size)); - return Addr; + // Ensure that enough memory is requested to allow aligning. + size_t NumElementsAligned = 1 + (Size + Alignment - 1)/Alignment; + uint8_t *Addr = (uint8_t*)calloc(NumElementsAligned, Alignment); + + // Honour the alignment requirement. + uint8_t *AlignedAddr = (uint8_t*)RoundUpToAlignment((uint64_t)Addr, Alignment); + + // Store the original address from calloc so we can free it later. + AllocatedDataMem.push_back(sys::MemoryBlock(Addr, NumElementsAligned*Alignment)); + return AlignedAddr; } uint8_t *LLIMCJITMemoryManager::allocateCodeSection(uintptr_t Size, |