| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include "vm/globals.h" | 5 #include "vm/globals.h" |
| 6 #if defined(TARGET_OS_WINDOWS) | 6 #if defined(TARGET_OS_WINDOWS) |
| 7 | 7 |
| 8 #include "vm/virtual_memory.h" | 8 #include "vm/virtual_memory.h" |
| 9 | 9 |
| 10 #include "platform/assert.h" | 10 #include "platform/assert.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 // can be freed. Therefore we will have to waste these unused | 47 // can be freed. Therefore we will have to waste these unused |
| 48 // virtual memory sub-segments. | 48 // virtual memory sub-segments. |
| 49 return false; | 49 return false; |
| 50 } | 50 } |
| 51 | 51 |
| 52 | 52 |
| 53 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { | 53 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { |
| 54 ASSERT(Contains(addr)); | 54 ASSERT(Contains(addr)); |
| 55 ASSERT(Contains(addr + size) || (addr + size == end())); | 55 ASSERT(Contains(addr + size) || (addr + size == end())); |
| 56 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; | 56 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; |
| 57 if (VirtualAlloc(address(), size, MEM_COMMIT, prot) == NULL) { | 57 if (VirtualAlloc(reinterpret_cast<void*>(addr), size, MEM_COMMIT, prot) == |
| 58 NULL) { |
| 58 return false; | 59 return false; |
| 59 } | 60 } |
| 60 return true; | 61 return true; |
| 61 } | 62 } |
| 62 | 63 |
| 63 | 64 |
| 64 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) { | 65 bool VirtualMemory::Protect(void* address, intptr_t size, Protection mode) { |
| 65 uword start_address = reinterpret_cast<uword>(address); | 66 uword start_address = reinterpret_cast<uword>(address); |
| 66 uword end_address = start_address + size; | 67 uword end_address = start_address + size; |
| 67 uword page_address = Utils::RoundDown(start_address, PageSize()); | 68 uword page_address = Utils::RoundDown(start_address, PageSize()); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 87 bool result = VirtualProtect(reinterpret_cast<void*>(page_address), | 88 bool result = VirtualProtect(reinterpret_cast<void*>(page_address), |
| 88 end_address - page_address, | 89 end_address - page_address, |
| 89 prot, | 90 prot, |
| 90 &old_prot); | 91 &old_prot); |
| 91 return result; | 92 return result; |
| 92 } | 93 } |
| 93 | 94 |
| 94 } // namespace dart | 95 } // namespace dart |
| 95 | 96 |
| 96 #endif // defined(TARGET_OS_WINDOWS) | 97 #endif // defined(TARGET_OS_WINDOWS) |
| OLD | NEW |