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(HOST_OS_WINDOWS) | 6 #if defined(HOST_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 bool VirtualMemory::FreeSubSegment(int32_t handle, | 47 bool VirtualMemory::FreeSubSegment(int32_t handle, |
48 void* address, | 48 void* address, |
49 intptr_t size) { | 49 intptr_t size) { |
50 // On Windows only the entire segment returned by VirtualAlloc | 50 // On Windows only the entire segment returned by VirtualAlloc |
51 // can be freed. Therefore we will have to waste these unused | 51 // can be freed. Therefore we will have to waste these unused |
52 // virtual memory sub-segments. | 52 // virtual memory sub-segments. |
53 return false; | 53 return false; |
54 } | 54 } |
55 | 55 |
56 | 56 |
57 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { | 57 bool VirtualMemory::Commit(uword addr, |
| 58 intptr_t size, |
| 59 bool executable, |
| 60 const char* name) { |
58 ASSERT(Contains(addr)); | 61 ASSERT(Contains(addr)); |
59 ASSERT(Contains(addr + size) || (addr + size == end())); | 62 ASSERT(Contains(addr + size) || (addr + size == end())); |
60 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; | 63 int prot = executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; |
61 if (VirtualAlloc(reinterpret_cast<void*>(addr), size, MEM_COMMIT, prot) == | 64 if (VirtualAlloc(reinterpret_cast<void*>(addr), size, MEM_COMMIT, prot) == |
62 NULL) { | 65 NULL) { |
63 return false; | 66 return false; |
64 } | 67 } |
65 return true; | 68 return true; |
66 } | 69 } |
67 | 70 |
(...skipping 24 matching lines...) Expand all Loading... |
92 } | 95 } |
93 DWORD old_prot = 0; | 96 DWORD old_prot = 0; |
94 bool result = VirtualProtect(reinterpret_cast<void*>(page_address), | 97 bool result = VirtualProtect(reinterpret_cast<void*>(page_address), |
95 end_address - page_address, prot, &old_prot); | 98 end_address - page_address, prot, &old_prot); |
96 return result; | 99 return result; |
97 } | 100 } |
98 | 101 |
99 } // namespace dart | 102 } // namespace dart |
100 | 103 |
101 #endif // defined(HOST_OS_WINDOWS) | 104 #endif // defined(HOST_OS_WINDOWS) |
OLD | NEW |