#define LLVM_EXECUTIONENGINE_SECTIONMEMORYMANAGER_H
#include "llvm/ADT/SmallVector.h"
-#include "llvm/ExecutionEngine/RuntimeDyld.h"
+#include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Memory.h"
namespace llvm {
-
/// This is a simple memory manager which implements the methods called by
/// the RuntimeDyld class to allocate memory for section-based loading of
/// objects, usually those generated by the MCJIT execution engine.
/// MCJIT::finalizeObject or by calling SectionMemoryManager::finalizeMemory
/// directly. Clients of MCJIT should call MCJIT::finalizeObject.
class SectionMemoryManager : public RTDyldMemoryManager {
- SectionMemoryManager(const SectionMemoryManager&) LLVM_DELETED_FUNCTION;
- void operator=(const SectionMemoryManager&) LLVM_DELETED_FUNCTION;
+ SectionMemoryManager(const SectionMemoryManager&) = delete;
+ void operator=(const SectionMemoryManager&) = delete;
public:
SectionMemoryManager() { }
- virtual ~SectionMemoryManager();
+ ~SectionMemoryManager() override;
/// \brief Allocates a memory block of (at least) the given size suitable for
/// executable code.
/// operations needed to reliably use the memory are also performed.
///
/// \returns true if an error occurred, false otherwise.
- bool finalizeMemory(std::string *ErrMsg = 0) override;
+ bool finalizeMemory(std::string *ErrMsg = nullptr) override;
/// \brief Invalidate instruction cache for code sections.
///
private:
struct MemoryGroup {
- SmallVector<sys::MemoryBlock, 16> AllocatedMem;
+ // PendingMem contains all allocated memory blocks
+ // which have not yet had their permissions set. Note
+ // that this tracks memory blocks that have been given to
+ // this memory manager by the system, not those
+ // given out to the user. In particular, the memory manager
+ // will give out subblocks of these MemoryBlocks in response
+ // to user requests. We track which subblocks have not beeen
+ // given out yet in `FreeMem`.
+ SmallVector<sys::MemoryBlock, 16> PendingMem;
SmallVector<sys::MemoryBlock, 16> FreeMem;
+
+ // All allocated memory blocks that have had their permissions
+ // set (i.e. that have been finalized). Because of this, we may
+ // not give out subblocks of this memory to the user anymore,
+ // even if those subblocks have not been previously given out.
+ SmallVector<sys::MemoryBlock, 16> AllocatedMem;
+
sys::MemoryBlock Near;
};
uint8_t *allocateSection(MemoryGroup &MemGroup, uintptr_t Size,
unsigned Alignment);
- error_code applyMemoryGroupPermissions(MemoryGroup &MemGroup,
- unsigned Permissions);
+ std::error_code applyMemoryGroupPermissions(MemoryGroup &MemGroup,
+ unsigned Permissions);
MemoryGroup CodeMem;
MemoryGroup RWDataMem;