Revision: 22152
Author:   [email protected]
Date:     Wed Jul  2 11:22:54 2014 UTC
Log:      Fix platform-cygwin.cc to really not use an Isolate

BUG=none
[email protected]
LOG=n

Review URL: https://codereview.chromium.org/367953002
http://code.google.com/p/v8/source/detail?r=22152

Modified:
 /branches/bleeding_edge/src/base/platform/platform-cygwin.cc

=======================================
--- /branches/bleeding_edge/src/base/platform/platform-cygwin.cc Mon Jun 30 13:25:46 2014 UTC +++ /branches/bleeding_edge/src/base/platform/platform-cygwin.cc Wed Jul 2 11:22:54 2014 UTC
@@ -179,41 +179,13 @@
 // This causes VirtualMemory::Commit to not always commit the memory region
 // specified.

-static void* GetRandomAddr() {
-  Isolate* isolate = Isolate::UncheckedCurrent();
-  // Note that the current isolate isn't set up in a call path via
- // CpuFeatures::Probe. We don't care about randomization in this case because
-  // the code page is immediately freed.
-  if (isolate != NULL) {
-    // The address range used to randomize RWX allocations in OS::Allocate
-    // Try not to map pages into the default range that windows loads DLLs
-    // Use a multiple of 64k to prevent committing unused memory.
-    // Note: This does not guarantee RWX regions will be within the
-    // range kAllocationRandomAddressMin to kAllocationRandomAddressMax
-#ifdef V8_HOST_ARCH_64_BIT
-    static const intptr_t kAllocationRandomAddressMin = 0x0000000080000000;
-    static const intptr_t kAllocationRandomAddressMax = 0x000003FFFFFF0000;
-#else
-    static const intptr_t kAllocationRandomAddressMin = 0x04000000;
-    static const intptr_t kAllocationRandomAddressMax = 0x3FFF0000;
-#endif
-    uintptr_t address =
-        (isolate->random_number_generator()->NextInt() << kPageSizeBits) |
-        kAllocationRandomAddressMin;
-    address &= kAllocationRandomAddressMax;
-    return reinterpret_cast<void *>(address);
-  }
-  return NULL;
-}
-
-
static void* RandomizedVirtualAlloc(size_t size, int action, int protection) {
   LPVOID base = NULL;

if (protection == PAGE_EXECUTE_READWRITE || protection == PAGE_NOACCESS) {
     // For exectutable pages try and randomize the allocation address
     for (size_t attempts = 0; base == NULL && attempts < 3; ++attempts) {
-      base = VirtualAlloc(GetRandomAddr(), size, action, protection);
+ base = VirtualAlloc(OS::GetRandomMmapAddr(), size, action, protection);
     }
   }

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to