Remove attribution from file headers, per discussion on llvmdev.

[oota-llvm.git] / lib / System / Win32 / Memory.inc

diff --git a/lib/System/Win32/Memory.inc b/lib/System/Win32/Memory.inc
index 946e50cd6fc2af0481b81d43819ca441a50e098f..eed2b100e6d805db961d93c1b8d7f081837d2de6 100644 (file)
--- a/lib/System/Win32/Memory.inc
+++ b/lib/System/Win32/Memory.inc
@@ -2,8 +2,8 @@
 // 
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 // 
 //===----------------------------------------------------------------------===//
 //
@@ -12,34 +12,46 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <llvm/System/Process.h>
-#include "windows.h"
+#include "Win32.h"
+#include "llvm/System/Process.h"
 
 namespace llvm {
 using namespace sys;
 
 //===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Win32 specific code.
+//=== WARNING: Implementation here must contain only Win32 specific code 
+//===          and must not be UNIX code
 //===----------------------------------------------------------------------===//
 
-MemoryBlock Memory::AllocateRWX(unsigned NumBytes) {
+MemoryBlock Memory::AllocateRWX(unsigned NumBytes,
+                                const MemoryBlock *NearBlock,
+                                std::string *ErrMsg) {
   if (NumBytes == 0) return MemoryBlock();
 
-  unsigned pageSize = Process::GetPageSize();
+  static const long pageSize = Process::GetPageSize();
   unsigned NumPages = (NumBytes+pageSize-1)/pageSize;
-  void *P = VirtualAlloc(0, NumPages*pageSize, MEM_COMMIT, 
-                         PAGE_EXECUTE_READWRITE);
-  if (P == 0) {
-    throw std::string("Couldn't allocate ") + utostr(NumBytes) + 
-        " bytes of executable memory!";
+
+  //FIXME: support NearBlock if ever needed on Win64.
+
+  void *pa = VirtualAlloc(NULL, NumPages*pageSize, MEM_COMMIT,
+                  PAGE_EXECUTE_READWRITE);
+  if (pa == NULL) {
+    MakeErrMsg(ErrMsg, "Can't allocate RWX Memory: ");
+    return MemoryBlock();
   }
+
   MemoryBlock result;
-  result.Address = P;
-  result.Size = NumBytes;
+  result.Address = pa;
+  result.Size = NumPages*pageSize;
   return result;
 }
 
-void Memory::ReleaseRWX(MemoryBlock& M) {
-  if (M.Address == 0 || M.Size == 0) return;
-  VirtualFree(M.Address, M.Size, MEM_DECOMMIT, PAGE_NOACCESS);
+bool Memory::ReleaseRWX(MemoryBlock &M, std::string *ErrMsg) {
+  if (M.Address == 0 || M.Size == 0) return false;
+  if (!VirtualFree(M.Address, 0, MEM_RELEASE))
+    return MakeErrMsg(ErrMsg, "Can't release RWX Memory: ");
+  return false;
 }
+
+}
+