6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-23 06:35:25 +00:00
Code Issues Projects Releases Wiki Activity

Change AllocateRWX/DeallocateRWX to not throw an exception.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29058 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2006-07-07 17:32:37 +00:00
parent c1780d2a0a
commit bed22d8902
4 changed files with 85 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/System/Unix/Memory.inc
+15 -14
View File
@@ -18,14 +18,14 @@
#include <sys/mman.h>
#endif
namespace llvm {
/// AllocateRWXMemory - Allocate a slab of memory with read/write/execute
/// permissions. This is typically used for JIT applications where we want
/// to emit code to the memory then jump to it. Getting this type of memory
/// is very OS specific.
///
MemoryBlock Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock) {
llvm::sys::MemoryBlock
llvm::sys::Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock,
std::string *ErrMsg) {
if (NumBytes == 0) return MemoryBlock();
long pageSize = Process::GetPageSize();
@@ -35,7 +35,8 @@ MemoryBlock Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock)
#ifdef NEED_DEV_ZERO_FOR_MMAP
static int zero_fd = open("/dev/zero", O_RDWR);
if (zero_fd == -1) {
ThrowErrno("Can't open /dev/zero device");
GetErrno("Can't open /dev/zero device", ErrMsg);
return MemoryBlock();
}
fd = zero_fd;
#endif
@@ -48,15 +49,17 @@ MemoryBlock Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock)
#endif
;
void* start = NearBlock ? (unsigned char*) NearBlock->base() + NearBlock->size() : 0;
void* start = NearBlock ? (unsigned char*)NearBlock->base() +
NearBlock->size() : 0;
void *pa = ::mmap(start, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC,
flags, fd, 0);
if (pa == MAP_FAILED) {
if (NearBlock) //Try again without a near hint
return AllocateRWX(NumBytes, 0);
else
ThrowErrno("Can't allocate RWX Memory");
GetErrno("Can't allocate RWX Memory", ErrMsg);
return MemoryBlock();
}
MemoryBlock result;
result.Address = pa;
@@ -64,12 +67,10 @@ MemoryBlock Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock)
return result;
}
void Memory::ReleaseRWX(MemoryBlock& M) {
if (M.Address == 0 || M.Size == 0) return;
if (0 != ::munmap(M.Address, M.Size)) {
ThrowErrno("Can't release RWX Memory");
}
}
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))
return GetErrno("Can't release RWX Memory", ErrMsg);
return false;
}