[llvm-commits] [llvm] r48743 - in /llvm/trunk: include/llvm/System/Memory.h lib/System/Unix/Memory.inc lib/System/Win32/Memory.inc

[Owen Anderson]

Author: resistor
Date: Mon Mar 24 16:29:58 2008
New Revision: 48743

URL: http://llvm.org/viewvc/llvm-project?rev=48743&view=rev
Log:
Revert r48676.  I had plans for using it, but now it's just dead code.

Modified:
    llvm/trunk/include/llvm/System/Memory.h
    llvm/trunk/lib/System/Unix/Memory.inc
    llvm/trunk/lib/System/Win32/Memory.inc

Modified: llvm/trunk/include/llvm/System/Memory.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/System/Memory.h?rev=48743&r1=48742&r2=48743&view=diff

==============================================================================
--- llvm/trunk/include/llvm/System/Memory.h (original)
+++ llvm/trunk/include/llvm/System/Memory.h Mon Mar 24 16:29:58 2008
@@ -57,18 +57,6 @@
                                      const MemoryBlock *NearBlock,
                                      std::string *ErrMsg = 0);
 
-      /// This method allocates a block of Read/Write memory.  This memory
-      /// needs to have executable permissions set before it can be used
-      /// to execute JIT'ed code.
-      ///
-      /// On success, this returns a non-null memory block, otherwise it returns
-      /// a null memory block and fills in *ErrMsg.
-      /// 
-      /// @brief Allocate Read/Write/Execute memory.
-      static MemoryBlock AllocateRW(unsigned NumBytes,
-                                    const MemoryBlock *NearBlock,
-                                    std::string *ErrMsg = 0);
-
       /// This method releases a block of Read/Write/Execute memory that was
       /// allocated with the AllocateRWX method. It should not be used to
       /// release any memory block allocated any other way.
@@ -78,7 +66,6 @@
       /// @throws std::string if an error occurred.
       /// @brief Release Read/Write/Execute memory.
       static bool ReleaseRWX(MemoryBlock &block, std::string *ErrMsg = 0);
-      
     /// @}
   };
 }

Modified: llvm/trunk/lib/System/Unix/Memory.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Unix/Memory.inc?rev=48743&r1=48742&r2=48743&view=diff

==============================================================================
--- llvm/trunk/lib/System/Unix/Memory.inc (original)
+++ llvm/trunk/lib/System/Unix/Memory.inc Mon Mar 24 16:29:58 2008
@@ -67,53 +67,6 @@
   return result;
 }
 
-/// AllocateRWMemory - Allocate a slab of memory with read/write permissions. 
-/// This memory needs to have executable permissions set before it can be used
-/// to execute JIT'ed code.
-llvm::sys::MemoryBlock 
-llvm::sys::Memory::AllocateRW(unsigned NumBytes, const MemoryBlock* NearBlock,
-                               std::string *ErrMsg) {
-  if (NumBytes == 0) return MemoryBlock();
-
-  long pageSize = Process::GetPageSize();
-  unsigned NumPages = (NumBytes+pageSize-1)/pageSize;
-
-  int fd = -1;
-#ifdef NEED_DEV_ZERO_FOR_MMAP
-  static int zero_fd = open("/dev/zero", O_RDWR);
-  if (zero_fd == -1) {
-    MakeErrMsg(ErrMsg, "Can't open /dev/zero device");
-    return MemoryBlock();
-  }
-  fd = zero_fd;
-#endif
-
-  int flags = MAP_PRIVATE |
-#ifdef HAVE_MMAP_ANONYMOUS
-  MAP_ANONYMOUS
-#else
-  MAP_ANON
-#endif
-  ;
-
-  void* start = NearBlock ? (unsigned char*)NearBlock->base() + 
-                            NearBlock->size() : 0;
-
-  void *pa = ::mmap(start, pageSize*NumPages, PROT_READ|PROT_WRITE,
-                    flags, fd, 0);
-  if (pa == MAP_FAILED) {
-    if (NearBlock) //Try again without a near hint
-      return AllocateRW(NumBytes, 0);
-
-    MakeErrMsg(ErrMsg, "Can't allocate RWX Memory");
-    return MemoryBlock();
-  }
-  MemoryBlock result;
-  result.Address = pa;
-  result.Size = NumPages*pageSize;
-  return result;
-}
-
 bool llvm::sys::Memory::ReleaseRWX(MemoryBlock &M, std::string *ErrMsg) {
   if (M.Address == 0 || M.Size == 0) return false;
   if (0 != ::munmap(M.Address, M.Size))

Modified: llvm/trunk/lib/System/Win32/Memory.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Win32/Memory.inc?rev=48743&r1=48742&r2=48743&view=diff

==============================================================================
--- llvm/trunk/lib/System/Win32/Memory.inc (original)
+++ llvm/trunk/lib/System/Win32/Memory.inc Mon Mar 24 16:29:58 2008
@@ -46,29 +46,6 @@
   return result;
 }
 
-MemoryBlock Memory::AllocateRW(unsigned NumBytes,
-                                const MemoryBlock *NearBlock,
-                                std::string *ErrMsg) {
-  if (NumBytes == 0) return MemoryBlock();
-
-  static const long pageSize = Process::GetPageSize();
-  unsigned NumPages = (NumBytes+pageSize-1)/pageSize;
-
-  //FIXME: support NearBlock if ever needed on Win64.
-
-  void *pa = VirtualAlloc(NULL, NumPages*pageSize, MEM_COMMIT,
-                  PAGE_READWRITE);
-  if (pa == NULL) {
-    MakeErrMsg(ErrMsg, "Can't allocate RWX Memory: ");
-    return MemoryBlock();
-  }
-
-  MemoryBlock result;
-  result.Address = pa;
-  result.Size = NumPages*pageSize;
-  return result;
-}
-
 bool Memory::ReleaseRWX(MemoryBlock &M, std::string *ErrMsg) {
   if (M.Address == 0 || M.Size == 0) return false;
   if (!VirtualFree(M.Address, 0, MEM_RELEASE))