Mercurial > hg > truffle

diff src/os/windows/vm/os_windows.cpp @ 647:bd441136a5ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Thu, 19 Mar 2009 09:13:24 -0700
parents 0fbdb4381b99 660978a2a31a
children 6bdd6923ba16
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.cpp	Wed Mar 18 11:37:48 2009 -0400
+++ b/src/os/windows/vm/os_windows.cpp	Thu Mar 19 09:13:24 2009 -0700
@@ -2595,7 +2595,7 @@
   return true;
 }
 
-char* os::reserve_memory_special(size_t bytes) {
+char* os::reserve_memory_special(size_t bytes, char* addr) {
 
   if (UseLargePagesIndividualAllocation) {
     if (TracePageSizes && Verbose) {
@@ -2615,7 +2615,7 @@
         "use -XX:-UseLargePagesIndividualAllocation to turn off");
       return NULL;
     }
-    p_buf = (char *) VirtualAlloc(NULL,
+    p_buf = (char *) VirtualAlloc(addr,
                                  size_of_reserve,  // size of Reserve
                                  MEM_RESERVE,
                                  PAGE_EXECUTE_READWRITE);