aboutsummaryrefslogtreecommitdiffstats
path: root/lib/System
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2008-03-24 21:29:58 +0000
committerOwen Anderson <resistor@mac.com>2008-03-24 21:29:58 +0000
commit19cfd733e2b383a43b9eb4217f901c4a51f36f63 (patch)
tree2197f789fd8790e41a51912398417feeb019f21a /lib/System
parent7a3ad1a401d0ede3d4365db144c4e7f04c73d2ec (diff)
downloadexternal_llvm-19cfd733e2b383a43b9eb4217f901c4a51f36f63.zip
external_llvm-19cfd733e2b383a43b9eb4217f901c4a51f36f63.tar.gz
external_llvm-19cfd733e2b383a43b9eb4217f901c4a51f36f63.tar.bz2
Revert r48676. I had plans for using it, but now it's just dead code.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48743 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/System')
-rw-r--r--lib/System/Unix/Memory.inc47
-rw-r--r--lib/System/Win32/Memory.inc23
2 files changed, 0 insertions, 70 deletions
diff --git a/lib/System/Unix/Memory.inc b/lib/System/Unix/Memory.inc
index e0bf8d8..afa8f03 100644
--- a/lib/System/Unix/Memory.inc
+++ b/lib/System/Unix/Memory.inc
@@ -67,53 +67,6 @@ llvm::sys::Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock,
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))
diff --git a/lib/System/Win32/Memory.inc b/lib/System/Win32/Memory.inc
index 1262752..eed2b10 100644
--- a/lib/System/Win32/Memory.inc
+++ b/lib/System/Win32/Memory.inc
@@ -46,29 +46,6 @@ MemoryBlock Memory::AllocateRWX(unsigned NumBytes,
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))