RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-15 07:39:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed alignment of code sections in the JIT mode. Added a test to the JITMemoryManager.

Browse Source 
llvm-svn: 185421
This commit is contained in:
Elena Demikhovsky 2013-07-02 12:24:22 +00:00
parent d0b90ac5a7
commit a6f1ca6a6f
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ExecutionEngine/JIT/JITMemoryManager.cpp
View File

@ -468,7 +468,11 @@ namespace {
// Grow the required block size to account for the block header
Size += sizeof(*CurBlock);
// FIXME: Alignement handling.
// Alignment handling.
if (!Alignment)
Alignment = 16;
Size += Alignment - 1;
FreeRangeHeader* candidateBlock = FreeMemoryList;
FreeRangeHeader* head = FreeMemoryList;
FreeRangeHeader* iter = head->Next;
@ -500,7 +504,8 @@ namespace {
FreeMemoryList = candidateBlock->AllocateBlock();
// Release the memory at the end of this block that isn't needed.
FreeMemoryList = CurBlock->TrimAllocationToSize(FreeMemoryList, Size);
return (uint8_t *)(CurBlock + 1);
uintptr_t unalignedAddr = (uintptr_t)CurBlock + sizeof(*CurBlock);
return (uint8_t*)RoundUpToAlignment((uint64_t)unalignedAddr, Alignment);
}
/// allocateDataSection - Allocate memory for a data section.

23
unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp
View File

@ -277,4 +277,27 @@ TEST(JITMemoryManagerTest, TestManyStubs) {
EXPECT_EQ(3U, MemMgr->GetNumStubSlabs());
}
// Check section allocation and alignment
TEST(JITMemoryManagerTest, AllocateSection) {
OwningPtr<JITMemoryManager> MemMgr(
JITMemoryManager::CreateDefaultMemManager());
uint8_t *code1 = MemMgr->allocateCodeSection(256, 0, 1);
uint8_t *data1 = MemMgr->allocateDataSection(256, 16, 2, true);
uint8_t *code2 = MemMgr->allocateCodeSection(257, 32, 3);
uint8_t *data2 = MemMgr->allocateDataSection(256, 64, 4, false);
uint8_t *code3 = MemMgr->allocateCodeSection(258, 64, 5);
EXPECT_NE((uint8_t*)0, code1);
EXPECT_NE((uint8_t*)0, code2);
EXPECT_NE((uint8_t*)0, data1);
EXPECT_NE((uint8_t*)0, data2);
// Check alignment
EXPECT_EQ((uint64_t)code1 & 0xf, 0);
EXPECT_EQ((uint64_t)code2 & 0x1f, 0);
EXPECT_EQ((uint64_t)code3 & 0x3f, 0);
EXPECT_EQ((uint64_t)data1 & 0xf, 0);
EXPECT_EQ((uint64_t)data2 & 0x3f, 0);
}
}