Commit 0389c51d authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r142039: 

------------------------------------------------------------------------
r142039 | chapuni | 2011-10-14 18:58:16 -0700 (Fri, 14 Oct 2011) | 3 lines

Windows/Memory.inc: Support the ability to allocate memory "near" another block of memory on Win32. It has fixed FIXME.

Thanks to Aaron Ballman!
------------------------------------------------------------------------

llvm-svn: 142095
parent 229865e2

llvm/lib/Support/Windows/Memory.inc

+7 −2
Original line number Diff line number Diff line
@@ -32,11 +32,16 @@ MemoryBlock Memory::AllocateRWX(size_t NumBytes, 
  static const size_t pageSize = Process::GetPageSize();

  size_t NumPages = (NumBytes+pageSize-1)/pageSize;



  //FIXME: support NearBlock if ever needed on Win64.

  PVOID start = NearBlock ? static_cast<unsigned char *>(NearBlock->base()) +

                                NearBlock->size() : NULL;



  void *pa = VirtualAlloc(NULL, NumPages*pageSize, MEM_COMMIT,

  void *pa = VirtualAlloc(start, NumPages*pageSize, MEM_RESERVE | MEM_COMMIT,

                  PAGE_EXECUTE_READWRITE);

  if (pa == NULL) {

    if (NearBlock) {

      // Try again without the NearBlock hint

      return AllocateRWX(NumBytes, NULL, ErrMsg);

    }

    MakeErrMsg(ErrMsg, "Can't allocate RWX Memory: ");

    return MemoryBlock();

  }