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_MACOS) | 6 #if defined(HOST_OS_MACOS) |
7 | 7 |
8 #include "vm/virtual_memory.h" | 8 #include "vm/virtual_memory.h" |
9 | 9 |
10 #include <sys/mman.h> // NOLINT | 10 #include <sys/mman.h> // NOLINT |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 | 61 |
62 | 62 |
63 bool VirtualMemory::FreeSubSegment(int32_t handle, | 63 bool VirtualMemory::FreeSubSegment(int32_t handle, |
64 void* address, | 64 void* address, |
65 intptr_t size) { | 65 intptr_t size) { |
66 unmap(address, size); | 66 unmap(address, size); |
67 return true; | 67 return true; |
68 } | 68 } |
69 | 69 |
70 | 70 |
71 bool VirtualMemory::Commit(uword addr, intptr_t size, bool executable) { | 71 bool VirtualMemory::Commit(uword addr, |
| 72 intptr_t size, |
| 73 bool executable, |
| 74 const char* name) { |
72 ASSERT(Contains(addr)); | 75 ASSERT(Contains(addr)); |
73 ASSERT(Contains(addr + size) || (addr + size == end())); | 76 ASSERT(Contains(addr + size) || (addr + size == end())); |
74 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0); | 77 int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0); |
75 void* address = mmap(reinterpret_cast<void*>(addr), size, prot, | 78 void* address = mmap(reinterpret_cast<void*>(addr), size, prot, |
76 MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0); | 79 MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0); |
77 if (address == MAP_FAILED) { | 80 if (address == MAP_FAILED) { |
78 return false; | 81 return false; |
79 } | 82 } |
80 return true; | 83 return true; |
81 } | 84 } |
(...skipping 23 matching lines...) Expand all Loading... |
105 prot = PROT_READ | PROT_WRITE | PROT_EXEC; | 108 prot = PROT_READ | PROT_WRITE | PROT_EXEC; |
106 break; | 109 break; |
107 } | 110 } |
108 return (mprotect(reinterpret_cast<void*>(page_address), | 111 return (mprotect(reinterpret_cast<void*>(page_address), |
109 end_address - page_address, prot) == 0); | 112 end_address - page_address, prot) == 0); |
110 } | 113 } |
111 | 114 |
112 } // namespace dart | 115 } // namespace dart |
113 | 116 |
114 #endif // defined(HOST_OS_MACOS) | 117 #endif // defined(HOST_OS_MACOS) |
OLD | NEW |