diff options
Diffstat (limited to 'unittests/ExecutionEngine/MCJIT')
| -rw-r--r-- | unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp | 8 | ||||
| -rw-r--r-- | unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp | 24 |
2 files changed, 17 insertions, 15 deletions
diff --git a/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp index c434a7c0b2..e4197ddced 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp @@ -28,18 +28,20 @@ static bool didCallAllocateCodeSection; static uint8_t *roundTripAllocateCodeSection(void *object, uintptr_t size, unsigned alignment, - unsigned sectionID) { + unsigned sectionID, + const char *sectionName) { didCallAllocateCodeSection = true; return static_cast<SectionMemoryManager*>(object)->allocateCodeSection( - size, alignment, sectionID); + size, alignment, sectionID, sectionName); } static uint8_t *roundTripAllocateDataSection(void *object, uintptr_t size, unsigned alignment, unsigned sectionID, + const char *sectionName, LLVMBool isReadOnly) { return static_cast<SectionMemoryManager*>(object)->allocateDataSection( - size, alignment, sectionID, isReadOnly); + size, alignment, sectionID, sectionName, isReadOnly); } static LLVMBool roundTripFinalizeMemory(void *object, char **errMsg) { diff --git a/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp index f6dbf98450..c24346de84 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp @@ -19,10 +19,10 @@ namespace { TEST(MCJITMemoryManagerTest, BasicAllocations) { OwningPtr<SectionMemoryManager> MemMgr(new SectionMemoryManager()); - uint8_t *code1 = MemMgr->allocateCodeSection(256, 0, 1); - uint8_t *data1 = MemMgr->allocateDataSection(256, 0, 2, true); - uint8_t *code2 = MemMgr->allocateCodeSection(256, 0, 3); - uint8_t *data2 = MemMgr->allocateDataSection(256, 0, 4, false); + uint8_t *code1 = MemMgr->allocateCodeSection(256, 0, 1, ""); + uint8_t *data1 = MemMgr->allocateDataSection(256, 0, 2, "", true); + uint8_t *code2 = MemMgr->allocateCodeSection(256, 0, 3, ""); + uint8_t *data2 = MemMgr->allocateDataSection(256, 0, 4, "", false); EXPECT_NE((uint8_t*)0, code1); EXPECT_NE((uint8_t*)0, code2); @@ -52,10 +52,10 @@ TEST(MCJITMemoryManagerTest, BasicAllocations) { TEST(MCJITMemoryManagerTest, LargeAllocations) { OwningPtr<SectionMemoryManager> MemMgr(new SectionMemoryManager()); - uint8_t *code1 = MemMgr->allocateCodeSection(0x100000, 0, 1); - uint8_t *data1 = MemMgr->allocateDataSection(0x100000, 0, 2, true); - uint8_t *code2 = MemMgr->allocateCodeSection(0x100000, 0, 3); - uint8_t *data2 = MemMgr->allocateDataSection(0x100000, 0, 4, false); + uint8_t *code1 = MemMgr->allocateCodeSection(0x100000, 0, 1, ""); + uint8_t *data1 = MemMgr->allocateDataSection(0x100000, 0, 2, "", true); + uint8_t *code2 = MemMgr->allocateCodeSection(0x100000, 0, 3, ""); + uint8_t *data2 = MemMgr->allocateDataSection(0x100000, 0, 4, "", false); EXPECT_NE((uint8_t*)0, code1); EXPECT_NE((uint8_t*)0, code2); @@ -91,8 +91,8 @@ TEST(MCJITMemoryManagerTest, ManyAllocations) { for (unsigned i = 0; i < 10000; ++i) { const bool isReadOnly = i % 2 == 0; - code[i] = MemMgr->allocateCodeSection(32, 0, 1); - data[i] = MemMgr->allocateDataSection(32, 0, 2, isReadOnly); + code[i] = MemMgr->allocateCodeSection(32, 0, 1, ""); + data[i] = MemMgr->allocateDataSection(32, 0, 2, "", isReadOnly); for (unsigned j = 0; j < 32; j++) { code[i][j] = 1 + (i % 254); @@ -130,8 +130,8 @@ TEST(MCJITMemoryManagerTest, ManyVariedAllocations) { bool isReadOnly = i % 3 == 0; unsigned Align = 8 << (i % 4); - code[i] = MemMgr->allocateCodeSection(CodeSize, Align, i); - data[i] = MemMgr->allocateDataSection(DataSize, Align, i + 10000, + code[i] = MemMgr->allocateCodeSection(CodeSize, Align, i, ""); + data[i] = MemMgr->allocateDataSection(DataSize, Align, i + 10000, "", isReadOnly); for (unsigned j = 0; j < CodeSize; j++) { |