| Index: src/platform-cygwin.cc
|
| diff --git a/src/platform-cygwin.cc b/src/platform-cygwin.cc
|
| index f2154a49585f74c6d59aa6148195b33a84213917..4d3b1e313e631d8e0ba498c11bc35b257cebee47 100644
|
| --- a/src/platform-cygwin.cc
|
| +++ b/src/platform-cygwin.cc
|
| @@ -80,7 +80,7 @@ void* OS::Allocate(const size_t requested,
|
| int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0);
|
| void* mbase = mmap(NULL, msize, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
| if (mbase == MAP_FAILED) {
|
| - LOG(ISOLATE, StringEvent("OS::Allocate", "mmap failed"));
|
| + LOG(Isolate::Current(), StringEvent("OS::Allocate", "mmap failed"));
|
| return NULL;
|
| }
|
| *allocated = msize;
|
| @@ -141,7 +141,7 @@ PosixMemoryMappedFile::~PosixMemoryMappedFile() {
|
| }
|
|
|
|
|
| -void OS::LogSharedLibraryAddresses() {
|
| +void OS::LogSharedLibraryAddresses(Isolate* isolate) {
|
| // This function assumes that the layout of the file is as follows:
|
| // hex_start_addr-hex_end_addr rwxp <unused data> [binary_file_name]
|
| // If we encounter an unexpected situation we abort scanning further entries.
|
| @@ -152,7 +152,6 @@ void OS::LogSharedLibraryAddresses() {
|
| const int kLibNameLen = FILENAME_MAX + 1;
|
| char* lib_name = reinterpret_cast<char*>(malloc(kLibNameLen));
|
|
|
| - i::Isolate* isolate = ISOLATE;
|
| // This loop will terminate once the scanning hits an EOF.
|
| while (true) {
|
| uintptr_t start, end;
|
| @@ -236,8 +235,9 @@ static void* GetRandomAddr() {
|
| static const intptr_t kAllocationRandomAddressMin = 0x04000000;
|
| static const intptr_t kAllocationRandomAddressMax = 0x3FFF0000;
|
| #endif
|
| - uintptr_t address = (V8::RandomPrivate(isolate) << kPageSizeBits)
|
| - | kAllocationRandomAddressMin;
|
| + uintptr_t address =
|
| + (isolate->random_number_generator()->NextInt() << kPageSizeBits) |
|
| + kAllocationRandomAddressMin;
|
| address &= kAllocationRandomAddressMax;
|
| return reinterpret_cast<void *>(address);
|
| }
|
| @@ -344,7 +344,7 @@ bool VirtualMemory::Guard(void* address) {
|
| if (NULL == VirtualAlloc(address,
|
| OS::CommitPageSize(),
|
| MEM_COMMIT,
|
| - PAGE_READONLY | PAGE_GUARD)) {
|
| + PAGE_NOACCESS)) {
|
| return false;
|
| }
|
| return true;
|
| @@ -366,16 +366,4 @@ bool VirtualMemory::HasLazyCommits() {
|
| return false;
|
| }
|
|
|
| -
|
| -void OS::SetUp() {
|
| - // Seed the random number generator.
|
| - // Convert the current time to a 64-bit integer first, before converting it
|
| - // to an unsigned. Going directly can cause an overflow and the seed to be
|
| - // set to all ones. The seed will be identical for different instances that
|
| - // call this setup code within the same millisecond.
|
| - uint64_t seed = static_cast<uint64_t>(TimeCurrentMillis());
|
| - srandom(static_cast<unsigned int>(seed));
|
| -}
|
| -
|
| -
|
| } } // namespace v8::internal
|
|
|