[C++] Use 'nullptr'.

[oota-llvm.git] / tools / lli / RemoteMemoryManager.h

diff --git a/tools/lli/RemoteMemoryManager.h b/tools/lli/RemoteMemoryManager.h
index dc7466667262148d9beadcc9db940327adbc31a8..cf5d7c6e5db8ffb71b97dd6bbd7465052931ebe5 100644 (file)
--- a/tools/lli/RemoteMemoryManager.h
+++ b/tools/lli/RemoteMemoryManager.h
@@ -15,6 +15,7 @@
 #ifndef REMOTEMEMORYMANAGER_H
 #define REMOTEMEMORYMANAGER_H
 
+#include "RemoteTarget.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ExecutionEngine/JITMemoryManager.h"
@@ -22,14 +23,13 @@
 #include "llvm/Support/Memory.h"
 #include <utility>
 
-#include "RemoteTarget.h"
-
 namespace llvm {
 
 class RemoteMemoryManager : public JITMemoryManager {
 public:
   // Notice that this structure takes ownership of the memory allocated.
   struct Allocation {
+    Allocation() {}
     Allocation(sys::MemoryBlock mb, unsigned a, bool code)
       : MB(mb), Alignment(a), IsCode(code) {}
 
@@ -48,11 +48,11 @@ private:
   // have allocated locally but have not yet remapped for the remote target.
   // When we receive notification of a completed module load, we will map
   // these sections into the remote target.
-  SmallVector<const Allocation *, 2>  UnmappedSections;
+  SmallVector<Allocation, 2>  UnmappedSections;
 
   // This map tracks the sections we have remapped for the remote target
   // but have not yet copied to the target.
-  DenseMap<uint64_t, const Allocation *>  MappedSections;
+  DenseMap<uint64_t, Allocation>  MappedSections;
 
   // FIXME: This is part of a work around to keep sections near one another
   // when MCJIT performs relocations after code emission but before
@@ -63,41 +63,52 @@ private:
   RemoteTarget *Target;
 
 public:
-  RemoteMemoryManager() : Target(NULL) {}
+  RemoteMemoryManager() : Target(nullptr) {}
   virtual ~RemoteMemoryManager();
 
   uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
-                               unsigned SectionID, StringRef SectionName);
+                               unsigned SectionID,
+                               StringRef SectionName) override;
 
   uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
                                unsigned SectionID, StringRef SectionName,
-                               bool IsReadOnly);
+                               bool IsReadOnly) override;
+
+  // For now, remote symbol resolution is not support in lli.  The MCJIT
+  // interface does support this, but clients must provide their own
+  // mechanism for finding remote symbol addresses.  MCJIT will resolve
+  // symbols from Modules it contains.
+  uint64_t getSymbolAddress(const std::string &Name) override { return 0; }
 
-  void *getPointerToNamedFunction(const std::string &Name,
-                                  bool AbortOnFailure = true);
+  void notifyObjectLoaded(ExecutionEngine *EE, const ObjectImage *Obj) override;
 
-  void notifyObjectLoaded(ExecutionEngine *EE, const ObjectImage *Obj);
+  bool finalizeMemory(std::string *ErrMsg) override;
 
-  bool finalizeMemory(std::string *ErrMsg);
+  // For now, remote EH frame registration isn't supported.  Remote symbol
+  // resolution is a prerequisite to supporting remote EH frame registration.
+  void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr,
+                        size_t Size) override {}
+  void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr,
+                          size_t Size) override {}
 
   // This is a non-interface function used by lli
   void setRemoteTarget(RemoteTarget *T) { Target = T; }
 
   // The following obsolete JITMemoryManager calls are stubbed out for
   // this model.
-  void setMemoryWritable();
-  void setMemoryExecutable();
-  void setPoisonMemory(bool poison);
-  void AllocateGOT();
-  uint8_t *getGOTBase() const;
-  uint8_t *startFunctionBody(const Function *F, uintptr_t &ActualSize);
+  void setMemoryWritable() override;
+  void setMemoryExecutable() override;
+  void setPoisonMemory(bool poison) override;
+  void AllocateGOT() override;
+  uint8_t *getGOTBase() const override;
+  uint8_t *startFunctionBody(const Function *F, uintptr_t &ActualSize) override;
   uint8_t *allocateStub(const GlobalValue* F, unsigned StubSize,
-                        unsigned Alignment);
+                        unsigned Alignment) override;
   void endFunctionBody(const Function *F, uint8_t *FunctionStart,
-                       uint8_t *FunctionEnd);
-  uint8_t *allocateSpace(intptr_t Size, unsigned Alignment);
-  uint8_t *allocateGlobal(uintptr_t Size, unsigned Alignment);
-  void deallocateFunctionBody(void *Body);
+                       uint8_t *FunctionEnd) override;
+  uint8_t *allocateSpace(intptr_t Size, unsigned Alignment) override;
+  uint8_t *allocateGlobal(uintptr_t Size, unsigned Alignment) override;
+  void deallocateFunctionBody(void *Body) override;
 };
 
 } // end namespace llvm